diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2014-06-28 21:12:37 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-02-14 19:18:49 +0100 |
| commit | 6d6df30386423518b5daef93c2f047b4140f85f4 (patch) | |
| tree | 7da3226d3276e019c49a4b4a673911a85297ecc7 /ripngd/ripngd.c | |
| parent | 0f048b90b5d6e4bd185913945b68dd254126eb9f (diff) | |
| download | quagga-6d6df30386423518b5daef93c2f047b4140f85f4.tar.bz2 quagga-6d6df30386423518b5daef93c2f047b4140f85f4.tar.xz | |
build: remove INRIA, NRL and MUSICA IPv6 quirks
Valar dohaeris.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Greg Troxel <gdt@ir.bbn.com>
Acked-by: Feng Lu <lu.feng@6wind.com>
Acked-by: Paul Jakma <paul@jakma.org>
Diffstat (limited to 'ripngd/ripngd.c')
| -rw-r--r-- | ripngd/ripngd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 941c3a06..2dbbf9e1 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -928,7 +928,7 @@ ripng_redistribute_add (int type, int sub_type, struct prefix_ipv6 *p, return; if (IN6_IS_ADDR_LOOPBACK (&p->prefix)) return; -#if defined (MUSICA) || defined (LINUX) +#ifdef LINUX /* XXX As long as the RIPng redistribution is applied to all the connected * routes, one needs to filter the ::/96 prefixes. * However it could be a wanted case, it will be removed soon. @@ -936,7 +936,7 @@ ripng_redistribute_add (int type, int sub_type, struct prefix_ipv6 *p, if ((IN6_IS_ADDR_V4COMPAT(&p->prefix)) || (IN6_IS_ADDR_UNSPECIFIED (&p->prefix) && (p->prefixlen == 96))) return; -#endif /* MUSICA or LINUX */ +#endif /* LINUX */ rp = route_node_get (ripng->table, (struct prefix *) p); rinfo = rp->info; @@ -1025,7 +1025,7 @@ ripng_redistribute_delete (int type, int sub_type, struct prefix_ipv6 *p, return; if (IN6_IS_ADDR_LOOPBACK (&p->prefix)) return; -#if defined (MUSICA) || defined (LINUX) +#ifdef LINUX /* XXX As long as the RIPng redistribution is applied to all the connected * routes, one needs to filter the ::/96 prefixes. * However it could be a wanted case, it will be removed soon. @@ -1033,7 +1033,7 @@ ripng_redistribute_delete (int type, int sub_type, struct prefix_ipv6 *p, if ((IN6_IS_ADDR_V4COMPAT(&p->prefix)) || (IN6_IS_ADDR_UNSPECIFIED (&p->prefix) && (p->prefixlen == 96))) return; -#endif /* MUSICA or LINUX */ +#endif /* LINUX */ rp = route_node_lookup (ripng->table, (struct prefix *) p); |