Merge pull request #1051 from donaldsharp/plists

Refactor Access and Prefix Lists application

diff --cc eigrpd/eigrp_dump.c
index 98c72668fc6aab2fd4708859508847dee06b038d,57aeb2a4d1d159f52f810fcaf0bf2604eec3c2d5..091b271129d989d3d05eaec3311d634b66a57a3c
--- 1/eigrpd/eigrp_dump.c
--- 2/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@@ -300,12 -299,11 +300,12 @@@ void show_ip_eigrp_prefix_entry(struct 
        vty_out(vty, "FD is %u, serno: %" PRIu64 " \n", tn->fdistance,
                tn->serno);
  
 -      list_delete(successors);
 +      if (successors)
 +              list_delete(successors);
  }
  
- void show_ip_eigrp_neighbor_entry(struct vty *vty, struct eigrp *eigrp,
-                                 struct eigrp_neighbor_entry *te, int *first)
+ void show_ip_eigrp_nexthop_entry(struct vty *vty, struct eigrp *eigrp,
+                                 struct eigrp_nexthop_entry *te, int *first)
  {
        if (te->reported_distance == EIGRP_MAX_METRIC)
                return;

diff --cc eigrpd/eigrp_interface.c
Simple merge

diff --cc eigrpd/eigrp_topology.c
index 8390bfc66ee606e4b7f11083f46dc958f923bcb2,2545f4d63f165b1cb3da7d1576e5da3cf75a8a60..f1bc83af63bc16aeb31cca92b91390feb8c33e1c
--- 1/eigrpd/eigrp_topology.c
--- 2/eigrpd/eigrp_topology.c
+++ b/eigrpd/eigrp_topology.c
@@@ -444,11 -444,11 +444,11 @@@ void eigrp_topology_update_node_flags(s
  
        for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry)) {
                if (((uint64_t)entry->distance
 -                   <= (uint64_t)(dest->distance * eigrp->variance))
 +                   <= (uint64_t)dest->distance * (uint64_t)eigrp->variance)
                    && entry->distance != EIGRP_MAX_METRIC) // is successor
                {
-                       entry->flags |= EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG;
-                       entry->flags &= ~EIGRP_NEIGHBOR_ENTRY_FSUCCESSOR_FLAG;
+                       entry->flags |= EIGRP_NEXTHOP_ENTRY_SUCCESSOR_FLAG;
+                       entry->flags &= ~EIGRP_NEXTHOP_ENTRY_FSUCCESSOR_FLAG;
                } else if (entry->reported_distance
                           < dest->fdistance) // is feasible successor
                {

diff --cc eigrpd/eigrp_update.c
Simple merge

diff --cc eigrpd/eigrp_vty.c
Simple merge