Browse Source

add missing changes

Darien Raymond 7 years ago
parent
commit
3eac22c27d
2 changed files with 5 additions and 7 deletions
  1. 4 4
      app/proxyman/inbound/worker.go
  2. 1 3
      app/proxyman/outbound/handler.go

+ 4 - 4
app/proxyman/inbound/worker.go

@@ -105,8 +105,8 @@ func (w *tcpWorker) Proxy() proxy.Inbound {
 }
 }
 
 
 func (w *tcpWorker) Start() error {
 func (w *tcpWorker) Start() error {
-	ctx := internet.ContextWithStreamSettings(context.Background(), w.stream)
-	hub, err := internet.ListenTCP(ctx, w.address, w.port, func(conn internet.Connection) {
+	ctx := context.Background()
+	hub, err := internet.ListenTCP(ctx, w.address, w.port, w.stream, func(conn internet.Connection) {
 		go w.callback(conn)
 		go w.callback(conn)
 	})
 	})
 	if err != nil {
 	if err != nil {
@@ -342,8 +342,8 @@ func (w *udpWorker) clean() error {
 
 
 func (w *udpWorker) Start() error {
 func (w *udpWorker) Start() error {
 	w.activeConn = make(map[connID]*udpConn, 16)
 	w.activeConn = make(map[connID]*udpConn, 16)
-	ctx := internet.ContextWithStreamSettings(context.Background(), w.stream)
-	h, err := udp.ListenUDP(ctx, w.address, w.port, udp.HubCapacity(256))
+	ctx := context.Background()
+	h, err := udp.ListenUDP(ctx, w.address, w.port, w.stream, udp.HubCapacity(256))
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}

+ 1 - 3
app/proxyman/outbound/handler.go

@@ -153,11 +153,9 @@ func (h *Handler) Dial(ctx context.Context, dest net.Destination) (internet.Conn
 			}
 			}
 			outbound.Gateway = h.senderSettings.Via.AsAddress()
 			outbound.Gateway = h.senderSettings.Via.AsAddress()
 		}
 		}
-
-		ctx = internet.ContextWithStreamSettings(ctx, h.streamSettings)
 	}
 	}
 
 
-	return internet.Dial(ctx, dest)
+	return internet.Dial(ctx, dest, h.streamSettings)
 }
 }
 
 
 // GetOutbound implements proxy.GetOutbound.
 // GetOutbound implements proxy.GetOutbound.