diff options
| author | julian <julian@FreeBSD.org> | 1998-06-05 22:40:01 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 1998-06-05 22:40:01 +0000 |
| commit | f7a6c6446198ae23d997bc4486e475fc29eac0a9 (patch) | |
| tree | 12135a908d89d9059a51c47f514b68038409b3e7 /sys/netinet/ip_output.c | |
| parent | 3baa0462547cb98ece8c9d8ac604a70290e7d83f (diff) | |
| download | FreeBSD-src-f7a6c6446198ae23d997bc4486e475fc29eac0a9.zip FreeBSD-src-f7a6c6446198ae23d997bc4486e475fc29eac0a9.tar.gz | |
Reverse the default sense of the IPFW/DIVERT reinjection code
so that the new behaviour is now default.
Solves the "infinite loop in diversion" problem when more than one diversion
is active.
Man page changes follow.
The new code is in -stable as the NON default option.
Diffstat (limited to 'sys/netinet/ip_output.c')
| -rw-r--r-- | sys/netinet/ip_output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index da061bb..5089b5c 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $Id: ip_output.c,v 1.66 1998/03/21 11:34:20 peter Exp $ + * $Id: ip_output.c,v 1.67 1998/05/25 10:37:47 julian Exp $ */ #define _IP_VHL @@ -371,7 +371,7 @@ sendit: */ if (ip_fw_chk_ptr) { #ifdef IPDIVERT -#ifndef IPFW_DIVERT_RESTART +#ifdef IPFW_DIVERT_OLDRESTART ip_divert_port = (*ip_fw_chk_ptr)(&ip, hlen, ifp, ip_divert_ignore, &m); ip_divert_ignore = 0; @@ -380,7 +380,7 @@ sendit: ip_divert_port = (*ip_fw_chk_ptr)(&ip, hlen, ifp, ip_divert_out_cookie, &m); ip_divert_out_cookie = 0; -#endif /* IPFW_DIVERT_RESTART */ +#endif /* IPFW_DIVERT_OLDRESTART */ if (ip_divert_port) { /* Divert packet */ (*inetsw[ip_protox[IPPROTO_DIVERT]].pr_input)(m, 0); goto done; |
