diff options
| author |   bluhm <bluhm@openbsd.org> | 2017-05-18 10:56:45 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2017-05-18 10:56:45 +0000 |
| commit | ea7848408c0d4634c25084306937f0cfac83caff (patch) | |
| tree | 6229c99f36b7222a3a7467af155dc42d589f0974 /sys/netinet/ipsec_output.c | |
| parent | Since copyin(9) already doeas access 32-bit quantities atomically, we can (diff) | |
| download | wireguard-openbsd-ea7848408c0d4634c25084306937f0cfac83caff.tar.xz wireguard-openbsd-ea7848408c0d4634c25084306937f0cfac83caff.zip | |
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/ipsec_output.c')
| -rw-r--r-- | sys/netinet/ipsec_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c index 61af386ed0c..4ed10f90552 100644 --- a/sys/netinet/ipsec_output.c +++ b/sys/netinet/ipsec_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_output.c,v 1.67 2017/05/16 12:24:02 mpi Exp $ */ +/* $OpenBSD: ipsec_output.c,v 1.68 2017/05/18 10:56:45 bluhm Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -42,7 +42,7 @@ #endif #include <netinet/udp.h> -#include <netinet/ip_ipsp.h> +#include <netinet/ip_ipip.h> #include <netinet/ip_ah.h> #include <netinet/ip_esp.h> #include <netinet/ip_ipcomp.h> |