fix: inbound context

v2fly · May 28, 2023 · 0472120 · 0472120
1 parent 0df1b43
commit 0472120
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/app/tun/config.pb.go b/app/tun/config.pb.go
diff --git a/app/tun/config.proto b/app/tun/config.proto
@@ -20,4 +20,5 @@ message Config {
     uint32 mtu = 2;
     uint32 user_level = 3;
     v2ray.core.net.packetaddr.PacketAddrType packet_encoding = 4;
+    string tag = 6;
 }
diff --git a/app/tun/handler_tcp.go b/app/tun/handler_tcp.go
@@ -7,6 +7,7 @@ import (
 	"github.com/v2fly/v2ray-core/v5/common/buf"
 	"github.com/v2fly/v2ray-core/v5/common/log"
 	"github.com/v2fly/v2ray-core/v5/common/net"
+	"github.com/v2fly/v2ray-core/v5/common/session"
 	"github.com/v2fly/v2ray-core/v5/common/signal"
 	"github.com/v2fly/v2ray-core/v5/common/task"
 	"github.com/v2fly/v2ray-core/v5/features/policy"
@@ -65,12 +66,13 @@ func SetTCPHandler(ctx context.Context, dispatcher routing.Dispatcher, policyMan
 }
 
 func (h *TCPHandler) Handle(conn net.Conn) error {
+	ctx := session.ContextWithInbound(h.ctx, &session.Inbound{Tag: h.config.Tag})
 	sessionPolicy := h.policyManager.ForLevel(h.config.UserLevel)
 
 	addr := conn.RemoteAddr()
 
 	dest := net.DestinationFromAddr(addr)
-	ctx := log.ContextWithAccessMessage(h.ctx, &log.AccessMessage{
+	ctx = log.ContextWithAccessMessage(h.ctx, &log.AccessMessage{
 		From:   addr,
 		To:     dest,
 		Status: log.AccessAccepted,

diff --git a/app/tun/handler_udp.go b/app/tun/handler_udp.go
@@ -7,6 +7,7 @@ import (
 	"github.com/v2fly/v2ray-core/v5/common/net"
 	"github.com/v2fly/v2ray-core/v5/common/net/packetaddr"
 	udp_proto "github.com/v2fly/v2ray-core/v5/common/protocol/udp"
+	"github.com/v2fly/v2ray-core/v5/common/session"
 	"github.com/v2fly/v2ray-core/v5/features/policy"
 	"github.com/v2fly/v2ray-core/v5/features/routing"
 	"github.com/v2fly/v2ray-core/v5/transport/internet/udp"
@@ -50,7 +51,7 @@ func SetUDPHandler(ctx context.Context, dispatcher routing.Dispatcher, policyMan
 	}
 }
 func (h *UDPHandler) Handle(conn net.Conn) error {
-	ctx := h.ctx
+	ctx := session.ContextWithInbound(h.ctx, &session.Inbound{Tag: h.config.Tag})
 	packetConn := conn.(net.PacketConn)
 
 	udpDispatcherConstructor := udp.NewSplitDispatcher