diff options
| author | Jeffrey C. Ollie <jeff@ocjtech.us> | 2007-04-09 15:36:33 -0500 |
|---|---|---|
| committer | Jeffrey C. Ollie <jeff@ocjtech.us> | 2007-04-09 15:36:33 -0500 |
| commit | 37e11172f8ed157340783b73d56595bb02d0a2d2 (patch) | |
| tree | 65163a9cdb8ded9c55c94da92e8a6327bda9067c /isisd/isis_spf.c | |
| parent | 8d3e3ccfd0d0cb82b253f937339d1c6189a2bf54 (diff) | |
| parent | 43cd33a44e010f818633b7f144b5a0be352b41e7 (diff) | |
| download | quagga-0.99.6-realms.patch.tar.bz2 quagga-0.99.6-realms.patch.tar.xz | |
Merge commit 'quagga_0_99_6_release' into linux-realmsquagga-0.99.6-realms.patch
Diffstat (limited to 'isisd/isis_spf.c')
| -rw-r--r-- | isisd/isis_spf.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 706ed16c..5d7e9da4 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -998,8 +998,10 @@ isis_run_spf (struct isis_area *area, int level, int family) /* Make all routes in current route table inactive. */ if (family == AF_INET) table = area->route_table[level - 1]; +#ifdef HAVE_IPV6 else if (family == AF_INET6) table = area->route_table6[level - 1]; +#endif for (rode = route_top (table); rode; rode = route_next (rode)) { @@ -1333,16 +1335,16 @@ isis_print_paths (struct vty *vty, struct list *paths) nh_dyn = dynhn_find_by_id (adj->sysid); vty_out (vty, "%-20s %-10u %-20s %-11s %-5s%s", (dyn != NULL) ? dyn->name.name : - (u_char *) rawlspid_print ((u_char *) vertex->N.id), + (const u_char *)rawlspid_print ((u_char *) vertex->N.id), vertex->d_N, (nh_dyn != NULL) ? nh_dyn->name.name : - (u_char *) rawlspid_print (adj->sysid), + (const u_char *)rawlspid_print (adj->sysid), adj->circuit->interface->name, snpa_print (adj->snpa), VTY_NEWLINE); } else { vty_out (vty, "%s %u %s", dyn ? dyn->name.name : - (u_char *) rawlspid_print (vertex->N.id), + (const u_char *) rawlspid_print (vertex->N.id), vertex->d_N, VTY_NEWLINE); } } |