github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

add missing changes

pull/1435/head
Darien Raymond 2018-11-21 14:55:05 +01:00
parent 5279296f03
commit 3eac22c27d
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/proxyman/inbound/worker.go
View File

@ -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) ctx := context.Background()
hub, err := internet.ListenTCP(ctx, w.address, w.port, func(conn internet.Connection) { 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) ctx := context.Background()
h, err := udp.ListenUDP(ctx, w.address, w.port, udp.HubCapacity(256)) h, err := udp.ListenUDP(ctx, w.address, w.port, w.stream, udp.HubCapacity(256))
if err != nil { if err != nil {
return err return err
} }

4
app/proxyman/outbound/handler.go
View File

@ -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.