diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-05-18 10:56:46 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-05-18 10:56:46 +0000 |
| commit | 4a8bd7e3495639f1cdd88bd2504d058ad958c3f6 (patch) | |
| tree | b39cdbcb9324fedeec1e116509d5250f851ba1dc /sys/netinet/ip_ipsp.h | |
| parent | 76ea618a134d0540f915355c9835d9095ab1fde5 (diff) | |
The function name ip4_input() is confusing as it also handles IPv6
packets. This is the IP in IP protocol input function, so call it
ipip_input(). Rename the existing ipip_input() to ipip_input_gif()
as it is the input function used by the gif interface. Pass the
address family to make it consistent with pr_input. Use __func__
in debug print and panic messages. Move all ipip prototypes to the
ip_ipip.h header file.
OK dhill@ mpi@
Diffstat (limited to 'sys/netinet/ip_ipsp.h')
| -rw-r--r-- | sys/netinet/ip_ipsp.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index 248c1f637d9..44496a53bf4 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.180 2017/05/06 15:55:15 bluhm Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.181 2017/05/18 10:56:45 bluhm Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -475,10 +475,6 @@ int ipe4_attach(void); int ipe4_init(struct tdb *, struct xformsw *, struct ipsecinit *); int ipe4_zeroize(struct tdb *); int ipe4_input(struct mbuf *, struct tdb *, int, int); -int ipip_input(struct mbuf **, int *, struct ifnet *, int); -int ipip_output(struct mbuf *, struct tdb *, struct mbuf **, int, int); - -int ip4_input(struct mbuf **, int *, int, int); /* XF_AH */ int ah_attach(void); |