Merge branch 'master' into docuser

* New manpage: mtracebis.rst
* Makefile.am includes mtracebis.rst
* configure.ac lines removed
* Debian packaging files updated
* Fixed up manpage |seealso-programs| in the process
* Centos7 build package list updated to include systemd-devel
* New paragraph on netns vrf support in zebra manpage

Conflicts:
	configure.ac
	debianpkg/backports/ubuntu14.04/debian/frr.install
	debianpkg/frr.install
	doc/Makefile.am
	doc/developer/Building_FRR_on_CentOS7.rst
	doc/zebra.8.in

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

1 files changed, 10 insertions, 31 deletions

diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c
index 022a5a138a..045634d8ab 100644
--- a/ospfd/ospf_network.c
+++ b/ospfd/ospf_network.c
@@ -169,42 +169,27 @@ int ospf_if_ipmulticast(struct ospf *top, struct prefix *p, ifindex_t ifindex)
 	return ret;
 }
 
-int ospf_bind_vrfdevice(struct ospf *ospf, int ospf_sock)
-{
-	int ret = 0;
-
-#ifdef SO_BINDTODEVICE
-
-	if (ospf && ospf->vrf_id != VRF_DEFAULT &&
-	    ospf->vrf_id != VRF_UNKNOWN) {
-		ret = setsockopt(ospf_sock, SOL_SOCKET, SO_BINDTODEVICE,
-				 ospf->name,
-				 strlen(ospf->name));
-		if (ret < 0) {
-			int save_errno = errno;
-
-			zlog_warn("%s: Could not setsockopt SO_BINDTODEVICE %s",
-					__PRETTY_FUNCTION__,
-					safe_strerror(save_errno));
-		}
-
-	}
-#endif
-	return ret;
-}
-
 int ospf_sock_init(struct ospf *ospf)
 {
 	int ospf_sock;
 	int ret, hincl = 1;
 	int bufsize = (8 * 1024 * 1024);
 
+	/* silently ignore. already done */
+	if (ospf->fd > 0)
+		return -1;
+
+	if (ospf->vrf_id == VRF_UNKNOWN) {
+		/* silently return since VRF is not ready */
+		return -1;
+	}
 	if (ospfd_privs.change(ZPRIVS_RAISE)) {
 		zlog_err("ospf_sock_init: could not raise privs, %s",
 			 safe_strerror(errno));
 	}
 
-	ospf_sock = socket(AF_INET, SOCK_RAW, IPPROTO_OSPFIGP);
+	ospf_sock = vrf_socket(AF_INET, SOCK_RAW, IPPROTO_OSPFIGP,
+			       ospf->vrf_id, ospf->name);
 	if (ospf_sock < 0) {
 		int save_errno = errno;
 
@@ -216,12 +201,6 @@ int ospf_sock_init(struct ospf *ospf)
 		exit(1);
 	}
 
-	ret = ospf_bind_vrfdevice(ospf, ospf_sock);
-	if (ret < 0) {
-		close(ospf_sock);
-		goto out;
-	}
-
 #ifdef IP_HDRINCL
 	/* we will include IP header with packet */
 	ret = setsockopt(ospf_sock, IPPROTO_IP, IP_HDRINCL, &hincl,