1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-25 06:33:56 +00:00

vendor change

This commit is contained in:
kinarashah
2019-09-25 19:31:01 -07:00
committed by Alena Prokharchyk
parent 5153dfd8b8
commit 88449ec73b
596 changed files with 95933 additions and 113274 deletions

View File

@@ -5,7 +5,6 @@
package proxy
import (
"context"
"net"
"strings"
)
@@ -42,20 +41,6 @@ func (p *PerHost) Dial(network, addr string) (c net.Conn, err error) {
return p.dialerForRequest(host).Dial(network, addr)
}
// DialContext connects to the address addr on the given network through either
// defaultDialer or bypass.
func (p *PerHost) DialContext(ctx context.Context, network, addr string) (c net.Conn, err error) {
host, _, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
d := p.dialerForRequest(host)
if x, ok := d.(ContextDialer); ok {
return x.DialContext(ctx, network, addr)
}
return dialContext(ctx, d, network, addr)
}
func (p *PerHost) dialerForRequest(host string) Dialer {
if ip := net.ParseIP(host); ip != nil {
for _, net := range p.bypassNetworks {