Skip to content

use DialContext for socks5 upstreams #772

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

Closed
dogancanbakir wants to merge 1 commit into from
Closed

use DialContext for socks5 upstreams #772

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
10 changes: 5 additions & 5 deletions proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func (p *Proxy) ModifyRequest(req *http.Request) error {
ctx := martian.NewContext(req)
// disable upgrading http connections to https by default
ctx.Session().MarkInsecure()
// setup passthrought and hijack here
// setup passthrough and hijack here
userData := types.UserData{
ID: ctx.ID(),
Host: req.Host,
Expand Down Expand Up @@ -504,20 +504,20 @@ func (p *Proxy) getRoundTripper() (http.RoundTripper, error) {
}, TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}
} else if len(p.options.UpstreamSock5Proxies) > 0 {
// for each socks5 proxy create a dialer
socks5Dialers := make(map[string]proxy.Dialer)
socks5Dialers := make(map[string]proxy.ContextDialer)
for _, socks5proxy := range p.options.UpstreamSock5Proxies {
dialer, err := proxy.SOCKS5("tcp", socks5proxy, nil, proxy.Direct)
if err != nil {
return nil, err
}
socks5Dialers[socks5proxy] = dialer
socks5Dialers[socks5proxy] = dialer.(proxy.ContextDialer)
}
roundtrip = &http.Transport{Dial: func(network, addr string) (net.Conn, error) {
roundtrip = &http.Transport{DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
// lookup next dialer
socks5Proxy := p.rbsocks5.Next()
socks5Dialer := socks5Dialers[socks5Proxy]
// use it to perform the request
return socks5Dialer.Dial(network, addr)
return socks5Dialer.DialContext(ctx, network, addr)
}, TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}
}
return roundtrip, nil
Expand Down
Loading