diff options
| author |   yasuoka <yasuoka@openbsd.org> | 2011-07-08 18:30:16 +0000 |
|---|---|---|
| committer | yasuoka <yasuoka@openbsd.org> | 2011-07-08 18:30:16 +0000 |
| commit | 90b03482cbe8f7eb592091739fe0f91d2f2a9712 (patch) | |
| tree | 870d600feac63574a4ae67b5dc720def8b5ba07b /sys/net/if_ethersubr.c | |
| parent | Move uvm_pmr_alloc_pig to kern/subr_hibernate.c (diff) | |
| download | wireguard-openbsd-90b03482cbe8f7eb592091739fe0f91d2f2a9712.tar.xz wireguard-openbsd-90b03482cbe8f7eb592091739fe0f91d2f2a9712.zip | |
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/net/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index d5b77eb20aa..0321a33726f 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.149 2011/07/04 23:58:26 claudio Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.150 2011/07/08 18:30:16 yasuoka Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -750,14 +750,14 @@ decapsulate: eh_tmp = mtod(m, struct ether_header *); bcopy(eh, eh_tmp, sizeof(struct ether_header)); #ifdef PIPEX - { - struct pipex_session *session; + if (pipex_enable) { + struct pipex_session *session; - if ((session = pipex_pppoe_lookup_session(m)) != NULL) { - pipex_pppoe_input(m, session); - goto done; + if ((session = pipex_pppoe_lookup_session(m)) != NULL) { + pipex_pppoe_input(m, session); + goto done; + } } - } #endif if (etype == ETHERTYPE_PPPOEDISC) inq = &pppoediscinq; |