zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / eigrpd / eigrp_reply.c

diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
index ae2d0c0904c744dc25d2c7b4194ffc71b409df5f..ccf0496736b8fce46eb82b3756476576ec738aa2 100644 (file)
--- a/eigrpd/eigrp_reply.c
+++ b/eigrpd/eigrp_reply.c
@@ -59,11 +59,12 @@
 #include "eigrpd/eigrp_topology.h"
 #include "eigrpd/eigrp_fsm.h"
 #include "eigrpd/eigrp_memory.h"
+#include "eigrpd/eigrp_errors.h"
 
 void eigrp_send_reply(struct eigrp_neighbor *nbr, struct eigrp_prefix_entry *pe)
 {
        struct eigrp_packet *ep;
-       u_int16_t length = EIGRP_HEADER_LEN;
+       uint16_t length = EIGRP_HEADER_LEN;
        struct eigrp_interface *ei = nbr->ei;
        struct eigrp *eigrp = ei->eigrp;
        struct eigrp_prefix_entry *pe2;
@@ -85,7 +86,7 @@ void eigrp_send_reply(struct eigrp_neighbor *nbr, struct eigrp_prefix_entry *pe)
         * End of filtering
         */
 
-       ep = eigrp_packet_new(ei->ifp->mtu, nbr);
+       ep = eigrp_packet_new(EIGRP_PACKET_MTU(ei->ifp->mtu), nbr);
 
        /* Prepare EIGRP INIT UPDATE header */
        eigrp_packet_header_init(EIGRP_OPC_REPLY, eigrp, ep->s, 0,
@@ -132,7 +133,7 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
        struct eigrp_neighbor *nbr;
        struct TLV_IPv4_Internal_type *tlv;
 
-       u_int16_t type;
+       uint16_t type;
 
        /* increment statistics. */
        ei->reply_in++;
@@ -153,7 +154,7 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
 
                struct prefix dest_addr;
 
-               stream_set_getp(s, s->getp - sizeof(u_int16_t));
+               stream_set_getp(s, s->getp - sizeof(uint16_t));
 
                tlv = eigrp_read_ipv4_tlv(s);
 
@@ -169,7 +170,8 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
                if (!dest) {
                        char buf[PREFIX_STRLEN];
 
-                       zlog_err(
+                       flog_err(
+                               EC_EIGRP_PACKET,
                                "%s: Received prefix %s which we do not know about",
                                __PRETTY_FUNCTION__,
                                prefix2str(&dest_addr, buf, sizeof(buf)));