refactor: reduce coupling between LocalConnection and Forwarder

This commit is contained in:
Matthias Radestock committed 2015-11-05 21:27:14 +00:00
1 parent ad15e5a234
commit fb3b690c5f
2 files changed
+2 -6

No files matched your search

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