other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-15 01:09:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Export instance context

This commit is contained in:
世界 2021-09-19 14:05:37 +08:00
parent 486f96838d
commit 390a76ff61
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/context.go
View File

@ -25,3 +25,10 @@ func MustFromContext(ctx context.Context) *Instance {
} }
return x return x
} }
func WithContext(ctx context.Context, v *Instance) context.Context {
if FromContext(ctx) != v {
ctx = context.WithValue(ctx, xrayKey, v)
}
return ctx
}

6
core/functions.go
View File

@ -15,7 +15,7 @@ import (
func CreateObject(v *Instance, config interface{}) (interface{}, error) { func CreateObject(v *Instance, config interface{}) (interface{}, error) {
ctx := v.ctx ctx := v.ctx
if v != nil { if v != nil {
ctx = context.WithValue(ctx, xrayKey, v) ctx = WithContext(v.ctx, v)
} }
return common.CreateObject(ctx, config) return common.CreateObject(ctx, config)
} }
@ -46,6 +46,8 @@ func StartInstance(configFormat string, configBytes []byte) (*Instance, error) {
// //
// xray:api:stable // xray: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) {
ctx = WithContext(ctx, 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 Xray core") return nil, newError("routing.Dispatcher is not registered in Xray core")
@ -70,6 +72,8 @@ func Dial(ctx context.Context, v *Instance, dest net.Destination) (net.Conn, err
// //
// xray:api:beta // xray:api:beta
func DialUDP(ctx context.Context, v *Instance) (net.PacketConn, error) { func DialUDP(ctx context.Context, v *Instance) (net.PacketConn, error) {
ctx = WithContext(ctx, 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 Xray core") return nil, newError("routing.Dispatcher is not registered in Xray core")