zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / pimd / pim_util.c

diff --git a/pimd/pim_util.c b/pimd/pim_util.c
index 139c0e3fb1bbe52090b332794a4d988c18b3b8ff..15bde256daf77ee3888507ad6442c7aa44e6c46d 100644 (file)
--- a/pimd/pim_util.c
+++ b/pimd/pim_util.c
@@ -21,23 +21,24 @@
 
 #include "log.h"
 #include "prefix.h"
+#include "plist.h"
 
 #include "pim_util.h"
 
 /*
   RFC 3376: 4.1.7. QQIC (Querier's Query Interval Code)
-  
+
   If QQIC < 128,  QQI = QQIC
   If QQIC >= 128, QQI = (mant | 0x10) << (exp + 3)
-  
+
   0 1 2 3 4 5 6 7
   +-+-+-+-+-+-+-+-+
   |1| exp | mant  |
   +-+-+-+-+-+-+-+-+
-  
+
   Since exp=0..7 then (exp+3)=3..10, then QQI has
   one of the following bit patterns:
-  
+
   exp=0: QQI = 0000.0000.1MMM.M000
   exp=1: QQI = 0000.0001.MMMM.0000
   ...
@@ -48,33 +49,32 @@
 */
 uint8_t igmp_msg_encode16to8(uint16_t value)
 {
-  uint8_t code;
-
-  if (value < 128) {
-    code = value;
-  }
-  else {
-    uint16_t mask = 0x4000;
-    uint8_t  exp;
-    uint16_t mant;
-    for (exp = 7; exp > 0; --exp) {
-      if (mask & value)
-       break;
-      mask >>= 1;
-    }
-    mant = 0x000F & (value >> (exp + 3));
-    code = ((uint8_t) 1 << 7) | ((uint8_t) exp << 4) | (uint8_t) mant;
-  }
-
-  return code;
+       uint8_t code;
+
+       if (value < 128) {
+               code = value;
+       } else {
+               uint16_t mask = 0x4000;
+               uint8_t exp;
+               uint16_t mant;
+               for (exp = 7; exp > 0; --exp) {
+                       if (mask & value)
+                               break;
+                       mask >>= 1;
+               }
+               mant = 0x000F & (value >> (exp + 3));
+               code = ((uint8_t)1 << 7) | ((uint8_t)exp << 4) | (uint8_t)mant;
+       }
+
+       return code;
 }
 
 /*
   RFC 3376: 4.1.7. QQIC (Querier's Query Interval Code)
-  
+
   If QQIC < 128,  QQI = QQIC
   If QQIC >= 128, QQI = (mant | 0x10) << (exp + 3)
-  
+
   0 1 2 3 4 5 6 7
   +-+-+-+-+-+-+-+-+
   |1| exp | mant  |
@@ -82,64 +82,75 @@ uint8_t igmp_msg_encode16to8(uint16_t value)
 */
 uint16_t igmp_msg_decode8to16(uint8_t code)
 {
-  uint16_t value;
-
-  if (code < 128) {
-    value = code;
-  }
-  else {
-    uint16_t mant = (code & 0x0F);
-    uint8_t  exp  = (code & 0x70) >> 4;
-    value = (mant | 0x10) << (exp + 3);
-  }
-
-  return value;
+       uint16_t value;
+
+       if (code < 128) {
+               value = code;
+       } else {
+               uint16_t mant = (code & 0x0F);
+               uint8_t exp = (code & 0x70) >> 4;
+               value = (mant | 0x10) << (exp + 3);
+       }
+
+       return value;
 }
 
 void pim_pkt_dump(const char *label, const uint8_t *buf, int size)
 {
-  zlog_debug("%s: pkt dump size=%d",
-            label,
-            size);
-  zlog_hexdump(buf, size);
+       zlog_debug("%s: pkt dump size=%d", label, size);
+       zlog_hexdump(buf, size);
+}
+
+int pim_is_group_224_0_0_0_24(struct in_addr group_addr)
+{
+       static int first = 1;
+       static struct prefix group_224;
+       struct prefix group;
+
+       if (first) {
+               if (!str2prefix("224.0.0.0/24", &group_224))
+                       return 0;
+               first = 0;
+       }
+
+       group.family = AF_INET;
+       group.u.prefix4 = group_addr;
+       group.prefixlen = IPV4_MAX_PREFIXLEN;
+
+       return prefix_match(&group_224, &group);
 }
 
-int
-pim_is_group_224_0_0_0_24 (struct in_addr group_addr)
+int pim_is_group_224_4(struct in_addr group_addr)
 {
-  static int first = 1;
-  static struct prefix group_224;
-  struct prefix group;
+       static int first = 1;
+       static struct prefix group_all;
+       struct prefix group;
 
-  if (first)
-    {
-      str2prefix ("224.0.0.0/24", &group_224);
-      first = 0;
-    }
+       if (first) {
+               if (!str2prefix("224.0.0.0/4", &group_all))
+                       return 0;
+               first = 0;
+       }
 
-  group.family = AF_INET;
-  group.u.prefix4 = group_addr;
-  group.prefixlen = 32;
+       group.family = AF_INET;
+       group.u.prefix4 = group_addr;
+       group.prefixlen = 32;
 
-  return prefix_match (&group_224, &group);
+       return prefix_match(&group_all, &group);
 }
 
-int
-pim_is_group_224_4 (struct in_addr group_addr)
+bool pim_is_group_filtered(struct pim_interface *pim_ifp, struct in_addr *grp)
 {
-  static int first = 1;
-  static struct prefix group_all;
-  struct prefix group;
+       struct prefix grp_pfx;
+       struct prefix_list *pl;
 
-  if (first)
-    {
-      str2prefix ("224.0.0.0/4", &group_all);
-      first = 0;
-    }
+       if (!pim_ifp->boundary_oil_plist)
+               return false;
 
-  group.family = AF_INET;
-  group.u.prefix4 = group_addr;
-  group.prefixlen = 32;
+       grp_pfx.family = AF_INET;
+       grp_pfx.prefixlen = 32;
+       grp_pfx.u.prefix4 = *grp;
 
-  return prefix_match (&group_all, &group);
+       pl = prefix_list_lookup(AFI_IP, pim_ifp->boundary_oil_plist);
+       return pl ? prefix_list_apply(pl, &grp_pfx) == PREFIX_DENY : false;
 }