parse real client IP

handler/socks/v5/udp.go

@@ -17,6 +17,7 @@ import (
 	"github.com/go-gost/x/internal/net/udp"
 	"github.com/go-gost/x/internal/util/socks"
 	traffic_wrapper "github.com/go-gost/x/limiter/traffic/wrapper"
+	metrics "github.com/go-gost/x/metrics/wrapper"
 	xstats "github.com/go-gost/x/observer/stats"
 	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
 	xrecorder "github.com/go-gost/x/recorder"
@@ -37,8 +38,8 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, ro *xrecor
 	lc := xnet.ListenConfig{
 		Netns: h.options.Netns,
 	}
-	laddr := &net.UDPAddr{IP: conn.LocalAddr().(*net.TCPAddr).IP, Port: 0} // use out-going interface's IP
-	cc, err := lc.ListenPacket(ctx, "udp", laddr.String())
+
+	cc, err := lc.ListenPacket(ctx, "udp", "")
 	if err != nil {
 		log.Error(err)
 		reply := gosocks5.NewReply(gosocks5.Failure, nil)
@@ -56,6 +57,12 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, ro *xrecor
 
 	saddr := gosocks5.Addr{}
 	saddr.ParseFrom(cc.LocalAddr().String())
+
+	saddr.Host, _, _ = net.SplitHostPort(conn.LocalAddr().String())
+	if v := net.ParseIP(h.md.publicAddr); v != nil {
+		saddr.Host = h.md.publicAddr
+	}
+	saddr.Type = 0
 	reply := gosocks5.NewReply(gosocks5.Succeeded, &saddr)
 	log.Trace(reply)
 	if err := reply.Write(conn); err != nil {
@@ -81,16 +88,17 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, ro *xrecor
 		log.Error(err)
 		return err
 	}
-
-	pStats := xstats.Stats{}
-	cc = stats_wrapper.WrapPacketConn(cc, &pStats)
-
-	defer func() {
-		ro.InputBytes = pStats.Get(stats.KindInputBytes)
-		ro.OutputBytes = pStats.Get(stats.KindOutputBytes)
-	}()
+	pc = metrics.WrapPacketConn(ro.Service, pc)
 
 	{
+		pStats := xstats.Stats{}
+		cc = stats_wrapper.WrapPacketConn(cc, &pStats)
+
+		defer func() {
+			ro.InputBytes = pStats.Get(stats.KindInputBytes)
+			ro.OutputBytes = pStats.Get(stats.KindOutputBytes)
+		}()
+
 		clientID := ctxvalue.ClientIDFromContext(ctx)
 		cc = traffic_wrapper.WrapPacketConn(
 			cc,