isisd: retrofit the 'isis [c|p]snp-interval' commands

[mirror_frr.git] / zebra / irdp_interface.c

diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index cda6f0e213957344e46c3c932756685bbae62a9c..3e50550dd2f8dcd9a541bff34baee9c147f0f9e6 100644 (file)
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -126,7 +126,7 @@ static int if_group(struct interface *ifp, int sock, uint32_t group,
        p = irdp_get_prefix(ifp);
 
        if (!p) {
-               flog_warn(ZEBRA_ERR_NO_IFACE_ADDR,
+               flog_warn(EC_ZEBRA_NO_IFACE_ADDR,
                          "IRDP: can't get address for %s", ifp->name);
                return 1;
        }
@@ -136,7 +136,7 @@ static int if_group(struct interface *ifp, int sock, uint32_t group,
        ret = setsockopt(sock, IPPROTO_IP, add_leave, (char *)&m,
                         sizeof(struct ip_mreq));
        if (ret < 0)
-               flog_err_sys(LIB_ERR_SOCKET, "IRDP: %s can't setsockopt %s: %s",
+               flog_err_sys(EC_LIB_SOCKET, "IRDP: %s can't setsockopt %s: %s",
                             add_leave == IP_ADD_MEMBERSHIP ? "join group"
                                                            : "leave group",
                             inet_2a(group, b1), safe_strerror(errno));
@@ -222,7 +222,7 @@ static void irdp_if_start(struct interface *ifp, int multicast,
                return;
        }
        if ((irdp_sock < 0) && ((irdp_sock = irdp_sock_init()) < 0)) {
-               flog_warn(ZEBRA_ERR_IRDP_CANNOT_ACTIVATE_IFACE,
+               flog_warn(EC_ZEBRA_IRDP_CANNOT_ACTIVATE_IFACE,
                          "IRDP: Cannot activate interface %s (cannot create "
                          "IRDP socket)",
                          ifp->name);
@@ -236,7 +236,7 @@ static void irdp_if_start(struct interface *ifp, int multicast,
        if_add_update(ifp);
 
        if (!(ifp->flags & IFF_UP)) {
-               flog_warn(ZEBRA_ERR_IRDP_IFACE_DOWN,
+               flog_warn(EC_ZEBRA_IRDP_IFACE_DOWN,
                          "IRDP: Interface is down %s", ifp->name);
        }
 
@@ -246,7 +246,7 @@ static void irdp_if_start(struct interface *ifp, int multicast,
                if_add_group(ifp);
 
                if (!(ifp->flags & (IFF_MULTICAST | IFF_ALLMULTI))) {
-                       flog_warn(ZEBRA_ERR_IRDP_IFACE_MCAST_DISABLED,
+                       flog_warn(EC_ZEBRA_IRDP_IFACE_MCAST_DISABLED,
                                  "IRDP: Interface not multicast enabled %s",
                                  ifp->name);
                }
@@ -309,7 +309,7 @@ static void irdp_if_stop(struct interface *ifp)
 
        irdp_advert_off(ifp);
 
-       list_delete_and_null(&irdp->AdvPrefList);
+       list_delete(&irdp->AdvPrefList);
 
        irdp->flags = 0;
 }