isisd: implement 'max-area-addresses-mismatch' notification

[mirror_frr.git] / zebra / ioctl.c

diff --git a/zebra/ioctl.c b/zebra/ioctl.c
index a95d5d4e1b9d90bb72ce06b8e53495e0859b3091..ebe1edcaef0a77b11ce5cf394269e254a38d5195 100644 (file)
--- a/zebra/ioctl.c
+++ b/zebra/ioctl.c
@@ -27,11 +27,13 @@
 #include "ioctl.h"
 #include "log.h"
 #include "privs.h"
+#include "lib_errors.h"
 
 #include "vty.h"
 #include "zebra/rib.h"
 #include "zebra/rt.h"
 #include "zebra/interface.h"
+#include "zebra/zebra_errors.h"
 
 #ifndef SUNOS_5
 
@@ -48,28 +50,22 @@ void ifreq_set_name(struct ifreq *ifreq, struct interface *ifp)
 }
 
 /* call ioctl system call */
-int if_ioctl(u_long request, caddr_t buffer)
+int if_ioctl(unsigned long request, caddr_t buffer)
 {
        int sock;
        int ret;
        int err = 0;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_err("Can't raise privileges");
-       sock = socket(AF_INET, SOCK_DGRAM, 0);
-       if (sock < 0) {
-               int save_errno = errno;
-
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       zlog_err("Can't lower privileges");
-               zlog_err("Cannot create UDP socket: %s",
-                        safe_strerror(save_errno));
-               exit(1);
+       frr_elevate_privs(&zserv_privs) {
+               sock = socket(AF_INET, SOCK_DGRAM, 0);
+               if (sock < 0) {
+                       zlog_err("Cannot create UDP socket: %s",
+                                safe_strerror(errno));
+                       exit(1);
+               }
+               if ((ret = ioctl(sock, request, buffer)) < 0)
+                       err = errno;
        }
-       if ((ret = ioctl(sock, request, buffer)) < 0)
-               err = errno;
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_err("Can't lower privileges");
        close(sock);
 
        if (ret < 0) {
@@ -80,29 +76,23 @@ int if_ioctl(u_long request, caddr_t buffer)
 }
 
 /* call ioctl system call */
-int vrf_if_ioctl(u_long request, caddr_t buffer, vrf_id_t vrf_id)
+int vrf_if_ioctl(unsigned long request, caddr_t buffer, vrf_id_t vrf_id)
 {
        int sock;
        int ret;
        int err = 0;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_err("Can't raise privileges");
-       sock = vrf_socket(AF_INET, SOCK_DGRAM, 0, vrf_id, NULL);
-       if (sock < 0) {
-               int save_errno = errno;
-
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       zlog_err("Can't lower privileges");
-               zlog_err("Cannot create UDP socket: %s",
-                        safe_strerror(save_errno));
-               exit(1);
+       frr_elevate_privs(&zserv_privs) {
+               sock = vrf_socket(AF_INET, SOCK_DGRAM, 0, vrf_id, NULL);
+               if (sock < 0) {
+                       zlog_err("Cannot create UDP socket: %s",
+                                safe_strerror(errno));
+                       exit(1);
+               }
+               ret = vrf_ioctl(vrf_id, sock, request, buffer);
+               if (ret < 0)
+                       err = errno;
        }
-       ret = vrf_ioctl(vrf_id, sock, request, buffer);
-       if (ret < 0)
-               err = errno;
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_err("Can't lower privileges");
        close(sock);
 
        if (ret < 0) {
@@ -113,29 +103,23 @@ int vrf_if_ioctl(u_long request, caddr_t buffer, vrf_id_t vrf_id)
 }
 
 #ifndef HAVE_NETLINK
-static int if_ioctl_ipv6(u_long request, caddr_t buffer)
+static int if_ioctl_ipv6(unsigned long request, caddr_t buffer)
 {
        int sock;
        int ret;
        int err = 0;
 
-       if (zserv_privs.change(ZPRIVS_RAISE))
-               zlog_err("Can't raise privileges");
-       sock = socket(AF_INET6, SOCK_DGRAM, 0);
-       if (sock < 0) {
-               int save_errno = errno;
-
-               if (zserv_privs.change(ZPRIVS_LOWER))
-                       zlog_err("Can't lower privileges");
-               zlog_err("Cannot create IPv6 datagram socket: %s",
-                        safe_strerror(save_errno));
-               exit(1);
-       }
+       frr_elevate_privs(&zserv_privs) {
+               sock = socket(AF_INET6, SOCK_DGRAM, 0);
+               if (sock < 0) {
+                       zlog_err("Cannot create IPv6 datagram socket: %s",
+                                safe_strerror(errno));
+                       exit(1);
+               }
 
-       if ((ret = ioctl(sock, request, buffer)) < 0)
-               err = errno;
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_err("Can't lower privileges");
+               if ((ret = ioctl(sock, request, buffer)) < 0)
+                       err = errno;
+       }
        close(sock);
 
        if (ret < 0) {
@@ -413,8 +397,9 @@ void if_get_flags(struct interface *ifp)
 
        ret = vrf_if_ioctl(SIOCGIFFLAGS, (caddr_t)&ifreq, ifp->vrf_id);
        if (ret < 0) {
-               zlog_err("vrf_if_ioctl(SIOCGIFFLAGS) failed: %s",
-                        safe_strerror(errno));
+               flog_err_sys(EC_LIB_SYSTEM_CALL,
+                            "vrf_if_ioctl(SIOCGIFFLAGS) failed: %s",
+                            safe_strerror(errno));
                return;
        }
 #ifdef HAVE_BSD_LINK_DETECT /* Detect BSD link-state at start-up */
@@ -430,9 +415,11 @@ void if_get_flags(struct interface *ifp)
                strncpy(ifmr.ifm_name, ifp->name, IFNAMSIZ);
 
                /* Seems not all interfaces implement this ioctl */
-               if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
-                       zlog_err("if_ioctl(SIOCGIFMEDIA) failed: %s",
-                                safe_strerror(errno));
+               if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) == -1 &&
+                   errno != EINVAL)
+                       flog_err_sys(EC_LIB_SYSTEM_CALL,
+                                    "if_ioctl(SIOCGIFMEDIA) failed: %s",
+                                    safe_strerror(errno));
                else if (ifmr.ifm_status & IFM_AVALID) /* Link state is valid */
                {
                        if (ifmr.ifm_status & IFM_ACTIVE)
@@ -493,7 +480,7 @@ int if_unset_flags(struct interface *ifp, uint64_t flags)
 /* linux/include/net/ipv6.h */
 struct in6_ifreq {
        struct in6_addr ifr6_addr;
-       u_int32_t ifr6_prefixlen;
+       uint32_t ifr6_prefixlen;
        int ifr6_ifindex;
 };
 #endif /* _LINUX_IN6_H */