MacCache.AddForced needs to return conflicting peer

rade · rade · commit c0c19fc8a469 · 2016-07-10T22:24:04.000+01:00
otherwise NetworkRouter.handleForwardedPacket fails to clear out the
now invalid flows.
diff --git a/router/mac_cache.go b/router/mac_cache.go
@@ -51,19 +51,21 @@ func (cache *MacCache) add(mac net.HardwareAddr, peer *mesh.Peer, force bool) (b
 		return true, nil
 	}
 
+	var conflictPeer *mesh.Peer
+
 	if entry.peer != peer {
+		conflictPeer = entry.peer
 		if !force {
-			return false, entry.peer
+			return false, conflictPeer
 		}
-
 		entry.peer = peer
 	}
 
 	if now.After(entry.lastSeen.Add(cache.maxAge / 10)) {
 		entry.lastSeen = now
 	}
 
-	return false, nil
+	return false, conflictPeer
 }
 
 func (cache *MacCache) Add(mac net.HardwareAddr, peer *mesh.Peer) (bool, *mesh.Peer) {

Original file line number	Diff line number	Diff line change
`@@ -51,19 +51,21 @@ func (cache MacCache) add(mac net.HardwareAddr, peer mesh.Peer, force bool) (b`
`51`	`51`	`return true, nil`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ var conflictPeer *mesh.Peer`
	`55`	`+`
`54`	`56`	`if entry.peer != peer {`
	`57`	`+ conflictPeer = entry.peer`
`55`	`58`	`if !force {`
`56`		`- return false, entry.peer`
	`59`	`+ return false, conflictPeer`
`57`	`60`	`}`
`58`		`-`
`59`	`61`	`entry.peer = peer`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`if now.After(entry.lastSeen.Add(cache.maxAge / 10)) {`
`63`	`65`	`entry.lastSeen = now`
`64`	`66`	`}`
`65`	`67`
`66`		`- return false, nil`
	`68`	`+ return false, conflictPeer`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`func (cache MacCache) Add(mac net.HardwareAddr, peer mesh.Peer) (bool, *mesh.Peer) {`