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 3607ee96b3a29d093006b53cf84e417d6bd70ca6..d1a6facb30435603082ff93ec176424a03e06845 100644 (file)
--- 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)