Merge pull request #3384 from donaldsharp/topotests

[mirror_frr.git] / zebra / irdp_packet.c

diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index 31351b1462305943cb83883d4e9b1b0645a3166d..bebccd716820403b20c856e07e8f7da6ba0d75bc 100644 (file)
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -96,26 +96,26 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
        src = ip->ip_src;
 
        if (len != iplen) {
-               flog_err(ZEBRA_ERR_IRDP_LEN_MISMATCH,
-                         "IRDP: RX length doesnt match IP length");
+               flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
+                        "IRDP: RX length doesn't match IP length");
                return;
        }
 
        if (iplen < ICMP_MINLEN) {
-               flog_err(ZEBRA_ERR_IRDP_LEN_MISMATCH,
-                         "IRDP: RX ICMP packet too short from %s\n",
-                         inet_ntoa(src));
+               flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
+                        "IRDP: RX ICMP packet too short from %s\n",
+                        inet_ntoa(src));
                return;
        }
 
-       /* XXX: RAW doesnt receive link-layer, surely? ??? */
+       /* XXX: RAW doesn't receive link-layer, surely? ??? */
        /* Check so we don't checksum packets longer than oure RX_BUF - (ethlen
         +
         len of IP-header) 14+20 */
        if (iplen > IRDP_RX_BUF - 34) {
-               flog_err(ZEBRA_ERR_IRDP_LEN_MISMATCH,
-                         "IRDP: RX ICMP packet too long from %s\n",
-                         inet_ntoa(src));
+               flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
+                        "IRDP: RX ICMP packet too long from %s\n",
+                        inet_ntoa(src));
                return;
        }
 
@@ -124,7 +124,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
        /* check icmp checksum */
        if (in_cksum(icmp, datalen) != icmp->checksum) {
                flog_warn(
-                       ZEBRA_ERR_IRDP_BAD_CHECKSUM,
+                       EC_ZEBRA_IRDP_BAD_CHECKSUM,
                        "IRDP: RX ICMP packet from %s. Bad checksum, silently ignored",
                        inet_ntoa(src));
                return;
@@ -136,7 +136,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
                return;
 
        if (icmp->code != 0) {
-               flog_warn(ZEBRA_ERR_IRDP_BAD_TYPE_CODE,
+               flog_warn(EC_ZEBRA_IRDP_BAD_TYPE_CODE,
                          "IRDP: RX packet type %d from %s. Bad ICMP type code,"
                          " silently ignored",
                          icmp->type, inet_ntoa(src));
@@ -148,7 +148,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
            || (ntohl(ip->ip_dst.s_addr) == INADDR_ALLRTRS_GROUP
                && !(irdp->flags & IF_BROADCAST))) {
                flog_warn(
-                       ZEBRA_ERR_IRDP_BAD_RX_FLAGS,
+                       EC_ZEBRA_IRDP_BAD_RX_FLAGS,
                        "IRDP: RX illegal from %s to %s while %s operates in %s; Please correct settings\n",
                        inet_ntoa(src),
                        ntohl(ip->ip_dst.s_addr) == INADDR_ALLRTRS_GROUP
@@ -174,7 +174,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
 
        default:
                flog_warn(
-                       ZEBRA_ERR_IRDP_BAD_TYPE,
+                       EC_ZEBRA_IRDP_BAD_TYPE,
                        "IRDP: RX type %d from %s. Bad ICMP type, silently ignored",
                        icmp->type, inet_ntoa(src));
        }
@@ -200,17 +200,17 @@ static int irdp_recvmsg(int sock, uint8_t *buf, int size, int *ifindex)
 
        ret = recvmsg(sock, &msg, 0);
        if (ret < 0) {
-               flog_warn(LIB_ERR_SOCKET, "IRDP: recvmsg: read error %s",
+               flog_warn(EC_LIB_SOCKET, "IRDP: recvmsg: read error %s",
                          safe_strerror(errno));
                return ret;
        }
 
        if (msg.msg_flags & MSG_TRUNC) {
-               flog_warn(LIB_ERR_SOCKET, "IRDP: recvmsg: truncated message");
+               flog_warn(EC_LIB_SOCKET, "IRDP: recvmsg: truncated message");
                return ret;
        }
        if (msg.msg_flags & MSG_CTRUNC) {
-               flog_warn(LIB_ERR_SOCKET,
+               flog_warn(EC_LIB_SOCKET,
                          "IRDP: recvmsg: truncated control message");
                return ret;
        }
@@ -236,7 +236,7 @@ int irdp_read_raw(struct thread *r)
        ret = irdp_recvmsg(irdp_sock, (uint8_t *)buf, IRDP_RX_BUF, &ifindex);
 
        if (ret < 0)
-               flog_warn(LIB_ERR_SOCKET, "IRDP: RX Error length = %d", ret);
+               flog_warn(EC_LIB_SOCKET, "IRDP: RX Error length = %d", ret);
 
        ifp = if_lookup_by_index(ifindex, VRF_DEFAULT);
        if (!ifp)