eigrpd: Pass in actual used parameter to header creation

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index 67f75c536b3c839547c71779910cb473374c272b..d56767fafc767c59b416579c57b52445069d1bea 100644 (file)
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -618,7 +618,7 @@ static struct eigrp_packet *eigrp_hello_encode(struct eigrp_interface *ei,
 
        if (ep) {
                // encode common header feilds
-               eigrp_packet_header_init(EIGRP_OPC_HELLO, ei, ep->s, 0, 0, ack);
+               eigrp_packet_header_init(EIGRP_OPC_HELLO, ei->eigrp, ep->s, 0, 0, ack);
 
                // encode Authentication TLV
                if ((IF_DEF_PARAMS(ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5)

diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index dde553d53f9bdd409c973bd21133d668ddb039cb..3b4a57ed54a91ee6fdbe03b3cd522bc43483958d 100644 (file)
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -877,7 +877,7 @@ void eigrp_packet_checksum(struct eigrp_interface *ei, struct stream *s,
 }
 
 /* Make EIGRP header. */
-void eigrp_packet_header_init(int type, struct eigrp_interface *ei,
+void eigrp_packet_header_init(int type, struct eigrp *eigrp,
                              struct stream *s, u_int32_t flags,
                              u_int32_t sequence, u_int32_t ack)
 {
@@ -890,8 +890,8 @@ void eigrp_packet_header_init(int type, struct eigrp_interface *ei,
        eigrph->opcode = (u_char)type;
        eigrph->checksum = 0;
 
-       eigrph->vrid = htons(ei->eigrp->vrid);
-       eigrph->ASNumber = htons(ei->eigrp->AS);
+       eigrph->vrid = htons(eigrp->vrid);
+       eigrph->ASNumber = htons(eigrp->AS);
        eigrph->ack = htonl(ack);
        eigrph->sequence = htonl(sequence);
        //  if(flags == EIGRP_INIT_FLAG)

diff --git a/eigrpd/eigrp_packet.h b/eigrpd/eigrp_packet.h
index 040204a7fc6abfd6e61f4b535cad561b2ed80788..03fe412f1f84e79f016d1c247310281fa9a5ac06 100644 (file)
--- a/eigrpd/eigrp_packet.h
+++ b/eigrpd/eigrp_packet.h
@@ -41,7 +41,7 @@ extern struct eigrp_packet *eigrp_packet_duplicate(struct eigrp_packet *,
                                                   struct eigrp_neighbor *);
 extern void eigrp_packet_free(struct eigrp_packet *);
 extern void eigrp_packet_delete(struct eigrp_interface *);
-extern void eigrp_packet_header_init(int, struct eigrp_interface *,
+extern void eigrp_packet_header_init(int, struct eigrp *,
                                     struct stream *, u_int32_t, u_int32_t,
                                     u_int32_t);
 extern void eigrp_packet_checksum(struct eigrp_interface *, struct stream *,

diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c
index d6299ad923bcf2c8c58bb1ab1cf020a81cf3f4cb..3bca444ab751b40536d46d4cbbab945c89c2ffee 100644 (file)
--- a/eigrpd/eigrp_query.c
+++ b/eigrpd/eigrp_query.c
@@ -162,7 +162,7 @@ void eigrp_send_query(struct eigrp_interface *ei)
        ep = eigrp_packet_new(ei->ifp->mtu, NULL);
 
        /* Prepare EIGRP INIT UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_QUERY, ei, ep->s, 0,
+       eigrp_packet_header_init(EIGRP_OPC_QUERY, ei->eigrp, ep->s, 0,
                                 ei->eigrp->sequence_number, 0);
 
        // encode Authentication TLV, if needed

diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
index 60390ad8a3044dec3cf07239ef0aac7482859bd2..e59db803936114f3bb7754fdc267f14d46d35cfa 100644 (file)
--- a/eigrpd/eigrp_reply.c
+++ b/eigrpd/eigrp_reply.c
@@ -113,7 +113,7 @@ void eigrp_send_reply(struct eigrp_neighbor *nbr, struct eigrp_prefix_entry *pe)
        ep = eigrp_packet_new(nbr->ei->ifp->mtu, nbr);
 
        /* Prepare EIGRP INIT UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_REPLY, nbr->ei, ep->s, 0,
+       eigrp_packet_header_init(EIGRP_OPC_REPLY, e, ep->s, 0,
                                 nbr->ei->eigrp->sequence_number, 0);
 
        // encode Authentication TLV, if needed

diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c
index 215df7b8ee96f163d7b6d6e887bb0feed69ee6fb..30f65ee87dace2dfef4cf8d85b6d88c7af3bf4c6 100644 (file)
--- a/eigrpd/eigrp_siaquery.c
+++ b/eigrpd/eigrp_siaquery.c
@@ -126,7 +126,7 @@ void eigrp_send_siaquery(struct eigrp_neighbor *nbr,
        ep = eigrp_packet_new(nbr->ei->ifp->mtu, nbr);
 
        /* Prepare EIGRP INIT UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_SIAQUERY, nbr->ei, ep->s, 0,
+       eigrp_packet_header_init(EIGRP_OPC_SIAQUERY, nbr->ei->eigrp, ep->s, 0,
                                 nbr->ei->eigrp->sequence_number, 0);
 
        // encode Authentication TLV, if needed

diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c
index 32f0c8be33f97f6c73dd077ef3f14400d090ed91..3050b910324990866e9a67298950df6bff371794 100644 (file)
--- a/eigrpd/eigrp_siareply.c
+++ b/eigrpd/eigrp_siareply.c
@@ -125,7 +125,7 @@ void eigrp_send_siareply(struct eigrp_neighbor *nbr,
        ep = eigrp_packet_new(nbr->ei->ifp->mtu, nbr);
 
        /* Prepare EIGRP INIT UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_SIAREPLY, nbr->ei, ep->s, 0,
+       eigrp_packet_header_init(EIGRP_OPC_SIAREPLY, nbr->ei->eigrp, ep->s, 0,
                                 nbr->ei->eigrp->sequence_number, 0);
 
        // encode Authentication TLV, if needed

diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c
index 8971635bfd297fe4093a9145eeeb4956c5f32200..7a7b1dd5d67137a4d3f4d12f1ddb17847fd59e80 100644 (file)
--- a/eigrpd/eigrp_update.c
+++ b/eigrpd/eigrp_update.c
@@ -471,9 +471,10 @@ void eigrp_update_send_init(struct eigrp_neighbor *nbr)
                           nbr->ei->eigrp->sequence_number,
                           nbr->recv_sequence_number);
 
-       eigrp_packet_header_init(
-               EIGRP_OPC_UPDATE, nbr->ei, ep->s, EIGRP_INIT_FLAG,
-               nbr->ei->eigrp->sequence_number, nbr->recv_sequence_number);
+       eigrp_packet_header_init(EIGRP_OPC_UPDATE, nbr->ei->eigrp,
+                                ep->s, EIGRP_INIT_FLAG,
+                                nbr->ei->eigrp->sequence_number,
+                                nbr->recv_sequence_number);
 
        // encode Authentication TLV, if needed
        if ((IF_DEF_PARAMS(nbr->ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5)
@@ -584,9 +585,9 @@ void eigrp_update_send_EOT(struct eigrp_neighbor *nbr)
        ep = eigrp_packet_new(nbr->ei->ifp->mtu, nbr);
 
        /* Prepare EIGRP EOT UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_UPDATE, nbr->ei, ep->s, EIGRP_EOT_FLAG,
-                                seq_no,
-                                nbr->recv_sequence_number);
+       eigrp_packet_header_init(EIGRP_OPC_UPDATE, nbr->ei->eigrp,
+                                ep->s, EIGRP_EOT_FLAG,
+                                seq_no, nbr->recv_sequence_number);
 
        // encode Authentication TLV, if needed
        if((IF_DEF_PARAMS (nbr->ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5) &&
@@ -606,7 +607,8 @@ void eigrp_update_send_EOT(struct eigrp_neighbor *nbr)
 
                                length = EIGRP_HEADER_LEN;
                                ep = eigrp_packet_new(nbr->ei->ifp->mtu, nbr);
-                               eigrp_packet_header_init(EIGRP_OPC_UPDATE, nbr->ei, ep->s, EIGRP_EOT_FLAG,
+                               eigrp_packet_header_init(EIGRP_OPC_UPDATE, nbr->ei->eigrp,
+                                                        ep->s, EIGRP_EOT_FLAG,
                                                         seq_no, nbr->recv_sequence_number);
 
                                if((IF_DEF_PARAMS (nbr->ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5) &&
@@ -674,8 +676,8 @@ void eigrp_update_send(struct eigrp_interface *ei)
        ep = eigrp_packet_new(ei->ifp->mtu, NULL);
 
        /* Prepare EIGRP INIT UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_UPDATE, ei, ep->s, 0,
-                                seq_no, 0);
+       eigrp_packet_header_init(EIGRP_OPC_UPDATE, ei->eigrp,
+                                ep->s, 0, seq_no, 0);
 
        // encode Authentication TLV, if needed
        if ((IF_DEF_PARAMS(ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5)
@@ -707,8 +709,8 @@ void eigrp_update_send(struct eigrp_interface *ei)
 
                        length = EIGRP_HEADER_LEN;
                        ep = eigrp_packet_new(ei->ifp->mtu, NULL);
-                       eigrp_packet_header_init(EIGRP_OPC_UPDATE, ei, ep->s, 0,
-                                                seq_no, 0);
+                       eigrp_packet_header_init(EIGRP_OPC_UPDATE, ei->eigrp,
+                                                ep->s, 0, seq_no, 0);
                        if ((IF_DEF_PARAMS(ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5)
                            && (IF_DEF_PARAMS(ei->ifp)->auth_keychain != NULL)) {
                                length += eigrp_add_authTLV_MD5_to_stream(ep->s, ei);
@@ -875,7 +877,7 @@ static void eigrp_update_send_GR_part(struct eigrp_neighbor *nbr)
        ep = eigrp_packet_new(nbr->ei->ifp->mtu, nbr);
 
        /* Prepare EIGRP Graceful restart UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_UPDATE, nbr->ei, ep->s, flags,
+       eigrp_packet_header_init(EIGRP_OPC_UPDATE, nbr->ei->eigrp, ep->s, flags,
                                 nbr->ei->eigrp->sequence_number,
                                 nbr->recv_sequence_number);