]> git.proxmox.com Git - mirror_frr.git/blobdiff - eigrpd/eigrp_query.c
zebra: Allow ns delete to happen after under/over flow checks
[mirror_frr.git] / eigrpd / eigrp_query.c
index 03c3705ffdd12403fa182c2ce52c7a9edf3bc623..84dcf5e2d55a081b6dae3685aea58e12b2cf092f 100644 (file)
 #include "eigrpd/eigrp_fsm.h"
 #include "eigrpd/eigrp_memory.h"
 
-u_int32_t eigrp_query_send_all(struct eigrp *eigrp)
+uint32_t eigrp_query_send_all(struct eigrp *eigrp)
 {
        struct eigrp_interface *iface;
        struct listnode *node, *node2, *nnode2;
        struct eigrp_prefix_entry *pe;
-       u_int32_t counter;
+       uint32_t counter;
 
        if (eigrp == NULL) {
                zlog_debug("EIGRP Routing Process not enabled");
@@ -93,8 +93,8 @@ void eigrp_query_receive(struct eigrp *eigrp, struct ip *iph,
        struct TLV_IPv4_Internal_type *tlv;
        struct prefix dest_addr;
 
-       u_int16_t type;
-       u_int16_t length;
+       uint16_t type;
+       uint16_t length;
 
        /* increment statistics. */
        ei->query_in++;
@@ -111,7 +111,7 @@ void eigrp_query_receive(struct eigrp *eigrp, struct ip *iph,
                type = stream_getw(s);
                switch (type) {
                case EIGRP_TLV_IPv4_INT:
-                       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);
 
@@ -142,13 +142,13 @@ void eigrp_query_receive(struct eigrp *eigrp, struct ip *iph,
                        break;
 
                case EIGRP_TLV_IPv4_EXT:
-                       /* DVS: processing of external routes needs packet and fsm work.
-                        *      for now, lets just not creash the box
-                        */
+               /* DVS: processing of external routes needs packet and fsm work.
+                *      for now, lets just not creash the box
+                */
                default:
                        length = stream_getw(s);
                        // -2 for type, -2 for len
-                       for (length-=4; length ; length--) {
+                       for (length -= 4; length; length--) {
                                (void)stream_getc(s);
                        }
                }
@@ -160,49 +160,88 @@ void eigrp_query_receive(struct eigrp *eigrp, struct ip *iph,
 
 void eigrp_send_query(struct eigrp_interface *ei)
 {
-       struct eigrp_packet *ep;
-       u_int16_t length = EIGRP_HEADER_LEN;
+       struct eigrp_packet *ep = NULL;
+       uint16_t length = EIGRP_HEADER_LEN;
        struct listnode *node, *nnode, *node2, *nnode2;
        struct eigrp_neighbor *nbr;
        struct eigrp_prefix_entry *pe;
-       char has_tlv;
-       bool ep_saved = false;
+       bool has_tlv = false;
+       bool new_packet = true;
+       uint16_t eigrp_mtu = EIGRP_PACKET_MTU(ei->ifp->mtu);
 
-       ep = eigrp_packet_new(ei->ifp->mtu, NULL);
+       for (ALL_LIST_ELEMENTS(ei->eigrp->topology_changes_internalIPV4, node,
+                              nnode, pe)) {
+               if (!(pe->req_action & EIGRP_FSM_NEED_QUERY))
+                       continue;
+
+               if (new_packet) {
+                       ep = eigrp_packet_new(eigrp_mtu, NULL);
+
+                       /* Prepare EIGRP INIT UPDATE header */
+                       eigrp_packet_header_init(EIGRP_OPC_QUERY, ei->eigrp,
+                                                ep->s, 0,
+                                                ei->eigrp->sequence_number, 0);
+
+                       // encode Authentication TLV, if needed
+                       if ((ei->params.auth_type == EIGRP_AUTH_TYPE_MD5)
+                           && (ei->params.auth_keychain != NULL)) {
+                               length += eigrp_add_authTLV_MD5_to_stream(ep->s,
+                                                                         ei);
+                       }
+                       new_packet = false;
+               }
 
-       /* Prepare EIGRP INIT UPDATE header */
-       eigrp_packet_header_init(EIGRP_OPC_QUERY, ei->eigrp, ep->s, 0,
-                                ei->eigrp->sequence_number, 0);
+               length += eigrp_add_internalTLV_to_stream(ep->s, pe);
+               has_tlv = true;
+               for (ALL_LIST_ELEMENTS(ei->nbrs, node2, nnode2, nbr)) {
+                       if (nbr->state == EIGRP_NEIGHBOR_UP)
+                               listnode_add(pe->rij, nbr);
+               }
 
-       // encode Authentication TLV, if needed
-       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);
-       }
+               if (length + EIGRP_TLV_MAX_IPV4_BYTE > eigrp_mtu) {
+                       if ((ei->params.auth_type == EIGRP_AUTH_TYPE_MD5)
+                           && ei->params.auth_keychain != NULL) {
+                               eigrp_make_md5_digest(ei, ep->s,
+                                                     EIGRP_AUTH_UPDATE_FLAG);
+                       }
+
+                       eigrp_packet_checksum(ei, ep->s, length);
+                       ep->length = length;
+
+                       ep->dst.s_addr = htonl(EIGRP_MULTICAST_ADDRESS);
+
+                       ep->sequence_number = ei->eigrp->sequence_number;
+                       ei->eigrp->sequence_number++;
 
-       has_tlv = 0;
-       for (ALL_LIST_ELEMENTS(ei->eigrp->topology_changes_internalIPV4, node,
-                              nnode, pe)) {
-               if (pe->req_action & EIGRP_FSM_NEED_QUERY) {
-                       length += eigrp_add_internalTLV_to_stream(ep->s, pe);
                        for (ALL_LIST_ELEMENTS(ei->nbrs, node2, nnode2, nbr)) {
-                               if (nbr->state == EIGRP_NEIGHBOR_UP) {
-                                       listnode_add(pe->rij, nbr);
-                                       has_tlv = 1;
-                               }
+                               struct eigrp_packet *dup;
+
+                               if (nbr->state != EIGRP_NEIGHBOR_UP)
+                                       continue;
+
+                               dup = eigrp_packet_duplicate(ep, nbr);
+                               /*Put packet to retransmission queue*/
+                               eigrp_fifo_push(nbr->retrans_queue, dup);
+
+                               if (nbr->retrans_queue->count == 1)
+                                       eigrp_send_packet_reliably(nbr);
                        }
+
+                       has_tlv = false;
+                       length = 0;
+                       eigrp_packet_free(ep);
+                       ep = NULL;
+                       new_packet = true;
                }
        }
 
-       if (!has_tlv) {
-               eigrp_packet_free(ep);
+       if (!has_tlv)
                return;
-       }
 
-       if ((IF_DEF_PARAMS(ei->ifp)->auth_type == EIGRP_AUTH_TYPE_MD5)
-           && (IF_DEF_PARAMS(ei->ifp)->auth_keychain != NULL)) {
+       if ((ei->params.auth_type == EIGRP_AUTH_TYPE_MD5)
+           && ei->params.auth_keychain != NULL)
                eigrp_make_md5_digest(ei, ep->s, EIGRP_AUTH_UPDATE_FLAG);
-       }
+
 
        /* EIGRP Checksum */
        eigrp_packet_checksum(ei, ep->s, length);
@@ -212,19 +251,21 @@ void eigrp_send_query(struct eigrp_interface *ei)
 
        /*This ack number we await from neighbor*/
        ep->sequence_number = ei->eigrp->sequence_number;
+       ei->eigrp->sequence_number++;
 
        for (ALL_LIST_ELEMENTS(ei->nbrs, node2, nnode2, nbr)) {
-               if (nbr->state == EIGRP_NEIGHBOR_UP) {
-                       /*Put packet to retransmission queue*/
-                       eigrp_fifo_push(nbr->retrans_queue, ep);
-                       ep_saved = true;
+               struct eigrp_packet *dup;
 
-                       if (nbr->retrans_queue->count == 1) {
-                               eigrp_send_packet_reliably(nbr);
-                       }
-               }
+               if (nbr->state != EIGRP_NEIGHBOR_UP)
+                       continue;
+
+               dup = eigrp_packet_duplicate(ep, nbr);
+               /*Put packet to retransmission queue*/
+               eigrp_fifo_push(nbr->retrans_queue, dup);
+
+               if (nbr->retrans_queue->count == 1)
+                       eigrp_send_packet_reliably(nbr);
        }
 
-       if (!ep_saved)
-               eigrp_packet_free(ep);
+       eigrp_packet_free(ep);
 }