From 7b3b98ae3ecdad20cf5cebd2a6532aee17184d95 Mon Sep 17 00:00:00 2001 From: Lu Feng Date: Mon, 14 Apr 2014 08:09:29 +0000 Subject: ripd & ripngd: avoid the zero interface metric The interface metric is initialized to 0 in the commit db19c85: zebra: set metric for directly connected routes via netlink to 0 Ripd and ripngd must be aware of it and avoid increase the route metric by 0. Signed-off-by: Feng Lu Signed-off-by: David Lamparter --- ripd/ripd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ripd') diff --git a/ripd/ripd.c b/ripd/ripd.c index 55a1a75f..01bd69ec 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -433,7 +433,7 @@ rip_rte_process (struct rte *rte, struct sockaddr_in *from, /* If offset-list does not modify the metric use interface's metric. */ if (!ret) - rte->metric += ifp->metric; + rte->metric += ifp->metric ? ifp->metric : 1; if (rte->metric > RIP_METRIC_INFINITY) rte->metric = RIP_METRIC_INFINITY; -- cgit v1.2.3