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

[mirror_frr.git] / eigrpd / eigrp_hello.c

diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index f10ff9d9f38fa0ac6624e550a7e87b64bc7093d9..413a35f2fa5285c4acbfc91ab768a9f0fa40e574 100644 (file)
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -54,6 +54,7 @@
 #include "eigrpd/eigrp_vty.h"
 #include "eigrpd/eigrp_dump.h"
 #include "eigrpd/eigrp_macros.h"
+#include "eigrpd/eigrp_errors.h"
 
 /* Packet Type String. */
 static const struct message eigrp_general_tlv_type_str[] = {
@@ -417,9 +418,11 @@ void eigrp_sw_version_initialize(void)
        if (dash)
                dash[0] = '\0';
 
-       ret = sscanf(ver_string, "%d.%d", &FRR_MAJOR, &FRR_MINOR);
+       ret = sscanf(ver_string, "%" SCNu32 ".%" SCNu32, &FRR_MAJOR,
+                    &FRR_MINOR);
        if (ret != 2)
-               zlog_err("Did not Properly parse %s, please fix VERSION string",
+               flog_err(EC_EIGRP_PACKET,
+                        "Did not Properly parse %s, please fix VERSION string",
                         VERSION);
 }
 
@@ -630,7 +633,7 @@ static struct eigrp_packet *eigrp_hello_encode(struct eigrp_interface *ei,
        uint16_t length = EIGRP_HEADER_LEN;
 
        // allocate a new packet to be sent
-       ep = eigrp_packet_new(ei->ifp->mtu - sizeof(struct ip), NULL);
+       ep = eigrp_packet_new(EIGRP_PACKET_MTU(ei->ifp->mtu), NULL);
 
        if (ep) {
                // encode common header feilds