pimd: Fix pim_upstream_find to match on INADDR_ANY for source

Fix the pim_upstream_find code to match on INADDR_ANY for source.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 15f96c2e4eb8e9e2910a86cbac365c535bd464ca..c0351708753079f74afea73e6bbef7aa52d7210f 100644 (file)
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -406,11 +406,11 @@ struct pim_upstream *pim_upstream_find(struct in_addr source_addr,
   struct pim_upstream *up;
 
   for (ALL_LIST_ELEMENTS_RO(qpim_upstream_list, up_node, up)) {
-    if (
-       (source_addr.s_addr == up->source_addr.s_addr) &&
-       (group_addr.s_addr == up->group_addr.s_addr)
-       ) {
-      return up;
+    if (group_addr.s_addr == up->group_addr.s_addr) {
+      if ((up->source_addr.s_addr == INADDR_ANY) ||
+         (source_addr.s_addr == up->source_addr.s_addr)) {
+       return up;
+      }
     }
   }