eigrpd: Improve external route distance comparison

If the new nexthop is external while the previous
best was Internal or Connected, it should always loose.

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

diff --git a/eigrpd/eigrp_topology.c b/eigrpd/eigrp_topology.c
index d1c09d661213ea8eb487b08d63f8b5f42f7f4134..9f62e5e899ae8ad25669ebe5aba0cf499ddecca9 100644 (file)
--- a/eigrpd/eigrp_topology.c
+++ b/eigrpd/eigrp_topology.c
@@ -414,9 +414,13 @@ enum metric_change eigrp_topology_update_distance(struct eigrp_fsm_action_messag
        case EIGRP_EXT:
                {
                        ext_data = msg->data.ipv4_ext_data;
-                       if (eigrp_metrics_is_same(ext_data->metric,
-                                                 entry->reported_metric))
-                               return change;
+
+                       if (prefix->nt == EIGRP_TOPOLOGY_TYPE_REMOTE_EXTERNAL) {
+                               if (eigrp_metrics_is_same(ext_data->metric,
+                                                         entry->reported_metric))
+                                       return change;
+                       } else
+                               change = METRIC_INCREASE;
 
                        break;
                }