Merge pull request #16630 from donaldsharp/babel_metric

Babel metric
FRRouting · Aug 22, 2024 · 44e8a95 · 44e8a95
2 parents 05c17ef + 63e2c09
commit 44e8a95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/babeld/kernel.c b/babeld/kernel.c
@@ -92,13 +92,9 @@ kernel_route(enum babel_kernel_routes operation, const unsigned char *pref,
         case ROUTE_MODIFY:
             if(newmetric == metric && memcmp(newgate, gate, 16) == 0 &&
                newifindex == ifindex)
-                return 0;
-            debugf(BABEL_DEBUG_ROUTE, "Modify route: delete old; add new.");
-            rc = zebra_route(0, family, pref, plen, gate, ifindex, metric);
-            if (rc < 0)
-                return -1;
+		    return 0;
 
-            rc = zebra_route(1, family, pref, plen, newgate, newifindex,
+	    rc = zebra_route(1, family, pref, plen, newgate, newifindex,
                              newmetric);
             return rc;
     }

diff --git a/babeld/route.c b/babeld/route.c
@@ -352,7 +352,7 @@ route_stream_done(struct route_stream *stream)
 static int
 metric_to_kernel(int metric)
 {
-    return metric < INFINITY ? kernel_metric : KERNEL_INFINITY;
+	return metric < INFINITY ? metric : KERNEL_INFINITY;
 }
 
 /* This is used to maintain the invariant that the installed route is at