summaryrefslogtreecommitdiff
path: root/pimd/pim_util.h
diff options
context:
space:
mode:
Diffstat (limited to 'pimd/pim_util.h')
-rw-r--r--pimd/pim_util.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/pimd/pim_util.h b/pimd/pim_util.h
index d780bfbc27..fbb7b0196b 100644
--- a/pimd/pim_util.h
+++ b/pimd/pim_util.h
@@ -16,6 +16,10 @@
along with this program; see the file COPYING; if not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
MA 02110-1301 USA
+<<<<<<< HEAD
+
+=======
+>>>>>>> origin/master
*/
#ifndef PIM_UTIL_H
@@ -32,4 +36,6 @@ uint16_t igmp_msg_decode8to16(uint8_t code);
void pim_pkt_dump(const char *label, const uint8_t *buf, int size);
+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);
#endif /* PIM_UTIL_H */