Skip to content

Commit 84dc5a6

Browse files
xinstginuerzh
authored andcommitted
fix compile error (ginuerzh#280)
1 parent a1de1af commit 84dc5a6

File tree

8 files changed

+47
-46
lines changed

8 files changed

+47
-46
lines changed

examples/bench/srv.go

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,18 @@ func main() {
5252
}
5353

5454
func httpServer() {
55-
s := &gost.Server{}
5655
ln, err := gost.TCPListener(":18080")
5756
if err != nil {
5857
log.Fatal(err)
5958
}
6059
h := gost.HTTPHandler(
6160
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
6261
)
63-
log.Fatal(s.Serve(ln, h))
62+
s := &gost.Server{ln}
63+
log.Fatal(s.Serve(h))
6464
}
6565

6666
func socks5Server() {
67-
s := &gost.Server{}
6867
ln, err := gost.TCPListener(":11080")
6968
if err != nil {
7069
log.Fatal(err)
@@ -73,79 +72,79 @@ func socks5Server() {
7372
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
7473
gost.TLSConfigHandlerOption(tlsConfig()),
7574
)
76-
log.Fatal(s.Serve(ln, h))
75+
s := &gost.Server{ln}
76+
log.Fatal(s.Serve(h))
7777
}
7878

7979
func shadowServer() {
80-
s := &gost.Server{}
8180
ln, err := gost.TCPListener(":18338")
8281
if err != nil {
8382
log.Fatal(err)
8483
}
8584
h := gost.ShadowHandler(
8685
gost.UsersHandlerOption(url.UserPassword("chacha20", "123456")),
8786
)
88-
log.Fatal(s.Serve(ln, h))
87+
s := &gost.Server{ln}
88+
log.Fatal(s.Serve(h))
8989
}
9090

9191
func tlsServer() {
92-
s := &gost.Server{}
9392
ln, err := gost.TLSListener(":11443", tlsConfig())
9493
if err != nil {
9594
log.Fatal(err)
9695
}
9796
h := gost.HTTPHandler(
9897
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
9998
)
100-
log.Fatal(s.Serve(ln, h))
99+
s := &gost.Server{ln}
100+
log.Fatal(s.Serve(h))
101101
}
102102

103103
func wsServer() {
104-
s := &gost.Server{}
105104
ln, err := gost.WSListener(":18000", nil)
106105
if err != nil {
107106
log.Fatal(err)
108107
}
109108
h := gost.HTTPHandler(
110109
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
111110
)
112-
log.Fatal(s.Serve(ln, h))
111+
s := &gost.Server{ln}
112+
log.Fatal(s.Serve(h))
113113
}
114114

115115
func wssServer() {
116-
s := &gost.Server{}
117116
ln, err := gost.WSSListener(":18443", tlsConfig(), nil)
118117
if err != nil {
119118
log.Fatal(err)
120119
}
121120
h := gost.HTTPHandler(
122121
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
123122
)
124-
log.Fatal(s.Serve(ln, h))
123+
s := &gost.Server{ln}
124+
log.Fatal(s.Serve(h))
125125
}
126126

127127
func kcpServer() {
128-
s := &gost.Server{}
129128
ln, err := gost.KCPListener(":18388", nil)
130129
if err != nil {
131130
log.Fatal(err)
132131
}
133132
h := gost.HTTPHandler()
134-
log.Fatal(s.Serve(ln, h))
133+
s := &gost.Server{ln}
134+
log.Fatal(s.Serve(h))
135135
}
136136

137137
func tcpForwardServer() {
138-
s := &gost.Server{}
139138
ln, err := gost.TCPListener(":2222")
140139
if err != nil {
141140
log.Fatal(err)
142141
}
143142
h := gost.TCPDirectForwardHandler("localhost:22")
144-
log.Fatal(s.Serve(ln, h))
143+
s := &gost.Server{ln}
144+
log.Fatal(s.Serve(h))
145145
}
146146

147147
func tcpRemoteForwardServer() {
148-
s := &gost.Server{}
149148
ln, err := gost.TCPRemoteForwardListener(
150149
":1222",
151150
/*
@@ -171,11 +170,11 @@ func tcpRemoteForwardServer() {
171170
":22",
172171
//gost.AddrHandlerOption("127.0.0.1:22"),
173172
)
174-
log.Fatal(s.Serve(ln, h))
173+
s := &gost.Server{ln}
174+
log.Fatal(s.Serve(h))
175175
}
176176

177177
func rudpForwardServer() {
178-
s := &gost.Server{}
179178
ln, err := gost.UDPRemoteForwardListener(
180179
":10053",
181180
gost.NewChain(
@@ -196,47 +195,47 @@ func rudpForwardServer() {
196195
log.Fatal()
197196
}
198197
h := gost.UDPRemoteForwardHandler("localhost:53")
199-
log.Fatal(s.Serve(ln, h))
198+
s := &gost.Server{ln}
199+
log.Fatal(s.Serve(h))
200200
}
201201

202202
func tcpRedirectServer() {
203-
s := &gost.Server{}
204203
ln, err := gost.TCPListener(":8008")
205204
if err != nil {
206205
log.Fatal(err)
207206
}
208207
h := gost.TCPRedirectHandler()
209-
log.Fatal(s.Serve(ln, h))
208+
s := &gost.Server{ln}
209+
log.Fatal(s.Serve(h))
210210
}
211211

212212
func sshTunnelServer() {
213-
s := &gost.Server{}
214213
ln, err := gost.SSHTunnelListener(":12222", &gost.SSHConfig{TLSConfig: tlsConfig()})
215214
if err != nil {
216215
log.Fatal(err)
217216
}
218217
h := gost.HTTPHandler(
219218
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
220219
)
221-
log.Fatal(s.Serve(ln, h))
220+
s := &gost.Server{ln}
221+
log.Fatal(s.Serve(h))
222222
}
223223

224224
func http2Server() {
225225
// http2.VerboseLogs = true
226226

227-
s := &gost.Server{}
228227
ln, err := gost.HTTP2Listener(":1443", tlsConfig())
229228
if err != nil {
230229
log.Fatal(err)
231230
}
232231
h := gost.HTTP2Handler(
233232
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
234233
)
235-
log.Fatal(s.Serve(ln, h))
234+
s := &gost.Server{ln}
235+
log.Fatal(s.Serve(h))
236236
}
237237

238238
func http2TunnelServer() {
239-
s := &gost.Server{}
240239
ln, err := gost.H2Listener(":8443", tlsConfig()) // HTTP2 h2 mode
241240
// ln, err := gost.H2CListener(":8443") // HTTP2 h2c mode
242241
if err != nil {
@@ -249,23 +248,23 @@ func http2TunnelServer() {
249248
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
250249
gost.TLSConfigHandlerOption(tlsConfig()),
251250
)
252-
log.Fatal(s.Serve(ln, h))
251+
s := &gost.Server{ln}
252+
log.Fatal(s.Serve(h))
253253
}
254254

255255
func quicServer() {
256-
s := &gost.Server{}
257256
ln, err := gost.QUICListener("localhost:6121", &gost.QUICConfig{TLSConfig: tlsConfig()})
258257
if err != nil {
259258
log.Fatal(err)
260259
}
261260
h := gost.HTTPHandler(
262261
gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
263262
)
264-
log.Fatal(s.Serve(ln, h))
263+
s := &gost.Server{ln}
264+
log.Fatal(s.Serve(h))
265265
}
266266

267267
func shadowUDPServer() {
268-
s := &gost.Server{}
269268
ln, err := gost.ShadowUDPListener(":18338", url.UserPassword("chacha20", "123456"), 30*time.Second)
270269
if err != nil {
271270
log.Fatal(err)
@@ -286,7 +285,8 @@ func shadowUDPServer() {
286285
)),
287286
*/
288287
)
289-
log.Fatal(s.Serve(ln, h))
288+
s := &gost.Server{ln}
289+
log.Fatal(s.Serve(h))
290290
}
291291

292292
var (

examples/forward/direct/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ func main() {
1212
}
1313

1414
func sshForwardServer() {
15-
s := &gost.Server{}
1615
ln, err := gost.TCPListener(":11222")
1716
if err != nil {
1817
log.Fatal(err)
@@ -22,7 +21,8 @@ func sshForwardServer() {
2221
// gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
2322
gost.TLSConfigHandlerOption(tlsConfig()),
2423
)
25-
log.Fatal(s.Serve(ln, h))
24+
s := &gost.Server{ln}
25+
log.Fatal(s.Serve(h))
2626
}
2727

2828
var (

examples/forward/remote/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ func main() {
1212
}
1313

1414
func sshRemoteForwardServer() {
15-
s := &gost.Server{}
1615
ln, err := gost.TCPListener(":11222")
1716
if err != nil {
1817
log.Fatal(err)
@@ -22,7 +21,8 @@ func sshRemoteForwardServer() {
2221
// gost.UsersHandlerOption(url.UserPassword("admin", "123456")),
2322
gost.TLSConfigHandlerOption(tlsConfig()),
2423
)
25-
log.Fatal(s.Serve(ln, h))
24+
s := &gost.Server{ln}
25+
log.Fatal(s.Serve(h))
2626
}
2727

2828
var (

examples/forward/udp/direct.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func main() {
3131
}
3232

3333
func udpDirectForwardServer() {
34-
s := &gost.Server{}
3534
ln, err := gost.UDPDirectForwardListener(laddr, time.Second*30)
3635
if err != nil {
3736
log.Fatal(err)
@@ -53,5 +52,6 @@ func udpDirectForwardServer() {
5352
})),
5453
*/
5554
)
56-
log.Fatal(s.Serve(ln, h))
55+
s := &gost.Server{ln}
56+
log.Fatal(s.Serve(h))
5757
}

examples/forward/udp/remote.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func main() {
3131
}
3232

3333
func udpRemoteForwardServer() {
34-
s := &gost.Server{}
3534
ln, err := gost.UDPRemoteForwardListener(
3635
laddr,
3736
/*
@@ -56,5 +55,6 @@ func udpRemoteForwardServer() {
5655
h := gost.UDPRemoteForwardHandler(
5756
faddr,
5857
)
59-
log.Fatal(s.Serve(ln, h))
58+
s := &gost.Server{ln}
59+
log.Fatal(s.Serve(h))
6060
}

examples/http2/http2.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func http2Server() {
5050
}
5151
}
5252

53-
s := &gost.Server{}
5453
ln, err := gost.HTTP2Listener(laddr, &tls.Config{Certificates: []tls.Certificate{cert}})
5554
if err != nil {
5655
log.Fatal(err)
@@ -65,7 +64,8 @@ func http2Server() {
6564
gost.UsersHandlerOption(users...),
6665
gost.AddrHandlerOption(laddr),
6766
)
68-
log.Fatal(s.Serve(ln, h))
67+
s := &gost.Server{ln}
68+
log.Fatal(s.Serve(h))
6969
}
7070

7171
var (

examples/quic/quics.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ func main() {
3232
}
3333

3434
func quicServer() {
35-
s := &gost.Server{}
3635
ln, err := gost.QUICListener(laddr, &gost.QUICConfig{TLSConfig: tlsConfig()})
3736
if err != nil {
3837
log.Fatal(err)
3938
}
4039
h := gost.SOCKS5Handler(gost.TLSConfigHandlerOption(tlsConfig()))
4140
log.Println("server listen on", laddr)
42-
log.Fatal(s.Serve(ln, h))
41+
42+
s := &gost.Server{ln}
43+
log.Fatal(s.Serve(h))
4344
}
4445

4546
var (

examples/ssh/sshd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ func main() {
3232
}
3333

3434
func sshTunnelServer() {
35-
s := &gost.Server{}
3635
ln, err := gost.SSHTunnelListener(laddr, &gost.SSHConfig{TLSConfig: tlsConfig()})
3736
if err != nil {
3837
log.Fatal(err)
3938
}
4039
h := gost.SOCKS5Handler(gost.TLSConfigHandlerOption(tlsConfig()))
4140
log.Println("server listen on", laddr)
42-
log.Fatal(s.Serve(ln, h))
41+
s := &gost.Server{ln}
42+
log.Fatal(s.Serve(h))
4343
}
4444

4545
var (

0 commit comments

Comments
 (0)