From: Jorge Boncompte <jbonor@gmail.com>
Date: Thu, 3 Aug 2017 17:12:27 +0000 (+0200)
Subject: nhrp: fix assertion with negative holding times
X-Git-Tag: frr-4.0-dev~455^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F867%2Fhead;p=mirror%2Ffrr.git

nhrp: fix assertion with negative holding times

Correctly reset status or we later assert at nhrp_cache_free().

Signed-off-by: Jorge Boncompte <jbonor@gmail.com>
---

diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c
index bd884bbc51..3ebdbf27ba 100644
--- a/nhrpd/nhrp_cache.c
+++ b/nhrpd/nhrp_cache.c
@@ -289,7 +289,7 @@ int nhrp_cache_update_binding(struct nhrp_cache *c, enum nhrp_cache_type type, i
 		if (holding_time > 0)
 			c->new.expires = monotime(NULL) + holding_time;
 		else if (holding_time < 0)
-			c->new.type = NHRP_CACHE_INVALID;
+			nhrp_cache_reset_new(c);
 
 		if (c->new.type == NHRP_CACHE_INVALID ||
 		    c->new.type >= NHRP_CACHE_STATIC ||