eigrpd: Use EIGRP_PACKET_MTU(mtu) macro

Signed-off-by: Piotr Jurkiewicz <piotr.jerzy.jurkiewicz@gmail.com>

diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index f10ff9d9f38fa0ac6624e550a7e87b64bc7093d9..d9e89357ca13ba0d92105a74338572cb528da3c5 100644 (file)
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -630,7 +630,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

diff --git a/eigrpd/eigrp_macros.h b/eigrpd/eigrp_macros.h
index eea7a26425f34109501b6371622214eede4686cb..b30e19a867bc7115621253ad3aa2394e0cd01ef4 100644 (file)
--- a/eigrpd/eigrp_macros.h
+++ b/eigrpd/eigrp_macros.h
@@ -35,6 +35,8 @@
 
 //--------------------------------------------------------------------------
 
+#define EIGRP_PACKET_MTU(mtu) ((mtu) - (sizeof(struct ip)))
+
 /* Topology Macros */
 
 

diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index 6f8d468a8f50ca19b0b32ab92b6a4d17170680eb..59864532cf9fde511ae9786a93547276ad6243df 100644 (file)
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -51,6 +51,7 @@
 #include "eigrpd/eigrp_zebra.h"
 #include "eigrpd/eigrp_vty.h"
 #include "eigrpd/eigrp_dump.h"
+#include "eigrpd/eigrp_macros.h"
 #include "eigrpd/eigrp_network.h"
 #include "eigrpd/eigrp_topology.h"
 #include "eigrpd/eigrp_fsm.h"
