diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-10-13 18:23:41 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-10-13 18:23:41 +0000 |
| commit | d0ab30fdb97104766da99fa8da4eb3371d2d4163 (patch) | |
| tree | 1b5cd770f1597f4f741778c5f55e6f431f1f22fc /sys/netinet6 | |
| parent | 35252f0dafa4ccce1148cc18897ba319f6c982cd (diff) | |
Since the IPv6 madness is not enough introduce NAT64 -- which is actually
"af-to" a generic IP version translator for pf(4).
Not everything perfect yet but lets fix these things in the tree.
Insane amount of work done by sperreault@, mikeb@ and reyk@.
Looked over by mcbride@ henning@ and myself at eurobsdcon.
OK mcbride@ and general put it in from deraadt@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6.h | 3 | ||||
| -rw-r--r-- | sys/netinet6/in6_var.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index d4cef9a013b..4b55f0e1f03 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.h,v 1.53 2011/05/02 13:48:38 mikeb Exp $ */ +/* $OpenBSD: in6.h,v 1.54 2011/10/13 18:23:40 claudio Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* @@ -787,6 +787,7 @@ int in6_addrscope(struct in6_addr *); struct in6_ifaddr *in6_ifawithscope(struct ifnet *, struct in6_addr *); extern void in6_if_up(struct ifnet *); void in6_get_rand_ifid(struct ifnet *, struct in6_addr *); +int in6_mask2len(struct in6_addr *, u_char *); #define satosin6(sa) ((struct sockaddr_in6 *)(sa)) #define sin6tosa(sin6) ((struct sockaddr *)(sin6)) diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 6c485d39f85..55f85009a71 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_var.h,v 1.33 2011/07/26 21:19:51 bluhm Exp $ */ +/* $OpenBSD: in6_var.h,v 1.34 2011/10/13 18:23:40 claudio Exp $ */ /* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */ /* @@ -572,7 +572,6 @@ struct in6_multi *in6_addmulti(struct in6_addr *, struct ifnet *, int *); void in6_delmulti(struct in6_multi *); struct in6_multi_mship *in6_joingroup(struct ifnet *, struct in6_addr *, int *); int in6_leavegroup(struct in6_multi_mship *); -int in6_mask2len(struct in6_addr *, u_char *); int in6_control(struct socket *, u_long, caddr_t, struct ifnet *, struct proc *); int in6_update_ifa(struct ifnet *, struct in6_aliasreq *, |