From f0c357f3a7ff469bad11432d5c05ebd50d9dc17e Mon Sep 17 00:00:00 2001 From: Karel Bilek Date: Mon, 19 Apr 2021 20:00:30 +0700 Subject: [PATCH] Use native context x/net/context is not needed for a while now --- request.go | 3 +-- resolver.go | 3 +-- resolver_test.go | 3 +-- ruleset.go | 2 +- ruleset_test.go | 3 +-- socks5.go | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/request.go b/request.go index b615fcb..8b40ffe 100644 --- a/request.go +++ b/request.go @@ -1,13 +1,12 @@ package socks5 import ( + "context" "fmt" "io" "net" "strconv" "strings" - - "golang.org/x/net/context" ) const ( diff --git a/resolver.go b/resolver.go index b75a5c4..ef10f3a 100644 --- a/resolver.go +++ b/resolver.go @@ -1,9 +1,8 @@ package socks5 import ( + "context" "net" - - "golang.org/x/net/context" ) // NameResolver is used to implement custom name resolution diff --git a/resolver_test.go b/resolver_test.go index 16d56ee..bd57f25 100644 --- a/resolver_test.go +++ b/resolver_test.go @@ -1,9 +1,8 @@ package socks5 import ( + "context" "testing" - - "golang.org/x/net/context" ) func TestDNSResolver(t *testing.T) { diff --git a/ruleset.go b/ruleset.go index ba0e353..d65699d 100644 --- a/ruleset.go +++ b/ruleset.go @@ -1,7 +1,7 @@ package socks5 import ( - "golang.org/x/net/context" + "context" ) // RuleSet is used to provide custom rules to allow or prohibit actions diff --git a/ruleset_test.go b/ruleset_test.go index b93f4a8..00840b1 100644 --- a/ruleset_test.go +++ b/ruleset_test.go @@ -1,9 +1,8 @@ package socks5 import ( + "context" "testing" - - "golang.org/x/net/context" ) func TestPermitCommand(t *testing.T) { diff --git a/socks5.go b/socks5.go index a17be68..3d3808c 100644 --- a/socks5.go +++ b/socks5.go @@ -2,12 +2,11 @@ package socks5 import ( "bufio" + "context" "fmt" "log" "net" "os" - - "golang.org/x/net/context" ) const (