@@ -1088,7 +1089,7 @@ struct eigrp_packet *eigrp_packet_duplicate(struct eigrp_packet *old,
 {
        struct eigrp_packet *new;
 
-       new = eigrp_packet_new(nbr->ei->ifp->mtu - sizeof(struct ip), nbr);
+       new = eigrp_packet_new(EIGRP_PACKET_MTU(nbr->ei->ifp->mtu), nbr);
        new->length = old->length;
        new->retrans_counter = old->retrans_counter;
        new->dst = old->dst;

diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c
index 8d13ef84d3005ec56935bf47471019282001e6f9..dd4231fa0053f2700e2e6f0acb06f6282d0ba8d4 100644 (file)
--- a/eigrpd/eigrp_query.c
+++ b/eigrpd/eigrp_query.c
@@ -167,7 +167,7 @@ void eigrp_send_query(struct eigrp_interface *ei)
        struct eigrp_prefix_entry *pe;
        bool has_tlv = false;
        bool new_packet = true;
-       uint16_t eigrp_mtu = ei->ifp->mtu - sizeof(struct ip);
+       uint16_t eigrp_mtu = EIGRP_PACKET_MTU(ei->ifp->mtu);
 
        for (ALL_LIST_ELEMENTS(ei->eigrp->topology_changes_internalIPV4, node,
                               nnode, pe)) {

diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
index de4a23b582925105c2e685613cdc92ddfccd012e..b7490cd49206a6bb523a8f28d78a1b52d622ad25 100644 (file)
--- a/eigrpd/eigrp_reply.c
+++ b/eigrpd/eigrp_reply.c
@@ -85,7 +85,7 @@ void eigrp_send_reply(struct eigrp_neighbor *nbr, struct eigrp_prefix_entry *pe)
         * End of filtering
         */
 
-       ep = eigrp_packet_new(ei->ifp->mtu - sizeof(struct ip), 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,

diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c
index 0f234ca4eca2588b9f342e3b1667b5089947329f..ff383254651a7759fc4bc968ca90d73ee9d7e65a 100644 (file)
--- a/eigrpd/eigrp_siaquery.c
+++ b/eigrpd/eigrp_siaquery.c
@@ -119,7 +119,7 @@ void eigrp_send_siaquery(struct eigrp_neighbor *nbr,
        struct eigrp_packet *ep;
        uint16_t length = EIGRP_HEADER_LEN;
 
-       ep = eigrp_packet_new(nbr->ei->ifp->mtu - sizeof(struct ip), nbr);
+       ep = eigrp_packet_new(EIGRP_PACKET_MTU(nbr->ei->ifp->mtu), nbr);
 
        /* Prepare EIGRP INIT UPDATE header */
        eigrp_packet_header_init(EIGRP_OPC_SIAQUERY, nbr->ei->eigrp, ep->s, 0,

diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c
index 93814d14e70cc44e450d1e6a0ab6b66379f11468..d3dd123f909cb4f79862e77914b1ae10c370a777 100644 (file)
--- a/eigrpd/eigrp_siareply.c
+++ b/eigrpd/eigrp_siareply.c
@@ -118,7 +118,7 @@ void eigrp_send_siareply(struct eigrp_neighbor *nbr,
        struct eigrp_packet *ep;
        uint16_t length = EIGRP_HEADER_LEN;
 
-       ep = eigrp_packet_new(nbr->ei->ifp->mtu - sizeof(struct ip), nbr);
+       ep = eigrp_packet_new(EIGRP_PACKET_MTU(nbr->ei->ifp->mtu), nbr);
 
        /* Prepare EIGRP INIT UPDATE header */
        eigrp_packet_header_init(EIGRP_OPC_SIAREPLY, nbr->ei->eigrp, ep->s, 0,

diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c
index cb5b4f518c0264c05730a37658b8d665aad50eec..a3080136b5bf815fd56596915cfd0ea33ddffed3 100644 (file)
--- a/eigrpd/eigrp_update.c
+++ b/eigrpd/eigrp_update.c
@@ -420,7 +420,7 @@ void eigrp_update_send_init(struct eigrp_neighbor *nbr)
        struct eigrp_packet *ep;
        uint16_t length = EIGRP_HEADER_LEN;
 
-       ep = eigrp_packet_new(nbr->ei->ifp->mtu - sizeof(struct ip), nbr);
+       ep = eigrp_packet_new(EIGRP_PACKET_MTU(nbr->ei->ifp->mtu), nbr);
 
        /* Prepare EIGRP INIT UPDATE header */
        if (IS_DEBUG_EIGRP_PACKET(0, RECV))
@@ -533,7 +533,7 @@ void eigrp_update_send_EOT(struct eigrp_neighbor *nbr)
        struct eigrp *eigrp = ei->eigrp;
        struct prefix *dest_addr;
        uint32_t seq_no = eigrp->sequence_number;
-       uint16_t eigrp_mtu = ei->ifp->mtu - sizeof(struct ip);
+       uint16_t eigrp_mtu = EIGRP_PACKET_MTU(ei->ifp->mtu);
        struct route_node *rn;
 
        ep = eigrp_packet_new(eigrp_mtu, nbr);
@@ -604,7 +604,7 @@ void eigrp_update_send(struct eigrp_interface *ei)
        struct eigrp *eigrp = ei->eigrp;
        struct prefix *dest_addr;
        uint32_t seq_no = eigrp->sequence_number;
-       uint16_t eigrp_mtu = ei->ifp->mtu - sizeof(struct ip);
+       uint16_t eigrp_mtu = EIGRP_PACKET_MTU(ei->ifp->mtu);
 
        if (ei->nbrs->count == 0)
                return;
@@ -790,7 +790,7 @@ static void eigrp_update_send_GR_part(struct eigrp_neighbor *nbr)
                }
        }
 
-       ep = eigrp_packet_new(ei->ifp->mtu - sizeof(struct ip), nbr);
+       ep = eigrp_packet_new(EIGRP_PACKET_MTU(ei->ifp->mtu), nbr);
 
        /* Prepare EIGRP Graceful restart UPDATE header */
        eigrp_packet_header_init(EIGRP_OPC_UPDATE, eigrp, ep->s, flags,