fix up NAT check and clear up naming
Jeromy committed
Nov 3, 2014 at 15:10 UTC
3e620427455e38742ea2ca2e1c9f96248efa5188
1 file changed
+4
-4
net/conn/handshake.go
+4
-4
@@ -127,8 +127,8 @@ func Handshake3(ctx context.Context, c Conn) error {
127
}
128
129
// checkNAT returns whether or not we might be behind a NAT
130
-func checkNAT(obsaddr string) (bool, error) {
131
- oma, err := ma.NewMultiaddr(obsaddr)
130
+func checkNAT(observedaddr string) (bool, error) {
131
+ observedma, err := ma.NewMultiaddr(observedaddr)
132
if err != nil {
133
return false, err
134
}
@@ -137,9 +137,9 @@ func checkNAT(obsaddr string) (bool, error) {
137
return false, err
138
}
139
140
- omastr := oma.String()
140
+ omastr := observedma.String()
141
for _, addr := range addrs {
142
- if strings.HasPrefix(addr.String(), omastr) {
142
+ if strings.HasPrefix(omastr, addr.String()) {
143
return false, nil
144
}
145
}