From c6b68dd2bdb80837eb2f598781f05a3ba6ceff0b Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 20 Jan 2015 20:49:23 +0000
Subject: [PATCH] cosmetic: move Router type from types.go to router.go

---
 router/router.go | 14 ++++++++++++++
 router/types.go  | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/router/router.go b/router/router.go
index e4810602..d788d84d 100644
--- a/router/router.go
+++ b/router/router.go
@@ -17,6 +17,20 @@ const macMaxAge = 10 * time.Minute // [1]
 // [1] should be greater than typical ARP cache expiries, i.e. > 3/2 *
 // /proc/sys/net/ipv4_neigh/*/base_reachable_time_ms on Linux
 
+type Router struct {
+	Iface           *net.Interface
+	Ourself         *LocalPeer
+	Macs            *MacCache
+	Peers           *Peers
+	Routes          *Routes
+	ConnectionMaker *ConnectionMaker
+	UDPListener     *net.UDPConn
+	Password        *[]byte
+	ConnLimit       int
+	BufSz           int
+	LogFrame        func(string, []byte, *layers.Ethernet)
+}
+
 func NewRouter(iface *net.Interface, name PeerName, password []byte, connLimit int, bufSz int, logFrame func(string, []byte, *layers.Ethernet)) *Router {
 	router := &Router{
 		Iface:     iface,
diff --git a/router/types.go b/router/types.go
index 9bd04c56..f68d307b 100644
--- a/router/types.go
+++ b/router/types.go
@@ -1,24 +1,9 @@
 package router
 
 import (
-	"code.google.com/p/gopacket/layers"
 	"net"
 )
 
-type Router struct {
-	Iface           *net.Interface
-	Ourself         *LocalPeer
-	Macs            *MacCache
-	Peers           *Peers
-	Routes          *Routes
-	ConnectionMaker *ConnectionMaker
-	UDPListener     *net.UDPConn
-	Password        *[]byte
-	ConnLimit       int
-	BufSz           int
-	LogFrame        func(string, []byte, *layers.Ethernet)
-}
-
 type UDPPacket struct {
 	Name   PeerName
 	Packet []byte