diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2006-12-08 01:09:50 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2006-12-08 01:09:50 +0000 |
| commit | 41b36e9013111a6da812ca000e3b978282bd27a9 (patch) | |
| tree | 11805d66de677613be7fe5e31626cfbbbbec78a6 /isisd/isis_spf.c | |
| parent | 3c0755dc9772deccff2ba6e9dc0511a9af2b9d1b (diff) | |
[isisd] Fix compiler warnings and allow v4-only compilation
2006-12-08 Hannes Gredler <hannes@gredler.at>
* isis_adjacency.c: (isis_new_adj) Allow NULL snpa argument.
* isis_pdu.c: (various) Update calls to isis_new_adj() to pass
NULL and use default.
* (general) Add forward declarations where required.
Fix up const char *'s.
Allow V4-only compilation.
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); } } |