From: Renato Westphal <renato@opensourcerouting.org>
Date: Wed, 14 Dec 2016 21:20:10 +0000 (-0200)
Subject: ldpd: allow multiple link adjacencies with unnumbered interfaces
X-Git-Tag: frr-3.0-branchpoint~94^2~2^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9c0b0e6753b110a7e0ba4229873a6c10cd8c6bd5;p=matthieu%2Ffrr.git

ldpd: allow multiple link adjacencies with unnumbered interfaces

Now we can have two different adjacencies coming from the same source
address. Check for the adjacency's interface on adj_find() to disambiguate
them.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c
index 3607ee96b3..d1a6facb30 100644
--- a/ldpd/adjacency.c
+++ b/ldpd/adjacency.c
@@ -117,6 +117,10 @@ adj_find(struct hello_source *source)
 
 		switch (source->type) {
 		case HELLO_LINK:
+			if (strcmp(source->link.ia->iface->name,
+			    adj->source.link.ia->iface->name))
+				continue;
+
 			if (ldp_addrcmp(source->link.ia->af,
 			    &adj->source.link.src_addr,
 			    &source->link.src_addr) == 0)