minor simplification
This commit is contained in:
		@@ -25,17 +25,13 @@ func GetTransport(proxy string) (http.RoundTripper, error) {
 | 
				
			|||||||
	return proxyTcp(proxyUrl)
 | 
						return proxyTcp(proxyUrl)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type forwardDialer struct {
 | 
					type forwardDialer func(ctx context.Context, network, address string) (net.Conn, error)
 | 
				
			||||||
	dialContext func(ctx context.Context, network, address string) (net.Conn, error)
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (d *forwardDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
 | 
					func (d forwardDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
 | 
				
			||||||
	return d.dialContext(ctx, network, address)
 | 
						return d(ctx, network, address)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
func (d *forwardDialer) Dial(network, address string) (net.Conn, error) {
 | 
					func (d forwardDialer) Dial(network, address string) (net.Conn, error) {
 | 
				
			||||||
	panic("Dial should not be called")
 | 
						panic("Dial should not be called")
 | 
				
			||||||
	//default Dial is nil
 | 
					 | 
				
			||||||
	//return defaultTransport().Dial(network, address)
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func unixSocks5Proxy(proxyUrl *url.URL) (http.RoundTripper, error) {
 | 
					func unixSocks5Proxy(proxyUrl *url.URL) (http.RoundTripper, error) {
 | 
				
			||||||
@@ -53,7 +49,7 @@ func unixSocks5Proxy(proxyUrl *url.URL) (http.RoundTripper, error) {
 | 
				
			|||||||
			Password: password,
 | 
								Password: password,
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	dialer, err := proxy.SOCKS5("unix", proxyUrl.Path, auth, &forwardDialer{trans.DialContext})
 | 
						dialer, err := proxy.SOCKS5("unix", proxyUrl.Path, auth, forwardDialer(trans.DialContext))
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		return nil, fmt.Errorf("failed to make socks proxy, url: %s, err: %w", proxyUrl, err)
 | 
							return nil, fmt.Errorf("failed to make socks proxy, url: %s, err: %w", proxyUrl, err)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user