From owner-svn-src-projects@FreeBSD.ORG Sat Feb 25 09:28:39 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D5BA106566C; Sat, 25 Feb 2012 09:28:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 823D48FC16; Sat, 25 Feb 2012 09:28:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1P9SdD0009785; Sat, 25 Feb 2012 09:28:39 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1P9SdOi009782; Sat, 25 Feb 2012 09:28:39 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201202250928.q1P9SdOi009782@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 25 Feb 2012 09:28:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232150 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Feb 2012 09:28:39 -0000 Author: glebius Date: Sat Feb 25 09:28:38 2012 New Revision: 232150 URL: http://svn.freebsd.org/changeset/base/232150 Log: In FreeBSD pfsync(4) is loadable, thus cleanup unnecessary ifdefs. Modified: projects/pf/head/sys/contrib/pf/net/pf.c projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Sat Feb 25 09:27:52 2012 (r232149) +++ projects/pf/head/sys/contrib/pf/net/pf.c Sat Feb 25 09:28:38 2012 (r232150) @@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bpf.h" #include "opt_pf.h" -#define NPFSYNC 1 - #ifdef DEV_PFLOW #define NPFLOW DEV_PFLOW #else @@ -871,10 +869,9 @@ pf_state_insert(struct pfi_kif *kif, str V_pf_status.fcounters[FCNT_STATE_INSERT]++; V_pf_status.states++; pfi_kif_ref(kif, PFI_KIF_REF_STATE); -#if NPFSYNC > 0 if (pfsync_insert_state_ptr != NULL) pfsync_insert_state_ptr(s); -#endif + return (0); } @@ -1172,10 +1169,8 @@ pf_unlink_state(struct pf_state *cur) if (export_pflow_ptr != NULL) export_pflow_ptr(cur); #endif -#if NPFSYNC > 0 if (pfsync_delete_state_ptr != NULL) pfsync_delete_state_ptr(cur); -#endif cur->timeout = PFTM_UNLINKED; pf_src_tree_remove_state(cur); pf_detach_state(cur); @@ -1187,11 +1182,10 @@ void pf_free_state(struct pf_state *cur) { -#if NPFSYNC > 0 if (pfsync_state_in_use_ptr != NULL && pfsync_state_in_use_ptr(cur)) return; -#endif + KASSERT(cur->timeout == PFTM_UNLINKED, ("pf_free_state: cur->timeout != PFTM_UNLINKED")); if (--cur->rule.ptr->states_cur <= 0 && @@ -3023,7 +3017,6 @@ pf_test_rule(struct pf_rule **rm, struct if (rewrite) m_copyback(m, off, hdrlen, pd->hdr.any); -#if NPFSYNC > 0 if (*sm != NULL && !ISSET((*sm)->state_flags, PFSTATE_NOSYNC) && direction == PF_OUT && pfsync_up_ptr != NULL && pfsync_up_ptr()) { /* @@ -3036,7 +3029,6 @@ pf_test_rule(struct pf_rule **rm, struct pfsync_defer_ptr(*sm, m)) return (PF_DEFER); } -#endif return (PF_PASS); @@ -5465,10 +5457,8 @@ pf_test(int dir, struct ifnet *ifp, stru action = pf_test_state_tcp(&s, dir, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; @@ -5496,10 +5486,8 @@ pf_test(int dir, struct ifnet *ifp, stru } action = pf_test_state_udp(&s, dir, kif, m, off, h, &pd); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; @@ -5521,10 +5509,8 @@ pf_test(int dir, struct ifnet *ifp, stru action = pf_test_state_icmp(&s, dir, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; @@ -5546,10 +5532,8 @@ pf_test(int dir, struct ifnet *ifp, stru default: action = pf_test_state_other(&s, dir, kif, m, &pd); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; @@ -5889,10 +5873,8 @@ pf_test6(int dir, struct ifnet *ifp, str action = pf_test_state_tcp(&s, dir, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; @@ -5920,10 +5902,8 @@ pf_test6(int dir, struct ifnet *ifp, str } action = pf_test_state_udp(&s, dir, kif, m, off, h, &pd); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; @@ -5952,10 +5932,8 @@ pf_test6(int dir, struct ifnet *ifp, str action = pf_test_state_icmp(&s, dir, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; @@ -5968,10 +5946,8 @@ pf_test6(int dir, struct ifnet *ifp, str default: action = pf_test_state_other(&s, dir, kif, m, &pd); if (action == PF_PASS) { -#if NPFSYNC > 0 if (pfsync_update_state_ptr != NULL) pfsync_update_state_ptr(s); -#endif /* NPFSYNC */ r = s->rule.ptr; a = s->anchor.ptr; log = s->log; Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Sat Feb 25 09:27:52 2012 (r232149) +++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Sat Feb 25 09:28:38 2012 (r232150) @@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bpf.h" #include "opt_pf.h" -#define NPFSYNC 1 - #ifdef DEV_PFLOG #define NPFLOG DEV_PFLOG #else @@ -1735,19 +1733,15 @@ pfioctl(struct cdev *dev, u_long cmd, ca if (!psk->psk_ifname[0] || !strcmp(psk->psk_ifname, s->kif->pfik_name)) { -#if NPFSYNC > 0 /* don't send out individual delete messages */ SET(s->state_flags, PFSTATE_NOSYNC); -#endif pf_unlink_state(s); killed++; } } psk->psk_killed = killed; -#if NPFSYNC > 0 if (pfsync_clear_states_ptr != NULL) pfsync_clear_states_ptr(V_pf_status.hostid, psk->psk_ifname); -#endif break; } @@ -3196,10 +3190,8 @@ pf_clear_states(void) RB_FOREACH(state, pf_state_tree_id, &V_tree_id) { state->timeout = PFTM_PURGE; -#if NPFSYNC /* don't send out individual delete messages */ state->sync_state = PFSTATE_NOSYNC; -#endif pf_unlink_state(state); }