fw: do not send to same faceid twice in broadcast

Author: r2dev2

fw/fw/broadcast.go

@@ -69,25 +69,44 @@ func (s *BroadcastStrategy) AfterReceiveMulticastInterest(
 	core.Log.Trace(s, "Broadcast multicast dispatch",
 		"name", packet.Name,
 		"deliveredToLocal", deliveredToLocal,
+		"petEgress", len(petEntry.EgressRouters),
+		"petNextHops", len(petEntry.NextHops),
 	)
-	seen := make(map[uint64]struct{})
-	for _, entry := range table.FibStrategyTable.GetAllFIBEntries() {
-		for _, nextHop := range entry.GetNextHops() {
-			if _, ok := seen[nextHop.Nexthop]; ok {
+
+	seen := make(map[uint64]bool)
+	sent := 0
+
+	for _, egress := range petEntry.EgressRouters {
+		nextHops := table.FibStrategyTable.FindNextHopsEnc(egress)
+
+		for _, nextHop := range nextHops {
+			faceID := nextHop.Nexthop
+			if _, ok := seen[faceID]; ok {
 				continue
 			}
-			seen[nextHop.Nexthop] = struct{}{}
+			seen[faceID] = true
 
-			if nextHop.Nexthop == packet.IncomingFaceID {
+			if faceID == packet.IncomingFaceID {
 				continue
 			}
 
-			if pitEntry.InRecords()[nextHop.Nexthop] != nil {
+			if pitEntry.InRecords()[faceID] != nil {
 				continue
 			}
-			s.SendInterest(packet, pitEntry, nextHop.Nexthop, inFace)
+
+			if s.SendInterest(packet, pitEntry, faceID, inFace) {
+				sent++
+			}
 		}
 	}
+
+	if sent == 0 {
+		core.Log.Warn(s, "Broadcast multicast had no eligible PET-scoped nexthops",
+			"name", packet.Name,
+			"deliveredToLocal", deliveredToLocal,
+			"petEgress", len(petEntry.EgressRouters),
+		)
+	}
 }
 
 func (s *BroadcastStrategy) BeforeSatisfyInterest(pitEntry table.PitEntry, inFace uint64) {}