*: rename ferr_zlog -> flog_err_sys

[mirror_frr.git] / zebra / ioctl_solaris.c

diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c
index f429c42440a95165bf2db52772c2f30fbf3c95b1..1ba37f2db538e31d5e336bb1b0f6b532be016d26 100644 (file)
--- a/zebra/ioctl_solaris.c
+++ b/zebra/ioctl_solaris.c
@@ -31,6 +31,7 @@
 #include "privs.h"
 #include "vty.h"
 #include "vrf.h"
+#include "lib_errors.h"
 
 #include "zebra/rib.h"
 #include "zebra/rt.h"
@@ -45,28 +46,28 @@ 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");
+               flog_err(LIB_ERR_PRIVILEGES, "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));
+                       flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
+               flog_err_sys(LIB_ERR_SOCKET, "Cannot create UDP socket: %s",
+                            safe_strerror(save_errno));
                exit(1);
        }
 
@@ -74,7 +75,7 @@ int if_ioctl(u_long request, caddr_t buffer)
                err = errno;
 
        if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_err("Can't lower privileges");
+               flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
 
        close(sock);
 
@@ -86,22 +87,23 @@ 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");
+               flog_err(LIB_ERR_PRIVILEGES, "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));
+                       flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
+               flog_err_sys(LIB_ERR_SOCKET,
+                            "Cannot create IPv6 datagram socket: %s",
+                            safe_strerror(save_errno));
                exit(1);
        }
 
@@ -109,7 +111,7 @@ int if_ioctl_ipv6(u_long request, caddr_t buffer)
                err = errno;
 
        if (zserv_privs.change(ZPRIVS_LOWER))
-               zlog_err("Can't lower privileges");
+               flog_err(LIB_ERR_PRIVILEGES, "Can't lower privileges");
 
        close(sock);
 
@@ -155,7 +157,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);