Skip to content

Commit

Permalink
fixed naming
Browse files Browse the repository at this point in the history
  • Loading branch information
aarshkshah1992 committed Feb 18, 2021
1 parent d337499 commit 5bcd646
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions p2p/protocol/identify/obsaddr.go
Expand Up @@ -389,7 +389,7 @@ func (oas *ObservedAddrManager) maybeRecordObservation(conn network.Conn, observ
oas.mu.Lock()
defer oas.mu.Unlock()
oas.recordObservationUnlocked(conn, observed)
oas.emitNATTypeUnlocked()
oas.emitAllNATTypes()
}

func (oas *ObservedAddrManager) recordObservationUnlocked(conn network.Conn, observed ma.Multiaddr) {
Expand Down Expand Up @@ -445,26 +445,26 @@ func (oas *ObservedAddrManager) recordObservationUnlocked(conn network.Conn, obs
//
// Please see the documentation on the enumerations for `network.NATDeviceType` for more details about these NAT Device types
// and how they relate to NAT traversal via Hole Punching.
func (oas *ObservedAddrManager) emitNATTypeUnlocked() {
func (oas *ObservedAddrManager) emitAllNATTypes() {
var allObserved []*observedAddr
for k := range oas.addrs {
allObserved = append(allObserved, oas.addrs[k]...)
}

hasChanged, natType := oas.emitNATType(allObserved, ma.P_TCP, event.NATTransportTCP, oas.currentTCPNATDeviceType)
hasChanged, natType := oas.emitSpecificNATType(allObserved, ma.P_TCP, event.NATTransportTCP, oas.currentTCPNATDeviceType)
if hasChanged {
oas.currentTCPNATDeviceType = natType
}

hasChanged, natType = oas.emitNATType(allObserved, ma.P_UDP, event.NATTransportUDP, oas.currentUDPNATDeviceType)
hasChanged, natType = oas.emitSpecificNATType(allObserved, ma.P_UDP, event.NATTransportUDP, oas.currentUDPNATDeviceType)
if hasChanged {
oas.currentUDPNATDeviceType = natType
}
}

// returns true along with the new NAT device type if the NAT device type for the given protocol has changed.
// returns false otherwise.
func (oas *ObservedAddrManager) emitNATType(addrs []*observedAddr, protoCode int, transportProto event.NATTransportProtocol,
func (oas *ObservedAddrManager) emitSpecificNATType(addrs []*observedAddr, protoCode int, transportProto event.NATTransportProtocol,
currentNATType network.NATDeviceType) (bool, network.NATDeviceType) {
now := time.Now()
seenBy := make(map[string]struct{})
Expand Down

0 comments on commit 5bcd646

Please sign in to comment.