diff --git a/README.md b/README.md index 7aa5fb6..d60243f 100644 --- a/README.md +++ b/README.md @@ -14,5 +14,5 @@ The `examples` directory runs the tests for other packages: * https://github.com/armon/go-socks5 (PASS, server only, lacks ASSOCIATE) * https://github.com/things-go/go-socks5 (PASS, server only, lacks BIND) * https://golang.org/x/net (PASS, client only, lacks BIND and ASSOCIATE) -* https://github.com/wzshiming/socks5 (v0.5.1: FAIL some tests, limited ASSOCIATE support, sometimes fails race checker) +* https://github.com/wzshiming/socks5 (v0.6.0: PASS; v0.5.1: FAIL some tests, limited ASSOCIATE support, sometimes fails race checker) * https://github.com/txthinking/socks5 (FAIL some tests, broken ASSOCIATE support) diff --git a/examples/github_com_wzshiming_socks5/all_test.go b/examples/github_com_wzshiming_socks5/all_test.go index 3a2ffe2..fe3d0e0 100644 --- a/examples/github_com_wzshiming_socks5/all_test.go +++ b/examples/github_com_wzshiming_socks5/all_test.go @@ -5,6 +5,7 @@ import ( "log" "net" "testing" + "time" "github.com/linkdata/socks5test" "github.com/wzshiming/socks5" @@ -12,7 +13,8 @@ import ( var srvfn = func(ctx context.Context, l net.Listener, username, password string) { server := &socks5.Server{ - Logger: log.Default(), + Logger: log.Default(), + ListenBindReuseTimeout: time.Second / 2, } if username != "" { server.Authentication = socks5.UserAuth(username, password) @@ -78,7 +80,6 @@ func TestUDP_Single(t *testing.T) { } func TestUDP_Multiple(t *testing.T) { - t.Skip("does not support net.PacketConn WriteTo and ReadFrom with other addresses") socks5test.UDP_Multiple(t, srvfn, clifn) } diff --git a/examples/github_com_wzshiming_socks5/go.mod b/examples/github_com_wzshiming_socks5/go.mod index cbb2efc..f57d317 100644 --- a/examples/github_com_wzshiming_socks5/go.mod +++ b/examples/github_com_wzshiming_socks5/go.mod @@ -3,8 +3,8 @@ module github_com_wzshiming_socks5 go 1.24.0 require ( - github.com/linkdata/socks5test v0.0.5 - github.com/wzshiming/socks5 v0.5.1 + github.com/linkdata/socks5test v0.0.0 + github.com/wzshiming/socks5 v0.6.0 ) replace github.com/linkdata/socks5test => ../.. diff --git a/examples/github_com_wzshiming_socks5/go.sum b/examples/github_com_wzshiming_socks5/go.sum index d6baba3..0f98c19 100644 --- a/examples/github_com_wzshiming_socks5/go.sum +++ b/examples/github_com_wzshiming_socks5/go.sum @@ -1,4 +1,4 @@ -github.com/linkdata/socks5 v0.0.9 h1:kj5umxuRSHWFUQQVXDHFs6uEx3IwrKx+oVIdvNI4TiI= -github.com/linkdata/socks5 v0.0.9/go.mod h1:0enIWfnw6ELUyAyxaJ2UbP0i6ZDmCAlj+P+5THjQkQc= -github.com/wzshiming/socks5 v0.5.1 h1:TRekapqSWrE4QYfGiZ4Ok04wQECuAyQsSUdljvbWO5w= -github.com/wzshiming/socks5 v0.5.1/go.mod h1:BvCAqlzocQN5xwLjBZDBbvWlrx8sCYSSbHEOf2wZgT0= +github.com/linkdata/socks5 v0.0.15 h1:ZLIagBPhzBDWlPVccWdEWblNclwhfY/cRlWKfP2VAJ8= +github.com/linkdata/socks5 v0.0.15/go.mod h1:0enIWfnw6ELUyAyxaJ2UbP0i6ZDmCAlj+P+5THjQkQc= +github.com/wzshiming/socks5 v0.6.0 h1:p5RFNs21Byv+Tnc7chYRFtz0SzK8TcqKV7xFkXSeZvw= +github.com/wzshiming/socks5 v0.6.0/go.mod h1:BvCAqlzocQN5xwLjBZDBbvWlrx8sCYSSbHEOf2wZgT0=