Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / pimd / pim_igmp_join.h

diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h
index 88385bffba47631c77b5faaf455d98a4690ca3be..d6d22be3e4c73565dcc11f1dfb3ec98751cd0970 100644 (file)
--- a/pimd/pim_igmp_join.h
+++ b/pimd/pim_igmp_join.h
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PIM for Quagga
  * Copyright (C) 2008  Everton da Silva Marques
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License 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
  */
 
 #ifndef PIM_IGMP_JOIN_H
@@ -26,6 +13,10 @@
 #define SOL_IP IPPROTO_IP
 #endif
 
+#ifndef MCAST_JOIN_GROUP
+#define MCAST_JOIN_GROUP 42
+#endif
+
 #ifndef MCAST_JOIN_SOURCE_GROUP
 #define MCAST_JOIN_SOURCE_GROUP 46
 struct group_source_req {
@@ -35,9 +26,9 @@ struct group_source_req {
 };
 #endif
 
-static int pim_igmp_join_source(int fd, ifindex_t ifindex,
-                               struct in_addr group_addr,
-                               struct in_addr source_addr)
+static inline int pim_igmp_join_source(int fd, ifindex_t ifindex,
+                                      struct in_addr group_addr,
+                                      struct in_addr source_addr)
 {
        struct group_source_req req;
        struct sockaddr_in group;
@@ -58,8 +49,12 @@ static int pim_igmp_join_source(int fd, ifindex_t ifindex,
 
        req.gsr_interface = ifindex;
 
-       return setsockopt(fd, SOL_IP, MCAST_JOIN_SOURCE_GROUP, &req,
-                         sizeof(req));
+       if (source_addr.s_addr == INADDR_ANY)
+               return setsockopt(fd, SOL_IP, MCAST_JOIN_GROUP, &req,
+                                 sizeof(req));
+       else
+               return setsockopt(fd, SOL_IP, MCAST_JOIN_SOURCE_GROUP, &req,
+                                 sizeof(req));
 }
 
 #endif /* PIM_IGMP_JOIN_H */