From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 1 Sep 2016 22:49:53 +0000 (-0400)
Subject: pimd: Allow interfaces to be unnumbered.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~252
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=21391ed8d887a4c5967e73f50018b9433e717a83;p=mirror%2Ffrr.git

pimd: Allow interfaces to be unnumbered.

Specify the ifindex of the interface that we want
to turn on IP_MULTICAST_IF on instead of the
address.  If we pass in the address then the
fact that we have multiple interfaces with the
same ip address causes confusion in the kernel.

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

diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index 8f8f4f191f..4312fe73b2 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -113,6 +113,7 @@ pim_socket_bind (int fd, struct interface *ifp)
 
 int pim_socket_mcast(int protocol, struct in_addr ifaddr, int ifindex, u_char loop)
 {
+  struct ip_mreqn mreq;
   int fd;
 
   fd = pim_socket_raw(protocol);
@@ -214,8 +215,10 @@ int pim_socket_mcast(int protocol, struct in_addr ifaddr, int ifindex, u_char lo
     return PIM_SOCK_ERR_LOOP;
   }
 
+  memset (&mreq, 0, sizeof (mreq));
+  mreq.imr_ifindex = ifindex;
   if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-		 (void *) &ifaddr, sizeof(ifaddr))) {
+		 (void *) &mreq, sizeof(mreq))) {
     zlog_warn("Could not set Outgoing Interface Option on socket fd=%d: errno=%d: %s",
 	      fd, errno, safe_strerror(errno));
     close(fd);