diff --git a/router/connection.go b/router/connection.go index 9f047159..cfb41897 100644 --- a/router/connection.go +++ b/router/connection.go @@ -453,10 +453,6 @@ func (conn *LocalConnection) extendReadDeadline() { conn.TCPConn.SetReadDeadline(time.Now().Add(TCPHeartbeat * 2)) } -func (conn *LocalConnection) Forward(key ForwardPacketKey) FlowOp { - return conn.forwarder.Forward(key) -} - func tickerChan(ticker *time.Ticker) <-chan time.Time { if ticker != nil { return ticker.C diff --git a/router/router.go b/router/router.go index 5e135a6d..d1e2bb5c 100644 --- a/router/router.go +++ b/router/router.go @@ -242,7 +242,7 @@ func (router *Router) relay(key ForwardPacketKey) FlowOp { return DiscardingFlowOp{} } - return conn.(*LocalConnection).Forward(key) + return conn.(*LocalConnection).forwarder.Forward(key) } func (router *Router) relayBroadcast(srcPeer *Peer, key PacketKey) FlowOp { @@ -254,7 +254,7 @@ func (router *Router) relayBroadcast(srcPeer *Peer, key PacketKey) FlowOp { op := NewMultiFlowOp(true) for _, conn := range router.Ourself.ConnectionsTo(nextHops) { - op.Add(conn.(*LocalConnection).Forward(ForwardPacketKey{ + op.Add(conn.(*LocalConnection).forwarder.Forward(ForwardPacketKey{ PacketKey: key, SrcPeer: srcPeer, DstPeer: conn.Remote()}))