Merge remote-tracking branch 'osr/master' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/command_match.c

1 files changed, 3 insertions, 5 deletions

diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c
index 6caa38d68b..088123ea24 100644
--- a/ospfd/ospf_network.c
+++ b/ospfd/ospf_network.c
@@ -132,18 +132,16 @@ ospf_if_ipmulticast (struct ospf *top, struct prefix *p, ifindex_t ifindex)
 {
   u_char val;
   int ret, len;
-  
-  val = 0;
-  len = sizeof (val);
-  
+
   /* Prevent receiving self-origined multicast packets. */
-  ret = setsockopt (top->fd, IPPROTO_IP, IP_MULTICAST_LOOP, (void *)&val, len);
+  ret = setsockopt_ipv4_multicast_loop (top->fd, 0);
   if (ret < 0)
     zlog_warn ("can't setsockopt IP_MULTICAST_LOOP(0) for fd %d: %s",
 	       top->fd, safe_strerror(errno));
   
   /* Explicitly set multicast ttl to 1 -- endo. */
   val = 1;
+  len = sizeof (val);
   ret = setsockopt (top->fd, IPPROTO_IP, IP_MULTICAST_TTL, (void *)&val, len);
   if (ret < 0)
     zlog_warn ("can't setsockopt IP_MULTICAST_TTL(1) for fd %d: %s",