diff --git a/examples/bench/srv.go b/examples/bench/srv.go index e2bb953..36da8e4 100644 --- a/examples/bench/srv.go +++ b/examples/bench/srv.go @@ -52,7 +52,6 @@ func main() { } func httpServer() { - s := &gost.Server{} ln, err := gost.TCPListener(":18080") if err != nil { log.Fatal(err) @@ -60,11 +59,11 @@ func httpServer() { h := gost.HTTPHandler( gost.UsersHandlerOption(url.UserPassword("admin", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func socks5Server() { - s := &gost.Server{} ln, err := gost.TCPListener(":11080") if err != nil { log.Fatal(err) @@ -73,11 +72,11 @@ func socks5Server() { gost.UsersHandlerOption(url.UserPassword("admin", "123456")), gost.TLSConfigHandlerOption(tlsConfig()), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func shadowServer() { - s := &gost.Server{} ln, err := gost.TCPListener(":18338") if err != nil { log.Fatal(err) @@ -85,11 +84,11 @@ func shadowServer() { h := gost.ShadowHandler( gost.UsersHandlerOption(url.UserPassword("chacha20", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func tlsServer() { - s := &gost.Server{} ln, err := gost.TLSListener(":11443", tlsConfig()) if err != nil { log.Fatal(err) @@ -97,11 +96,11 @@ func tlsServer() { h := gost.HTTPHandler( gost.UsersHandlerOption(url.UserPassword("admin", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func wsServer() { - s := &gost.Server{} ln, err := gost.WSListener(":18000", nil) if err != nil { log.Fatal(err) @@ -109,11 +108,11 @@ func wsServer() { h := gost.HTTPHandler( gost.UsersHandlerOption(url.UserPassword("admin", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func wssServer() { - s := &gost.Server{} ln, err := gost.WSSListener(":18443", tlsConfig(), nil) if err != nil { log.Fatal(err) @@ -121,31 +120,31 @@ func wssServer() { h := gost.HTTPHandler( gost.UsersHandlerOption(url.UserPassword("admin", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func kcpServer() { - s := &gost.Server{} ln, err := gost.KCPListener(":18388", nil) if err != nil { log.Fatal(err) } h := gost.HTTPHandler() - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func tcpForwardServer() { - s := &gost.Server{} ln, err := gost.TCPListener(":2222") if err != nil { log.Fatal(err) } h := gost.TCPDirectForwardHandler("localhost:22") - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func tcpRemoteForwardServer() { - s := &gost.Server{} ln, err := gost.TCPRemoteForwardListener( ":1222", /* @@ -171,11 +170,11 @@ func tcpRemoteForwardServer() { ":22", //gost.AddrHandlerOption("127.0.0.1:22"), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func rudpForwardServer() { - s := &gost.Server{} ln, err := gost.UDPRemoteForwardListener( ":10053", gost.NewChain( @@ -196,21 +195,21 @@ func rudpForwardServer() { log.Fatal() } h := gost.UDPRemoteForwardHandler("localhost:53") - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func tcpRedirectServer() { - s := &gost.Server{} ln, err := gost.TCPListener(":8008") if err != nil { log.Fatal(err) } h := gost.TCPRedirectHandler() - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func sshTunnelServer() { - s := &gost.Server{} ln, err := gost.SSHTunnelListener(":12222", &gost.SSHConfig{TLSConfig: tlsConfig()}) if err != nil { log.Fatal(err) @@ -218,13 +217,13 @@ func sshTunnelServer() { h := gost.HTTPHandler( gost.UsersHandlerOption(url.UserPassword("admin", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func http2Server() { // http2.VerboseLogs = true - s := &gost.Server{} ln, err := gost.HTTP2Listener(":1443", tlsConfig()) if err != nil { log.Fatal(err) @@ -232,11 +231,11 @@ func http2Server() { h := gost.HTTP2Handler( gost.UsersHandlerOption(url.UserPassword("admin", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func http2TunnelServer() { - s := &gost.Server{} ln, err := gost.H2Listener(":8443", tlsConfig()) // HTTP2 h2 mode // ln, err := gost.H2CListener(":8443") // HTTP2 h2c mode if err != nil { @@ -249,11 +248,11 @@ func http2TunnelServer() { gost.UsersHandlerOption(url.UserPassword("admin", "123456")), gost.TLSConfigHandlerOption(tlsConfig()), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func quicServer() { - s := &gost.Server{} ln, err := gost.QUICListener("localhost:6121", &gost.QUICConfig{TLSConfig: tlsConfig()}) if err != nil { log.Fatal(err) @@ -261,11 +260,11 @@ func quicServer() { h := gost.HTTPHandler( gost.UsersHandlerOption(url.UserPassword("admin", "123456")), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } func shadowUDPServer() { - s := &gost.Server{} ln, err := gost.ShadowUDPListener(":18338", url.UserPassword("chacha20", "123456"), 30*time.Second) if err != nil { log.Fatal(err) @@ -286,7 +285,8 @@ func shadowUDPServer() { )), */ ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } var ( diff --git a/examples/forward/direct/server.go b/examples/forward/direct/server.go index 1427bc2..20aca6d 100644 --- a/examples/forward/direct/server.go +++ b/examples/forward/direct/server.go @@ -12,7 +12,6 @@ func main() { } func sshForwardServer() { - s := &gost.Server{} ln, err := gost.TCPListener(":11222") if err != nil { log.Fatal(err) @@ -22,7 +21,8 @@ func sshForwardServer() { // gost.UsersHandlerOption(url.UserPassword("admin", "123456")), gost.TLSConfigHandlerOption(tlsConfig()), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } var ( diff --git a/examples/forward/remote/server.go b/examples/forward/remote/server.go index 2268f49..cc83aa8 100644 --- a/examples/forward/remote/server.go +++ b/examples/forward/remote/server.go @@ -12,7 +12,6 @@ func main() { } func sshRemoteForwardServer() { - s := &gost.Server{} ln, err := gost.TCPListener(":11222") if err != nil { log.Fatal(err) @@ -22,7 +21,8 @@ func sshRemoteForwardServer() { // gost.UsersHandlerOption(url.UserPassword("admin", "123456")), gost.TLSConfigHandlerOption(tlsConfig()), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } var ( diff --git a/examples/forward/udp/direct.go b/examples/forward/udp/direct.go index c9da045..79f9a35 100644 --- a/examples/forward/udp/direct.go +++ b/examples/forward/udp/direct.go @@ -31,7 +31,6 @@ func main() { } func udpDirectForwardServer() { - s := &gost.Server{} ln, err := gost.UDPDirectForwardListener(laddr, time.Second*30) if err != nil { log.Fatal(err) @@ -53,5 +52,6 @@ func udpDirectForwardServer() { })), */ ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } diff --git a/examples/forward/udp/remote.go b/examples/forward/udp/remote.go index 6ef3e36..b0c4d50 100644 --- a/examples/forward/udp/remote.go +++ b/examples/forward/udp/remote.go @@ -31,7 +31,6 @@ func main() { } func udpRemoteForwardServer() { - s := &gost.Server{} ln, err := gost.UDPRemoteForwardListener( laddr, /* @@ -56,5 +55,6 @@ func udpRemoteForwardServer() { h := gost.UDPRemoteForwardHandler( faddr, ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } diff --git a/examples/http2/http2.go b/examples/http2/http2.go index 1d3f6c5..369fdfe 100644 --- a/examples/http2/http2.go +++ b/examples/http2/http2.go @@ -50,7 +50,6 @@ func http2Server() { } } - s := &gost.Server{} ln, err := gost.HTTP2Listener(laddr, &tls.Config{Certificates: []tls.Certificate{cert}}) if err != nil { log.Fatal(err) @@ -65,7 +64,8 @@ func http2Server() { gost.UsersHandlerOption(users...), gost.AddrHandlerOption(laddr), ) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } var ( diff --git a/examples/quic/quics.go b/examples/quic/quics.go index b40d455..246995a 100644 --- a/examples/quic/quics.go +++ b/examples/quic/quics.go @@ -32,14 +32,15 @@ func main() { } func quicServer() { - s := &gost.Server{} ln, err := gost.QUICListener(laddr, &gost.QUICConfig{TLSConfig: tlsConfig()}) if err != nil { log.Fatal(err) } h := gost.SOCKS5Handler(gost.TLSConfigHandlerOption(tlsConfig())) log.Println("server listen on", laddr) - log.Fatal(s.Serve(ln, h)) + + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } var ( diff --git a/examples/ssh/sshd.go b/examples/ssh/sshd.go index 68f1f81..72aa2f7 100644 --- a/examples/ssh/sshd.go +++ b/examples/ssh/sshd.go @@ -32,14 +32,14 @@ func main() { } func sshTunnelServer() { - s := &gost.Server{} ln, err := gost.SSHTunnelListener(laddr, &gost.SSHConfig{TLSConfig: tlsConfig()}) if err != nil { log.Fatal(err) } h := gost.SOCKS5Handler(gost.TLSConfigHandlerOption(tlsConfig())) log.Println("server listen on", laddr) - log.Fatal(s.Serve(ln, h)) + s := &gost.Server{ln} + log.Fatal(s.Serve(h)) } var (