hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-27 08:09:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-2646: Make --edge flag work again for local development

Browse Source
This commit is contained in:
Nick Vollmar
2019-12-23 23:11:00 -06:00
parent 7d7bdffde5
commit 7367827a11
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
origin/supervisor.go
View File

@@ -72,7 +72,15 @@ type tunnelError struct {
}
func NewSupervisor(config *TunnelConfig, u uuid.UUID) (*Supervisor, error) {
edgeIPs, err := connection.NewEdgeAddrResolver(config.Logger)
var (
edgeIPs connection.EdgeServiceDiscoverer
err error
)
if len(config.EdgeAddrs) > 0 {
edgeIPs, err = connection.NewEdgeHostnameResolver(config.EdgeAddrs)
} else {
edgeIPs, err = connection.NewEdgeAddrResolver(config.Logger)
}
if err != nil {
return nil, err
}

2
origin/tunnel.go
View File

@@ -539,7 +539,7 @@ func NewTunnelHandler(ctx context.Context,
// Client mux handshake with agent server
h.muxer, err = h2mux.Handshake(edgeConn, edgeConn, config.muxerConfig(h), h.metrics.activeStreams)
if err != nil {
return nil, "", errors.Wrap(err, "Handshake with edge error")
return nil, "", errors.Wrap(err, "h2mux handshake with edge error")
}
return h, edgeConn.LocalAddr().String(), nil
}