eigrpd: Fix communication w/ Zebra

We were not properly sending data to zebra for
route installation.

I removed the metric installation because I am not sure
if we've actually been passed the metric to install.
if we need it it can be added back in later.

Additionally cleaned up some silliness in eigrp_topology.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-03-19 20:21:47 -04:00
parent d9be204162
commit 03f0bd35e2
2 changed files with 2 additions and 3 deletions

View File

@ -330,9 +330,9 @@ struct list *
eigrp_topology_get_successor(struct eigrp_prefix_entry *table_node) eigrp_topology_get_successor(struct eigrp_prefix_entry *table_node)
{ {
struct list *successors = list_new(); struct list *successors = list_new();
;
struct eigrp_neighbor_entry *data; struct eigrp_neighbor_entry *data;
struct listnode *node1, *node2; struct listnode *node1, *node2;
for (ALL_LIST_ELEMENTS(table_node->entries, node1, node2, data)) for (ALL_LIST_ELEMENTS(table_node->entries, node1, node2, data))
{ {
if (data->flags & EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG) if (data->flags & EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG)

View File

@ -417,7 +417,6 @@ eigrp_zebra_route_add (struct prefix_ipv4 *p, struct eigrp_neighbor_entry *te)
/* EIGRP pass nexthop and metric */ /* EIGRP pass nexthop and metric */
SET_FLAG (message, ZAPI_MESSAGE_NEXTHOP); SET_FLAG (message, ZAPI_MESSAGE_NEXTHOP);
SET_FLAG (message, ZAPI_MESSAGE_METRIC);
/* Distance value. */ /* Distance value. */
// distance = eigrp_distance_apply (p, er); // distance = eigrp_distance_apply (p, er);
@ -432,7 +431,7 @@ eigrp_zebra_route_add (struct prefix_ipv4 *p, struct eigrp_neighbor_entry *te)
zclient_create_header (s, ZEBRA_IPV4_ROUTE_ADD, VRF_DEFAULT); zclient_create_header (s, ZEBRA_IPV4_ROUTE_ADD, VRF_DEFAULT);
stream_putc (s, ZEBRA_ROUTE_EIGRP); stream_putc (s, ZEBRA_ROUTE_EIGRP);
stream_putw (s, 0); stream_putw (s, 0);
stream_putc (s, flags); stream_putl (s, flags);
stream_putc (s, message); stream_putc (s, message);
stream_putw (s, SAFI_UNICAST); stream_putw (s, SAFI_UNICAST);