ospfd: Correct LSA parser which fulfill the TED

Traffic Engineering Database (TED) is fulfill from the various LSA advertised
and received by the router. To remove information on the TED, 2 mechanisms are
used: i) parse TE Opaque LSA when there are flushed and ii) compare the list of
prefixes advertised in the Router LSA with the list of corresponding edges and
subnets contained in the TED. However, this second mechanism assumes that the
Router LSA is unique and contains all prefixes of the advertised router.
But, this is wrong. Prefixes could be advertised with several Router LSA.
This conduct to remove edge and subnet in the TED while it should be maintained.
The result is a faulty test with ospf_sr_te_topo1 topotest when server is heavy
loaded.

This simple patch removed deletion of edges and subnets when parsing the Router
LSA and only removed them when the corresponding TE Opaque LSA is flushed. In
addition, TE Opaque LSA are not flushed when OSPF ajacency goes down. This
patch also correct this second problem.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
(cherry picked from commit a3230323f74204f88e44e579c3ec7e8b9142bad1)

diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index 3cf39e5fb54203e0dd19f787db7feb58444fe44e..d203b5ef4dcfba55e9d4a09318eb2541e5f0f92f 100644 (file)
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -980,8 +980,8 @@ static void ospf_mpls_te_nsm_change(struct ospf_neighbor *nbr, int old_state)
        struct ospf_interface *oi = nbr->oi;
        struct mpls_te_link *lp;
 
-       /* Process Neighbor only when its state is NSM Full */
-       if (nbr->state != NSM_Full)
+       /* Process Link only when neighbor old or new state is NSM Full */
+       if (nbr->state != NSM_Full && old_state != NSM_Full)
                return;
 
        /* Get interface information for Traffic Engineering */
@@ -1839,6 +1839,7 @@ static void ospf_te_delete_subnet(struct ls_ted *ted, struct in_addr addr)
        p.family = AF_INET;
        p.prefixlen = IPV4_MAX_BITLEN;
        p.u.prefix4 = addr;
+       ote_debug("  |- Delete Subnet info. for Prefix %pFX", &p);
        subnet = ls_find_subnet(ted, &p);
 
        /* Remove subnet if found */
@@ -1851,8 +1852,7 @@ static void ospf_te_delete_subnet(struct ls_ted *ted, struct in_addr addr)
 
 /**
  * Parse Router LSA. This function will create or update corresponding Vertex,
- * Edge and Subnet. It also remove Edge and Subnet if they are marked as Orphan
- * once Router LSA is parsed.
+ * Edge and Subnet.
  *
  * @param ted  Link State Traffic Engineering Database
  * @param lsa  OSPF Link State Advertisement
@@ -1864,9 +1864,6 @@ static int ospf_te_parse_router_lsa(struct ls_ted *ted, struct ospf_lsa *lsa)
        struct router_lsa *rl;
        enum ls_node_type type;
        struct ls_vertex *vertex;
-       struct ls_edge *edge;
-       struct ls_subnet *subnet;
-       struct listnode *node;
        int len, links;
 
        /* Sanity Check */
@@ -1909,13 +1906,6 @@ static int ospf_te_parse_router_lsa(struct ls_ted *ted, struct ospf_lsa *lsa)
                vertex->status = SYNC;
        }
 
-       /* Mark outgoing Edge and Subnet as ORPHAN to detect deletion */
-       for (ALL_LIST_ELEMENTS_RO(vertex->outgoing_edges, node, edge))
-               edge->status = ORPHAN;
-
-       for (ALL_LIST_ELEMENTS_RO(vertex->prefixes, node, subnet))
-               subnet->status = ORPHAN;
-
        /* Then, process Link Information */
        len = lsa->size - OSPF_LSA_HEADER_SIZE - OSPF_ROUTER_LSA_MIN_SIZE;
        links = ntohs(rl->links);
@@ -1948,11 +1938,6 @@ static int ospf_te_parse_router_lsa(struct ls_ted *ted, struct ospf_lsa *lsa)
                        break;
                }
        }
-       /* Clean remaining Orphan Edges or Subnets */
-       if (OspfMplsTE.export)
-               ls_vertex_clean(ted, vertex, zclient);
-       else
-               ls_vertex_clean(ted, vertex, NULL);
 
        return 0;
 }
@@ -2405,7 +2390,10 @@ static int ospf_te_delete_te(struct ls_ted *ted, struct ospf_lsa *lsa)
        ote_debug("  |- Delete TE info. for Edge %pI4",
                  &edge->attributes->standard.local);
 
-       /* Remove Link State Attributes TE information */
+       /* First remove the associated Subnet */
+       ospf_te_delete_subnet(ted, attr->standard.local);
+
+       /* Then ,remove Link State Attributes TE information */
        memset(&attr->standard, 0, sizeof(struct ls_standard));
        attr->flags &= 0x0FFFF;
        memset(&attr->extended, 0, sizeof(struct ls_extended));
@@ -2420,7 +2408,6 @@ static int ospf_te_delete_te(struct ls_ted *ted, struct ospf_lsa *lsa)
                edge->status = SYNC;
        } else {
                /* Remove completely the Edge if Segment Routing is not set */
-               ospf_te_delete_subnet(ted, attr->standard.local);
                edge->status = DELETE;
                ospf_te_export(LS_MSG_TYPE_ATTRIBUTES, edge);
                ls_edge_del_all(ted, edge);