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

[mirror_frr.git] / eigrpd / eigrp_reply.c

diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
index 8dbd1a5b35b9bea854e8a8d58e39ae317d3aecf1..ccf0496736b8fce46eb82b3756476576ec738aa2 100644 (file)
--- a/eigrpd/eigrp_reply.c
+++ b/eigrpd/eigrp_reply.c
@@ -59,11 +59,12 @@
 #include "eigrpd/eigrp_topology.h"
 #include "eigrpd/eigrp_fsm.h"
 #include "eigrpd/eigrp_memory.h"
+#include "eigrpd/eigrp_errors.h"
 
 void eigrp_send_reply(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;
        struct eigrp_interface *ei = nbr->ei;
        struct eigrp *eigrp = ei->eigrp;
        struct eigrp_prefix_entry *pe2;
@@ -75,19 +76,17 @@ void eigrp_send_reply(struct eigrp_neighbor *nbr, struct eigrp_prefix_entry *pe)
                      sizeof(struct eigrp_prefix_entry));
        memcpy(pe2, pe, sizeof(struct eigrp_prefix_entry));
 
-       if (eigrp_update_prefix_apply(eigrp, ei,
-                                     EIGRP_FILTER_OUT,
+       if (eigrp_update_prefix_apply(eigrp, ei, EIGRP_FILTER_OUT,
                                      pe2->destination)) {
                zlog_info("REPLY SEND: Setting Metric to max");
                pe2->reported_metric.delay = EIGRP_MAX_METRIC;
-
        }
 
        /*
         * End of filtering
         */
 
-       ep = eigrp_packet_new(ei->ifp->mtu, 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,
@@ -134,7 +133,7 @@ void eigrp_reply_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->reply_in++;
@@ -149,49 +148,59 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
 
        while (s->endp > s->getp) {
                type = stream_getw(s);
-               if (type == EIGRP_TLV_IPv4_INT) {
-                       struct prefix dest_addr;
-
-                       stream_set_getp(s, s->getp - sizeof(u_int16_t));
-
-                       tlv = eigrp_read_ipv4_tlv(s);
-
-                       dest_addr.family = AF_INET;
-                       dest_addr.u.prefix4 = tlv->destination;
-                       dest_addr.prefixlen = tlv->prefix_length;
-                       struct eigrp_prefix_entry *dest =
-                               eigrp_topology_table_lookup_ipv4(
-                                       eigrp->topology_table, &dest_addr);
-                       /*
-                        * Destination must exists
-                        */
-                       assert(dest);
-
-                       struct eigrp_fsm_action_message msg;
-                       struct eigrp_nexthop_entry *entry =
-                               eigrp_prefix_entry_lookup(dest->entries, nbr);
-
-                       if (eigrp_update_prefix_apply(eigrp, ei,
-                                                     EIGRP_FILTER_IN,
-                                                     &dest_addr)) {
-                               tlv->metric.delay = EIGRP_MAX_METRIC;
-                       }
-                       /*
-                        * End of filtering
-                        */
-
-                       msg.packet_type = EIGRP_OPC_REPLY;
-                       msg.eigrp = eigrp;
-                       msg.data_type = EIGRP_INT;
-                       msg.adv_router = nbr;
-                       msg.metrics = tlv->metric;
-                       msg.entry = entry;
-                       msg.prefix = dest;
-                       eigrp_fsm_event(&msg);
 
+               if (type != EIGRP_TLV_IPv4_INT)
+                       continue;
+
+               struct prefix dest_addr;
+
+               stream_set_getp(s, s->getp - sizeof(uint16_t));
+
+               tlv = eigrp_read_ipv4_tlv(s);
 
+               dest_addr.family = AF_INET;
+               dest_addr.u.prefix4 = tlv->destination;
+               dest_addr.prefixlen = tlv->prefix_length;
+               struct eigrp_prefix_entry *dest =
+                       eigrp_topology_table_lookup_ipv4(eigrp->topology_table,
+                                                        &dest_addr);
+               /*
+                * Destination must exists
+                */
+               if (!dest) {
+                       char buf[PREFIX_STRLEN];
+
+                       flog_err(
+                               EC_EIGRP_PACKET,
+                               "%s: Received prefix %s which we do not know about",
+                               __PRETTY_FUNCTION__,
+                               prefix2str(&dest_addr, buf, sizeof(buf)));
                        eigrp_IPv4_InternalTLV_free(tlv);
+                       continue;
+               }
+
+               struct eigrp_fsm_action_message msg;
+               struct eigrp_nexthop_entry *entry =
+                       eigrp_prefix_entry_lookup(dest->entries, nbr);
+
+               if (eigrp_update_prefix_apply(eigrp, ei, EIGRP_FILTER_IN,
+                                             &dest_addr)) {
+                       tlv->metric.delay = EIGRP_MAX_METRIC;
                }
+               /*
+                * End of filtering
+                */
+
+               msg.packet_type = EIGRP_OPC_REPLY;
+               msg.eigrp = eigrp;
+               msg.data_type = EIGRP_INT;
+               msg.adv_router = nbr;
+               msg.metrics = tlv->metric;
+               msg.entry = entry;
+               msg.prefix = dest;
+               eigrp_fsm_event(&msg);
+
+               eigrp_IPv4_InternalTLV_free(tlv);
        }
        eigrp_hello_send_ack(nbr);
 }