Merge pull request #5805 from donaldsharp/babel_int_return

[mirror_frr.git] / zebra / irdp_main.c

diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index b96405f9ee80baa5458da257d367341dd9e55761..0de618625d770e67bb41edc402b7856c55b44183 100644 (file)
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -56,9 +56,10 @@
 #include "zebra/interface.h"
 #include "zebra/rtadv.h"
 #include "zebra/rib.h"
-#include "zebra/zserv.h"
+#include "zebra/zebra_router.h"
 #include "zebra/redistribute.h"
 #include "zebra/irdp.h"
+#include "zebra/zebra_errors.h"
 #include <netinet/ip_icmp.h>
 
 #include "checksum.h"
@@ -81,7 +82,7 @@ int irdp_sock_init(void)
        int save_errno;
        int sock;
 
-       frr_elevate_privs(&zserv_privs) {
+       frr_with_privs(&zserv_privs) {
 
                sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
                save_errno = errno;
@@ -89,8 +90,7 @@ int irdp_sock_init(void)
        }
 
        if (sock < 0) {
-               flog_err_sys(LIB_ERR_SOCKET,
-                            "IRDP: can't create irdp socket %s",
+               flog_err_sys(EC_LIB_SOCKET, "IRDP: can't create irdp socket %s",
                             safe_strerror(save_errno));
                return sock;
        };
@@ -98,7 +98,7 @@ int irdp_sock_init(void)
        i = 1;
        ret = setsockopt(sock, IPPROTO_IP, IP_TTL, (void *)&i, sizeof(i));
        if (ret < 0) {
-               flog_err_sys(LIB_ERR_SOCKET, "IRDP: can't do irdp sockopt %s",
+               flog_err_sys(EC_LIB_SOCKET, "IRDP: can't do irdp sockopt %s",
                             safe_strerror(errno));
                close(sock);
                return ret;
@@ -106,14 +106,14 @@ int irdp_sock_init(void)
 
        ret = setsockopt_ifindex(AF_INET, sock, 1);
        if (ret < 0) {
-               flog_err_sys(LIB_ERR_SOCKET, "IRDP: can't do irdp sockopt %s",
+               flog_err_sys(EC_LIB_SOCKET, "IRDP: can't do irdp sockopt %s",
                             safe_strerror(errno));
                close(sock);
                return ret;
        };
 
        t_irdp_raw = NULL;
-       thread_add_read(zebrad.master, irdp_read_raw, NULL, sock, &t_irdp_raw);
+       thread_add_read(zrouter.master, irdp_read_raw, NULL, sock, &t_irdp_raw);
 
        return sock;
 }
@@ -241,11 +241,11 @@ int irdp_send_thread(struct thread *t_advert)
                timer = MAX_INITIAL_ADVERT_INTERVAL;
 
        if (irdp->flags & IF_DEBUG_MISC)
-               zlog_debug("IRDP: New timer for %s set to %u\n", ifp->name,
+               zlog_debug("IRDP: New timer for %s set to %u", ifp->name,
                           timer);
 
        irdp->t_advertise = NULL;
-       thread_add_timer(zebrad.master, irdp_send_thread, ifp, timer,
+       thread_add_timer(zrouter.master, irdp_send_thread, ifp, timer,
                         &irdp->t_advertise);
        return 0;
 }
@@ -306,7 +306,7 @@ void process_solicit(struct interface *ifp)
        timer = (random() % MAX_RESPONSE_DELAY) + 1;
 
        irdp->t_advertise = NULL;
-       thread_add_timer(zebrad.master, irdp_send_thread, ifp, timer,
+       thread_add_timer(zrouter.master, irdp_send_thread, ifp, timer,
                         &irdp->t_advertise);
 }