Merge pull request #5280 from qlyoung/doc-clean-topotest-json

[mirror_frr.git] / ospf6d / ospf6_network.c

diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c
index 9f81bb89fba9138c5e05ff365ce84a3841dac289..9a18680b8b532c1a2fa16b430c58ab2d9fafeaae 100644 (file)
--- a/ospf6d/ospf6_network.c
+++ b/ospf6d/ospf6_network.c
@@ -25,6 +25,7 @@
 #include "sockunion.h"
 #include "sockopt.h"
 #include "privs.h"
+#include "lib_errors.h"
 
 #include "libospf.h"
 #include "ospf6_proto.h"
@@ -38,9 +39,9 @@ struct in6_addr alldrouters6;
 /* setsockopt MulticastLoop to off */
 static void ospf6_reset_mcastloop(void)
 {
-       u_int off = 0;
+       unsigned int off = 0;
        if (setsockopt(ospf6_sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &off,
-                      sizeof(u_int))
+                      sizeof(unsigned int))
            < 0)
                zlog_warn("Network: reset IPV6_MULTICAST_LOOP failed: %s",
                          safe_strerror(errno));
@@ -72,21 +73,26 @@ static void ospf6_set_checksum(void)
 #endif /* DISABLE_IPV6_CHECKSUM */
 }
 
+void ospf6_serv_close(void)
+{
+       if (ospf6_sock > 0) {
+               close(ospf6_sock);
+               ospf6_sock = -1;
+               return;
+       }
+}
+
 /* Make ospf6d's server socket. */
 int ospf6_serv_sock(void)
 {
-       if (ospf6d_privs.change(ZPRIVS_RAISE))
-               zlog_err("ospf6_serv_sock: could not raise privs");
-
-       ospf6_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_OSPFIGP);
-       if (ospf6_sock < 0) {
-               zlog_warn("Network: can't create OSPF6 socket.");
-               if (ospf6d_privs.change(ZPRIVS_LOWER))
-                       zlog_err("ospf_sock_init: could not lower privs");
-               return -1;
+       frr_with_privs(&ospf6d_privs) {
+
+               ospf6_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_OSPFIGP);
+               if (ospf6_sock < 0) {
+                       zlog_warn("Network: can't create OSPF6 socket.");
+                       return -1;
+               }
        }
-       if (ospf6d_privs.change(ZPRIVS_LOWER))
-               zlog_err("ospf_sock_init: could not lower privs");
 
 /* set socket options */
 #if 1
@@ -120,8 +126,10 @@ int ospf6_sso(ifindex_t ifindex, struct in6_addr *group, int option)
        ret = setsockopt(ospf6_sock, IPPROTO_IPV6, option, &mreq6,
                         sizeof(mreq6));
        if (ret < 0) {
-               zlog_err("Network: setsockopt (%d) on ifindex %d failed: %s",
-                        option, ifindex, safe_strerror(errno));
+               flog_err_sys(
+                       EC_LIB_SOCKET,
+                       "Network: setsockopt (%d) on ifindex %d failed: %s",
+                       option, ifindex, safe_strerror(errno));
                return ret;
        }
 
@@ -156,7 +164,7 @@ int ospf6_sendmsg(struct in6_addr *src, struct in6_addr *dst,
        struct cmsghdr *scmsgp;
        union {
                struct cmsghdr hdr;
-               u_char buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+               uint8_t buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
        } cmsgbuf;
        struct in6_pktinfo *pktinfo;
        struct sockaddr_in6 dst_sin6;
@@ -164,6 +172,7 @@ int ospf6_sendmsg(struct in6_addr *src, struct in6_addr *dst,
        assert(dst);
        assert(*ifindex);
 
+       memset(&cmsgbuf, 0, sizeof(cmsgbuf));
        scmsgp = (struct cmsghdr *)&cmsgbuf;
        pktinfo = (struct in6_pktinfo *)(CMSG_DATA(scmsgp));
        memset(&dst_sin6, 0, sizeof(struct sockaddr_in6));
@@ -212,7 +221,7 @@ int ospf6_recvmsg(struct in6_addr *src, struct in6_addr *dst,
        int retval;
        struct msghdr rmsghdr;
        struct cmsghdr *rcmsgp;
-       u_char cmsgbuf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+       uint8_t cmsgbuf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
        struct in6_pktinfo *pktinfo;
        struct sockaddr_in6 src_sin6;