diff options
| author | Darren Reed <Darren.Reed@Sun.COM> | 2008-09-08 14:46:50 -0700 |
|---|---|---|
| committer | Darren Reed <Darren.Reed@Sun.COM> | 2008-09-08 14:46:50 -0700 |
| commit | 7ddc9b1afd18f260b9fb78ec7732facd91769131 (patch) | |
| tree | 1a305ae7471e9362c1ba0ea3d32834448059eb00 /usr/src/uts/common/sys/netstack.h | |
| parent | 7739299d04f7910358ca2ad79106f174022a9ab2 (diff) | |
| download | illumos-joyent-7ddc9b1afd18f260b9fb78ec7732facd91769131.tar.gz | |
PSARC/2008/219 Committed API for packet interception
PSARC/2008/335 Corrections for Committed API for packet interception
PSARC/2008/557 Revision to net instance notification API
4844507 Solaris needs stable interface for packet filtering software
6705155 ipf_stack_init() assumes kmem_alloc with KM_NOSLEEP never fails
Diffstat (limited to 'usr/src/uts/common/sys/netstack.h')
| -rw-r--r-- | usr/src/uts/common/sys/netstack.h | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/usr/src/uts/common/sys/netstack.h b/usr/src/uts/common/sys/netstack.h index 9bd7701693..55acab834c 100644 --- a/usr/src/uts/common/sys/netstack.h +++ b/usr/src/uts/common/sys/netstack.h @@ -26,8 +26,6 @@ #ifndef _SYS_NETSTACK_H #define _SYS_NETSTACK_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/kstat.h> #ifdef __cplusplus @@ -64,24 +62,23 @@ typedef id_t netstackid_t; * done ine in decending order). */ #define NS_ALL -1 /* Match all */ -#define NS_HOOK 0 -#define NS_NETI 1 -#define NS_ARP 2 -#define NS_IP 3 -#define NS_ICMP 4 -#define NS_UDP 5 -#define NS_TCP 6 -#define NS_SCTP 7 -#define NS_RTS 8 -#define NS_IPSEC 9 -#define NS_KEYSOCK 10 -#define NS_SPDSOCK 11 -#define NS_IPSECAH 12 -#define NS_IPSECESP 13 -#define NS_TUN 14 -#define NS_IPF 15 -#define NS_STR 16 /* autopush list etc */ -#define NS_MAX (NS_STR+1) +#define NS_STR 0 /* autopush list etc */ +#define NS_HOOK 1 +#define NS_NETI 2 +#define NS_ARP 3 +#define NS_IP 4 +#define NS_ICMP 5 +#define NS_UDP 6 +#define NS_TCP 7 +#define NS_SCTP 8 +#define NS_RTS 9 +#define NS_IPSEC 10 +#define NS_KEYSOCK 11 +#define NS_SPDSOCK 12 +#define NS_IPSECAH 13 +#define NS_IPSECESP 14 +#define NS_TUN 15 +#define NS_MAX (NS_TUN+1) /* * State maintained for each module which tracks the state of @@ -138,6 +135,7 @@ struct netstack { union { void *nu_modules[NS_MAX]; struct { + struct str_stack *nu_str; struct hook_stack *nu_hook; struct neti_stack *nu_neti; struct arp_stack *nu_arp; @@ -153,11 +151,10 @@ struct netstack { struct ipsecah_stack *nu_ipsecah; struct ipsecesp_stack *nu_ipsecesp; struct tun_stack *nu_tun; - struct ipf_stack *nu_ipf; - struct str_stack *nu_str; } nu_s; } netstack_u; #define netstack_modules netstack_u.nu_modules +#define netstack_str netstack_u.nu_s.nu_str #define netstack_hook netstack_u.nu_s.nu_hook #define netstack_neti netstack_u.nu_s.nu_neti #define netstack_arp netstack_u.nu_s.nu_arp @@ -173,8 +170,6 @@ struct netstack { #define netstack_ipsecah netstack_u.nu_s.nu_ipsecah #define netstack_ipsecesp netstack_u.nu_s.nu_ipsecesp #define netstack_tun netstack_u.nu_s.nu_tun -#define netstack_ipf netstack_u.nu_s.nu_ipf -#define netstack_str netstack_u.nu_s.nu_str nm_state_t netstack_m_state[NS_MAX]; /* module state */ |