From d6bceb139ee12eaaa1f5bf00e65c0128227939d8 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Tue, 19 May 2015 11:12:41 +0100 Subject: [PATCH] Eliminate MacCache Start method --- router/mac_cache.go | 6 ++---- router/router.go | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/router/mac_cache.go b/router/mac_cache.go index d251d194..5eb03f41 100644 --- a/router/mac_cache.go +++ b/router/mac_cache.go @@ -22,14 +22,12 @@ type MacCache struct { } func NewMacCache(maxAge time.Duration, onExpiry func(net.HardwareAddr, *Peer)) *MacCache { - return &MacCache{ + cache := &MacCache{ table: make(map[uint64]*MacCacheEntry), maxAge: maxAge, onExpiry: onExpiry} -} - -func (cache *MacCache) Start() { cache.setExpiryTimer() + return cache } func (cache *MacCache) Enter(mac net.HardwareAddr, peer *Peer) bool { diff --git a/router/router.go b/router/router.go index 520ca080..b5f40071 100644 --- a/router/router.go +++ b/router/router.go @@ -96,7 +96,6 @@ func (router *Router) Start() { checkFatal(err) } router.Ourself.Start() - router.Macs.Start() router.Routes.Start() router.ConnectionMaker.Start() router.UDPListener = router.listenUDP(router.Port, po)