From c6898de4c0c5783baf5cf95f3097e57c86634d34 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Fri, 16 Jan 2015 23:10:03 +0000 Subject: [PATCH] refactor: compare Peer pointers instead of names That is what we do pretty much everywhere else and it is safe since there are never two Peers with the same name. --- router/router.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/router/router.go b/router/router.go index f017e7a0..2e132815 100644 --- a/router/router.go +++ b/router/router.go @@ -262,7 +262,7 @@ func (router *Router) handleUDPPacketFunc(dec *EthernetDecoder, po PacketSink) F return checkFrameTooBig(router.Ourself.Relay(srcPeer, dstPeer, df, frame, dec), srcPeer) } - if relayConn.Remote().Name == srcPeer.Name { + if relayConn.Remote() == srcPeer { if frameLen == 0 { relayConn.ReceivedHeartbeat(sender) return nil @@ -278,7 +278,7 @@ func (router *Router) handleUDPPacketFunc(dec *EthernetDecoder, po PacketSink) F return nil } - if dec.IsPMTUVerify() && relayConn.Remote().Name == srcPeer.Name { + if dec.IsPMTUVerify() && relayConn.Remote() == srcPeer { frameLenBytes := []byte{0, 0} binary.BigEndian.PutUint16(frameLenBytes, uint16(frameLen-EthernetOverhead)) relayConn.SendTCP(Concat(ProtocolPMTUVerifiedByte, frameLenBytes)) @@ -289,7 +289,7 @@ func (router *Router) handleUDPPacketFunc(dec *EthernetDecoder, po PacketSink) F dstMac := dec.eth.DstMAC if router.Macs.Enter(srcMac, srcPeer) { - log.Println("Discovered remote MAC", srcMac, "at", srcPeer.Name) + log.Println("Discovered remote MAC", srcMac, "at", srcName) } router.LogFrame("Injecting", frame, &dec.eth) checkWarn(po.WritePacket(frame))