diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-10-24 11:20:16 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-10-24 11:20:16 +0000 |
| commit | 5453c090dc30f151d07471e0569e538c383cf7d8 (patch) | |
| tree | 0f65a8d04112950b47fe74e0cad8d6b6cd9f620f /sys/netinet6/icmp6.c | |
| parent | Move obvious kernel prototypes (and structure's with kernel pointers, (diff) | |
| download | wireguard-openbsd-5453c090dc30f151d07471e0569e538c383cf7d8.tar.xz wireguard-openbsd-5453c090dc30f151d07471e0569e538c383cf7d8.zip | |
Significant namespace cleanup of netinet6 symbols.
One worrying bit is in icmp6.h where some htols() and htonl() are
added, which may affect compatibility down the line. This component
can be reverted if issues show up. Ports tree greps indicate no issue.
ok claudio mpi etc
Diffstat (limited to 'sys/netinet6/icmp6.c')
| -rw-r--r-- | sys/netinet6/icmp6.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index ca5ffbd420c..ea643e4b205 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.134 2013/10/23 19:57:50 deraadt Exp $ */ +/* $OpenBSD: icmp6.c,v 1.135 2013/10/24 11:20:18 deraadt Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -1672,15 +1672,15 @@ ni6_addrs(struct icmp6_nodeinfo *ni6, struct mbuf *m, struct ifnet **ifpp, /* What do we have to do about ::1? */ switch (in6_addrscope(&ifa6->ia_addr.sin6_addr)) { - case IPV6_ADDR_SCOPE_LINKLOCAL: + case __IPV6_ADDR_SCOPE_LINKLOCAL: if ((niflags & NI_NODEADDR_FLAG_LINKLOCAL) == 0) continue; break; - case IPV6_ADDR_SCOPE_SITELOCAL: + case __IPV6_ADDR_SCOPE_SITELOCAL: if ((niflags & NI_NODEADDR_FLAG_SITELOCAL) == 0) continue; break; - case IPV6_ADDR_SCOPE_GLOBAL: + case __IPV6_ADDR_SCOPE_GLOBAL: if ((niflags & NI_NODEADDR_FLAG_GLOBAL) == 0) continue; break; @@ -1752,15 +1752,15 @@ ni6_store_addrs(struct icmp6_nodeinfo *ni6, struct icmp6_nodeinfo *nni6, /* What do we have to do about ::1? */ switch (in6_addrscope(&ifa6->ia_addr.sin6_addr)) { - case IPV6_ADDR_SCOPE_LINKLOCAL: + case __IPV6_ADDR_SCOPE_LINKLOCAL: if ((niflags & NI_NODEADDR_FLAG_LINKLOCAL) == 0) continue; break; - case IPV6_ADDR_SCOPE_SITELOCAL: + case __IPV6_ADDR_SCOPE_SITELOCAL: if ((niflags & NI_NODEADDR_FLAG_SITELOCAL) == 0) continue; break; - case IPV6_ADDR_SCOPE_GLOBAL: + case __IPV6_ADDR_SCOPE_GLOBAL: if ((niflags & NI_NODEADDR_FLAG_GLOBAL) == 0) continue; break; |