STRLCPY/prox5

Merge branch 'master' into dev
[email protected] committed 2 years ago

700fd699

2 parents
cb4f28f1
0cb06377

■ ■ ■ ■ ■ ■

README.md

		skipped 49 lines
50	50
51	51		Please break it and let me know what broke.
52	52
53		-	### See [the docs](https://pkg.go.dev/git.tcp.direct/kayos/Prox5) and the [example](example/main.go) for more details.
	53	+	### See [the docs](https://pkg.go.dev/git.tcp.direct/kayos/prox5) and the [example](example/main.go) for more details.
54	54

■ ■ ■ ■ ■ ■

list_management.go

		skipped 18 lines
19	19
20	20		// LoadProxyTXT loads proxies from a given seed file and feeds them to the mapBuilder to be later queued automatically for validation.
21	21		// Expects one of the following formats for each line:
22		-	// * 127.0.0.1:1080
23		-	// * 127.0.0.1:1080:user:pass
24		-	// * yeet.com:1080
25		-	// * yeet.com:1080:user:pass
26		-	// * [fe80::2ef0:5dff:fe7f:c299]:1080
27		-	// * [fe80::2ef0:5dff:fe7f:c299]:1080:user:pass
	22	+	// - 127.0.0.1:1080
	23	+	// - 127.0.0.1:1080:user:pass
	24	+	// - yeet.com:1080
	25	+	// - yeet.com:1080:user:pass
	26	+	// - [fe80::2ef0:5dff:fe7f:c299]:1080
	27	+	// - [fe80::2ef0:5dff:fe7f:c299]:1080:user:pass
28	28		func (p5 *Swamp) LoadProxyTXT(seedFile string) (count int) {
29	29		f, err := os.Open(seedFile)
30	30		if err != nil {
		skipped 19 lines
50	50
51	51		// LoadSingleProxy loads a SOCKS proxy into our map.
52	52		// Expects one of the following formats:
53		-	// * 127.0.0.1:1080
54		-	// * 127.0.0.1:1080:user:pass
55		-	// * yeet.com:1080
56		-	// * yeet.com:1080:user:pass
57		-	// * [fe80::2ef0:5dff:fe7f:c299]:1080
58		-	// * [fe80::2ef0:5dff:fe7f:c299]:1080:user:pass
	53	+	// - 127.0.0.1:1080
	54	+	// - 127.0.0.1:1080:user:pass
	55	+	// - yeet.com:1080
	56	+	// - yeet.com:1080:user:pass
	57	+	// - [fe80::2ef0:5dff:fe7f:c299]:1080
	58	+	// - [fe80::2ef0:5dff:fe7f:c299]:1080:user:pass
59	59		func (p5 *Swamp) LoadSingleProxy(sock string) (ok bool) {
60	60		if sock, ok = filter(sock); !ok {
61	61		return
		skipped 15 lines
77	77
78	78		// LoadMultiLineString loads a multiine string object with proxy per line.
79	79		// Expects one of the following formats for each line:
80		-	// * 127.0.0.1:1080
81		-	// * 127.0.0.1:1080:user:pass
82		-	// * yeet.com:1080
83		-	// * yeet.com:1080:user:pass
84		-	// * [fe80::2ef0:5dff:fe7f:c299]:1080
85		-	// * [fe80::2ef0:5dff:fe7f:c299]:1080:user:pass
	80	+	// - 127.0.0.1:1080
	81	+	// - 127.0.0.1:1080:user:pass
	82	+	// - yeet.com:1080
	83	+	// - yeet.com:1080:user:pass
	84	+	// - [fe80::2ef0:5dff:fe7f:c299]:1080
	85	+	// - [fe80::2ef0:5dff:fe7f:c299]:1080:user:pass
86	86		func (p5 *Swamp) LoadMultiLineString(socks string) int {
87	87		var count int
88	88		scan := bufio.NewScanner(strings.NewReader(socks))
		skipped 15 lines

Merge branch 'master' into dev