add handler error metrics

pkg/handler/socks/v5/udp_tun.go

@@ -6,12 +6,12 @@ import (
 	"time"
 
 	"github.com/go-gost/gosocks5"
+	"github.com/go-gost/gost/pkg/common/net/relay"
 	"github.com/go-gost/gost/pkg/common/util/socks"
-	"github.com/go-gost/gost/pkg/handler"
 	"github.com/go-gost/gost/pkg/logger"
 )
 
-func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) {
+func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) error {
 	log = log.WithFields(map[string]any{
 		"cmd": "udp-tun",
 	})
@@ -25,26 +25,24 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network
 		// relay mode
 		if !h.md.enableUDP {
 			reply := gosocks5.NewReply(gosocks5.NotAllowed, nil)
-			reply.Write(conn)
 			log.Debug(reply)
-			log.Error("UDP relay is diabled")
-			return
+			log.Error("socks5: UDP relay is disabled")
+			return reply.Write(conn)
 		}
 	} else {
 		// BIND mode
 		if !h.md.enableBind {
 			reply := gosocks5.NewReply(gosocks5.NotAllowed, nil)
-			reply.Write(conn)
 			log.Debug(reply)
-			log.Error("BIND is diabled")
-			return
+			log.Error("socks5: BIND is disabled")
+			return reply.Write(conn)
 		}
 	}
 
 	pc, err := net.ListenUDP(network, bindAddr)
 	if err != nil {
 		log.Error(err)
-		return
+		return err
 	}
 	defer pc.Close()
 
@@ -53,20 +51,22 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network
 	reply := gosocks5.NewReply(gosocks5.Succeeded, &saddr)
 	if err := reply.Write(conn); err != nil {
 		log.Error(err)
-		return
+		return err
 	}
 	log.Debug(reply)
 	log.Debugf("bind on %s OK", pc.LocalAddr())
 
-	relay := handler.NewUDPRelay(socks.UDPTunServerConn(conn), pc).
+	r := relay.NewUDPRelay(socks.UDPTunServerConn(conn), pc).
 		WithBypass(h.options.Bypass).
 		WithLogger(log)
-	relay.SetBufferSize(h.md.udpBufferSize)
+	r.SetBufferSize(h.md.udpBufferSize)
 
 	t := time.Now()
 	log.Infof("%s <-> %s", conn.RemoteAddr(), pc.LocalAddr())
-	relay.Run()
+	r.Run()
 	log.WithFields(map[string]any{
 		"duration": time.Since(t),
 	}).Infof("%s >-< %s", conn.RemoteAddr(), pc.LocalAddr())
+
+	return nil
 }