From 3e620427455e38742ea2ca2e1c9f96248efa5188 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Mon, 3 Nov 2014 15:10:44 -0800 Subject: [PATCH] fix up NAT check and clear up naming --- net/conn/handshake.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/conn/handshake.go b/net/conn/handshake.go index 61e6d183a..36a187061 100644 --- 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 } }