Fix missing inbound options

nekohasekai · nekohasekai · commit 0c7c64c2d402 · 2024-11-15T17:21:48.000+08:00
diff --git a/protocol/direct/inbound.go b/protocol/direct/inbound.go
@@ -110,6 +110,8 @@ func (i *Inbound) NewConnectionEx(ctx context.Context, conn net.Conn, metadata a
 	i.logger.InfoContext(ctx, "inbound connection to ", metadata.Destination)
 	metadata.Inbound = i.Tag()
 	metadata.InboundType = i.Type()
+	metadata.InboundDetour = i.listener.ListenOptions().Detour
+	metadata.InboundOptions = i.listener.ListenOptions().InboundOptions
 	i.router.RouteConnectionEx(ctx, conn, metadata, onClose)
 }
 
@@ -119,6 +121,8 @@ func (i *Inbound) NewPacketConnectionEx(ctx context.Context, conn N.PacketConn,
 	var metadata adapter.InboundContext
 	metadata.Inbound = i.Tag()
 	metadata.InboundType = i.Type()
+	metadata.InboundDetour = i.listener.ListenOptions().Detour
+	metadata.InboundOptions = i.listener.ListenOptions().InboundOptions
 	metadata.Source = source
 	metadata.Destination = destination
 	metadata.OriginDestination = i.listener.UDPAddr()
diff --git a/protocol/redirect/redirect.go b/protocol/redirect/redirect.go
@@ -59,6 +59,8 @@ func (h *Redirect) NewConnectionEx(ctx context.Context, conn net.Conn, metadata
 	}
 	metadata.Inbound = h.Tag()
 	metadata.InboundType = h.Type()
+	metadata.InboundDetour = h.listener.ListenOptions().Detour
+	metadata.InboundOptions = h.listener.ListenOptions().InboundOptions
 	metadata.Destination = M.SocksaddrFromNetIP(destination)
 	h.logger.InfoContext(ctx, "inbound connection to ", metadata.Destination)
 	h.router.RouteConnectionEx(ctx, conn, metadata, onClose)
diff --git a/protocol/redirect/tproxy.go b/protocol/redirect/tproxy.go
@@ -101,6 +101,8 @@ func (t *TProxy) NewPacketConnectionEx(ctx context.Context, conn N.PacketConn, s
 	var metadata adapter.InboundContext
 	metadata.Inbound = t.Tag()
 	metadata.InboundType = t.Type()
+	metadata.InboundDetour = t.listener.ListenOptions().Detour
+	metadata.InboundOptions = t.listener.ListenOptions().InboundOptions
 	metadata.Source = source
 	metadata.Destination = destination
 	metadata.OriginDestination = t.listener.UDPAddr()
diff --git a/protocol/shadowsocks/inbound.go b/protocol/shadowsocks/inbound.go
@@ -120,6 +120,8 @@ func (h *Inbound) newConnection(ctx context.Context, conn net.Conn, metadata ada
 	h.logger.InfoContext(ctx, "inbound connection to ", metadata.Destination)
 	metadata.Inbound = h.Tag()
 	metadata.InboundType = h.Type()
+	metadata.InboundDetour = h.listener.ListenOptions().Detour
+	metadata.InboundOptions = h.listener.ListenOptions().InboundOptions
 	return h.router.RouteConnection(ctx, conn, metadata)
 }
 
diff --git a/protocol/shadowsocks/inbound_multi.go b/protocol/shadowsocks/inbound_multi.go
@@ -138,6 +138,8 @@ func (h *MultiInbound) newConnection(ctx context.Context, conn net.Conn, metadat
 	h.logger.InfoContext(ctx, "[", user, "] inbound connection to ", metadata.Destination)
 	metadata.Inbound = h.Tag()
 	metadata.InboundType = h.Type()
+	metadata.InboundDetour = h.listener.ListenOptions().Detour
+	metadata.InboundOptions = h.listener.ListenOptions().InboundOptions
 	return h.router.RouteConnection(ctx, conn, metadata)
 }
 
diff --git a/protocol/shadowsocks/inbound_relay.go b/protocol/shadowsocks/inbound_relay.go
@@ -123,6 +123,8 @@ func (h *RelayInbound) newConnection(ctx context.Context, conn net.Conn, metadat
 	h.logger.InfoContext(ctx, "[", destination, "] inbound connection to ", metadata.Destination)
 	metadata.Inbound = h.Tag()
 	metadata.InboundType = h.Type()
+	metadata.InboundDetour = h.listener.ListenOptions().Detour
+	metadata.InboundOptions = h.listener.ListenOptions().InboundOptions
 	return h.router.RouteConnection(ctx, conn, metadata)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ func (h *Redirect) NewConnectionEx(ctx context.Context, conn net.Conn, metadata`
`59`	`59`	`}`
`60`	`60`	`metadata.Inbound = h.Tag()`
`61`	`61`	`metadata.InboundType = h.Type()`
	`62`	`+ metadata.InboundDetour = h.listener.ListenOptions().Detour`
	`63`	`+ metadata.InboundOptions = h.listener.ListenOptions().InboundOptions`
`62`	`64`	`metadata.Destination = M.SocksaddrFromNetIP(destination)`
`63`	`65`	`h.logger.InfoContext(ctx, "inbound connection to ", metadata.Destination)`
`64`	`66`	`h.router.RouteConnectionEx(ctx, conn, metadata, onClose)`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,8 @@ func (h *Inbound) newConnection(ctx context.Context, conn net.Conn, metadata ada`
`120`	`120`	`h.logger.InfoContext(ctx, "inbound connection to ", metadata.Destination)`
`121`	`121`	`metadata.Inbound = h.Tag()`
`122`	`122`	`metadata.InboundType = h.Type()`
	`123`	`+ metadata.InboundDetour = h.listener.ListenOptions().Detour`
	`124`	`+ metadata.InboundOptions = h.listener.ListenOptions().InboundOptions`
`123`	`125`	`return h.router.RouteConnection(ctx, conn, metadata)`
`124`	`126`	`}`
`125`	`127`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,8 @@ func (h *MultiInbound) newConnection(ctx context.Context, conn net.Conn, metadat`
`138`	`138`	`h.logger.InfoContext(ctx, "[", user, "] inbound connection to ", metadata.Destination)`
`139`	`139`	`metadata.Inbound = h.Tag()`
`140`	`140`	`metadata.InboundType = h.Type()`
	`141`	`+ metadata.InboundDetour = h.listener.ListenOptions().Detour`
	`142`	`+ metadata.InboundOptions = h.listener.ListenOptions().InboundOptions`
`141`	`143`	`return h.router.RouteConnection(ctx, conn, metadata)`
`142`	`144`	`}`
`143`	`145`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,8 @@ func (h *RelayInbound) newConnection(ctx context.Context, conn net.Conn, metadat`
`123`	`123`	`h.logger.InfoContext(ctx, "[", destination, "] inbound connection to ", metadata.Destination)`
`124`	`124`	`metadata.Inbound = h.Tag()`
`125`	`125`	`metadata.InboundType = h.Type()`
	`126`	`+ metadata.InboundDetour = h.listener.ListenOptions().Detour`
	`127`	`+ metadata.InboundOptions = h.listener.ListenOptions().InboundOptions`
`126`	`128`	`return h.router.RouteConnection(ctx, conn, metadata)`
`127`	`129`	`}`
`128`	`130`