fix up NAT check and clear up naming

ipfs · Nov 3, 2014 · 3e62042 · 3e62042
1 parent 0581737
commit 3e62042
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/net/conn/handshake.go b/net/conn/handshake.go
@@ -127,8 +127,8 @@ func Handshake3(ctx context.Context, c Conn) error {
 }
 
 // checkNAT returns whether or not we might be behind a NAT
-func checkNAT(obsaddr string) (bool, error) {
-	oma, err := ma.NewMultiaddr(obsaddr)
+func checkNAT(observedaddr string) (bool, error) {
+	observedma, err := ma.NewMultiaddr(observedaddr)
 	if err != nil {
 		return false, err
 	}
@@ -137,9 +137,9 @@ func checkNAT(obsaddr string) (bool, error) {
 		return false, err
 	}
 
-	omastr := oma.String()
+	omastr := observedma.String()
 	for _, addr := range addrs {
-		if strings.HasPrefix(addr.String(), omastr) {
+		if strings.HasPrefix(omastr, addr.String()) {
 			return false, nil
 		}
 	}