zebra: Refactor kernel_rtm to be a bit smarter about how it handles options

[mirror_frr.git] / zebra / ioctl_solaris.c

diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c
index f429c42440a95165bf2db52772c2f30fbf3c95b1..fc554219bcf989d68d0d242f42236b7e7f35b591 100644 (file)
--- a/zebra/ioctl_solaris.c
+++ b/zebra/ioctl_solaris.c
@@ -31,11 +31,13 @@
 #include "privs.h"
 #include "vty.h"
 #include "vrf.h"
+#include "lib_errors.h"
 
 #include "zebra/rib.h"
 #include "zebra/rt.h"
 #include "zebra/interface.h"
 #include "zebra/ioctl_solaris.h"
+#include "zebra/zebra_errors.h"
 
 extern struct zebra_privs_t zserv_privs;
 
@@ -45,36 +47,31 @@ void lifreq_set_name(struct lifreq *lifreq, const char *ifname)
        strncpy(lifreq->lifr_name, ifname, IFNAMSIZ);
 }
 
-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)
 {
        return if_ioctl(request, buffer);
 }
 
 /* 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;
 
-       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);
 
@@ -86,30 +83,25 @@ int if_ioctl(u_long request, caddr_t buffer)
 }
 
 
-int if_ioctl_ipv6(u_long request, caddr_t buffer)
+int if_ioctl_ipv6(unsigned long request, caddr_t buffer)
 {
        int sock;
        int ret;
        int err;
 
-       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 ((ret = ioctl(sock, request, buffer)) < 0)
+                       err = errno;
 
-       if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_err("Can't lower privileges");
+       }
 
        close(sock);
 
@@ -155,7 +147,7 @@ void if_get_mtu(struct interface *ifp)
 {
        struct lifreq lifreq;
        int ret;
-       u_char changed = 0;
+       uint8_t changed = 0;
 
        if (ifp->flags & IFF_IPV4) {
                lifreq_set_name(&lifreq, ifp->name);
@@ -389,7 +381,7 @@ int if_prefix_add_ipv6(struct interface *ifp, struct connected *ifc)
 {
        char addrbuf[PREFIX_STRLEN];
 
-       zlog_warn("Can't set %s on interface %s",
+       flog_warn(EC_LIB_DEVELOPMENT, "Can't set %s on interface %s",
                  prefix2str(ifc->address, addrbuf, sizeof(addrbuf)),
                  ifp->name);
 
@@ -400,7 +392,7 @@ int if_prefix_delete_ipv6(struct interface *ifp, struct connected *ifc)
 {
        char addrbuf[PREFIX_STRLEN];
 
-       zlog_warn("Can't delete %s on interface %s",
+       flog_warn(EC_LIB_DEVELOPMENT, "Can't delete %s on interface %s",
                  prefix2str(ifc->address, addrbuf, sizeof(addrbuf)),
                  ifp->name);