diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-27 08:09:13 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-01-27 08:09:13 +0000 |
| commit | 98f40bbc84e70cdf4b25f5ee817c6eebe3d46a3d (patch) | |
| tree | d43e5507a833c1b2d60fea7c9e4363d15715be06 /sys/netinet/ipsec_input.c | |
| parent | 95d6b976dfe454179868d92f7eab5c4bcdd4ab5a (diff) | |
Merge "old" and "new" ESP and AH in two files (one for each).
Fix a couple of buglets with ingress flow deletion.
tcpdump on enc0 should now show all outgoing packets *before* being
processed, and all incoming packets *after* being processed.
Good to be in Canada (land of the free commits).
Diffstat (limited to 'sys/netinet/ipsec_input.c')
| -rw-r--r-- | sys/netinet/ipsec_input.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index 0f6c75e0bd8..7249fbe5887 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.17 2000/01/25 17:18:59 espie Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.18 2000/01/27 08:09:12 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -106,9 +106,9 @@ int ipsec_common_input(struct mbuf **m0, int skip, int protoff, int af, int sproto) { #define IPSEC_ISTAT(y,z) (sproto == IPPROTO_ESP ? (y)++ : (z)++) -#define IPSEC_NAME (sproto == IPPROTO_ESP ? (af == AF_INET ? "esp_input()" :\ +#define IPSEC_NAME (sproto == IPPROTO_ESP ? (af == AF_INET ? "esp4_input()" :\ "esp6_input()") :\ - (af == AF_INET ? "ah_input()" :\ + (af == AF_INET ? "ah4_input()" :\ "ah6_input()")) union sockaddr_union src_address, dst_address, src2, dst2; caddr_t sport = 0, dport = 0; @@ -633,7 +633,7 @@ ah_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlen, void *newp, #ifdef INET /* IPv4 AH wrapper */ void -ah_input(struct mbuf *m, ...) +ah4_input(struct mbuf *m, ...) { struct ifqueue *ifq = &ipintrq; struct mbuf *mp = m; @@ -662,7 +662,7 @@ ah_input(struct mbuf *m, ...) m_freem(mp); ahstat.ahs_qfull++; splx(s); - DPRINTF(("ah_input(): dropped packet because of full IP queue\n")); + DPRINTF(("ah4_input(): dropped packet because of full IP queue\n")); return; } @@ -673,7 +673,7 @@ ah_input(struct mbuf *m, ...) /* IPv4 ESP wrapper */ void -esp_input(struct mbuf *m, ...) +esp4_input(struct mbuf *m, ...) { struct ifqueue *ifq = &ipintrq; struct mbuf *mp = m; @@ -702,7 +702,7 @@ esp_input(struct mbuf *m, ...) m_freem(mp); espstat.esps_qfull++; splx(s); - DPRINTF(("esp_input(): dropped packet because of full IP queue\n")); + DPRINTF(("esp4_input(): dropped packet because of full IP queue\n")); return; } |