diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-01-28 05:56:09 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-01-28 05:56:09 -0600 |
| commit | 5c82541da7e1c32c093de140d0c173418ee9c545 (patch) | |
| tree | 62715df97fe66ca00111fcf838760d1326653264 /sys/net | |
| parent | 6d77218901c68616c2f97486c813b9a78c48046a (diff) | |
| download | FreeBSD-src-5c82541da7e1c32c093de140d0c173418ee9c545.zip FreeBSD-src-5c82541da7e1c32c093de140d0c173418ee9c545.tar.gz | |
Revert "Importing pfSense patch pf_static_tracker.diff"
This reverts commit 9068fb423dfecae0f8b611d4bc558dd6cb2e2bd7.
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, 0 insertions, 10 deletions
diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h index 326b551..0faeb7d 100644 --- a/sys/net/if_pflog.h +++ b/sys/net/if_pflog.h @@ -40,14 +40,10 @@ 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 e46bb69..2936771 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -547,11 +547,7 @@ 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; @@ -1148,13 +1144,11 @@ 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; |
