lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 10:08:15 -05:00
Code Issues Releases Wiki Activity

Revert "feat: export (const.)core.v2rayKey (#831)"

Browse Source 
This reverts commit 102e3295
This commit is contained in:
Shelikhoo 2021-04-02 12:12:27 +01:00
parent 102e32957a
commit e31bfe02f0
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
context.go
View File

@ -9,12 +9,11 @@ import (
// V2rayKey is the key type of Instance in Context, exported for test. // V2rayKey is the key type of Instance in Context, exported for test.
type V2rayKey int type V2rayKey int
// V2rayKeyValue is the key value of Instance in Context, exported for test. const v2rayKey V2rayKey = 1
const V2rayKeyValue V2rayKey = 1
// FromContext returns an Instance from the given context, or nil if the context doesn't contain one. // FromContext returns an Instance from the given context, or nil if the context doesn't contain one.
func FromContext(ctx context.Context) *Instance { func FromContext(ctx context.Context) *Instance {
if s, ok := ctx.Value(V2rayKeyValue).(*Instance); ok { if s, ok := ctx.Value(v2rayKey).(*Instance); ok {
return s return s
} }
return nil return nil

2
functions.go
View File

@ -16,7 +16,7 @@ import (
func CreateObject(v *Instance, config interface{}) (interface{}, error) { func CreateObject(v *Instance, config interface{}) (interface{}, error) {
var ctx context.Context var ctx context.Context
if v != nil { if v != nil {
ctx = context.WithValue(v.ctx, V2rayKeyValue, v) ctx = context.WithValue(v.ctx, v2rayKey, v)
} }
return common.CreateObject(ctx, config) return common.CreateObject(ctx, config)
} }