From 4a1d3aeb9634d8e639cde794e0a9af7882088680 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Wed, 18 Mar 2015 16:20:32 +0000 Subject: [PATCH] Remove frameLen parameter to FrameConsumer It's the same as len(frame) --- router/crypto.go | 4 ++-- router/router.go | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/router/crypto.go b/router/crypto.go index f1f8ae51..7aae7200 100644 --- a/router/crypto.go +++ b/router/crypto.go @@ -244,7 +244,7 @@ func (ne *NaClEncryptor) TotalLen() int { // Frame Decryptors -type FrameConsumer func(conn *LocalConnection, sender *net.UDPAddr, src []byte, dst []byte, len uint16, frame []byte) +type FrameConsumer func(conn *LocalConnection, sender *net.UDPAddr, src []byte, dst []byte, frame []byte) type Decryptor interface { IterateFrames(FrameConsumer, *UDPPacket) error @@ -294,7 +294,7 @@ func (nd *NonDecryptor) IterateFrames(consumer FrameConsumer, packet *UDPPacket) } frame := buf[:length] buf = buf[length:] - consumer(nd.conn, packet.Sender, srcNameByte, dstNameByte, length, frame) + consumer(nd.conn, packet.Sender, srcNameByte, dstNameByte, frame) } if len(buf) > 0 { return PacketDecodingError{Desc: fmt.Sprintf("%d octets of trailing garbage", len(buf))} diff --git a/router/router.go b/router/router.go index a78f020f..2f4f0b61 100644 --- a/router/router.go +++ b/router/router.go @@ -268,7 +268,7 @@ func (router *Router) udpReader(conn *net.UDPConn, po PacketSink) { } func (router *Router) handleUDPPacketFunc(dec *EthernetDecoder, po PacketSink) FrameConsumer { - return func(relayConn *LocalConnection, sender *net.UDPAddr, srcNameByte, dstNameByte []byte, frameLen uint16, frame []byte) { + return func(relayConn *LocalConnection, sender *net.UDPAddr, srcNameByte, dstNameByte []byte, frame []byte) { srcPeer, found := router.Peers.Fetch(PeerNameFromBin(srcNameByte)) if !found { return @@ -293,7 +293,7 @@ func (router *Router) handleUDPPacketFunc(dec *EthernetDecoder, po PacketSink) F // detecting special frames is cheaper post decoding than pre. if decodedLen == 1 && dec.IsSpecial() { if srcPeer == relayConn.Remote() && dstPeer == router.Ourself.Peer { - handleSpecialFrame(relayConn, sender, frameLen, frame) + handleSpecialFrame(relayConn, sender, frame) } } @@ -335,7 +335,8 @@ func (router *Router) handleUDPPacketFunc(dec *EthernetDecoder, po PacketSink) F } } -func handleSpecialFrame(relayConn *LocalConnection, sender *net.UDPAddr, frameLen uint16, frame []byte) { +func handleSpecialFrame(relayConn *LocalConnection, sender *net.UDPAddr, frame []byte) { + frameLen := len(frame) switch { case frameLen == EthernetOverhead+8: relayConn.ReceivedHeartbeat(sender, binary.BigEndian.Uint64(frame[EthernetOverhead:]))