fw: fix bug in sorting for forwarding + copy packet when setting ER tag in replicast

Author: r2dev2

e2e/test_005.py

@@ -1,5 +1,6 @@
 import random
 import os
+import time
 from pathlib import Path
 
 from mininet.log import info
@@ -55,16 +56,18 @@ def receive_chat_message(node):
                 buf = []
 
     try:
+        beg = time.time()
         for node in chatters[:publish_size]:
             # send a random message into chat
             msg = os.urandom(8).hex()
             node.write(msg + "\n")
-            info(f"{node.name} publishing {msg}\n")
+            info(f"[t={time.time() - beg:.2f}] {node.name} publishing {msg!r}\n")
 
             for other_node in chatters:
                 if other_node.name == node.name:
                     continue
                 received = receive_chat_message(other_node)
+                info(f"[t={time.time() - beg:.2f}] {other_node.name} received {received!r}\n")
                 assert msg in received, "received wrong message"
 
     # custom cleanup logic for this test

fw/fw/bestroute.go

@@ -73,7 +73,7 @@ func (s *BestRoute) AfterReceiveInterest(
 
 	// sort nexthops by cost and send to best-possible hop for each unique ER
 	sort.Slice(nexthops, func(i, j int) bool {
-		return nexthops[i].HopEntry.Cost < nexthops[i].HopEntry.Cost
+		return nexthops[i].HopEntry.Cost < nexthops[j].HopEntry.Cost
 	})
 
 	now := time.Now()
@@ -101,12 +101,10 @@ func (s *BestRoute) AfterReceiveInterest(
 
 			// if there is an associated EgressRouter tag with this new route, then set packet.EgressRouter to the tag
 			if nh.EgressRouter != nil {
-				oldEgress := packet.EgressRouter
 				packet.EgressRouter = nh.EgressRouter
 				if sent := s.SendInterest(packet, pitEntry, nh.HopEntry.Nexthop, inFace); sent {
 					return
 				}
-				packet.EgressRouter = oldEgress
 				// otherwise, normal forwarding
 			} else {
 				if sent := s.SendInterest(packet, pitEntry, nh.HopEntry.Nexthop, inFace); sent {

fw/fw/replicast.go

@@ -67,9 +67,15 @@ func (s *Replicast) AfterReceiveInterest(
 		return
 	}
 
+	// interest with ER tag should only be unicast as dest router is known
+	if len(packet.EgressRouter) > 0 {
+		core.Log.Debug(s, "Interest with ER tag passed to replicast - DROP", "name", packet.Name)
+		return
+	}
+
 	// sort nexthops by cost and send to best-possible nexthop for each unique ER
 	sort.Slice(nexthops, func(i, j int) bool {
-		return nexthops[i].HopEntry.Cost < nexthops[i].HopEntry.Cost
+		return nexthops[i].HopEntry.Cost < nexthops[j].HopEntry.Cost
 	})
 
 	sentER := make(map[uint64]bool)
@@ -80,13 +86,12 @@ func (s *Replicast) AfterReceiveInterest(
 			continue
 		}
 
-		oldEgress := packet.EgressRouter
-		packet.EgressRouter = nh.EgressRouter
-		if sent := s.SendInterest(packet, pitEntry, nh.HopEntry.Nexthop, inFace); sent {
-			core.Log.Trace(s, "Forwarded Interest", "name", packet.Name, "faceid", nh.HopEntry.Nexthop, "er", nh.EgressRouter, "inFace", inFace)
+		outgoingPkt := *packet
+		outgoingPkt.EgressRouter = nh.EgressRouter
+		if sent := s.SendInterest(&outgoingPkt, pitEntry, nh.HopEntry.Nexthop, inFace); sent {
+			core.Log.Trace(s, "Forwarded Interest", "name", outgoingPkt.Name, "faceid", nh.HopEntry.Nexthop, "er", nh.EgressRouter, "inFace", inFace)
 			sentER[nh.EgressRouter.Hash()] = true
 		}
-		packet.EgressRouter = oldEgress
 	}
 
 	for _, nh := range nexthops {