refactor: move MaxNextHops to defn

named-data · Dec 25, 2024 · c1fd578 · c1fd578
1 parent 460b7c6
commit c1fd578
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/fw/defn/mtu.go b/fw/defn/mtu.go
@@ -2,3 +2,6 @@ package defn
 
 // MaxNDNPacketSize is the maximum allowed NDN packet size
 const MaxNDNPacketSize = 8800
+
+// Maximum number of next hops for a given path
+const MaxNextHops = 16
diff --git a/fw/fw/bestroute.go b/fw/fw/bestroute.go
@@ -62,7 +62,7 @@ func (s *BestRoute) AfterReceiveInterest(
 	packet *defn.Pkt,
 	pitEntry table.PitEntry,
 	inFace uint64,
-	nexthops [MaxNextHops]*table.FibNextHopEntry,
+	nexthops [defn.MaxNextHops]*table.FibNextHopEntry,
 	nexthopsCount int,
 ) {
 	if nexthopsCount == 0 {

diff --git a/fw/fw/multicast.go b/fw/fw/multicast.go
@@ -61,7 +61,7 @@ func (s *Multicast) AfterReceiveInterest(
 	packet *defn.Pkt,
 	pitEntry table.PitEntry,
 	inFace uint64,
-	nexthops [MaxNextHops]*table.FibNextHopEntry,
+	nexthops [defn.MaxNextHops]*table.FibNextHopEntry,
 	nexthopsCount int,
 ) {
 	if nexthopsCount == 0 {

diff --git a/fw/fw/strategy.go b/fw/fw/strategy.go
@@ -18,9 +18,6 @@ import (
 // StrategyPrefix is the prefix of all strategy names for YaNFD
 const StrategyPrefix = "/localhost/nfd/strategy"
 
-// Maximum number of possible next hops (i.e. router links) for optimization
-const MaxNextHops = 32
-
 // Strategy represents a forwarding strategy.
 type Strategy interface {
 	Instantiate(fwThread *Thread)
@@ -39,7 +36,7 @@ type Strategy interface {
 		packet *defn.Pkt,
 		pitEntry table.PitEntry,
 		inFace uint64,
-		nexthops [MaxNextHops]*table.FibNextHopEntry,
+		nexthops [defn.MaxNextHops]*table.FibNextHopEntry,
 		nexthopsCount int,
 	)
 	BeforeSatisfyInterest(

diff --git a/fw/fw/thread.go b/fw/fw/thread.go
@@ -327,15 +327,15 @@ func (t *Thread) processIncomingInterest(packet *defn.Pkt) {
 
 	// Exclude faces that have an in-record for this interest
 	// TODO: unclear where NFD dev guide specifies such behavior (if any)
-	allowedNexthops := [MaxNextHops]*table.FibNextHopEntry{}
+	allowedNexthops := [defn.MaxNextHops]*table.FibNextHopEntry{}
 	allowedNexthopsCount := 0
 	for _, nexthop := range nexthops {
 		record := pitEntry.InRecords()[nexthop.Nexthop]
 		if record == nil || nexthop.Nexthop == incomingFace.FaceID() {
 			allowedNexthops[allowedNexthopsCount] = nexthop
 			allowedNexthopsCount++
 		}
-		if allowedNexthopsCount >= MaxNextHops {
+		if allowedNexthopsCount >= defn.MaxNextHops {
 			break // limit reached
 		}
 	}