|
|
@@ -55,34 +55,34 @@ func (p *Proxy) accept(conn net.Conn) {
|
|
55
|
55
|
|
|
56
|
56
|
log.Infow("Client connected", "addr", conn.RemoteAddr())
|
|
57
|
57
|
|
|
58
|
|
- client, opts, err := p.clientInit(conn, connID, p.conf)
|
|
|
58
|
+ clientConn, opts, err := p.clientInit(conn, connID, p.conf)
|
|
59
|
59
|
if err != nil {
|
|
60
|
60
|
log.Errorw("Cannot initialize client connection", "error", err)
|
|
61
|
61
|
return
|
|
62
|
62
|
}
|
|
63
|
|
- defer client.(io.Closer).Close() // nolint: errcheck
|
|
|
63
|
+ defer clientConn.(io.Closer).Close() // nolint: errcheck
|
|
64
|
64
|
|
|
65
|
|
- stats.ClientConnected(opts.ConnectionType, client.RemoteAddr())
|
|
66
|
|
- defer stats.ClientDisconnected(opts.ConnectionType, client.RemoteAddr())
|
|
|
65
|
+ stats.ClientConnected(opts.ConnectionType, clientConn.RemoteAddr())
|
|
|
66
|
+ defer stats.ClientDisconnected(opts.ConnectionType, clientConn.RemoteAddr())
|
|
67
|
67
|
|
|
68
|
|
- server, err := p.getTelegramConn(opts, connID)
|
|
|
68
|
+ serverConn, err := p.getTelegramConn(opts, connID)
|
|
69
|
69
|
if err != nil {
|
|
70
|
70
|
log.Errorw("Cannot initialize server connection", "error", err)
|
|
71
|
71
|
return
|
|
72
|
72
|
}
|
|
73
|
|
- defer server.(io.Closer).Close() // nolint: errcheck
|
|
|
73
|
+ defer serverConn.(io.Closer).Close() // nolint: errcheck
|
|
74
|
74
|
|
|
75
|
75
|
wait := &sync.WaitGroup{}
|
|
76
|
76
|
wait.Add(2)
|
|
77
|
77
|
|
|
78
|
78
|
if p.conf.UseMiddleProxy() {
|
|
79
|
|
- clientPacket := client.(wrappers.PacketReadWriteCloser)
|
|
80
|
|
- serverPacket := server.(wrappers.PacketReadWriteCloser)
|
|
|
79
|
+ clientPacket := clientConn.(wrappers.PacketReadWriteCloser)
|
|
|
80
|
+ serverPacket := serverConn.(wrappers.PacketReadWriteCloser)
|
|
81
|
81
|
go p.middlePipe(clientPacket, serverPacket, wait, &opts.ReadHacks)
|
|
82
|
82
|
go p.middlePipe(serverPacket, clientPacket, wait, &opts.WriteHacks)
|
|
83
|
83
|
} else {
|
|
84
|
|
- clientStream := client.(wrappers.StreamReadWriteCloser)
|
|
85
|
|
- serverStream := server.(wrappers.StreamReadWriteCloser)
|
|
|
84
|
+ clientStream := clientConn.(wrappers.StreamReadWriteCloser)
|
|
|
85
|
+ serverStream := serverConn.(wrappers.StreamReadWriteCloser)
|
|
86
|
86
|
go p.directPipe(clientStream, serverStream, wait)
|
|
87
|
87
|
go p.directPipe(serverStream, clientStream, wait)
|
|
88
|
88
|
}
|