Remove frameLen parameter to FrameConsumer

It's the same as len(frame)
This commit is contained in:
David Wragg committed 2015-03-27 18:05:00 +00:00
1 parent bc45a363dd
commit 4a1d3aeb96
2 files changed
+6 -5

No files matched your search

+2 -2
View File
@@ -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))}
+4 -3
View File
@@ -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:]))