From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Thu, 26 May 2016 00:36:10 +0000 (-0400)
Subject: pimd: Fix some static analysis
X-Git-Tag: frr-2.0-rc1~800
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9eda95bde57355387f64065967bbd6e01cced05f;p=mirror%2Ffrr.git

pimd: Fix some static analysis

Using && instead of &.

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

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 11717acf0c..406f91494a 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -202,7 +202,7 @@ pim_register_recv (struct interface *ifp,
   if (I_am_RP (group) && (dest_addr.s_addr == ((RP (group))->rpf_addr.s_addr))) {
     sentRegisterStop = 0;
 
-    if (*bits && PIM_REGISTER_BORDER_BIT) {
+    if (*bits & PIM_REGISTER_BORDER_BIT) {
       struct in_addr pimbr = pim_br_get_pmbr (source, group);
       if (PIM_DEBUG_PIM_PACKETS)
 	zlog_debug("%s: Received Register message with Border bit set", __func__);
@@ -243,7 +243,7 @@ pim_register_recv (struct interface *ifp,
     }
 
     if (!(upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) &&
-	!(*bits && PIM_REGISTER_NR_BIT)) {
+	!(*bits & PIM_REGISTER_NR_BIT)) {
       //decapsulate and forward the iner packet to
       //inherited_olist(S,G,rpt)
     }