Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use native context #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions request.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package socks5

import (
"context"
"fmt"
"io"
"net"
"strconv"
"strings"

"golang.org/x/net/context"
)

const (
Expand Down
3 changes: 1 addition & 2 deletions resolver.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package socks5

import (
"context"
"net"

"golang.org/x/net/context"
)

// NameResolver is used to implement custom name resolution
Expand Down
3 changes: 1 addition & 2 deletions resolver_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package socks5

import (
"context"
"testing"

"golang.org/x/net/context"
)

func TestDNSResolver(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ruleset.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions ruleset_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package socks5

import (
"context"
"testing"

"golang.org/x/net/context"
)

func TestPermitCommand(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions socks5.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ package socks5

import (
"bufio"
"context"
"fmt"
"log"
"net"
"os"

"golang.org/x/net/context"
)

const (
Expand Down