From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 5 Sep 2017 17:17:47 +0000 (-0400)
Subject: ripd: Fix warning about metric value less than 0
X-Git-Tag: frr-4.0-dev~335^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3679c9fa30bfa6a2b3caa6b2afcd3571dc246f47;p=mirror%2Ffrr.git

ripd: Fix warning about metric value less than 0

RIP is testing to ensure that the metric returned
isn't negative.  We should be looking at the returned
value from the cli strtol.

If we get a metric value that is less than zero that
means that we shouldn't use this value in RIP currently.
So signify that by returning mod here.

Fixes: #1107
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index 7d39023b38..ad9f8cf80b 100644
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -421,8 +421,7 @@ static void *route_set_metric_compile(const char *arg)
 	/* Convert string to integer. */
 	metric = strtol(pnt, &endptr, 10);
 
-	if (*endptr != '\0' || mod->metric < 0) {
-		metric = 0;
+	if (*endptr != '\0' || metric < 0) {
 		return mod;
 	}
 	if (metric > RIP_METRIC_INFINITY) {