diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-01-28 06:03:25 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-01-28 06:03:25 -0600 |
| commit | 00da2a1c8c0008725cae2d87abfe17736bf0318a (patch) | |
| tree | e394dcaec1b9bb3d1db3b4f7759bb4f415633e0c /sys/net | |
| parent | 5c82541da7e1c32c093de140d0c173418ee9c545 (diff) | |
| download | FreeBSD-src-00da2a1c8c0008725cae2d87abfe17736bf0318a.zip FreeBSD-src-00da2a1c8c0008725cae2d87abfe17736bf0318a.tar.gz | |
Importing pfSense patch pf_static_tracker.diff
This version fixes the issue with 'State Creations' in pfctl -vvsr.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_pflog.h | 4 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h index 0faeb7d..326b551 100644 --- a/sys/net/if_pflog.h +++ b/sys/net/if_pflog.h @@ -40,10 +40,14 @@ struct pfloghdr { char ruleset[PFLOG_RULESET_NAME_SIZE]; u_int32_t rulenr; u_int32_t subrulenr; +#ifdef PF_USER_INFO uid_t uid; pid_t pid; uid_t rule_uid; pid_t rule_pid; +#else + u_int32_t ridentifier; +#endif u_int8_t dir; u_int8_t pad[3]; }; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 2936771..e46bb69 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -547,7 +547,11 @@ struct pf_rule { u_int32_t rt_listid; u_int32_t nr; u_int32_t prob; +#ifdef PF_USER_INFO uid_t cuid; +#else + u_int32_t cuid; +#endif pid_t cpid; counter_u64_t states_cur; @@ -1144,11 +1148,13 @@ struct pfi_kif { #define PFI_IFLAG_SKIP 0x0100 /* skip filtering on interface */ struct pf_pdesc { +#ifdef PF_USER_INFO struct { int done; uid_t uid; gid_t gid; } lookup; +#endif u_int64_t tot_len; /* Make Mickey money */ union { struct tcphdr *tcp; |
