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>

diff --git a/eigrpd/eigrp_topology.c b/eigrpd/eigrp_topology.c
index c8b53515b1569a522aedb6adfaf88565df4dd132..5d45e03bd92cc068f8e482703e099f86e66ae240 100644 (file)
--- 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 825470c854abca2c6f1ce82e71b9fe600feedfe8..bd32af27982dbf6747adfd811dc98a26dba46bb5 100644 (file)
--- 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);