mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/portmapper: rename ErrGatewayNotFound to ErrGatewayRange, reword text 

It confused & scared people. And it was just bad.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-07-26 20:09:44 -07:00 committed by Brad Fitzpatrick
parent aaf2df7ab1
commit 68df379a7d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/portmapper/portmapper.go
View File

@ -270,7 +270,7 @@ func IsNoMappingError(err error) bool {
var ( var (
ErrNoPortMappingServices = errors.New("no port mapping services were found") 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. // 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) { func (c *Client) createOrGetMapping(ctx context.Context) (external netaddr.IPPort, err error) {
gw, myIP, ok := c.gatewayAndSelfIP() gw, myIP, ok := c.gatewayAndSelfIP()
if !ok { if !ok {
return netaddr.IPPort{}, NoMappingError{ErrGatewayNotFound} return netaddr.IPPort{}, NoMappingError{ErrGatewayRange}
} }
c.mu.Lock() c.mu.Lock()
@ -540,7 +540,7 @@ type ProbeResult struct {
func (c *Client) Probe(ctx context.Context) (res ProbeResult, err error) { func (c *Client) Probe(ctx context.Context) (res ProbeResult, err error) {
gw, myIP, ok := c.gatewayAndSelfIP() gw, myIP, ok := c.gatewayAndSelfIP()
if !ok { if !ok {
return res, ErrGatewayNotFound return res, ErrGatewayRange
} }
defer func() { defer func() {
if err == nil { if err == nil {