From 68df379a7d88e3da0e207a3ec5ecaf78c153b55c Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 26 Jul 2021 20:09:44 -0700 Subject: [PATCH] net/portmapper: rename ErrGatewayNotFound to ErrGatewayRange, reword text It confused & scared people. And it was just bad. Signed-off-by: Brad Fitzpatrick --- net/portmapper/portmapper.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/portmapper/portmapper.go b/net/portmapper/portmapper.go index 6d9e2dfbc..e9ddf27c9 100644 --- a/net/portmapper/portmapper.go +++ b/net/portmapper/portmapper.go @@ -270,7 +270,7 @@ func IsNoMappingError(err error) bool { var ( ErrNoPortMappingServices = errors.New("no port mapping services were found") - ErrGatewayNotFound = errors.New("failed to look up gateway address") + ErrGatewayRange = errors.New("skipping portmap; gateway range likely lacks support") ) // GetCachedMappingOrStartCreatingOne quickly returns with our current cached portmapping, if any. @@ -331,7 +331,7 @@ func (c *Client) createMapping() { func (c *Client) createOrGetMapping(ctx context.Context) (external netaddr.IPPort, err error) { gw, myIP, ok := c.gatewayAndSelfIP() if !ok { - return netaddr.IPPort{}, NoMappingError{ErrGatewayNotFound} + return netaddr.IPPort{}, NoMappingError{ErrGatewayRange} } c.mu.Lock() @@ -540,7 +540,7 @@ type ProbeResult struct { func (c *Client) Probe(ctx context.Context) (res ProbeResult, err error) { gw, myIP, ok := c.gatewayAndSelfIP() if !ok { - return res, ErrGatewayNotFound + return res, ErrGatewayRange } defer func() { if err == nil {