diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2011-07-08 18:38:56 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2011-07-08 18:38:56 +0000 |
| commit | b8421f9c0d529449591ff36c0cffcd1477bd35b5 (patch) | |
| tree | 29a24b53ad9ca293c9faaebf0bd7f4219d1328f2 /sys | |
| parent | b1f8992b55acbddfd6c63321e98ce19c50d007b2 (diff) | |
this must be included my previous commit.
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')
| -rw-r--r-- | sys/sys/socket.h | 7 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 258891fb099..c1ba7fc208a 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -1,4 +1,4 @@ -/* $OpenBSD: socket.h,v 1.73 2011/07/04 00:33:36 mikeb Exp $ */ +/* $OpenBSD: socket.h,v 1.74 2011/07/08 18:38:55 yasuoka Exp $ */ /* $NetBSD: socket.h,v 1.14 1996/02/09 18:25:36 christos Exp $ */ /* @@ -153,7 +153,8 @@ struct splice { #define AF_BLUETOOTH 32 /* Bluetooth */ #define AF_MPLS 33 /* MPLS */ #define pseudo_AF_PFLOW 34 /* pflow */ -#define AF_MAX 35 +#define pseudo_AF_PIPEX 35 /* PIPEX */ +#define AF_MAX 36 /* * Structure used by kernel to store most @@ -234,6 +235,7 @@ struct sockproto { #define PF_BLUETOOTH AF_BLUETOOTH #define PF_MPLS AF_MPLS #define PF_PFLOW pseudo_AF_PFLOW +#define PF_PIPEX pseudo_AF_PIPEX #define PF_MAX AF_MAX /* @@ -316,6 +318,7 @@ struct sockpeercred { { "bluetooth", CTLTYPE_NODE }, \ { "mpls", CTLTYPE_NODE }, \ { "pflow", CTLTYPE_NODE }, \ + { "pipex", CTLTYPE_NODE }, \ } /* diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 3123988c9ad..f8885b68df9 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.115 2011/07/05 04:48:02 guenther Exp $ */ +/* $OpenBSD: sysctl.h,v 1.116 2011/07/08 18:38:55 yasuoka Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -962,6 +962,7 @@ extern void (*cpu_setperf)(int); int bpf_sysctl(int *, u_int, void *, size_t *, void *, size_t); int pflow_sysctl(int *, u_int, void *, size_t *, void *, size_t); +int pipex_sysctl(int *, u_int, void *, size_t *, void *, size_t); #else /* !_KERNEL */ #include <sys/cdefs.h> |