lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-07-25 03:05:20 -04:00
Code Issues Releases Wiki Activity

Fix VLite UDP Outbound bugs

Browse Source
This commit is contained in:
Shelikhoo 2022-04-12 21:59:15 +01:00 committed by Xiaokang Wang (Shelikhoo)
parent 0b20760e17
commit 010aa3a103
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proxy/vlite/outbound/outbound.go
View File

@ -48,7 +48,7 @@ type Handler struct {
// Process implements proxy.Outbound.Process(). // Process implements proxy.Outbound.Process().
func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer internet.Dialer) error { func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer internet.Dialer) error {
proxyEnvironment := envctx.EnvironmentFromContext(ctx).(environment.ProxyEnvironment) proxyEnvironment := envctx.EnvironmentFromContext(h.ctx).(environment.ProxyEnvironment)
statusInstanceIfce, err := proxyEnvironment.TransientStorage().Get(ctx, "status") statusInstanceIfce, err := proxyEnvironment.TransientStorage().Get(ctx, "status")
if err != nil { if err != nil {
return newError("uninitialized handler").Base(err) return newError("uninitialized handler").Base(err)
@ -64,7 +64,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
return newError("target not specified") return newError("target not specified")
} }
destination := outbound.Target destination := outbound.Target
packetConnOut := statusInstance.connAdp.DialUDP(net.UDPAddr{Port: int(connid)}) packetConnOut := statusInstance.connAdp.DialUDP(net.UDPAddr{Port: int(connid % 65535)})
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
timer := signal.CancelAfterInactivity(ctx, cancel, time.Second*600) timer := signal.CancelAfterInactivity(ctx, cancel, time.Second*600)
@ -118,7 +118,7 @@ type status struct {
} }
func createStatusFromConfig(config *UDPProtocolConfig) (*status, error) { func createStatusFromConfig(config *UDPProtocolConfig) (*status, error) {
s := &status{} s := &status{password: []byte(config.Password)}
ctx := context.Background() ctx := context.Background()
s.msgbus = ibus.NewMessageBus() s.msgbus = ibus.NewMessageBus()
@ -130,13 +130,14 @@ func createStatusFromConfig(config *UDPProtocolConfig) (*status, error) {
ctx = context.WithValue(ctx, interfaces.ExtraOptionsUDPMask, string(s.password)) ctx = context.WithValue(ctx, interfaces.ExtraOptionsUDPMask, string(s.password))
destinationString := fmt.Sprintf("%v:%v", config.Address.String(), config.Port) destinationString := fmt.Sprintf("%v:%v", config.Address.AsAddress().String(), config.Port)
s.udpdialer = udpClient.NewUdpClient(destinationString, ctx) s.udpdialer = udpClient.NewUdpClient(destinationString, ctx)
if config.EnableStabilization { if config.EnableStabilization {
s.udpdialer = udpunic.NewUdpUniClient(string(s.password), ctx, s.udpdialer) s.udpdialer = udpunic.NewUdpUniClient(string(s.password), ctx, s.udpdialer)
s.udpdialer = uniclient.NewUnifiedConnectionClient(s.udpdialer, ctx) s.udpdialer = uniclient.NewUnifiedConnectionClient(s.udpdialer, ctx)
} }
s.ctx = ctx
return s, nil return s, nil
} }