15
15
package service
16
16
17
17
import (
18
- "context"
19
18
"errors"
20
19
"fmt"
21
20
"net"
@@ -121,7 +120,7 @@ func (h *packetHandler) Handle(clientConn net.PacketConn) {
121
120
122
121
for {
123
122
status := "OK"
124
- keyID , clientInfo , proxyMetrics , connErr := h .handleConnection (context . TODO (), clientConn )
123
+ keyID , clientInfo , proxyMetrics , connErr := h .handleConnection (clientConn )
125
124
if connErr != nil {
126
125
if errors .Is (connErr .Cause , net .ErrClosed ) {
127
126
break
@@ -159,7 +158,7 @@ func (h *packetHandler) authenticate(clientConn net.PacketConn) (net.Addr, *Ciph
159
158
return clientAddr , cipherEntry , textData , clientProxyBytes , nil
160
159
}
161
160
162
- func (h * packetHandler ) proxyConnection (ctx context. Context , clientAddr net.Addr , tgtAddr net.Addr , clientConn net.PacketConn , cipherEntry CipherEntry , payload []byte , proxyMetrics * metrics.ProxyMetrics ) (ipinfo.IPInfo , * onet.ConnectionError ) {
161
+ func (h * packetHandler ) proxyConnection (clientAddr net.Addr , tgtAddr net.Addr , clientConn net.PacketConn , cipherEntry CipherEntry , payload []byte , proxyMetrics * metrics.ProxyMetrics ) (ipinfo.IPInfo , * onet.ConnectionError ) {
163
162
tgtConn := h .nm .Get (clientAddr .String ())
164
163
if tgtConn == nil {
165
164
clientInfo , locErr := ipinfo .GetIPInfoFromAddr (h .m , clientAddr )
@@ -183,7 +182,7 @@ func (h *packetHandler) proxyConnection(ctx context.Context, clientAddr net.Addr
183
182
return tgtConn .clientInfo , nil
184
183
}
185
184
186
- func (h * packetHandler ) handleConnection (ctx context. Context , clientConn net.PacketConn ) (string , ipinfo.IPInfo , metrics.ProxyMetrics , * onet.ConnectionError ) {
185
+ func (h * packetHandler ) handleConnection (clientConn net.PacketConn ) (string , ipinfo.IPInfo , metrics.ProxyMetrics , * onet.ConnectionError ) {
187
186
defer func () {
188
187
if r := recover (); r != nil {
189
188
logger .Errorf ("Panic in UDP loop: %v. Continuing to listen." , r )
@@ -204,7 +203,7 @@ func (h *packetHandler) handleConnection(ctx context.Context, clientConn net.Pac
204
203
}
205
204
debugUDPAddr (clientAddr , "Proxy exit %s" , tgtAddr .String ())
206
205
207
- clientInfo , err := h .proxyConnection (ctx , clientAddr , tgtAddr , clientConn , * cipherEntry , payload , & proxyMetrics )
206
+ clientInfo , err := h .proxyConnection (clientAddr , tgtAddr , clientConn , * cipherEntry , payload , & proxyMetrics )
208
207
return cipherEntry .ID , clientInfo , proxyMetrics , err
209
208
}
210
209
0 commit comments