From d8cd119bbcde762c4d6273ad39c1afc2a60e7759 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 3 Nov 2015 16:39:40 -0800 Subject: [PATCH] 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 --- pimd/pim_upstream.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 15f96c2e4e..c035170875 100644 --- 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; + } } } -- 2.39.5