diff options
| author | Niels Provos <provos@cvs.openbsd.org> | 1998-03-18 10:16:32 +0000 |
|---|---|---|
| committer | Niels Provos <provos@cvs.openbsd.org> | 1998-03-18 10:16:32 +0000 |
| commit | 1ff621f6d9357c68d34b80f7e751dd037ba9afae (patch) | |
| tree | 2218084b9c162ecad7e5b508cd80afa96916f096 /sys/netinet/ip_output.c | |
| parent | 68e9f4d100dffb1a03a06b996fce196d3967780b (diff) | |
Fix tunnel mode input processing (use ip4_input instead of ipe4_input),
fix some old code leftovers in ah_new_input (adjust to variable hash length),
avoid double ip encapsulation in tunnel mode. Problems reportd by
Petr Novak <petr@internet.cz>.
Diffstat (limited to 'sys/netinet/ip_output.c')
| -rw-r--r-- | sys/netinet/ip_output.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 990bf072e94..d2283dd35c6 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.25 1998/02/03 19:06:30 deraadt Exp $ */ +/* $OpenBSD: ip_output.c,v 1.26 1998/03/18 10:16:31 provos Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -271,7 +271,8 @@ ip_output(m0, va_alist) } /* Check for tunneling */ - if (tdb->tdb_flags & TDBF_TUNNELING) { + if ((tdb->tdb_flags & TDBF_TUNNELING) && + (tdb->tdb_xform->xf_type != XF_IP4)){ #ifdef ENCDEBUG if (encdebug) printf("ip_output(): tunneling\n"); |