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

don't use new address if not in redirect mode

pull/1516/head
Darien Raymond 2019-01-14 22:57:53 +01:00
parent f79f0a83c9
commit 35432832c4
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/dokodemo/dokodemo.go
View File

@ -78,13 +78,17 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn in
Address: d.address, Address: d.address,
Port: d.port, Port: d.port,
} }
destinationOverridden := false
if d.config.FollowRedirect { if d.config.FollowRedirect {
if outbound := session.OutboundFromContext(ctx); outbound != nil && outbound.Target.IsValid() { if outbound := session.OutboundFromContext(ctx); outbound != nil && outbound.Target.IsValid() {
dest = outbound.Target dest = outbound.Target
destinationOverridden = true
} else if handshake, ok := conn.(hasHandshakeAddress); ok { } else if handshake, ok := conn.(hasHandshakeAddress); ok {
addr := handshake.HandshakeAddress() addr := handshake.HandshakeAddress()
if addr != nil { if addr != nil {
dest.Address = addr dest.Address = addr
destinationOverridden = true
} }
} }
} }
@ -121,7 +125,7 @@ func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn in
writer = buf.NewWriter(conn) writer = buf.NewWriter(conn)
} else { } else {
//if we are in TPROXY mode, use linux's udp forging functionality //if we are in TPROXY mode, use linux's udp forging functionality
if !d.config.FollowRedirect { if !destinationOverridden {
writer = &buf.SequentialWriter{Writer: conn} writer = &buf.SequentialWriter{Writer: conn}
} else { } else {
sockopt := &internet.SocketConfig{ sockopt := &internet.SocketConfig{