diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-19 20:21:47 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-19 20:24:10 -0400 |
| commit | 03f0bd35e267a6e2cac41011d574ef790455c22d (patch) | |
| tree | 6d378acb470588b2b5f1ee6d1f40f05a7a1dff0e | |
| parent | d9be204162a863ed8f4985ba538f84da05f8babd (diff) | |
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>
| -rw-r--r-- | eigrpd/eigrp_topology.c | 2 | ||||
| -rw-r--r-- | eigrpd/eigrp_zebra.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/eigrpd/eigrp_topology.c b/eigrpd/eigrp_topology.c index c8b53515b1..5d45e03bd9 100644 --- a/eigrpd/eigrp_topology.c +++ b/eigrpd/eigrp_topology.c @@ -330,9 +330,9 @@ struct list * eigrp_topology_get_successor(struct eigrp_prefix_entry *table_node) { struct list *successors = list_new(); - ; struct eigrp_neighbor_entry *data; struct listnode *node1, *node2; + for (ALL_LIST_ELEMENTS(table_node->entries, node1, node2, data)) { if (data->flags & EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG) diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c index 825470c854..bd32af2798 100644 --- a/eigrpd/eigrp_zebra.c +++ b/eigrpd/eigrp_zebra.c @@ -417,7 +417,6 @@ eigrp_zebra_route_add (struct prefix_ipv4 *p, struct eigrp_neighbor_entry *te) /* EIGRP pass nexthop and metric */ SET_FLAG (message, ZAPI_MESSAGE_NEXTHOP); - SET_FLAG (message, ZAPI_MESSAGE_METRIC); /* Distance value. */ // 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); stream_putc (s, ZEBRA_ROUTE_EIGRP); stream_putw (s, 0); - stream_putc (s, flags); + stream_putl (s, flags); stream_putc (s, message); stream_putw (s, SAFI_UNICAST); |