diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2011-07-08 18:30:18 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2011-07-08 18:30:18 +0000 |
| commit | 10fcba53ef6983f49604f8f0da1619428df97c97 (patch) | |
| tree | cfcb48c33f5803859f0a19286ecac3e7e8f14b24 /sys/netinet/ip_gre.c | |
| parent | 48142241ec73b235e102c03fa64123d49a404e71 (diff) | |
Include PIPEX in kernel by default. And add new sysctl variable
`net.pipex.enable' to enable PIPEX. By default, pipex is disabled
and it will not process packets from wire. Update man pages and
update HOWTO_PIPEX_NPPPD.txt for testers.
discussed with dlg@, ok deraadt@ mcbride@ claudio@
Diffstat (limited to 'sys/netinet/ip_gre.c')
| -rw-r--r-- | sys/netinet/ip_gre.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 11d1ee761ea..7edc239d8dc 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.c,v 1.42 2011/07/05 21:40:38 dhill Exp $ */ +/* $OpenBSD: ip_gre.c,v 1.43 2011/07/08 18:30:17 yasuoka Exp $ */ /* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -249,14 +249,14 @@ gre_input(struct mbuf *m, ...) } #ifdef PIPEX - { - struct pipex_session *session; + if (pipex_enable) { + struct pipex_session *session; - if ((session = pipex_pptp_lookup_session(m)) != NULL) { - if (pipex_pptp_input(m, session) == NULL) - return; + if ((session = pipex_pptp_lookup_session(m)) != NULL) { + if (pipex_pptp_input(m, session) == NULL) + return; + } } - } #endif ret = gre_input2(m, hlen, IPPROTO_GRE); |