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

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

View File

@ -29,7 +29,7 @@ func DialEdge(
tlsEdgeConn.SetDeadline(time.Now().Add(timeout)) tlsEdgeConn.SetDeadline(time.Now().Add(timeout))
if err = tlsEdgeConn.Handshake(); err != nil { if err = tlsEdgeConn.Handshake(); err != nil {
return nil, newDialError(err, "Handshake with edge error") return nil, newDialError(err, "TLS handshake with edge error")
} }
// clear the deadline on the conn; h2mux has its own timeouts // clear the deadline on the conn; h2mux has its own timeouts
tlsEdgeConn.SetDeadline(time.Time{}) tlsEdgeConn.SetDeadline(time.Time{})

View File

@ -72,7 +72,15 @@ type tunnelError struct {
} }
func NewSupervisor(config *TunnelConfig, u uuid.UUID) (*Supervisor, error) { 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 { if err != nil {
return nil, err return nil, err
} }

View File

@ -539,7 +539,7 @@ func NewTunnelHandler(ctx context.Context,
// Client mux handshake with agent server // Client mux handshake with agent server
h.muxer, err = h2mux.Handshake(edgeConn, edgeConn, config.muxerConfig(h), h.metrics.activeStreams) h.muxer, err = h2mux.Handshake(edgeConn, edgeConn, config.muxerConfig(h), h.metrics.activeStreams)
if err != nil { 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 return h, edgeConn.LocalAddr().String(), nil
} }