From: David Lamparter <equinox@diac24.net>
Date: Tue, 5 Sep 2017 02:41:17 +0000 (+0200)
Subject: Merge pull request #1051 from donaldsharp/plists
X-Git-Tag: frr-4.0-dev~343
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8972cae0fd5401cbb135faf934f03c26c6122855;p=matthieu%2Ffrr.git

Merge pull request #1051 from donaldsharp/plists

Refactor Access and Prefix Lists application
---

8972cae0fd5401cbb135faf934f03c26c6122855
diff --cc eigrpd/eigrp_dump.c
index 98c72668fc,57aeb2a4d1..091b271129
--- a/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_topology.c
index 8390bfc66e,2545f4d63f..f1bc83af63
--- a/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
  		{