From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 7 Mar 2017 01:44:25 +0000 (-0500)
Subject: pimd: Ensure that *,G is first entry in srcs list
X-Git-Tag: frr-3.1-dev~24^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=701ec0f47482e076151f2bce56988d636752f0dd;p=mirror%2Ffrr.git

pimd: Ensure that *,G is first entry in srcs list

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

diff --git a/pimd/pim_jp_agg.c b/pimd/pim_jp_agg.c
index 29faace322..251e67a351 100644
--- a/pimd/pim_jp_agg.c
+++ b/pimd/pim_jp_agg.c
@@ -83,10 +83,10 @@ pim_jp_agg_src_cmp (void *arg1, void *arg2)
   if (!js1->is_join && js2->is_join)
     return 1;
 
-  if (js1->up->sg.src.s_addr < js2->up->sg.src.s_addr)
+  if ((uint32_t)js1->up->sg.src.s_addr < (uint32_t)js2->up->sg.src.s_addr)
     return -1;
 
-  if (js1->up->sg.src.s_addr > js2->up->sg.src.s_addr)
+  if ((uint32_t)js1->up->sg.src.s_addr > (uint32_t)js2->up->sg.src.s_addr)
     return 1;
 
   return 0;