lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

check ctx to fix. (#841)

Browse Source
This commit is contained in:
rurirei 2021-04-02 20:11:07 +08:00 committed by GitHub
parent 3476a0e1d1
commit 44151f3420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
functions.go
View File

@ -47,15 +47,15 @@ func StartInstance(configFormat string, configBytes []byte) (*Instance, error) {
// //
// v2ray:api:stable // v2ray:api:stable
func Dial(ctx context.Context, v *Instance, dest net.Destination) (net.Conn, error) { func Dial(ctx context.Context, v *Instance, dest net.Destination) (net.Conn, error) {
if FromContext(ctx) == nil {
ctx = context.WithValue(ctx, v2rayKey, v)
}
dispatcher := v.GetFeature(routing.DispatcherType()) dispatcher := v.GetFeature(routing.DispatcherType())
if dispatcher == nil { if dispatcher == nil {
return nil, newError("routing.Dispatcher is not registered in V2Ray core") return nil, newError("routing.Dispatcher is not registered in V2Ray core")
} }
if ctx.Value(v2rayKey) == nil {
ctx = context.WithValue(ctx, v2rayKey, v)
}
r, err := dispatcher.(routing.Dispatcher).Dispatch(ctx, dest) r, err := dispatcher.(routing.Dispatcher).Dispatch(ctx, dest)
if err != nil { if err != nil {
return nil, err return nil, err
@ -76,6 +76,10 @@ func Dial(ctx context.Context, v *Instance, dest net.Destination) (net.Conn, err
// //
// v2ray:api:beta // v2ray:api:beta
func DialUDP(ctx context.Context, v *Instance) (net.PacketConn, error) { func DialUDP(ctx context.Context, v *Instance) (net.PacketConn, error) {
if FromContext(ctx) == nil {
ctx = context.WithValue(ctx, v2rayKey, v)
}
dispatcher := v.GetFeature(routing.DispatcherType()) dispatcher := v.GetFeature(routing.DispatcherType())
if dispatcher == nil { if dispatcher == nil {
return nil, newError("routing.Dispatcher is not registered in V2Ray core") return nil, newError("routing.Dispatcher is not registered in V2Ray core")