diff --git a/router/router.go b/router/router.go index d788d84d..111d0626 100644 --- a/router/router.go +++ b/router/router.go @@ -195,6 +195,16 @@ func (router *Router) listenUDP(localPort int, po PacketSink) *net.UDPConn { return conn } +type UDPPacket struct { + Name PeerName + Packet []byte + Sender *net.UDPAddr +} + +func (packet UDPPacket) String() string { + return fmt.Sprintf("UDP Packet\n name: %s\n sender: %v\n payload: % X", packet.Name, packet.Sender, packet.Packet) +} + func (router *Router) udpReader(conn *net.UDPConn, po PacketSink) { defer conn.Close() dec := NewEthernetDecoder() diff --git a/router/types.go b/router/types.go index de426fcf..f47848da 100644 --- a/router/types.go +++ b/router/types.go @@ -1,15 +1,5 @@ package router -import ( - "net" -) - -type UDPPacket struct { - Name PeerName - Packet []byte - Sender *net.UDPAddr -} - type ForwardedFrame struct { srcPeer *Peer dstPeer *Peer diff --git a/router/utils.go b/router/utils.go index 60f6a603..c7f8059c 100644 --- a/router/utils.go +++ b/router/utils.go @@ -50,10 +50,6 @@ func (pde PacketDecodingError) Error() string { return fmt.Sprint("Failed to decode packet: ", pde.Desc) } -func (packet UDPPacket) String() string { - return fmt.Sprintf("UDP Packet\n name: %s\n sender: %v\n payload: % X", packet.Name, packet.Sender, packet.Packet) -} - func Concat(elems ...[]byte) []byte { res := []byte{} for _, e := range elems {