zebra: Refactor kernel_rtm to be a bit smarter about how it handles options

[mirror_frr.git] / eigrpd / eigrp_siaquery.c

diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c
index 9447efb2e26b5e54aa66296b5746b1f96377139d..ff383254651a7759fc4bc968ca90d73ee9d7e65a 100644 (file)
--- a/eigrpd/eigrp_siaquery.c
+++ b/eigrpd/eigrp_siaquery.c
@@ -62,7 +62,7 @@ void eigrp_siaquery_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->siaQuery_in++;
@@ -78,14 +78,14 @@ void eigrp_siaquery_receive(struct eigrp *eigrp, struct ip *iph,
        while (s->endp > s->getp) {
                type = stream_getw(s);
                if (type == EIGRP_TLV_IPv4_INT) {
-                       struct prefix_ipv4 dest_addr;
+                       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);
 
                        dest_addr.family = AFI_IP;
-                       dest_addr.prefix = tlv->destination;
+                       dest_addr.u.prefix4 = tlv->destination;
                        dest_addr.prefixlen = tlv->prefix_length;
                        struct eigrp_prefix_entry *dest =
                                eigrp_topology_table_lookup_ipv4(
@@ -95,14 +95,14 @@ void eigrp_siaquery_receive(struct eigrp *eigrp, struct ip *iph,
                         * know)*/
                        if (dest != NULL) {
                                struct eigrp_fsm_action_message msg;
-                               struct eigrp_neighbor_entry *entry =
+                               struct eigrp_nexthop_entry *entry =
                                        eigrp_prefix_entry_lookup(dest->entries,
                                                                  nbr);
                                msg.packet_type = EIGRP_OPC_SIAQUERY;
                                msg.eigrp = eigrp;
-                               msg.data_type = EIGRP_TLV_IPv4_INT;
+                               msg.data_type = EIGRP_INT;
                                msg.adv_router = nbr;
-                               msg.data.ipv4_int_type = tlv;
+                               msg.metrics = tlv->metric;
                                msg.entry = entry;
                                msg.prefix = dest;
                                eigrp_fsm_event(&msg);
@@ -117,24 +117,24 @@ void eigrp_send_siaquery(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;
 
-       ep = eigrp_packet_new(nbr->ei->ifp->mtu, 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,
                                 nbr->ei->eigrp->sequence_number, 0);
 
        // encode Authentication TLV, if needed
-       if ((IF_DEF_PARAMS(nbr->ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5)
-           && (IF_DEF_PARAMS(nbr->ei->ifp)->auth_keychain != NULL)) {
+       if ((nbr->ei->params.auth_type == EIGRP_AUTH_TYPE_MD5)
+           && (nbr->ei->params.auth_keychain != NULL)) {
                length += eigrp_add_authTLV_MD5_to_stream(ep->s, nbr->ei);
        }
 
        length += eigrp_add_internalTLV_to_stream(ep->s, pe);
 
-       if ((IF_DEF_PARAMS(nbr->ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5)
-           && (IF_DEF_PARAMS(nbr->ei->ifp)->auth_keychain != NULL)) {
+       if ((nbr->ei->params.auth_type == EIGRP_AUTH_TYPE_MD5)
+           && (nbr->ei->params.auth_keychain != NULL)) {
                eigrp_make_md5_digest(nbr->ei, ep->s, EIGRP_AUTH_UPDATE_FLAG);
        }