Merge pull request #3503 from qlyoung/fix-bgpd-show-ip-neigh-json-double-free

[mirror_frr.git] / zebra / if_ioctl_solaris.c

diff --git a/zebra/if_ioctl_solaris.c b/zebra/if_ioctl_solaris.c
index 1449925aaed5f967dd045486a0f37c7e03d8d5f8..0206d4938efda498eb908772f28b574a8cb56396 100644 (file)
--- a/zebra/if_ioctl_solaris.c
+++ b/zebra/if_ioctl_solaris.c
@@ -39,6 +39,8 @@
 #include "zebra/interface.h"
 #include "zebra/ioctl_solaris.h"
 #include "zebra/rib.h"
+#include "zebra/rt.h"
+#include "zebra/zebra_errors.h"
 
 static int if_get_addr(struct interface *, struct sockaddr *, const char *);
 static void interface_info_ioctl(struct interface *);
@@ -55,7 +57,6 @@ static int interface_list_ioctl(int af)
        struct lifconf lifconf;
        struct interface *ifp;
        int n;
-       int save_errno;
        size_t needed, lastneeded = 0;
        char *buf = NULL;
 
@@ -64,7 +65,7 @@ static int interface_list_ioctl(int af)
        }
 
        if (sock < 0) {
-               flog_err_sys(LIB_ERR_SOCKET, "Can't make %s socket stream: %s",
+               flog_err_sys(EC_LIB_SOCKET, "Can't make %s socket stream: %s",
                             (af == AF_INET ? "AF_INET" : "AF_INET6"),
                             safe_strerror(errno));
                return -1;
@@ -76,14 +77,12 @@ calculate_lifc_len:
                lifn.lifn_flags = LIFC_NOXMIT;
                /* we want NOXMIT interfaces too */
                ret = ioctl(sock, SIOCGLIFNUM, &lifn);
-               save_errno = errno;
-
        }
 
        if (ret < 0) {
-               flog_err_sys(LIB_ERR_SYSTEM_CALL,
+               flog_err_sys(EC_LIB_SYSTEM_CALL,
                             "interface_list_ioctl: SIOCGLIFNUM failed %s",
-                            safe_strerror(save_errno));
+                            safe_strerror(errno));
                close(sock);
                return -1;
        }
@@ -116,7 +115,7 @@ calculate_lifc_len:
                if (errno == EINVAL)
                        goto calculate_lifc_len;
 
-               flog_err_sys(LIB_ERR_SYSTEM_CALL, "SIOCGLIFCONF: %s",
+               flog_err_sys(EC_LIB_SYSTEM_CALL, "SIOCGLIFCONF: %s",
                             safe_strerror(errno));
                goto end;
        }
@@ -157,7 +156,7 @@ calculate_lifc_len:
                       && (*(lifreq->lifr_name + normallen) != ':'))
                        normallen++;
 
-               ifp = if_get_by_name(lifreq->lifr_name, VRF_DEFAULT, 0);
+               ifp = if_get_by_name(lifreq->lifr_name, VRF_DEFAULT);
 
                if (lifreq->lifr_addr.ss_family == AF_INET)
                        ifp->flags |= IFF_IPV4;
@@ -208,7 +207,7 @@ static int if_get_index(struct interface *ifp)
                ret = -1;
 
        if (ret < 0) {
-               flog_err_sys(LIB_ERR_SYSTEM_CALL, "SIOCGLIFINDEX(%s) failed",
+               flog_err_sys(EC_LIB_SYSTEM_CALL, "SIOCGLIFINDEX(%s) failed",
                             ifp->name);
                return ret;
        }
@@ -271,7 +270,7 @@ static int if_get_addr(struct interface *ifp, struct sockaddr *addr,
 
                if (ret < 0) {
                        if (errno != EADDRNOTAVAIL) {
-                               flog_err_sys(LIB_ERR_SYSTEM_CALL,
+                               flog_err_sys(EC_LIB_SYSTEM_CALL,
                                             "SIOCGLIFNETMASK (%s) fail: %s",
                                             ifp->name, safe_strerror(errno));
                                return ret;
@@ -292,7 +291,7 @@ static int if_get_addr(struct interface *ifp, struct sockaddr *addr,
                        if (ifp->flags & IFF_POINTOPOINT)
                                prefixlen = IPV6_MAX_BITLEN;
                        else
-                               flog_err_sys(LIB_ERR_SYSTEM_CALL,
+                               flog_err_sys(EC_LIB_SYSTEM_CALL,
                                             "SIOCGLIFSUBNET (%s) fail: %s",
                                             ifp->name, safe_strerror(errno));
                } else {