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_route.c | |
| parent | 8d3e3ccfd0d0cb82b253f937339d1c6189a2bf54 (diff) | |
| parent | 43cd33a44e010f818633b7f144b5a0be352b41e7 (diff) | |
| download | quagga-37e11172f8ed157340783b73d56595bb02d0a2d2.tar.bz2 quagga-37e11172f8ed157340783b73d56595bb02d0a2d2.tar.xz | |
Merge commit 'quagga_0_99_6_release' into linux-realmsquagga-0.99.6-realms.patch
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]); |