summaryrefslogtreecommitdiff
path: root/isisd
diff options
context:
space:
mode:
Diffstat (limited to 'isisd')
-rw-r--r--isisd/ChangeLog4
-rw-r--r--isisd/isis_route.c22
2 files changed, 20 insertions, 6 deletions
diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 36098d17..78dc462b 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-21 Hasso Tepper <hasso at quagga.net>
+
+ * isis_route.c: Fix output of nexthops in case of extreme debug.
+
2005-09-19 Hasso Tepper <hasso at quagga.net>
* isis_lsp.c, isis_pdu.c, isis_spf.c: Remove some old unused code.
diff --git a/isisd/isis_route.c b/isisd/isis_route.c
index 04346d4a..7cee89ee 100644
--- a/isisd/isis_route.c
+++ b/isisd/isis_route.c
@@ -115,7 +115,7 @@ nexthoplookup (struct list *nexthops, struct in_addr *ip,
return 0;
}
-#if 0 /* Old or new code? */
+#ifdef EXTREME_DEBUG
static void
nexthop_print (struct isis_nexthop *nh)
{
@@ -134,7 +134,7 @@ nexthops_print (struct list *nhs)
for (ALL_LIST_ELEMENTS_RO (nhs, node, nh))
nexthop_print (nh);
}
-#endif /* 0 */
+#endif /* EXTREME_DEBUG */
#ifdef HAVE_IPV6
static struct isis_nexthop6 *
@@ -506,10 +506,20 @@ isis_route_create (struct prefix *prefix, u_int32_t cost, u_int32_t depth,
zlog_debug ("ISIS-Rte (%s) route changed (same attribs): %s",
area->area_tag, buff);
#ifdef EXTREME_DEBUG
- zlog_debug ("Old nexthops");
- nexthops6_print (rinfo_old->nexthops6);
- zlog_debug ("New nexthops");
- nexthops6_print (rinfo_new->nexthops6);
+ if (family == AF_INET)
+ {
+ zlog_debug ("Old nexthops");
+ nexthops_print (rinfo_old->nexthops);
+ zlog_debug ("New nexthops");
+ nexthops_print (rinfo_new->nexthops);
+ }
+ else if (family == AF_INET6)
+ {
+ zlog_debug ("Old nexthops");
+ nexthops6_print (rinfo_old->nexthops6);
+ zlog_debug ("New nexthops");
+ nexthops6_print (rinfo_new->nexthops6);
+ }
#endif /* EXTREME_DEBUG */
isis_route_info_merge (rinfo_new, rinfo_old, family);
isis_route_info_delete (rinfo_new);