From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 23 Aug 2017 17:26:50 +0000 (-0400)
Subject: eigrpd: Use FSM for interface pe already known.
X-Git-Tag: frr-4.0-dev~375^2~8
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=348addb4e7e44f614f84d75d41a0af1a8ad2e6c1;p=matthieu%2Ffrr.git

eigrpd: Use FSM for interface pe already known.

There exists a case where a switch already has
a eigrp_prefix_entry for a interface that is
coming up.

In this situation, we need to use the FSM
to let the connected route take precedence
instead of blindly just updating the world
about it.

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

diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c
index b316a22d88..207001778d 100644
--- a/eigrpd/eigrp_interface.c
+++ b/eigrpd/eigrp_interface.c
@@ -53,6 +53,7 @@
 #include "eigrpd/eigrp_network.h"
 #include "eigrpd/eigrp_topology.h"
 #include "eigrpd/eigrp_memory.h"
+#include "eigrpd/eigrp_fsm.h"
 
 static void eigrp_delete_from_if(struct interface *, struct eigrp_interface *);
 
@@ -279,6 +280,15 @@ int eigrp_if_up(struct eigrp_interface *ei)
 
 	/*Add connected entry to topology table*/
 
+	ne = eigrp_neighbor_entry_new();
+	ne->ei = ei;
+	ne->reported_metric = metric;
+	ne->total_metric = metric;
+	ne->distance = eigrp_calculate_metrics(eigrp, metric);
+	ne->reported_distance = 0;
+	ne->adv_router = eigrp->neighbor_self;
+	ne->flags = EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG;
+
 	struct prefix_ipv4 dest_addr;
 
 	dest_addr.family = AF_INET;
@@ -297,29 +307,36 @@ int eigrp_if_up(struct eigrp_interface *ei)
 		pe->af = AF_INET;
 		pe->nt = EIGRP_TOPOLOGY_TYPE_CONNECTED;
 
+		ne->prefix = pe;
 		pe->state = EIGRP_FSM_STATE_PASSIVE;
 		pe->fdistance = eigrp_calculate_metrics(eigrp, metric);
 		pe->req_action |= EIGRP_FSM_NEED_UPDATE;
 		eigrp_prefix_entry_add(eigrp->topology_table, pe);
 		listnode_add(eigrp->topology_changes_internalIPV4, pe);
-	}
-	ne = eigrp_neighbor_entry_new();
-	ne->ei = ei;
-	ne->reported_metric = metric;
-	ne->total_metric = metric;
-	ne->distance = eigrp_calculate_metrics(eigrp, metric);
-	ne->reported_distance = 0;
-	ne->prefix = pe;
-	ne->adv_router = eigrp->neighbor_self;
-	ne->flags = EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG;
-	eigrp_neighbor_entry_add(pe, ne);
 
-	for (ALL_LIST_ELEMENTS(eigrp->eiflist, node, nnode, ei2)) {
-		eigrp_update_send(ei2);
-	}
+		eigrp_neighbor_entry_add(pe, ne);
 
-	pe->req_action &= ~EIGRP_FSM_NEED_UPDATE;
-	listnode_delete(eigrp->topology_changes_internalIPV4, pe);
+		for (ALL_LIST_ELEMENTS(eigrp->eiflist, node, nnode, ei2)) {
+			eigrp_update_send(ei2);
+		}
+
+		pe->req_action &= ~EIGRP_FSM_NEED_UPDATE;
+		listnode_delete(eigrp->topology_changes_internalIPV4, pe);
+	} else {
+		struct eigrp_fsm_action_message msg;
+
+		ne->prefix = pe;
+		eigrp_neighbor_entry_add(pe, ne);
+
+		msg.packet_type = EIGRP_OPC_UPDATE;
+		msg.eigrp = eigrp;
+		msg.data_type = EIGRP_CONNECTED;
+		msg.adv_router = NULL;
+		msg.entry = ne;
+		msg.prefix = pe;
+
+		eigrp_fsm_event(&msg);
+	}
 
 	return 1;
 }