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_var.h | |
| 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_var.h')
| -rw-r--r-- | sys/netinet/ip_var.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a0aaeef..ba3e8cc0 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $Id: ip_var.h,v 1.37 1998/05/19 15:53:50 pb Exp $ + * $Id: ip_var.h,v 1.38 1998/05/25 10:37:48 julian Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -65,9 +65,9 @@ struct ipq { struct in_addr ipq_src,ipq_dst; #ifdef IPDIVERT u_short ipq_divert; /* divert protocol port */ -#ifdef IPFW_DIVERT_RESTART +#ifndef IPFW_DIVERT_OLDRESTART u_short ipq_div_cookie; /* divert protocol cookie */ -#endif /* IPFW_DIVERT_RESTART */ +#endif /* IPFW_DIVERT_OLDRESTART */ #endif }; @@ -210,13 +210,13 @@ void div_init __P((void)); void div_input __P((struct mbuf *, int)); extern struct pr_usrreqs div_usrreqs; extern u_short ip_divert_port; -#ifndef IPFW_DIVERT_RESTART +#ifdef IPFW_DIVERT_OLDRESTART extern u_short ip_divert_ignore; #else extern u_short ip_divert_in_cookie; extern u_short ip_divert_out_cookie; -#endif /* IPFW_DIVERT_RESTART */ +#endif /* IPFW_DIVERT_OLDRESTART */ #endif /* IPDIVERT */ #endif /* KERNEL */ |
