OpenSourceRouting / quagga-snap / 10d04cdb419

Commits

Dmitrij Tejblum authored and Denis Ovsienko committed 10d04cdb419 22 Aug 2011

lib: use "protocol-independed API" from RFC3678, if that is available

(This commit is based on the patch from BZ#420, and should fix that bug.)

* configure.ac: detect availability of that API
* sockopt.c (setsockopt_ipv4_multicast): use it for join/leave IPv4
  multicast groups

lib/sockopt.c

Modified

-202
+ * (e.g. Linux, Solaris) behave when leaving groups on down interfaces,
-203
+ * but this behavior should not be harmful if they behave the same way,
-204
+ * allow leaves, or implicitly leave all groups joined to down interfaces.
-205
+ */
-206
+int
-207
+setsockopt_ipv4_multicast(int sock,
-208
+			int optname,
-209
+			unsigned int mcast_addr,
-210
+			unsigned int ifindex)
-211
+{
-+
+#ifdef HAVE_RFC3678
-+
+  struct group_req gr;
-+
+  struct sockaddr_in *si;
-+
+  int ret;
-+
+  memset (&gr, 0, sizeof(gr));
-+
+  si = (struct sockaddr_in *)&gr.gr_group;
-+
+  gr.gr_interface = ifindex;
-+
+  si->sin_family = AF_INET;
-+
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-+
+  si->sin_len = sizeof(struct sockaddr_in);
-+
+#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-+
+  si->sin_addr.s_addr = mcast_addr;
-+
+  ret = setsockopt(sock, IPPROTO_IP, (optname == IP_ADD_MEMBERSHIP) ?
-+
+    MCAST_JOIN_GROUP : MCAST_LEAVE_GROUP, (void *)&gr, sizeof(gr));
-+
+  if ((ret < 0) && (optname == IP_ADD_MEMBERSHIP) && (errno == EADDRINUSE))
-+
+    {
-+
+      setsockopt(sock, IPPROTO_IP, MCAST_LEAVE_GROUP, (void *)&gr, sizeof(gr));
-+
+      ret = setsockopt(sock, IPPROTO_IP, MCAST_JOIN_GROUP, (void *)&gr, sizeof(gr));
-+
+    }
-+
+  return ret;
-232
--
+#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX
-+
+#elif defined(HAVE_STRUCT_IP_MREQN_IMR_IFINDEX) && !defined(__FreeBSD__)
-234
+  struct ip_mreqn mreqn;
-235
+  int ret;
-236
-237
+  assert(optname == IP_ADD_MEMBERSHIP || optname == IP_DROP_MEMBERSHIP);
-238
+  memset (&mreqn, 0, sizeof(mreqn));
-239
--
+  if (mcast_addr)
--
+    mreqn.imr_multiaddr.s_addr = mcast_addr;
--
-+
+  mreqn.imr_multiaddr.s_addr = mcast_addr;
-241
+  mreqn.imr_ifindex = ifindex;
-242
-243
+  ret = setsockopt(sock, IPPROTO_IP, optname,
-244
+                   (void *)&mreqn, sizeof(mreqn));
-245
+  if ((ret < 0) && (optname == IP_ADD_MEMBERSHIP) && (errno == EADDRINUSE))
-246
+    {
-247
+      /* see above: handle possible problem when interface comes back up */
-248
+      char buf[1][INET_ADDRSTRLEN];
-249
+      zlog_info("setsockopt_ipv4_multicast attempting to drop and "
-250
+                "re-add (fd %d, mcast %s, ifindex %u)",

quagga-snap

Commits

Jira Issues

Add shortcut