Skip to content

Commit 745da20

Browse files
committed
Fix socks bind addr not unwrapped
1 parent 0dde5e3 commit 745da20

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

protocol/socks/handshake.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func HandleConnectionEx(
239239
}
240240
err = socks5.WriteResponse(conn, socks5.Response{
241241
ReplyCode: socks5.ReplyCodeSuccess,
242-
Bind: M.SocksaddrFromNet(udpConn.LocalAddr()),
242+
Bind: M.SocksaddrFromNet(udpConn.LocalAddr()).Unwrap(),
243243
})
244244
if err != nil {
245245
return E.Cause(err, "socks5: write response")

protocol/socks/lazy.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ func (c *LazyConn) ConnHandshakeSuccess(conn net.Conn) error {
3535
case socks4.Version:
3636
return socks4.WriteResponse(c.Conn, socks4.Response{
3737
ReplyCode: socks4.ReplyCodeGranted,
38-
Destination: M.SocksaddrFromNet(conn.LocalAddr()),
38+
Destination: M.SocksaddrFromNet(conn.LocalAddr()).Unwrap(),
3939
})
4040
case socks5.Version:
4141
return socks5.WriteResponse(c.Conn, socks5.Response{
4242
ReplyCode: socks5.ReplyCodeSuccess,
43-
Bind: M.SocksaddrFromNet(conn.LocalAddr()),
43+
Bind: M.SocksaddrFromNet(conn.LocalAddr()).Unwrap(),
4444
})
4545
default:
4646
panic("unknown socks version")
@@ -124,7 +124,7 @@ func (c *LazyAssociatePacketConn) HandshakeSuccess() error {
124124
}()
125125
return socks5.WriteResponse(c.underlying, socks5.Response{
126126
ReplyCode: socks5.ReplyCodeSuccess,
127-
Bind: M.SocksaddrFromNet(c.conn.LocalAddr()),
127+
Bind: M.SocksaddrFromNet(c.conn.LocalAddr()).Unwrap(),
128128
})
129129
}
130130

0 commit comments

Comments
 (0)