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_route.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_route.c')
| -rw-r--r-- | isisd/isis_route.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/isisd/isis_route.c b/isisd/isis_route.c index c8f0aaba..1286486c 100644 --- a/isisd/isis_route.c +++ b/isisd/isis_route.c @@ -631,6 +631,8 @@ isis_route_validate_table (struct isis_area *area, struct route_table *table) if (drnode->info == rnode->info) drnode->info = NULL; } + +#ifdef HAVE_IPV6 if (rnode->p.family == AF_INET6) { drnode = route_node_get (area->route_table6[0], &rnode->p); @@ -640,6 +642,7 @@ isis_route_validate_table (struct isis_area *area, struct route_table *table) if (drnode->info == rnode->info) drnode->info = NULL; } +#endif isis_route_delete (&rnode->p, table); } @@ -667,8 +670,10 @@ isis_route_validate_merge (struct isis_area *area, int family) if (family == AF_INET) table = area->route_table[0]; +#ifdef HAVE_IPV6 else if (family == AF_INET6) table = area->route_table6[0]; +#endif for (rnode = route_top (table); rnode; rnode = route_next (rnode)) { @@ -680,8 +685,10 @@ isis_route_validate_merge (struct isis_area *area, int family) if (family == AF_INET) table = area->route_table[1]; +#ifdef HAVE_IPV6 else if (family == AF_INET6) table = area->route_table6[1]; +#endif for (rnode = route_top (table); rnode; rnode = route_next (rnode)) { @@ -719,8 +726,8 @@ isis_route_validate (struct thread *thread) isis_route_validate_merge (area, AF_INET); -#ifdef HAVE_IPV6 validate_ipv6: +#ifdef HAVE_IPV6 if (area->is_type == IS_LEVEL_1) { isis_route_validate_table (area, area->route_table6[0]); |