Skip to content

debug. There were not enough corrections. #41

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 10, 2024
Merged

debug. There were not enough corrections. #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,19 @@ import (
"golang.org/x/net/proxy"
)

type ProxyDialer interface {
Dial(network, addr string) (net.Conn, error)
DialContext(ctx context.Context, network, addr string) (net.Conn, error)
}

type ContextDialer struct {
dialer proxy.Dialer
}

func (c *ContextDialer) Dial(network, addr string) (net.Conn, error) {
return c.dialer.Dial(network, addr)
}

func (c *ContextDialer) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
connChan := make(chan net.Conn, 1)
errChan := make(chan error, 1)
Expand Down Expand Up @@ -72,11 +81,11 @@ type Proxy struct {
Command string

// Forwarder set Dialer.
Forwarder proxy.Dialer
Forwarder ProxyDialer
}

// CreateProxyDialer retrun proxy.Dialer.
func (p *Proxy) CreateProxyDialer() (proxyContextDialer proxy.ContextDialer, err error) {
// CreateProxyDialer retrun ProxyDialer.
func (p *Proxy) CreateProxyDialer() (proxyContextDialer ProxyDialer, err error) {
var proxyDialer proxy.Dialer
switch p.Type {
case "http", "https":
Expand All @@ -92,7 +101,7 @@ func (p *Proxy) CreateProxyDialer() (proxyContextDialer proxy.ContextDialer, err
return
}

// CreateHttpProxy return proxy.Dialer as http proxy.
// CreateHttpProxy return ProxyDialer as http proxy.
func (p *Proxy) CreateHttpProxyDialer() (proxyDialer proxy.Dialer, err error) {
// Regist dialer
proxy.RegisterDialerType("http", newHttpProxy)
Expand All @@ -119,7 +128,7 @@ func (p *Proxy) CreateHttpProxyDialer() (proxyDialer proxy.Dialer, err error) {
return
}

// CreateSocks5Proxy return proxy.Dialer as Socks5 proxy.
// CreateSocks5Proxy return ProxyDialer as Socks5 proxy.
func (p *Proxy) CreateSocks5ProxyDialer() (proxyDialer proxy.Dialer, err error) {
var proxyAuth *proxy.Auth

Expand All @@ -128,7 +137,7 @@ func (p *Proxy) CreateSocks5ProxyDialer() (proxyDialer proxy.Dialer, err error)
proxyAuth.Password = p.Password
}

var forwarder proxy.Dialer
var forwarder ProxyDialer
forwarder = proxy.Direct
if p.Forwarder != nil {
forwarder = p.Forwarder
Expand Down
Loading