From 5c82541da7e1c32c093de140d0c173418ee9c545 Mon Sep 17 00:00:00 2001 From: Luiz Otavio O Souza Date: Thu, 28 Jan 2016 05:56:09 -0600 Subject: Revert "Importing pfSense patch pf_static_tracker.diff" This reverts commit 9068fb423dfecae0f8b611d4bc558dd6cb2e2bd7. --- sys/netpfil/pf/pf_ioctl.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'sys/netpfil/pf/pf_ioctl.c') diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 146a56f..cacae58 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1168,9 +1168,7 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td rule->states_cur = counter_u64_alloc(M_WAITOK); rule->states_tot = counter_u64_alloc(M_WAITOK); rule->src_nodes = counter_u64_alloc(M_WAITOK); -#ifdef PF_USER_INFO rule->cuid = td->td_ucred->cr_ruid; -#endif rule->cpid = td->td_proc ? td->td_proc->p_pid : 0; TAILQ_INIT(&rule->rpool.list); @@ -1196,6 +1194,7 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td V_ticket_pabuf)); ERROUT(EBUSY); } + tail = TAILQ_LAST(ruleset->rules[rs_num].inactive.ptr, pf_rulequeue); if (tail) @@ -1274,29 +1273,8 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td } rule->rpool.cur = TAILQ_FIRST(&rule->rpool.list); -#ifndef PF_USER_INFO - if (rule->cuid) { - tail = TAILQ_FIRST(ruleset->rules[rs_num].active.ptr); - while ((tail != NULL) && (tail->cuid != rule->cuid)) - tail = TAILQ_NEXT(tail, entries); - if (tail != NULL) { - rule->evaluations = tail->evaluations; - rule->packets[0] = tail->packets[0]; - rule->packets[1] = tail->packets[1]; - rule->bytes[0] = tail->bytes[0]; - rule->bytes[1] = tail->bytes[1]; - } else { - rule->evaluations = rule->packets[0] = rule->packets[1] = - rule->bytes[0] = rule->bytes[1] = 0; - } - } else { - rule->evaluations = rule->packets[0] = rule->packets[1] = - rule->bytes[0] = rule->bytes[1] = 0; - } -#else rule->evaluations = rule->packets[0] = rule->packets[1] = rule->bytes[0] = rule->bytes[1] = 0; -#endif TAILQ_INSERT_TAIL(ruleset->rules[rs_num].inactive.ptr, rule, entries); ruleset->rules[rs_num].inactive.rcount++; @@ -1446,9 +1424,7 @@ DIOCADDRULE_error: newrule->states_cur = counter_u64_alloc(M_WAITOK); newrule->states_tot = counter_u64_alloc(M_WAITOK); newrule->src_nodes = counter_u64_alloc(M_WAITOK); -#ifdef PF_USER_INFO newrule->cuid = td->td_ucred->cr_ruid; -#endif newrule->cpid = td->td_proc ? td->td_proc->p_pid : 0; TAILQ_INIT(&newrule->rpool.list); } -- cgit v1.1