From: Gaurav Goyal <gaurav.goyal@4rf.com>
Date: Fri, 27 Nov 2020 02:41:09 +0000 (+1300)
Subject: nhrpd: Only create one child sa
X-Git-Tag: base_7.6~66^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6c9ca5876623d3b1e36a3e5684523d9d57845038;p=mirror%2Ffrr.git

nhrpd: Only create one child sa

In some circumstances, especicially when GRE tunnel interface does not exist,
repeated child sa requests are sent. Prevent this by only sending another
request if the child sa does not exist

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
---

diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
old mode 100644
new mode 100755
index 2dc019ce65..85d7477aa3
--- a/nhrpd/nhrp_peer.c
+++ b/nhrpd/nhrp_peer.c
@@ -271,6 +271,8 @@ int nhrp_peer_check(struct nhrp_peer *p, int establish)
 		return 0;
 	if (sockunion_family(&vc->local.nbma) == AF_UNSPEC)
 		return 0;
+	if (vc->ipsec)
+		return 1;
 
 	p->prio = establish > 1;
 	p->requested = 1;