From 10fcba53ef6983f49604f8f0da1619428df97c97 Mon Sep 17 00:00:00 2001 From: YASUOKA Masahiko Date: Fri, 8 Jul 2011 18:30:18 +0000 Subject: 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@ --- sys/netinet/ip_gre.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sys/netinet/ip_gre.c') 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); -- cgit v1.2.3