Browse Source

Fix inject conn

世界 3 years ago
parent
commit
f5e0ead01c
3 changed files with 5 additions and 5 deletions
  1. 3 3
      inbound/default.go
  2. 1 1
      inbound/trojan.go
  3. 1 1
      inbound/vmess.go

+ 3 - 3
inbound/default.go

@@ -177,7 +177,7 @@ func (a *myInboundAdapter) loopTCPIn() {
 		if err != nil {
 			return
 		}
-		go a.injectTCP(conn)
+		go a.injectTCP(conn, adapter.InboundContext{})
 	}
 }
 
@@ -199,9 +199,9 @@ func (a *myInboundAdapter) createMetadata(conn net.Conn, metadata adapter.Inboun
 	return metadata
 }
 
-func (a *myInboundAdapter) injectTCP(conn net.Conn) {
+func (a *myInboundAdapter) injectTCP(conn net.Conn, metadata adapter.InboundContext) {
 	ctx := log.ContextWithNewID(a.ctx)
-	metadata := a.createMetadata(conn, adapter.InboundContext{})
+	metadata = a.createMetadata(conn, metadata)
 	a.logger.InfoContext(ctx, "inbound connection from ", metadata.Source)
 	hErr := a.connHandler.NewConnection(ctx, conn, metadata)
 	if hErr != nil {

+ 1 - 1
inbound/trojan.go

@@ -146,7 +146,7 @@ func (h *Trojan) Close() error {
 }
 
 func (h *Trojan) newTransportConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
-	h.injectTCP(conn)
+	h.injectTCP(conn, metadata)
 	return nil
 }
 

+ 1 - 1
inbound/vmess.go

@@ -126,7 +126,7 @@ func (h *VMess) Close() error {
 }
 
 func (h *VMess) newTransportConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
-	h.injectTCP(conn)
+	h.injectTCP(conn, metadata)
 	return nil
 }