net/portmapper: make pcpCodeNotAuthorized log more descriptive

DentonGentry · DentonGentry · commit de4c635e54b8 · 2022-06-28T03:55:17.000-07:00
If PCP is present but disabled, turning it on might help
get direct connections.

Signed-off-by: Denton Gentry &lt;dgentry@tailscale.com&gt;
diff --git a/net/portmapper/pcp.go b/net/portmapper/pcp.go
@@ -115,6 +115,9 @@ func parsePCPMapResponse(resp []byte) (*pcpMapping, error) {
 	if !ok {
 		return nil, fmt.Errorf("Invalid PCP common header")
 	}
+	if res.ResultCode == pcpCodeNotAuthorized {
+		return nil, fmt.Errorf("PCP is implemented but not enabled in the router")
+	}
 	if res.ResultCode != pcpCodeOK {
 		return nil, fmt.Errorf("PCP response not ok, code %d", res.ResultCode)
 	}

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,9 @@ func parsePCPMapResponse(resp []byte) (*pcpMapping, error) {`
`115`	`115`	`if !ok {`
`116`	`116`	`return nil, fmt.Errorf("Invalid PCP common header")`
`117`	`117`	`}`
	`118`	`+ if res.ResultCode == pcpCodeNotAuthorized {`
	`119`	`+ return nil, fmt.Errorf("PCP is implemented but not enabled in the router")`
	`120`	`+ }`
`118`	`121`	`if res.ResultCode != pcpCodeOK {`
`119`	`122`	`return nil, fmt.Errorf("PCP response not ok, code %d", res.ResultCode)`
`120`	`123`	`}`