Skip to content

Commit

Permalink
fix: vmess udp
Browse files Browse the repository at this point in the history
  • Loading branch information
wwqgtxx committed Jan 10, 2023
1 parent 01d8b22 commit 261b8a1
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions adapter/outbound/vmess.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,16 +290,6 @@ func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata, o
}
return v.ListenPacketOnStreamConn(c, metadata)
}
c, err = dialer.DialContext(ctx, "tcp", v.addr, v.Base.DialOptions(opts...)...)
if err != nil {
return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
}
tcpKeepAlive(c)
defer func(c net.Conn) {
safeConnClose(c, err)
}(c)

c, err = v.StreamConn(c, metadata)
return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
}

Expand All @@ -316,9 +306,17 @@ func (v *Vmess) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, met

c, err := dialer.DialContext(ctx, "tcp", v.addr)
if err != nil {
return nil, fmt.Errorf("new vmess client error: %v", err)
return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
}
tcpKeepAlive(c)
defer func(c net.Conn) {
safeConnClose(c, err)
}(c)

c, err = v.StreamConn(c, metadata)
if err != nil {
return nil, fmt.Errorf("new vmess client error: %v", err)
}
return v.ListenPacketOnStreamConn(c, metadata)
}

Expand Down

0 comments on commit 261b8a1

Please sign in to comment.