2017-11-27 15:23:17 +00:00
|
|
|
/*-
|
|
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
|
|
*
|
2004-02-26 02:04:28 +00:00
|
|
|
* Copyright (c) 2001 Daniel Hartmeier
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* - Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* - Redistributions in binary form must reproduce the above
|
|
|
|
* copyright notice, this list of conditions and the following
|
|
|
|
* disclaimer in the documentation and/or other materials provided
|
|
|
|
* with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
|
|
* COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
|
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
|
|
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*
|
2012-09-18 12:21:32 +00:00
|
|
|
* $OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
|
2012-09-18 10:52:46 +00:00
|
|
|
* $FreeBSD$
|
2004-02-26 02:04:28 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _NET_PFVAR_H_
|
|
|
|
#define _NET_PFVAR_H_
|
|
|
|
|
2005-05-03 16:43:32 +00:00
|
|
|
#include <sys/param.h>
|
2004-02-26 02:04:28 +00:00
|
|
|
#include <sys/queue.h>
|
2014-02-14 10:05:21 +00:00
|
|
|
#include <sys/counter.h>
|
2018-05-30 07:11:33 +00:00
|
|
|
#include <sys/cpuset.h>
|
2016-02-01 17:41:21 +00:00
|
|
|
#include <sys/malloc.h>
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#include <sys/refcount.h>
|
2019-02-11 05:17:31 +00:00
|
|
|
#include <sys/sysctl.h>
|
2018-05-30 12:40:37 +00:00
|
|
|
#include <sys/lock.h>
|
2018-05-30 07:11:33 +00:00
|
|
|
#include <sys/rmlock.h>
|
2004-02-26 02:04:28 +00:00
|
|
|
#include <sys/tree.h>
|
2016-02-01 17:41:21 +00:00
|
|
|
#include <vm/uma.h>
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
#include <net/radix.h>
|
2004-02-26 02:34:12 +00:00
|
|
|
#include <netinet/in.h>
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2013-10-27 16:25:57 +00:00
|
|
|
#include <netpfil/pf/pf.h>
|
|
|
|
#include <netpfil/pf/pf_altq.h>
|
|
|
|
#include <netpfil/pf/pf_mtag.h>
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2004-03-17 21:11:02 +00:00
|
|
|
#ifdef _KERNEL
|
|
|
|
|
2019-02-11 05:17:31 +00:00
|
|
|
SYSCTL_DECL(_net_pf);
|
|
|
|
MALLOC_DECLARE(M_PFHASH);
|
|
|
|
|
2004-06-16 23:24:02 +00:00
|
|
|
struct pfi_dynaddr {
|
2007-07-03 12:16:07 +00:00
|
|
|
TAILQ_ENTRY(pfi_dynaddr) entry;
|
|
|
|
struct pf_addr pfid_addr4;
|
|
|
|
struct pf_addr pfid_mask4;
|
|
|
|
struct pf_addr pfid_addr6;
|
|
|
|
struct pf_addr pfid_mask6;
|
|
|
|
struct pfr_ktable *pfid_kt;
|
|
|
|
struct pfi_kif *pfid_kif;
|
|
|
|
int pfid_net; /* mask or 128 */
|
|
|
|
int pfid_acnt4; /* address count IPv4 */
|
|
|
|
int pfid_acnt6; /* address count IPv6 */
|
|
|
|
sa_family_t pfid_af; /* rule af */
|
|
|
|
u_int8_t pfid_iflags; /* PFI_AFLAG_* */
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Address manipulation macros
|
|
|
|
*/
|
2004-02-26 03:53:54 +00:00
|
|
|
#define HTONL(x) (x) = htonl((__uint32_t)(x))
|
|
|
|
#define HTONS(x) (x) = htons((__uint16_t)(x))
|
|
|
|
#define NTOHL(x) (x) = ntohl((__uint32_t)(x))
|
|
|
|
#define NTOHS(x) (x) = ntohs((__uint16_t)(x))
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
#define PF_NAME "pf"
|
2004-02-26 02:34:12 +00:00
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#define PF_HASHROW_ASSERT(h) mtx_assert(&(h)->lock, MA_OWNED)
|
|
|
|
#define PF_HASHROW_LOCK(h) mtx_lock(&(h)->lock)
|
|
|
|
#define PF_HASHROW_UNLOCK(h) mtx_unlock(&(h)->lock)
|
2004-02-26 02:34:12 +00:00
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#define PF_STATE_LOCK(s) \
|
|
|
|
do { \
|
|
|
|
struct pf_idhash *_ih = &V_pf_idhash[PF_IDHASH(s)]; \
|
|
|
|
PF_HASHROW_LOCK(_ih); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define PF_STATE_UNLOCK(s) \
|
|
|
|
do { \
|
|
|
|
struct pf_idhash *_ih = &V_pf_idhash[PF_IDHASH((s))]; \
|
|
|
|
PF_HASHROW_UNLOCK(_ih); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#ifdef INVARIANTS
|
|
|
|
#define PF_STATE_LOCK_ASSERT(s) \
|
|
|
|
do { \
|
|
|
|
struct pf_idhash *_ih = &V_pf_idhash[PF_IDHASH(s)]; \
|
|
|
|
PF_HASHROW_ASSERT(_ih); \
|
|
|
|
} while (0)
|
|
|
|
#else /* !INVARIANTS */
|
|
|
|
#define PF_STATE_LOCK_ASSERT(s) do {} while (0)
|
|
|
|
#endif /* INVARIANTS */
|
|
|
|
|
|
|
|
extern struct mtx pf_unlnkdrules_mtx;
|
|
|
|
#define PF_UNLNKDRULES_LOCK() mtx_lock(&pf_unlnkdrules_mtx)
|
|
|
|
#define PF_UNLNKDRULES_UNLOCK() mtx_unlock(&pf_unlnkdrules_mtx)
|
|
|
|
|
2018-05-30 07:11:33 +00:00
|
|
|
extern struct rmlock pf_rules_lock;
|
|
|
|
#define PF_RULES_RLOCK_TRACKER struct rm_priotracker _pf_rules_tracker
|
|
|
|
#define PF_RULES_RLOCK() rm_rlock(&pf_rules_lock, &_pf_rules_tracker)
|
|
|
|
#define PF_RULES_RUNLOCK() rm_runlock(&pf_rules_lock, &_pf_rules_tracker)
|
|
|
|
#define PF_RULES_WLOCK() rm_wlock(&pf_rules_lock)
|
|
|
|
#define PF_RULES_WUNLOCK() rm_wunlock(&pf_rules_lock)
|
|
|
|
#define PF_RULES_ASSERT() rm_assert(&pf_rules_lock, RA_LOCKED)
|
|
|
|
#define PF_RULES_RASSERT() rm_assert(&pf_rules_lock, RA_RLOCKED)
|
|
|
|
#define PF_RULES_WASSERT() rm_assert(&pf_rules_lock, RA_WLOCKED)
|
2004-02-26 02:34:12 +00:00
|
|
|
|
2017-03-22 21:18:18 +00:00
|
|
|
extern struct sx pf_end_lock;
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
#define PF_MODVER 1
|
|
|
|
#define PFLOG_MODVER 1
|
|
|
|
#define PFSYNC_MODVER 1
|
|
|
|
|
|
|
|
#define PFLOG_MINVER 1
|
|
|
|
#define PFLOG_PREFVER PFLOG_MODVER
|
|
|
|
#define PFLOG_MAXVER 1
|
|
|
|
#define PFSYNC_MINVER 1
|
|
|
|
#define PFSYNC_PREFVER PFSYNC_MODVER
|
|
|
|
#define PFSYNC_MAXVER 1
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
#ifdef INET
|
|
|
|
#ifndef INET6
|
2011-06-28 11:57:25 +00:00
|
|
|
#define PF_INET_ONLY
|
2004-02-26 02:04:28 +00:00
|
|
|
#endif /* ! INET6 */
|
|
|
|
#endif /* INET */
|
|
|
|
|
|
|
|
#ifdef INET6
|
|
|
|
#ifndef INET
|
2011-06-28 11:57:25 +00:00
|
|
|
#define PF_INET6_ONLY
|
2004-02-26 02:04:28 +00:00
|
|
|
#endif /* ! INET */
|
|
|
|
#endif /* INET6 */
|
|
|
|
|
|
|
|
#ifdef INET
|
|
|
|
#ifdef INET6
|
2011-06-28 11:57:25 +00:00
|
|
|
#define PF_INET_INET6
|
2004-02-26 02:04:28 +00:00
|
|
|
#endif /* INET6 */
|
|
|
|
#endif /* INET */
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
#define PF_INET_INET6
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
#endif /* _KERNEL */
|
|
|
|
|
|
|
|
/* Both IPv4 and IPv6 */
|
|
|
|
#ifdef PF_INET_INET6
|
|
|
|
|
|
|
|
#define PF_AEQ(a, b, c) \
|
|
|
|
((c == AF_INET && (a)->addr32[0] == (b)->addr32[0]) || \
|
2015-04-15 14:46:45 +00:00
|
|
|
(c == AF_INET6 && (a)->addr32[3] == (b)->addr32[3] && \
|
2004-02-26 02:04:28 +00:00
|
|
|
(a)->addr32[2] == (b)->addr32[2] && \
|
|
|
|
(a)->addr32[1] == (b)->addr32[1] && \
|
|
|
|
(a)->addr32[0] == (b)->addr32[0])) \
|
|
|
|
|
|
|
|
#define PF_ANEQ(a, b, c) \
|
2015-10-25 13:14:53 +00:00
|
|
|
((c == AF_INET && (a)->addr32[0] != (b)->addr32[0]) || \
|
2015-10-25 18:09:03 +00:00
|
|
|
(c == AF_INET6 && ((a)->addr32[0] != (b)->addr32[0] || \
|
2004-02-26 02:04:28 +00:00
|
|
|
(a)->addr32[1] != (b)->addr32[1] || \
|
2015-04-15 14:46:45 +00:00
|
|
|
(a)->addr32[2] != (b)->addr32[2] || \
|
2015-10-25 18:09:03 +00:00
|
|
|
(a)->addr32[3] != (b)->addr32[3]))) \
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
#define PF_AZERO(a, c) \
|
|
|
|
((c == AF_INET && !(a)->addr32[0]) || \
|
2015-04-15 14:46:45 +00:00
|
|
|
(c == AF_INET6 && !(a)->addr32[0] && !(a)->addr32[1] && \
|
2004-02-26 02:04:28 +00:00
|
|
|
!(a)->addr32[2] && !(a)->addr32[3] )) \
|
|
|
|
|
|
|
|
#define PF_MATCHA(n, a, m, b, f) \
|
|
|
|
pf_match_addr(n, a, m, b, f)
|
|
|
|
|
|
|
|
#define PF_ACPY(a, b, f) \
|
|
|
|
pf_addrcpy(a, b, f)
|
|
|
|
|
|
|
|
#define PF_AINC(a, f) \
|
|
|
|
pf_addr_inc(a, f)
|
|
|
|
|
|
|
|
#define PF_POOLMASK(a, b, c, d, f) \
|
|
|
|
pf_poolmask(a, b, c, d, f)
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
/* Just IPv6 */
|
|
|
|
|
|
|
|
#ifdef PF_INET6_ONLY
|
|
|
|
|
|
|
|
#define PF_AEQ(a, b, c) \
|
|
|
|
((a)->addr32[3] == (b)->addr32[3] && \
|
|
|
|
(a)->addr32[2] == (b)->addr32[2] && \
|
|
|
|
(a)->addr32[1] == (b)->addr32[1] && \
|
|
|
|
(a)->addr32[0] == (b)->addr32[0]) \
|
|
|
|
|
|
|
|
#define PF_ANEQ(a, b, c) \
|
|
|
|
((a)->addr32[3] != (b)->addr32[3] || \
|
|
|
|
(a)->addr32[2] != (b)->addr32[2] || \
|
|
|
|
(a)->addr32[1] != (b)->addr32[1] || \
|
|
|
|
(a)->addr32[0] != (b)->addr32[0]) \
|
|
|
|
|
|
|
|
#define PF_AZERO(a, c) \
|
|
|
|
(!(a)->addr32[0] && \
|
|
|
|
!(a)->addr32[1] && \
|
|
|
|
!(a)->addr32[2] && \
|
|
|
|
!(a)->addr32[3] ) \
|
|
|
|
|
|
|
|
#define PF_MATCHA(n, a, m, b, f) \
|
|
|
|
pf_match_addr(n, a, m, b, f)
|
|
|
|
|
|
|
|
#define PF_ACPY(a, b, f) \
|
|
|
|
pf_addrcpy(a, b, f)
|
|
|
|
|
|
|
|
#define PF_AINC(a, f) \
|
|
|
|
pf_addr_inc(a, f)
|
|
|
|
|
|
|
|
#define PF_POOLMASK(a, b, c, d, f) \
|
|
|
|
pf_poolmask(a, b, c, d, f)
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
/* Just IPv4 */
|
|
|
|
#ifdef PF_INET_ONLY
|
|
|
|
|
|
|
|
#define PF_AEQ(a, b, c) \
|
|
|
|
((a)->addr32[0] == (b)->addr32[0])
|
|
|
|
|
|
|
|
#define PF_ANEQ(a, b, c) \
|
|
|
|
((a)->addr32[0] != (b)->addr32[0])
|
|
|
|
|
|
|
|
#define PF_AZERO(a, c) \
|
|
|
|
(!(a)->addr32[0])
|
|
|
|
|
|
|
|
#define PF_MATCHA(n, a, m, b, f) \
|
|
|
|
pf_match_addr(n, a, m, b, f)
|
|
|
|
|
|
|
|
#define PF_ACPY(a, b, f) \
|
|
|
|
(a)->v4.s_addr = (b)->v4.s_addr
|
|
|
|
|
|
|
|
#define PF_AINC(a, f) \
|
|
|
|
do { \
|
|
|
|
(a)->addr32[0] = htonl(ntohl((a)->addr32[0]) + 1); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define PF_POOLMASK(a, b, c, d, f) \
|
|
|
|
do { \
|
|
|
|
(a)->addr32[0] = ((b)->addr32[0] & (c)->addr32[0]) | \
|
|
|
|
(((c)->addr32[0] ^ 0xffffffff ) & (d)->addr32[0]); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#endif /* PF_INET_ONLY */
|
|
|
|
#endif /* PF_INET6_ONLY */
|
|
|
|
#endif /* PF_INET_INET6 */
|
|
|
|
|
2012-02-03 13:20:48 +00:00
|
|
|
/*
|
|
|
|
* XXX callers not FIB-aware in our version of pf yet.
|
|
|
|
* OpenBSD fixed it later it seems, 2010/05/07 13:33:16 claudio.
|
|
|
|
*/
|
|
|
|
#define PF_MISMATCHAW(aw, x, af, neg, ifp, rtid) \
|
2007-07-03 12:16:07 +00:00
|
|
|
( \
|
|
|
|
(((aw)->type == PF_ADDR_NOROUTE && \
|
2012-02-03 13:20:48 +00:00
|
|
|
pf_routable((x), (af), NULL, (rtid))) || \
|
2007-07-03 12:16:07 +00:00
|
|
|
(((aw)->type == PF_ADDR_URPFFAILED && (ifp) != NULL && \
|
2012-02-03 13:20:48 +00:00
|
|
|
pf_routable((x), (af), (ifp), (rtid))) || \
|
2007-07-03 12:16:07 +00:00
|
|
|
((aw)->type == PF_ADDR_TABLE && \
|
|
|
|
!pfr_match_addr((aw)->p.tbl, (x), (af))) || \
|
|
|
|
((aw)->type == PF_ADDR_DYNIFTL && \
|
2011-06-28 11:57:25 +00:00
|
|
|
!pfi_match_addr((aw)->p.dyn, (x), (af))) || \
|
|
|
|
((aw)->type == PF_ADDR_RANGE && \
|
|
|
|
!pf_match_addr_range(&(aw)->v.a.addr, \
|
|
|
|
&(aw)->v.a.mask, (x), (af))) || \
|
2007-07-03 12:16:07 +00:00
|
|
|
((aw)->type == PF_ADDR_ADDRMASK && \
|
|
|
|
!PF_AZERO(&(aw)->v.a.mask, (af)) && \
|
|
|
|
!PF_MATCHA(0, &(aw)->v.a.addr, \
|
|
|
|
&(aw)->v.a.mask, (x), (af))))) != \
|
|
|
|
(neg) \
|
2004-02-26 02:04:28 +00:00
|
|
|
)
|
|
|
|
|
2020-12-20 20:06:32 +00:00
|
|
|
#define PF_ALGNMNT(off) (((off) % 2) == 0)
|
|
|
|
|
2020-12-23 13:51:52 +00:00
|
|
|
#ifdef _KERNEL
|
2020-12-05 13:32:54 +00:00
|
|
|
|
|
|
|
union pf_krule_ptr {
|
|
|
|
struct pf_krule *ptr;
|
|
|
|
u_int32_t nr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pf_krule {
|
|
|
|
struct pf_rule_addr src;
|
|
|
|
struct pf_rule_addr dst;
|
|
|
|
union pf_krule_ptr skip[PF_SKIP_COUNT];
|
|
|
|
char label[PF_RULE_LABEL_SIZE];
|
|
|
|
char ifname[IFNAMSIZ];
|
|
|
|
char qname[PF_QNAME_SIZE];
|
|
|
|
char pqname[PF_QNAME_SIZE];
|
|
|
|
char tagname[PF_TAG_NAME_SIZE];
|
|
|
|
char match_tagname[PF_TAG_NAME_SIZE];
|
|
|
|
|
|
|
|
char overload_tblname[PF_TABLE_NAME_SIZE];
|
|
|
|
|
|
|
|
TAILQ_ENTRY(pf_krule) entries;
|
|
|
|
struct pf_pool rpool;
|
|
|
|
|
|
|
|
u_int64_t evaluations;
|
|
|
|
u_int64_t packets[2];
|
|
|
|
u_int64_t bytes[2];
|
|
|
|
|
|
|
|
struct pfi_kif *kif;
|
|
|
|
struct pf_kanchor *anchor;
|
|
|
|
struct pfr_ktable *overload_tbl;
|
|
|
|
|
|
|
|
pf_osfp_t os_fingerprint;
|
|
|
|
|
|
|
|
int rtableid;
|
|
|
|
u_int32_t timeout[PFTM_MAX];
|
|
|
|
u_int32_t max_states;
|
|
|
|
u_int32_t max_src_nodes;
|
|
|
|
u_int32_t max_src_states;
|
|
|
|
u_int32_t max_src_conn;
|
|
|
|
struct {
|
|
|
|
u_int32_t limit;
|
|
|
|
u_int32_t seconds;
|
|
|
|
} max_src_conn_rate;
|
|
|
|
u_int32_t qid;
|
|
|
|
u_int32_t pqid;
|
|
|
|
u_int32_t rt_listid;
|
|
|
|
u_int32_t nr;
|
|
|
|
u_int32_t prob;
|
|
|
|
uid_t cuid;
|
|
|
|
pid_t cpid;
|
|
|
|
|
|
|
|
counter_u64_t states_cur;
|
|
|
|
counter_u64_t states_tot;
|
|
|
|
counter_u64_t src_nodes;
|
|
|
|
|
|
|
|
u_int16_t return_icmp;
|
|
|
|
u_int16_t return_icmp6;
|
|
|
|
u_int16_t max_mss;
|
|
|
|
u_int16_t tag;
|
|
|
|
u_int16_t match_tag;
|
|
|
|
u_int16_t scrub_flags;
|
|
|
|
|
|
|
|
struct pf_rule_uid uid;
|
|
|
|
struct pf_rule_gid gid;
|
|
|
|
|
|
|
|
u_int32_t rule_flag;
|
|
|
|
u_int8_t action;
|
|
|
|
u_int8_t direction;
|
|
|
|
u_int8_t log;
|
|
|
|
u_int8_t logif;
|
|
|
|
u_int8_t quick;
|
|
|
|
u_int8_t ifnot;
|
|
|
|
u_int8_t match_tag_not;
|
|
|
|
u_int8_t natpass;
|
|
|
|
|
|
|
|
u_int8_t keep_state;
|
|
|
|
sa_family_t af;
|
|
|
|
u_int8_t proto;
|
|
|
|
u_int8_t type;
|
|
|
|
u_int8_t code;
|
|
|
|
u_int8_t flags;
|
|
|
|
u_int8_t flagset;
|
|
|
|
u_int8_t min_ttl;
|
|
|
|
u_int8_t allow_opts;
|
|
|
|
u_int8_t rt;
|
|
|
|
u_int8_t return_ttl;
|
|
|
|
u_int8_t tos;
|
|
|
|
u_int8_t set_tos;
|
|
|
|
u_int8_t anchor_relative;
|
|
|
|
u_int8_t anchor_wildcard;
|
|
|
|
|
|
|
|
u_int8_t flush;
|
|
|
|
u_int8_t prio;
|
|
|
|
u_int8_t set_prio[2];
|
|
|
|
|
|
|
|
struct {
|
|
|
|
struct pf_addr addr;
|
|
|
|
u_int16_t port;
|
|
|
|
} divert;
|
|
|
|
};
|
|
|
|
|
2020-12-23 13:51:52 +00:00
|
|
|
struct pf_ksrc_node {
|
|
|
|
LIST_ENTRY(pf_ksrc_node) entry;
|
2004-06-16 23:24:02 +00:00
|
|
|
struct pf_addr addr;
|
|
|
|
struct pf_addr raddr;
|
2020-12-05 13:32:54 +00:00
|
|
|
union pf_krule_ptr rule;
|
2004-06-16 23:24:02 +00:00
|
|
|
struct pfi_kif *kif;
|
2020-11-13 19:31:51 +00:00
|
|
|
counter_u64_t bytes[2];
|
|
|
|
counter_u64_t packets[2];
|
2004-06-16 23:24:02 +00:00
|
|
|
u_int32_t states;
|
2005-05-03 16:43:32 +00:00
|
|
|
u_int32_t conn;
|
|
|
|
struct pf_threshold conn_rate;
|
2004-06-16 23:24:02 +00:00
|
|
|
u_int32_t creation;
|
|
|
|
u_int32_t expire;
|
|
|
|
sa_family_t af;
|
|
|
|
u_int8_t ruletype;
|
|
|
|
};
|
2020-12-23 13:51:52 +00:00
|
|
|
#endif
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
struct pf_state_scrub {
|
2005-05-03 16:43:32 +00:00
|
|
|
struct timeval pfss_last; /* time received last packet */
|
|
|
|
u_int32_t pfss_tsecr; /* last echoed timestamp */
|
|
|
|
u_int32_t pfss_tsval; /* largest timestamp */
|
|
|
|
u_int32_t pfss_tsval0; /* original timestamp */
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int16_t pfss_flags;
|
2005-05-03 16:43:32 +00:00
|
|
|
#define PFSS_TIMESTAMP 0x0001 /* modulate timestamp */
|
|
|
|
#define PFSS_PAWS 0x0010 /* stricter PAWS checks */
|
|
|
|
#define PFSS_PAWS_IDLED 0x0020 /* was idle too long. no PAWS */
|
|
|
|
#define PFSS_DATA_TS 0x0040 /* timestamp on data packets */
|
|
|
|
#define PFSS_DATA_NOTS 0x0080 /* no timestamp on data packets */
|
|
|
|
u_int8_t pfss_ttl; /* stashed TTL */
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int8_t pad;
|
2005-05-03 16:43:32 +00:00
|
|
|
u_int32_t pfss_ts_mod; /* timestamp modulation */
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct pf_state_host {
|
|
|
|
struct pf_addr addr;
|
|
|
|
u_int16_t port;
|
|
|
|
u_int16_t pad;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pf_state_peer {
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_state_scrub *scrub; /* state is scrubbed */
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int32_t seqlo; /* Max sequence number sent */
|
|
|
|
u_int32_t seqhi; /* Max the other end ACKd + win */
|
|
|
|
u_int32_t seqdiff; /* Sequence number modulator */
|
|
|
|
u_int16_t max_win; /* largest window (pre scaling) */
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int16_t mss; /* Maximum segment size option */
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int8_t state; /* active state level */
|
|
|
|
u_int8_t wscale; /* window scaling factor */
|
2007-07-03 12:16:07 +00:00
|
|
|
u_int8_t tcp_est; /* Did we reach TCPS_ESTABLISHED */
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int8_t pad[1];
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
/* Keep synced with struct pf_state_key. */
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_state_key_cmp {
|
|
|
|
struct pf_addr addr[2];
|
|
|
|
u_int16_t port[2];
|
2007-07-03 12:16:07 +00:00
|
|
|
sa_family_t af;
|
|
|
|
u_int8_t proto;
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int8_t pad[2];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pf_state_key {
|
|
|
|
struct pf_addr addr[2];
|
|
|
|
u_int16_t port[2];
|
|
|
|
sa_family_t af;
|
|
|
|
u_int8_t proto;
|
|
|
|
u_int8_t pad[2];
|
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
LIST_ENTRY(pf_state_key) entry;
|
|
|
|
TAILQ_HEAD(, pf_state) states[2];
|
2011-06-28 11:57:25 +00:00
|
|
|
};
|
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
/* Keep synced with struct pf_state. */
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_state_cmp {
|
|
|
|
u_int64_t id;
|
|
|
|
u_int32_t creatorid;
|
|
|
|
u_int8_t direction;
|
|
|
|
u_int8_t pad[3];
|
2007-07-03 12:16:07 +00:00
|
|
|
};
|
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
#define PFSTATE_ALLOWOPTS 0x01
|
|
|
|
#define PFSTATE_SLOPPY 0x02
|
|
|
|
/* was PFSTATE_PFLOW 0x04 */
|
|
|
|
#define PFSTATE_NOSYNC 0x08
|
|
|
|
#define PFSTATE_ACK 0x10
|
|
|
|
#define PFSTATE_SETPRIO 0x0200
|
|
|
|
#define PFSTATE_SETMASK (PFSTATE_SETPRIO)
|
|
|
|
|
|
|
|
#ifdef _KERNEL
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pf_state {
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int64_t id;
|
|
|
|
u_int32_t creatorid;
|
|
|
|
u_int8_t direction;
|
|
|
|
u_int8_t pad[3];
|
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
u_int refs;
|
2011-06-28 11:57:25 +00:00
|
|
|
TAILQ_ENTRY(pf_state) sync_list;
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
TAILQ_ENTRY(pf_state) key_list[2];
|
|
|
|
LIST_ENTRY(pf_state) entry;
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_state_peer src;
|
|
|
|
struct pf_state_peer dst;
|
2020-12-05 13:32:54 +00:00
|
|
|
union pf_krule_ptr rule;
|
|
|
|
union pf_krule_ptr anchor;
|
|
|
|
union pf_krule_ptr nat_rule;
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_addr rt_addr;
|
|
|
|
struct pf_state_key *key[2]; /* addresses stack and wire */
|
|
|
|
struct pfi_kif *kif;
|
|
|
|
struct pfi_kif *rt_kif;
|
2020-12-23 13:51:52 +00:00
|
|
|
struct pf_ksrc_node *src_node;
|
|
|
|
struct pf_ksrc_node *nat_src_node;
|
2020-12-23 08:37:59 +00:00
|
|
|
counter_u64_t packets[2];
|
|
|
|
counter_u64_t bytes[2];
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int32_t creation;
|
|
|
|
u_int32_t expire;
|
|
|
|
u_int32_t pfsync_time;
|
|
|
|
u_int16_t tag;
|
|
|
|
u_int8_t log;
|
|
|
|
u_int8_t state_flags;
|
|
|
|
u_int8_t timeout;
|
|
|
|
u_int8_t sync_state; /* PFSYNC_S_x */
|
|
|
|
|
|
|
|
/* XXX */
|
|
|
|
u_int8_t sync_updates;
|
|
|
|
u_int8_t _tail[3];
|
|
|
|
};
|
2020-12-05 13:32:54 +00:00
|
|
|
#endif
|
2011-06-28 11:57:25 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Unified state structures for pulling states out of the kernel
|
|
|
|
* used by pfsync(4) and the pf(4) ioctl.
|
|
|
|
*/
|
|
|
|
struct pfsync_state_scrub {
|
|
|
|
u_int16_t pfss_flags;
|
|
|
|
u_int8_t pfss_ttl; /* stashed TTL */
|
|
|
|
#define PFSYNC_SCRUB_FLAG_VALID 0x01
|
|
|
|
u_int8_t scrub_flag;
|
|
|
|
u_int32_t pfss_ts_mod; /* timestamp modulation */
|
|
|
|
} __packed;
|
|
|
|
|
|
|
|
struct pfsync_state_peer {
|
|
|
|
struct pfsync_state_scrub scrub; /* state is scrubbed */
|
|
|
|
u_int32_t seqlo; /* Max sequence number sent */
|
|
|
|
u_int32_t seqhi; /* Max the other end ACKd + win */
|
|
|
|
u_int32_t seqdiff; /* Sequence number modulator */
|
|
|
|
u_int16_t max_win; /* largest window (pre scaling) */
|
|
|
|
u_int16_t mss; /* Maximum segment size option */
|
|
|
|
u_int8_t state; /* active state level */
|
|
|
|
u_int8_t wscale; /* window scaling factor */
|
|
|
|
u_int8_t pad[6];
|
|
|
|
} __packed;
|
|
|
|
|
|
|
|
struct pfsync_state_key {
|
|
|
|
struct pf_addr addr[2];
|
|
|
|
u_int16_t port[2];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pfsync_state {
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
u_int64_t id;
|
2011-06-28 11:57:25 +00:00
|
|
|
char ifname[IFNAMSIZ];
|
|
|
|
struct pfsync_state_key key[2];
|
|
|
|
struct pfsync_state_peer src;
|
|
|
|
struct pfsync_state_peer dst;
|
|
|
|
struct pf_addr rt_addr;
|
|
|
|
u_int32_t rule;
|
|
|
|
u_int32_t anchor;
|
|
|
|
u_int32_t nat_rule;
|
|
|
|
u_int32_t creation;
|
|
|
|
u_int32_t expire;
|
|
|
|
u_int32_t packets[2][2];
|
|
|
|
u_int32_t bytes[2][2];
|
2007-07-03 12:16:07 +00:00
|
|
|
u_int32_t creatorid;
|
|
|
|
sa_family_t af;
|
|
|
|
u_int8_t proto;
|
|
|
|
u_int8_t direction;
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
u_int8_t __spare[2];
|
2007-07-03 12:16:07 +00:00
|
|
|
u_int8_t log;
|
2009-12-24 00:43:44 +00:00
|
|
|
u_int8_t state_flags;
|
2007-07-03 12:16:07 +00:00
|
|
|
u_int8_t timeout;
|
|
|
|
u_int8_t sync_flags;
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int8_t updates;
|
|
|
|
} __packed;
|
|
|
|
|
|
|
|
#ifdef _KERNEL
|
|
|
|
/* pfsync */
|
|
|
|
typedef int pfsync_state_import_t(struct pfsync_state *, u_int8_t);
|
|
|
|
typedef void pfsync_insert_state_t(struct pf_state *);
|
|
|
|
typedef void pfsync_update_state_t(struct pf_state *);
|
|
|
|
typedef void pfsync_delete_state_t(struct pf_state *);
|
|
|
|
typedef void pfsync_clear_states_t(u_int32_t, const char *);
|
|
|
|
typedef int pfsync_defer_t(struct pf_state *, struct mbuf *);
|
2018-11-02 16:57:23 +00:00
|
|
|
typedef void pfsync_detach_ifnet_t(struct ifnet *);
|
2011-06-28 11:57:25 +00:00
|
|
|
|
2018-11-02 16:47:07 +00:00
|
|
|
VNET_DECLARE(pfsync_state_import_t *, pfsync_state_import_ptr);
|
|
|
|
#define V_pfsync_state_import_ptr VNET(pfsync_state_import_ptr)
|
|
|
|
VNET_DECLARE(pfsync_insert_state_t *, pfsync_insert_state_ptr);
|
|
|
|
#define V_pfsync_insert_state_ptr VNET(pfsync_insert_state_ptr)
|
|
|
|
VNET_DECLARE(pfsync_update_state_t *, pfsync_update_state_ptr);
|
|
|
|
#define V_pfsync_update_state_ptr VNET(pfsync_update_state_ptr)
|
|
|
|
VNET_DECLARE(pfsync_delete_state_t *, pfsync_delete_state_ptr);
|
|
|
|
#define V_pfsync_delete_state_ptr VNET(pfsync_delete_state_ptr)
|
|
|
|
VNET_DECLARE(pfsync_clear_states_t *, pfsync_clear_states_ptr);
|
|
|
|
#define V_pfsync_clear_states_ptr VNET(pfsync_clear_states_ptr)
|
|
|
|
VNET_DECLARE(pfsync_defer_t *, pfsync_defer_ptr);
|
|
|
|
#define V_pfsync_defer_ptr VNET(pfsync_defer_ptr)
|
2018-11-02 16:57:23 +00:00
|
|
|
extern pfsync_detach_ifnet_t *pfsync_detach_ifnet_ptr;
|
2011-06-28 11:57:25 +00:00
|
|
|
|
|
|
|
void pfsync_state_export(struct pfsync_state *,
|
|
|
|
struct pf_state *);
|
|
|
|
|
|
|
|
/* pflog */
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_kruleset;
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_pdesc;
|
|
|
|
typedef int pflog_packet_t(struct pfi_kif *, struct mbuf *, sa_family_t,
|
2020-12-05 13:32:54 +00:00
|
|
|
u_int8_t, u_int8_t, struct pf_krule *, struct pf_krule *,
|
|
|
|
struct pf_kruleset *, struct pf_pdesc *, int);
|
2011-06-28 11:57:25 +00:00
|
|
|
extern pflog_packet_t *pflog_packet_ptr;
|
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#endif /* _KERNEL */
|
2011-06-28 11:57:25 +00:00
|
|
|
|
|
|
|
#define PFSYNC_FLAG_SRCNODE 0x04
|
|
|
|
#define PFSYNC_FLAG_NATSRCNODE 0x08
|
|
|
|
|
|
|
|
/* for copies to/from network byte order */
|
|
|
|
/* ioctl interface also uses network byte order */
|
|
|
|
#define pf_state_peer_hton(s,d) do { \
|
|
|
|
(d)->seqlo = htonl((s)->seqlo); \
|
|
|
|
(d)->seqhi = htonl((s)->seqhi); \
|
|
|
|
(d)->seqdiff = htonl((s)->seqdiff); \
|
|
|
|
(d)->max_win = htons((s)->max_win); \
|
|
|
|
(d)->mss = htons((s)->mss); \
|
|
|
|
(d)->state = (s)->state; \
|
|
|
|
(d)->wscale = (s)->wscale; \
|
|
|
|
if ((s)->scrub) { \
|
|
|
|
(d)->scrub.pfss_flags = \
|
|
|
|
htons((s)->scrub->pfss_flags & PFSS_TIMESTAMP); \
|
|
|
|
(d)->scrub.pfss_ttl = (s)->scrub->pfss_ttl; \
|
|
|
|
(d)->scrub.pfss_ts_mod = htonl((s)->scrub->pfss_ts_mod);\
|
|
|
|
(d)->scrub.scrub_flag = PFSYNC_SCRUB_FLAG_VALID; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define pf_state_peer_ntoh(s,d) do { \
|
|
|
|
(d)->seqlo = ntohl((s)->seqlo); \
|
|
|
|
(d)->seqhi = ntohl((s)->seqhi); \
|
|
|
|
(d)->seqdiff = ntohl((s)->seqdiff); \
|
|
|
|
(d)->max_win = ntohs((s)->max_win); \
|
|
|
|
(d)->mss = ntohs((s)->mss); \
|
|
|
|
(d)->state = (s)->state; \
|
|
|
|
(d)->wscale = (s)->wscale; \
|
|
|
|
if ((s)->scrub.scrub_flag == PFSYNC_SCRUB_FLAG_VALID && \
|
|
|
|
(d)->scrub != NULL) { \
|
|
|
|
(d)->scrub->pfss_flags = \
|
|
|
|
ntohs((s)->scrub.pfss_flags) & PFSS_TIMESTAMP; \
|
|
|
|
(d)->scrub->pfss_ttl = (s)->scrub.pfss_ttl; \
|
|
|
|
(d)->scrub->pfss_ts_mod = ntohl((s)->scrub.pfss_ts_mod);\
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define pf_state_counter_hton(s,d) do { \
|
|
|
|
d[0] = htonl((s>>32)&0xffffffff); \
|
|
|
|
d[1] = htonl(s&0xffffffff); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define pf_state_counter_from_pfsync(s) \
|
|
|
|
(((u_int64_t)(s[0])<<32) | (u_int64_t)(s[1]))
|
|
|
|
|
|
|
|
#define pf_state_counter_ntoh(s,d) do { \
|
|
|
|
d = ntohl(s[0]); \
|
|
|
|
d = d<<32; \
|
|
|
|
d += ntohl(s[1]); \
|
|
|
|
} while (0)
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
TAILQ_HEAD(pf_krulequeue, pf_krule);
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_kanchor;
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_kruleset {
|
2004-02-26 02:04:28 +00:00
|
|
|
struct {
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_krulequeue queues[2];
|
2004-02-26 02:04:28 +00:00
|
|
|
struct {
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_krulequeue *ptr;
|
|
|
|
struct pf_krule **ptr_array;
|
2007-07-03 12:16:07 +00:00
|
|
|
u_int32_t rcount;
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int32_t ticket;
|
2004-06-16 23:24:02 +00:00
|
|
|
int open;
|
2004-02-26 02:04:28 +00:00
|
|
|
} active, inactive;
|
|
|
|
} rules[PF_RULESET_MAX];
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_kanchor *anchor;
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int32_t tticket;
|
|
|
|
int tables;
|
|
|
|
int topen;
|
|
|
|
};
|
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
RB_HEAD(pf_kanchor_global, pf_kanchor);
|
|
|
|
RB_HEAD(pf_kanchor_node, pf_kanchor);
|
|
|
|
struct pf_kanchor {
|
|
|
|
RB_ENTRY(pf_kanchor) entry_global;
|
|
|
|
RB_ENTRY(pf_kanchor) entry_node;
|
|
|
|
struct pf_kanchor *parent;
|
|
|
|
struct pf_kanchor_node children;
|
2004-02-26 02:04:28 +00:00
|
|
|
char name[PF_ANCHOR_NAME_SIZE];
|
2005-05-03 16:43:32 +00:00
|
|
|
char path[MAXPATHLEN];
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_kruleset ruleset;
|
2005-05-03 16:43:32 +00:00
|
|
|
int refcnt; /* anchor rules */
|
Make ruleset anchors in pf(4) reentrant. We've got two problems here:
1) Ruleset parser uses a global variable for anchor stack.
2) When processing a wildcard anchor, matching anchors are marked.
To fix the first one:
o Allocate anchor processing stack on stack. To make this allocation
as small as possible, following measures taken:
- Maximum stack size reduced from 64 to 32.
- The struct pf_anchor_stackframe trimmed by one pointer - parent.
We can always obtain the parent via the rule pointer.
- When pf_test_rule() calls pf_get_translation(), the former lends
its stack to the latter, to avoid recursive allocation 32 entries.
The second one appeared more tricky. The code, that marks anchors was
added in OpenBSD rev. 1.516 of pf.c. According to commit log, the idea
is to enable the "quick" keyword on an anchor rule. The feature isn't
documented anywhere. The most obscure part of the 1.516 was that code
examines the "match" mark on a just processed child, which couldn't be
put here by current frame. Since this wasn't documented even in the
commit message and functionality of this is not clear to me, I decided
to drop this examination for now. The rest of 1.516 is redone in a
thread safe manner - the mark isn't put on the anchor itself, but on
current stack frame. To avoid growing stack frame, we utilize LSB
from the rule pointer, relying on kernel malloc(9) returning pointer
aligned addresses.
Discussed with: dhartmei
2012-09-18 10:54:56 +00:00
|
|
|
int match; /* XXX: used for pfctl black magic */
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
2020-12-05 13:32:54 +00:00
|
|
|
RB_PROTOTYPE(pf_kanchor_global, pf_kanchor, entry_global, pf_anchor_compare);
|
|
|
|
RB_PROTOTYPE(pf_kanchor_node, pf_kanchor, entry_node, pf_kanchor_compare);
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2004-06-16 23:24:02 +00:00
|
|
|
#define PF_RESERVED_ANCHOR "_pf"
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
#define PFR_TFLAG_PERSIST 0x00000001
|
|
|
|
#define PFR_TFLAG_CONST 0x00000002
|
|
|
|
#define PFR_TFLAG_ACTIVE 0x00000004
|
|
|
|
#define PFR_TFLAG_INACTIVE 0x00000008
|
|
|
|
#define PFR_TFLAG_REFERENCED 0x00000010
|
|
|
|
#define PFR_TFLAG_REFDANCHOR 0x00000020
|
2011-06-28 11:57:25 +00:00
|
|
|
#define PFR_TFLAG_COUNTERS 0x00000040
|
|
|
|
/* Adjust masks below when adding flags. */
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#define PFR_TFLAG_USRMASK (PFR_TFLAG_PERSIST | \
|
|
|
|
PFR_TFLAG_CONST | \
|
|
|
|
PFR_TFLAG_COUNTERS)
|
|
|
|
#define PFR_TFLAG_SETMASK (PFR_TFLAG_ACTIVE | \
|
|
|
|
PFR_TFLAG_INACTIVE | \
|
|
|
|
PFR_TFLAG_REFERENCED | \
|
|
|
|
PFR_TFLAG_REFDANCHOR)
|
|
|
|
#define PFR_TFLAG_ALLMASK (PFR_TFLAG_PERSIST | \
|
|
|
|
PFR_TFLAG_CONST | \
|
|
|
|
PFR_TFLAG_ACTIVE | \
|
|
|
|
PFR_TFLAG_INACTIVE | \
|
|
|
|
PFR_TFLAG_REFERENCED | \
|
|
|
|
PFR_TFLAG_REFDANCHOR | \
|
|
|
|
PFR_TFLAG_COUNTERS)
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_kanchor_stackframe;
|
Make ruleset anchors in pf(4) reentrant. We've got two problems here:
1) Ruleset parser uses a global variable for anchor stack.
2) When processing a wildcard anchor, matching anchors are marked.
To fix the first one:
o Allocate anchor processing stack on stack. To make this allocation
as small as possible, following measures taken:
- Maximum stack size reduced from 64 to 32.
- The struct pf_anchor_stackframe trimmed by one pointer - parent.
We can always obtain the parent via the rule pointer.
- When pf_test_rule() calls pf_get_translation(), the former lends
its stack to the latter, to avoid recursive allocation 32 entries.
The second one appeared more tricky. The code, that marks anchors was
added in OpenBSD rev. 1.516 of pf.c. According to commit log, the idea
is to enable the "quick" keyword on an anchor rule. The feature isn't
documented anywhere. The most obscure part of the 1.516 was that code
examines the "match" mark on a just processed child, which couldn't be
put here by current frame. Since this wasn't documented even in the
commit message and functionality of this is not clear to me, I decided
to drop this examination for now. The rest of 1.516 is redone in a
thread safe manner - the mark isn't put on the anchor itself, but on
current stack frame. To avoid growing stack frame, we utilize LSB
from the rule pointer, relying on kernel malloc(9) returning pointer
aligned addresses.
Discussed with: dhartmei
2012-09-18 10:54:56 +00:00
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pfr_table {
|
2005-05-03 16:43:32 +00:00
|
|
|
char pfrt_anchor[MAXPATHLEN];
|
2004-02-26 02:04:28 +00:00
|
|
|
char pfrt_name[PF_TABLE_NAME_SIZE];
|
|
|
|
u_int32_t pfrt_flags;
|
|
|
|
u_int8_t pfrt_fback;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum { PFR_FB_NONE, PFR_FB_MATCH, PFR_FB_ADDED, PFR_FB_DELETED,
|
|
|
|
PFR_FB_CHANGED, PFR_FB_CLEARED, PFR_FB_DUPLICATE,
|
2011-06-28 11:57:25 +00:00
|
|
|
PFR_FB_NOTMATCH, PFR_FB_CONFLICT, PFR_FB_NOCOUNT, PFR_FB_MAX };
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
struct pfr_addr {
|
|
|
|
union {
|
|
|
|
struct in_addr _pfra_ip4addr;
|
|
|
|
struct in6_addr _pfra_ip6addr;
|
|
|
|
} pfra_u;
|
|
|
|
u_int8_t pfra_af;
|
|
|
|
u_int8_t pfra_net;
|
|
|
|
u_int8_t pfra_not;
|
|
|
|
u_int8_t pfra_fback;
|
|
|
|
};
|
|
|
|
#define pfra_ip4addr pfra_u._pfra_ip4addr
|
|
|
|
#define pfra_ip6addr pfra_u._pfra_ip6addr
|
|
|
|
|
|
|
|
enum { PFR_DIR_IN, PFR_DIR_OUT, PFR_DIR_MAX };
|
|
|
|
enum { PFR_OP_BLOCK, PFR_OP_PASS, PFR_OP_ADDR_MAX, PFR_OP_TABLE_MAX };
|
2020-05-16 00:28:12 +00:00
|
|
|
enum { PFR_TYPE_PACKETS, PFR_TYPE_BYTES, PFR_TYPE_MAX };
|
|
|
|
#define PFR_NUM_COUNTERS (PFR_DIR_MAX * PFR_OP_ADDR_MAX * PFR_TYPE_MAX)
|
2004-02-26 02:04:28 +00:00
|
|
|
#define PFR_OP_XPASS PFR_OP_ADDR_MAX
|
|
|
|
|
|
|
|
struct pfr_astats {
|
|
|
|
struct pfr_addr pfras_a;
|
|
|
|
u_int64_t pfras_packets[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
|
|
|
|
u_int64_t pfras_bytes[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
|
|
|
|
long pfras_tzero;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum { PFR_REFCNT_RULE, PFR_REFCNT_ANCHOR, PFR_REFCNT_MAX };
|
|
|
|
|
|
|
|
struct pfr_tstats {
|
|
|
|
struct pfr_table pfrts_t;
|
|
|
|
u_int64_t pfrts_packets[PFR_DIR_MAX][PFR_OP_TABLE_MAX];
|
|
|
|
u_int64_t pfrts_bytes[PFR_DIR_MAX][PFR_OP_TABLE_MAX];
|
|
|
|
u_int64_t pfrts_match;
|
|
|
|
u_int64_t pfrts_nomatch;
|
|
|
|
long pfrts_tzero;
|
|
|
|
int pfrts_cnt;
|
|
|
|
int pfrts_refcnt[PFR_REFCNT_MAX];
|
|
|
|
};
|
2019-03-15 11:08:44 +00:00
|
|
|
|
|
|
|
struct pfr_ktstats {
|
|
|
|
struct pfr_table pfrts_t;
|
|
|
|
counter_u64_t pfrkts_packets[PFR_DIR_MAX][PFR_OP_TABLE_MAX];
|
|
|
|
counter_u64_t pfrkts_bytes[PFR_DIR_MAX][PFR_OP_TABLE_MAX];
|
|
|
|
counter_u64_t pfrkts_match;
|
|
|
|
counter_u64_t pfrkts_nomatch;
|
|
|
|
long pfrkts_tzero;
|
|
|
|
int pfrkts_cnt;
|
|
|
|
int pfrkts_refcnt[PFR_REFCNT_MAX];
|
|
|
|
};
|
2004-02-26 02:04:28 +00:00
|
|
|
#define pfrts_name pfrts_t.pfrt_name
|
|
|
|
#define pfrts_flags pfrts_t.pfrt_flags
|
|
|
|
|
2004-09-23 12:44:40 +00:00
|
|
|
#ifndef _SOCKADDR_UNION_DEFINED
|
|
|
|
#define _SOCKADDR_UNION_DEFINED
|
|
|
|
union sockaddr_union {
|
|
|
|
struct sockaddr sa;
|
|
|
|
struct sockaddr_in sin;
|
|
|
|
struct sockaddr_in6 sin6;
|
|
|
|
};
|
|
|
|
#endif /* _SOCKADDR_UNION_DEFINED */
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pfr_kcounters {
|
2020-05-16 00:28:12 +00:00
|
|
|
counter_u64_t pfrkc_counters;
|
2019-03-15 11:08:44 +00:00
|
|
|
long pfrkc_tzero;
|
2011-06-28 11:57:25 +00:00
|
|
|
};
|
2020-05-16 00:28:12 +00:00
|
|
|
#define pfr_kentry_counter(kc, dir, op, t) \
|
|
|
|
((kc)->pfrkc_counters + \
|
|
|
|
(dir) * PFR_OP_ADDR_MAX * PFR_TYPE_MAX + (op) * PFR_TYPE_MAX + (t))
|
2011-06-28 11:57:25 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
#ifdef _KERNEL
|
2004-02-26 02:04:28 +00:00
|
|
|
SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
|
|
|
|
struct pfr_kentry {
|
|
|
|
struct radix_node pfrke_node[2];
|
|
|
|
union sockaddr_union pfrke_sa;
|
|
|
|
SLIST_ENTRY(pfr_kentry) pfrke_workq;
|
2019-03-15 11:08:44 +00:00
|
|
|
struct pfr_kcounters pfrke_counters;
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int8_t pfrke_af;
|
|
|
|
u_int8_t pfrke_net;
|
|
|
|
u_int8_t pfrke_not;
|
|
|
|
u_int8_t pfrke_mark;
|
|
|
|
};
|
|
|
|
|
|
|
|
SLIST_HEAD(pfr_ktableworkq, pfr_ktable);
|
|
|
|
RB_HEAD(pfr_ktablehead, pfr_ktable);
|
|
|
|
struct pfr_ktable {
|
2019-03-15 11:08:44 +00:00
|
|
|
struct pfr_ktstats pfrkt_kts;
|
2004-02-26 02:04:28 +00:00
|
|
|
RB_ENTRY(pfr_ktable) pfrkt_tree;
|
|
|
|
SLIST_ENTRY(pfr_ktable) pfrkt_workq;
|
|
|
|
struct radix_node_head *pfrkt_ip4;
|
|
|
|
struct radix_node_head *pfrkt_ip6;
|
|
|
|
struct pfr_ktable *pfrkt_shadow;
|
|
|
|
struct pfr_ktable *pfrkt_root;
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_kruleset *pfrkt_rs;
|
2004-06-16 23:24:02 +00:00
|
|
|
long pfrkt_larg;
|
2004-02-26 02:04:28 +00:00
|
|
|
int pfrkt_nflags;
|
|
|
|
};
|
2019-03-15 11:08:44 +00:00
|
|
|
#define pfrkt_t pfrkt_kts.pfrts_t
|
2004-02-26 02:04:28 +00:00
|
|
|
#define pfrkt_name pfrkt_t.pfrt_name
|
2004-06-16 23:24:02 +00:00
|
|
|
#define pfrkt_anchor pfrkt_t.pfrt_anchor
|
|
|
|
#define pfrkt_ruleset pfrkt_t.pfrt_ruleset
|
2004-02-26 02:04:28 +00:00
|
|
|
#define pfrkt_flags pfrkt_t.pfrt_flags
|
2019-03-15 11:08:44 +00:00
|
|
|
#define pfrkt_cnt pfrkt_kts.pfrkts_cnt
|
|
|
|
#define pfrkt_refcnt pfrkt_kts.pfrkts_refcnt
|
|
|
|
#define pfrkt_packets pfrkt_kts.pfrkts_packets
|
|
|
|
#define pfrkt_bytes pfrkt_kts.pfrkts_bytes
|
|
|
|
#define pfrkt_match pfrkt_kts.pfrkts_match
|
|
|
|
#define pfrkt_nomatch pfrkt_kts.pfrkts_nomatch
|
|
|
|
#define pfrkt_tzero pfrkt_kts.pfrkts_tzero
|
2020-12-05 13:32:54 +00:00
|
|
|
#endif
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2007-07-03 12:16:07 +00:00
|
|
|
/* keep synced with pfi_kif, used in RB_FIND */
|
|
|
|
struct pfi_kif_cmp {
|
|
|
|
char pfik_name[IFNAMSIZ];
|
|
|
|
};
|
|
|
|
|
2004-06-16 23:24:02 +00:00
|
|
|
struct pfi_kif {
|
2007-07-03 12:16:07 +00:00
|
|
|
char pfik_name[IFNAMSIZ];
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
union {
|
|
|
|
RB_ENTRY(pfi_kif) _pfik_tree;
|
|
|
|
LIST_ENTRY(pfi_kif) _pfik_list;
|
|
|
|
} _pfik_glue;
|
|
|
|
#define pfik_tree _pfik_glue._pfik_tree
|
|
|
|
#define pfik_list _pfik_glue._pfik_list
|
2007-07-03 12:16:07 +00:00
|
|
|
u_int64_t pfik_packets[2][2][2];
|
|
|
|
u_int64_t pfik_bytes[2][2][2];
|
|
|
|
u_int32_t pfik_tzero;
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
u_int pfik_flags;
|
2004-06-16 23:24:02 +00:00
|
|
|
struct ifnet *pfik_ifp;
|
2007-07-03 12:16:07 +00:00
|
|
|
struct ifg_group *pfik_group;
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
u_int pfik_rulerefs;
|
2007-07-03 12:16:07 +00:00
|
|
|
TAILQ_HEAD(, pfi_dynaddr) pfik_dynaddrs;
|
2004-06-16 23:24:02 +00:00
|
|
|
};
|
2007-07-03 12:16:07 +00:00
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#define PFI_IFLAG_REFS 0x0001 /* has state references */
|
2005-05-03 16:43:32 +00:00
|
|
|
#define PFI_IFLAG_SKIP 0x0100 /* skip filtering on interface */
|
2004-06-16 23:24:02 +00:00
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pf_pdesc {
|
2007-07-03 12:16:07 +00:00
|
|
|
struct {
|
|
|
|
int done;
|
|
|
|
uid_t uid;
|
|
|
|
gid_t gid;
|
|
|
|
} lookup;
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int64_t tot_len; /* Make Mickey money */
|
|
|
|
union {
|
|
|
|
struct tcphdr *tcp;
|
|
|
|
struct udphdr *udp;
|
|
|
|
struct icmp *icmp;
|
|
|
|
#ifdef INET6
|
|
|
|
struct icmp6_hdr *icmp6;
|
|
|
|
#endif /* INET6 */
|
|
|
|
void *any;
|
|
|
|
} hdr;
|
2011-06-28 11:57:25 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_krule *nat_rule; /* nat/rdr rule applied to packet */
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_addr *src; /* src address */
|
|
|
|
struct pf_addr *dst; /* dst address */
|
|
|
|
u_int16_t *sport;
|
|
|
|
u_int16_t *dport;
|
2007-07-03 12:16:07 +00:00
|
|
|
struct pf_mtag *pf_mtag;
|
2011-06-28 11:57:25 +00:00
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int32_t p_len; /* total length of payload */
|
2011-06-28 11:57:25 +00:00
|
|
|
|
|
|
|
u_int16_t *ip_sum;
|
|
|
|
u_int16_t *proto_sum;
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int16_t flags; /* Let SCRUB trigger behavior in
|
|
|
|
* state code. Easier than tags */
|
|
|
|
#define PFDESC_TCP_NORM 0x0001 /* TCP shall be statefully scrubbed */
|
2005-05-03 16:43:32 +00:00
|
|
|
#define PFDESC_IP_REAS 0x0002 /* IP frags would've been reassembled */
|
2004-02-26 02:04:28 +00:00
|
|
|
sa_family_t af;
|
|
|
|
u_int8_t proto;
|
|
|
|
u_int8_t tos;
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int8_t dir; /* direction */
|
|
|
|
u_int8_t sidx; /* key index for source */
|
|
|
|
u_int8_t didx; /* key index for destination */
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* flags for RDR options */
|
|
|
|
#define PF_DPORT_RANGE 0x01 /* Dest port uses range */
|
|
|
|
#define PF_RPORT_RANGE 0x02 /* RDR'ed port uses range */
|
|
|
|
|
|
|
|
/* UDP state enumeration */
|
|
|
|
#define PFUDPS_NO_TRAFFIC 0
|
|
|
|
#define PFUDPS_SINGLE 1
|
|
|
|
#define PFUDPS_MULTIPLE 2
|
|
|
|
|
|
|
|
#define PFUDPS_NSTATES 3 /* number of state levels */
|
|
|
|
|
|
|
|
#define PFUDPS_NAMES { \
|
|
|
|
"NO_TRAFFIC", \
|
|
|
|
"SINGLE", \
|
|
|
|
"MULTIPLE", \
|
|
|
|
NULL \
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Other protocol state enumeration */
|
|
|
|
#define PFOTHERS_NO_TRAFFIC 0
|
|
|
|
#define PFOTHERS_SINGLE 1
|
|
|
|
#define PFOTHERS_MULTIPLE 2
|
|
|
|
|
|
|
|
#define PFOTHERS_NSTATES 3 /* number of state levels */
|
|
|
|
|
|
|
|
#define PFOTHERS_NAMES { \
|
|
|
|
"NO_TRAFFIC", \
|
|
|
|
"SINGLE", \
|
|
|
|
"MULTIPLE", \
|
|
|
|
NULL \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define ACTION_SET(a, x) \
|
|
|
|
do { \
|
|
|
|
if ((a) != NULL) \
|
|
|
|
*(a) = (x); \
|
|
|
|
} while (0)
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
#define REASON_SET(a, x) \
|
|
|
|
do { \
|
|
|
|
if ((a) != NULL) \
|
|
|
|
*(a) = (x); \
|
|
|
|
if (x < PFRES_MAX) \
|
2014-08-14 18:57:46 +00:00
|
|
|
counter_u64_add(V_pf_status.counters[x], 1); \
|
2011-06-28 11:57:25 +00:00
|
|
|
} while (0)
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2014-08-14 18:57:46 +00:00
|
|
|
struct pf_kstatus {
|
|
|
|
counter_u64_t counters[PFRES_MAX]; /* reason for passing/dropping */
|
|
|
|
counter_u64_t lcounters[LCNT_MAX]; /* limit counters */
|
|
|
|
counter_u64_t fcounters[FCNT_MAX]; /* state operation counters */
|
|
|
|
counter_u64_t scounters[SCNT_MAX]; /* src_node operation counters */
|
|
|
|
uint32_t states;
|
|
|
|
uint32_t src_nodes;
|
|
|
|
uint32_t running;
|
|
|
|
uint32_t since;
|
|
|
|
uint32_t debug;
|
|
|
|
uint32_t hostid;
|
2004-02-26 02:04:28 +00:00
|
|
|
char ifname[IFNAMSIZ];
|
2014-08-14 18:57:46 +00:00
|
|
|
uint8_t pf_chksum[PF_MD5_DIGEST_LENGTH];
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_divert {
|
|
|
|
union {
|
|
|
|
struct in_addr ipv4;
|
|
|
|
struct in6_addr ipv6;
|
|
|
|
} addr;
|
|
|
|
u_int16_t port;
|
|
|
|
};
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
#define PFFRAG_FRENT_HIWAT 5000 /* Number of fragment entries */
|
2007-07-03 12:16:07 +00:00
|
|
|
#define PFR_KENTRY_HIWAT 200000 /* Number of table entries */
|
|
|
|
|
2018-11-02 15:26:51 +00:00
|
|
|
/*
|
|
|
|
* Limit the length of the fragment queue traversal. Remember
|
|
|
|
* search entry points based on the fragment offset.
|
|
|
|
*/
|
|
|
|
#define PF_FRAG_ENTRY_POINTS 16
|
|
|
|
|
2018-11-02 15:32:04 +00:00
|
|
|
/*
|
|
|
|
* The number of entries in the fragment queue must be limited
|
|
|
|
* to avoid DoS by linear seaching. Instead of a global limit,
|
|
|
|
* use a limit per entry point. For large packets these sum up.
|
|
|
|
*/
|
|
|
|
#define PF_FRAG_ENTRY_LIMIT 64
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
/*
|
|
|
|
* ioctl parameter structures
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct pfioc_pooladdr {
|
|
|
|
u_int32_t action;
|
|
|
|
u_int32_t ticket;
|
|
|
|
u_int32_t nr;
|
|
|
|
u_int32_t r_num;
|
|
|
|
u_int8_t r_action;
|
|
|
|
u_int8_t r_last;
|
|
|
|
u_int8_t af;
|
2005-05-03 16:43:32 +00:00
|
|
|
char anchor[MAXPATHLEN];
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pf_pooladdr addr;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pfioc_rule {
|
|
|
|
u_int32_t action;
|
|
|
|
u_int32_t ticket;
|
|
|
|
u_int32_t pool_ticket;
|
|
|
|
u_int32_t nr;
|
2005-05-03 16:43:32 +00:00
|
|
|
char anchor[MAXPATHLEN];
|
|
|
|
char anchor_call[MAXPATHLEN];
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pf_rule rule;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pfioc_natlook {
|
|
|
|
struct pf_addr saddr;
|
|
|
|
struct pf_addr daddr;
|
|
|
|
struct pf_addr rsaddr;
|
|
|
|
struct pf_addr rdaddr;
|
|
|
|
u_int16_t sport;
|
|
|
|
u_int16_t dport;
|
|
|
|
u_int16_t rsport;
|
|
|
|
u_int16_t rdport;
|
|
|
|
sa_family_t af;
|
|
|
|
u_int8_t proto;
|
|
|
|
u_int8_t direction;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pfioc_state {
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pfsync_state state;
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
2007-07-03 12:16:07 +00:00
|
|
|
struct pfioc_src_node_kill {
|
|
|
|
sa_family_t psnk_af;
|
|
|
|
struct pf_rule_addr psnk_src;
|
|
|
|
struct pf_rule_addr psnk_dst;
|
2011-06-28 11:57:25 +00:00
|
|
|
u_int psnk_killed;
|
2007-07-03 12:16:07 +00:00
|
|
|
};
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pfioc_state_kill {
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_state_cmp psk_pfcmp;
|
2004-02-26 02:04:28 +00:00
|
|
|
sa_family_t psk_af;
|
|
|
|
int psk_proto;
|
|
|
|
struct pf_rule_addr psk_src;
|
|
|
|
struct pf_rule_addr psk_dst;
|
2004-06-16 23:24:02 +00:00
|
|
|
char psk_ifname[IFNAMSIZ];
|
2011-06-28 11:57:25 +00:00
|
|
|
char psk_label[PF_RULE_LABEL_SIZE];
|
|
|
|
u_int psk_killed;
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct pfioc_states {
|
|
|
|
int ps_len;
|
|
|
|
union {
|
2011-06-28 11:57:25 +00:00
|
|
|
caddr_t psu_buf;
|
|
|
|
struct pfsync_state *psu_states;
|
2004-02-26 02:04:28 +00:00
|
|
|
} ps_u;
|
|
|
|
#define ps_buf ps_u.psu_buf
|
|
|
|
#define ps_states ps_u.psu_states
|
|
|
|
};
|
|
|
|
|
2004-06-16 23:24:02 +00:00
|
|
|
struct pfioc_src_nodes {
|
|
|
|
int psn_len;
|
|
|
|
union {
|
|
|
|
caddr_t psu_buf;
|
|
|
|
struct pf_src_node *psu_src_nodes;
|
|
|
|
} psn_u;
|
|
|
|
#define psn_buf psn_u.psu_buf
|
|
|
|
#define psn_src_nodes psn_u.psu_src_nodes
|
|
|
|
};
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pfioc_if {
|
|
|
|
char ifname[IFNAMSIZ];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pfioc_tm {
|
|
|
|
int timeout;
|
|
|
|
int seconds;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pfioc_limit {
|
|
|
|
int index;
|
|
|
|
unsigned limit;
|
|
|
|
};
|
|
|
|
|
2018-08-22 19:38:48 +00:00
|
|
|
struct pfioc_altq_v0 {
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int32_t action;
|
|
|
|
u_int32_t ticket;
|
|
|
|
u_int32_t nr;
|
2018-08-22 19:38:48 +00:00
|
|
|
struct pf_altq_v0 altq;
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
2018-08-22 19:38:48 +00:00
|
|
|
struct pfioc_altq_v1 {
|
|
|
|
u_int32_t action;
|
|
|
|
u_int32_t ticket;
|
|
|
|
u_int32_t nr;
|
|
|
|
/*
|
|
|
|
* Placed here so code that only uses the above parameters can be
|
|
|
|
* written entirely in terms of the v0 or v1 type.
|
|
|
|
*/
|
|
|
|
u_int32_t version;
|
|
|
|
struct pf_altq_v1 altq;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Latest version of struct pfioc_altq_vX. This must move in lock-step with
|
|
|
|
* the latest version of struct pf_altq_vX as it has that struct as a
|
|
|
|
* member.
|
|
|
|
*/
|
|
|
|
#define PFIOC_ALTQ_VERSION PF_ALTQ_VERSION
|
|
|
|
|
|
|
|
struct pfioc_qstats_v0 {
|
|
|
|
u_int32_t ticket;
|
|
|
|
u_int32_t nr;
|
|
|
|
void *buf;
|
|
|
|
int nbytes;
|
|
|
|
u_int8_t scheduler;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pfioc_qstats_v1 {
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int32_t ticket;
|
|
|
|
u_int32_t nr;
|
|
|
|
void *buf;
|
|
|
|
int nbytes;
|
|
|
|
u_int8_t scheduler;
|
2018-08-22 19:38:48 +00:00
|
|
|
/*
|
|
|
|
* Placed here so code that only uses the above parameters can be
|
|
|
|
* written entirely in terms of the v0 or v1 type.
|
|
|
|
*/
|
|
|
|
u_int32_t version; /* Requested version of stats struct */
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
2018-08-22 19:38:48 +00:00
|
|
|
/* Latest version of struct pfioc_qstats_vX */
|
|
|
|
#define PFIOC_QSTATS_VERSION 1
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pfioc_ruleset {
|
|
|
|
u_int32_t nr;
|
2005-05-03 16:43:32 +00:00
|
|
|
char path[MAXPATHLEN];
|
|
|
|
char name[PF_ANCHOR_NAME_SIZE];
|
2004-02-26 02:04:28 +00:00
|
|
|
};
|
|
|
|
|
2004-06-16 23:24:02 +00:00
|
|
|
#define PF_RULESET_ALTQ (PF_RULESET_MAX)
|
|
|
|
#define PF_RULESET_TABLE (PF_RULESET_MAX+1)
|
|
|
|
struct pfioc_trans {
|
|
|
|
int size; /* number of elements */
|
|
|
|
int esize; /* size of each element in bytes */
|
|
|
|
struct pfioc_trans_e {
|
|
|
|
int rs_num;
|
2005-05-03 16:43:32 +00:00
|
|
|
char anchor[MAXPATHLEN];
|
2004-06-16 23:24:02 +00:00
|
|
|
u_int32_t ticket;
|
|
|
|
} *array;
|
|
|
|
};
|
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#define PFR_FLAG_ATOMIC 0x00000001 /* unused */
|
2004-02-26 02:04:28 +00:00
|
|
|
#define PFR_FLAG_DUMMY 0x00000002
|
|
|
|
#define PFR_FLAG_FEEDBACK 0x00000004
|
|
|
|
#define PFR_FLAG_CLSTATS 0x00000008
|
|
|
|
#define PFR_FLAG_ADDRSTOO 0x00000010
|
|
|
|
#define PFR_FLAG_REPLACE 0x00000020
|
|
|
|
#define PFR_FLAG_ALLRSETS 0x00000040
|
|
|
|
#define PFR_FLAG_ALLMASK 0x0000007F
|
2004-06-16 23:24:02 +00:00
|
|
|
#ifdef _KERNEL
|
|
|
|
#define PFR_FLAG_USERIOCTL 0x10000000
|
|
|
|
#endif
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
struct pfioc_table {
|
|
|
|
struct pfr_table pfrio_table;
|
|
|
|
void *pfrio_buffer;
|
|
|
|
int pfrio_esize;
|
|
|
|
int pfrio_size;
|
|
|
|
int pfrio_size2;
|
|
|
|
int pfrio_nadd;
|
|
|
|
int pfrio_ndel;
|
|
|
|
int pfrio_nchange;
|
|
|
|
int pfrio_flags;
|
|
|
|
u_int32_t pfrio_ticket;
|
|
|
|
};
|
|
|
|
#define pfrio_exists pfrio_nadd
|
|
|
|
#define pfrio_nzero pfrio_nadd
|
|
|
|
#define pfrio_nmatch pfrio_nadd
|
|
|
|
#define pfrio_naddr pfrio_size2
|
|
|
|
#define pfrio_setflag pfrio_size2
|
|
|
|
#define pfrio_clrflag pfrio_nadd
|
|
|
|
|
2004-06-16 23:24:02 +00:00
|
|
|
struct pfioc_iface {
|
|
|
|
char pfiio_name[IFNAMSIZ];
|
|
|
|
void *pfiio_buffer;
|
|
|
|
int pfiio_esize;
|
|
|
|
int pfiio_size;
|
|
|
|
int pfiio_nzero;
|
|
|
|
int pfiio_flags;
|
|
|
|
};
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
/*
|
|
|
|
* ioctl operations
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define DIOCSTART _IO ('D', 1)
|
|
|
|
#define DIOCSTOP _IO ('D', 2)
|
|
|
|
#define DIOCADDRULE _IOWR('D', 4, struct pfioc_rule)
|
|
|
|
#define DIOCGETRULES _IOWR('D', 6, struct pfioc_rule)
|
|
|
|
#define DIOCGETRULE _IOWR('D', 7, struct pfioc_rule)
|
|
|
|
/* XXX cut 8 - 17 */
|
2004-06-16 23:24:02 +00:00
|
|
|
#define DIOCCLRSTATES _IOWR('D', 18, struct pfioc_state_kill)
|
2018-07-04 03:36:46 +00:00
|
|
|
#define DIOCGETSTATE _IOWR('D', 19, struct pfioc_state)
|
2004-02-26 02:04:28 +00:00
|
|
|
#define DIOCSETSTATUSIF _IOWR('D', 20, struct pfioc_if)
|
|
|
|
#define DIOCGETSTATUS _IOWR('D', 21, struct pf_status)
|
|
|
|
#define DIOCCLRSTATUS _IO ('D', 22)
|
|
|
|
#define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook)
|
|
|
|
#define DIOCSETDEBUG _IOWR('D', 24, u_int32_t)
|
|
|
|
#define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states)
|
2018-07-04 03:36:46 +00:00
|
|
|
#define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule)
|
2004-02-26 02:04:28 +00:00
|
|
|
/* XXX cut 26 - 28 */
|
|
|
|
#define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm)
|
|
|
|
#define DIOCGETTIMEOUT _IOWR('D', 30, struct pfioc_tm)
|
2018-07-04 03:36:46 +00:00
|
|
|
#define DIOCADDSTATE _IOWR('D', 37, struct pfioc_state)
|
|
|
|
#define DIOCCLRRULECTRS _IO ('D', 38)
|
2004-02-26 02:04:28 +00:00
|
|
|
#define DIOCGETLIMIT _IOWR('D', 39, struct pfioc_limit)
|
|
|
|
#define DIOCSETLIMIT _IOWR('D', 40, struct pfioc_limit)
|
|
|
|
#define DIOCKILLSTATES _IOWR('D', 41, struct pfioc_state_kill)
|
|
|
|
#define DIOCSTARTALTQ _IO ('D', 42)
|
|
|
|
#define DIOCSTOPALTQ _IO ('D', 43)
|
2018-08-22 19:38:48 +00:00
|
|
|
#define DIOCADDALTQV0 _IOWR('D', 45, struct pfioc_altq_v0)
|
|
|
|
#define DIOCADDALTQV1 _IOWR('D', 45, struct pfioc_altq_v1)
|
|
|
|
#define DIOCGETALTQSV0 _IOWR('D', 47, struct pfioc_altq_v0)
|
|
|
|
#define DIOCGETALTQSV1 _IOWR('D', 47, struct pfioc_altq_v1)
|
|
|
|
#define DIOCGETALTQV0 _IOWR('D', 48, struct pfioc_altq_v0)
|
|
|
|
#define DIOCGETALTQV1 _IOWR('D', 48, struct pfioc_altq_v1)
|
|
|
|
#define DIOCCHANGEALTQV0 _IOWR('D', 49, struct pfioc_altq_v0)
|
|
|
|
#define DIOCCHANGEALTQV1 _IOWR('D', 49, struct pfioc_altq_v1)
|
|
|
|
#define DIOCGETQSTATSV0 _IOWR('D', 50, struct pfioc_qstats_v0)
|
|
|
|
#define DIOCGETQSTATSV1 _IOWR('D', 50, struct pfioc_qstats_v1)
|
2004-02-26 02:04:28 +00:00
|
|
|
#define DIOCBEGINADDRS _IOWR('D', 51, struct pfioc_pooladdr)
|
|
|
|
#define DIOCADDADDR _IOWR('D', 52, struct pfioc_pooladdr)
|
|
|
|
#define DIOCGETADDRS _IOWR('D', 53, struct pfioc_pooladdr)
|
|
|
|
#define DIOCGETADDR _IOWR('D', 54, struct pfioc_pooladdr)
|
2018-07-04 03:36:46 +00:00
|
|
|
#define DIOCCHANGEADDR _IOWR('D', 55, struct pfioc_pooladdr)
|
2005-05-03 16:43:32 +00:00
|
|
|
/* XXX cut 55 - 57 */
|
2004-02-26 02:04:28 +00:00
|
|
|
#define DIOCGETRULESETS _IOWR('D', 58, struct pfioc_ruleset)
|
|
|
|
#define DIOCGETRULESET _IOWR('D', 59, struct pfioc_ruleset)
|
|
|
|
#define DIOCRCLRTABLES _IOWR('D', 60, struct pfioc_table)
|
|
|
|
#define DIOCRADDTABLES _IOWR('D', 61, struct pfioc_table)
|
|
|
|
#define DIOCRDELTABLES _IOWR('D', 62, struct pfioc_table)
|
|
|
|
#define DIOCRGETTABLES _IOWR('D', 63, struct pfioc_table)
|
|
|
|
#define DIOCRGETTSTATS _IOWR('D', 64, struct pfioc_table)
|
2011-06-28 11:57:25 +00:00
|
|
|
#define DIOCRCLRTSTATS _IOWR('D', 65, struct pfioc_table)
|
2004-02-26 02:04:28 +00:00
|
|
|
#define DIOCRCLRADDRS _IOWR('D', 66, struct pfioc_table)
|
|
|
|
#define DIOCRADDADDRS _IOWR('D', 67, struct pfioc_table)
|
|
|
|
#define DIOCRDELADDRS _IOWR('D', 68, struct pfioc_table)
|
|
|
|
#define DIOCRSETADDRS _IOWR('D', 69, struct pfioc_table)
|
|
|
|
#define DIOCRGETADDRS _IOWR('D', 70, struct pfioc_table)
|
|
|
|
#define DIOCRGETASTATS _IOWR('D', 71, struct pfioc_table)
|
2011-06-28 11:57:25 +00:00
|
|
|
#define DIOCRCLRASTATS _IOWR('D', 72, struct pfioc_table)
|
2004-02-26 02:04:28 +00:00
|
|
|
#define DIOCRTSTADDRS _IOWR('D', 73, struct pfioc_table)
|
|
|
|
#define DIOCRSETTFLAGS _IOWR('D', 74, struct pfioc_table)
|
2011-06-28 11:57:25 +00:00
|
|
|
#define DIOCRINADEFINE _IOWR('D', 77, struct pfioc_table)
|
|
|
|
#define DIOCOSFPFLUSH _IO('D', 78)
|
|
|
|
#define DIOCOSFPADD _IOWR('D', 79, struct pf_osfp_ioctl)
|
|
|
|
#define DIOCOSFPGET _IOWR('D', 80, struct pf_osfp_ioctl)
|
|
|
|
#define DIOCXBEGIN _IOWR('D', 81, struct pfioc_trans)
|
|
|
|
#define DIOCXCOMMIT _IOWR('D', 82, struct pfioc_trans)
|
|
|
|
#define DIOCXROLLBACK _IOWR('D', 83, struct pfioc_trans)
|
|
|
|
#define DIOCGETSRCNODES _IOWR('D', 84, struct pfioc_src_nodes)
|
|
|
|
#define DIOCCLRSRCNODES _IO('D', 85)
|
|
|
|
#define DIOCSETHOSTID _IOWR('D', 86, u_int32_t)
|
|
|
|
#define DIOCIGETIFACES _IOWR('D', 87, struct pfioc_iface)
|
|
|
|
#define DIOCSETIFFLAG _IOWR('D', 89, struct pfioc_iface)
|
|
|
|
#define DIOCCLRIFFLAG _IOWR('D', 90, struct pfioc_iface)
|
|
|
|
#define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill)
|
2018-08-22 19:38:48 +00:00
|
|
|
struct pf_ifspeed_v0 {
|
2004-02-26 02:34:12 +00:00
|
|
|
char ifname[IFNAMSIZ];
|
|
|
|
u_int32_t baudrate;
|
|
|
|
};
|
2018-08-22 19:38:48 +00:00
|
|
|
|
|
|
|
struct pf_ifspeed_v1 {
|
|
|
|
char ifname[IFNAMSIZ];
|
|
|
|
u_int32_t baudrate32;
|
|
|
|
/* layout identical to struct pf_ifspeed_v0 up to this point */
|
|
|
|
u_int64_t baudrate;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Latest version of struct pf_ifspeed_vX */
|
|
|
|
#define PF_IFSPEED_VERSION 1
|
|
|
|
|
|
|
|
#define DIOCGIFSPEEDV0 _IOWR('D', 92, struct pf_ifspeed_v0)
|
|
|
|
#define DIOCGIFSPEEDV1 _IOWR('D', 92, struct pf_ifspeed_v1)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Compatibility and convenience macros
|
|
|
|
*/
|
|
|
|
#ifndef _KERNEL
|
|
|
|
#ifdef PFIOC_USE_LATEST
|
|
|
|
/*
|
|
|
|
* Maintaining in-tree consumers of the ioctl interface is easier when that
|
|
|
|
* code can be written in terms old names that refer to the latest interface
|
|
|
|
* version as that reduces the required changes in the consumers to those
|
|
|
|
* that are functionally necessary to accommodate a new interface version.
|
|
|
|
*/
|
|
|
|
#define pfioc_altq __CONCAT(pfioc_altq_v, PFIOC_ALTQ_VERSION)
|
|
|
|
#define pfioc_qstats __CONCAT(pfioc_qstats_v, PFIOC_QSTATS_VERSION)
|
|
|
|
#define pf_ifspeed __CONCAT(pf_ifspeed_v, PF_IFSPEED_VERSION)
|
|
|
|
|
|
|
|
#define DIOCADDALTQ __CONCAT(DIOCADDALTQV, PFIOC_ALTQ_VERSION)
|
|
|
|
#define DIOCGETALTQS __CONCAT(DIOCGETALTQSV, PFIOC_ALTQ_VERSION)
|
|
|
|
#define DIOCGETALTQ __CONCAT(DIOCGETALTQV, PFIOC_ALTQ_VERSION)
|
|
|
|
#define DIOCCHANGEALTQ __CONCAT(DIOCCHANGEALTQV, PFIOC_ALTQ_VERSION)
|
|
|
|
#define DIOCGETQSTATS __CONCAT(DIOCGETQSTATSV, PFIOC_QSTATS_VERSION)
|
|
|
|
#define DIOCGIFSPEED __CONCAT(DIOCGIFSPEEDV, PF_IFSPEED_VERSION)
|
|
|
|
#else
|
|
|
|
/*
|
|
|
|
* When building out-of-tree code that is written for the old interface,
|
|
|
|
* such as may exist in ports for example, resolve the old struct tags and
|
|
|
|
* ioctl command names to the v0 versions.
|
|
|
|
*/
|
|
|
|
#define pfioc_altq __CONCAT(pfioc_altq_v, 0)
|
|
|
|
#define pfioc_qstats __CONCAT(pfioc_qstats_v, 0)
|
|
|
|
#define pf_ifspeed __CONCAT(pf_ifspeed_v, 0)
|
|
|
|
|
|
|
|
#define DIOCADDALTQ __CONCAT(DIOCADDALTQV, 0)
|
|
|
|
#define DIOCGETALTQS __CONCAT(DIOCGETALTQSV, 0)
|
|
|
|
#define DIOCGETALTQ __CONCAT(DIOCGETALTQV, 0)
|
|
|
|
#define DIOCCHANGEALTQ __CONCAT(DIOCCHANGEALTQV, 0)
|
|
|
|
#define DIOCGETQSTATS __CONCAT(DIOCGETQSTATSV, 0)
|
|
|
|
#define DIOCGIFSPEED __CONCAT(DIOCGIFSPEEDV, 0)
|
|
|
|
#endif /* PFIOC_USE_LATEST */
|
|
|
|
#endif /* _KERNEL */
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
#ifdef _KERNEL
|
2020-12-23 13:51:52 +00:00
|
|
|
LIST_HEAD(pf_ksrc_node_list, pf_ksrc_node);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
struct pf_srchash {
|
2020-12-23 13:51:52 +00:00
|
|
|
struct pf_ksrc_node_list nodes;
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
struct mtx lock;
|
|
|
|
};
|
2004-06-16 23:24:02 +00:00
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
struct pf_keyhash {
|
|
|
|
LIST_HEAD(, pf_state_key) keys;
|
|
|
|
struct mtx lock;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pf_idhash {
|
|
|
|
LIST_HEAD(, pf_state) states;
|
|
|
|
struct mtx lock;
|
|
|
|
};
|
|
|
|
|
2013-06-19 13:37:29 +00:00
|
|
|
extern u_long pf_hashmask;
|
|
|
|
extern u_long pf_srchashmask;
|
2018-08-05 13:54:37 +00:00
|
|
|
#define PF_HASHSIZ (131072)
|
2018-02-25 08:56:44 +00:00
|
|
|
#define PF_SRCHASHSIZ (PF_HASHSIZ/4)
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
VNET_DECLARE(struct pf_keyhash *, pf_keyhash);
|
|
|
|
VNET_DECLARE(struct pf_idhash *, pf_idhash);
|
|
|
|
#define V_pf_keyhash VNET(pf_keyhash)
|
|
|
|
#define V_pf_idhash VNET(pf_idhash)
|
|
|
|
VNET_DECLARE(struct pf_srchash *, pf_srchash);
|
|
|
|
#define V_pf_srchash VNET(pf_srchash)
|
|
|
|
|
2013-06-19 13:37:29 +00:00
|
|
|
#define PF_IDHASH(s) (be64toh((s)->id) % (pf_hashmask + 1))
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
|
|
|
|
VNET_DECLARE(void *, pf_swi_cookie);
|
|
|
|
#define V_pf_swi_cookie VNET(pf_swi_cookie)
|
|
|
|
|
|
|
|
VNET_DECLARE(uint64_t, pf_stateid[MAXCPU]);
|
|
|
|
#define V_pf_stateid VNET(pf_stateid)
|
2004-06-16 23:24:02 +00:00
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
TAILQ_HEAD(pf_altqqueue, pf_altq);
|
2019-02-11 05:17:31 +00:00
|
|
|
VNET_DECLARE(struct pf_altqqueue, pf_altqs[4]);
|
2011-06-28 11:57:25 +00:00
|
|
|
#define V_pf_altqs VNET(pf_altqs)
|
|
|
|
VNET_DECLARE(struct pf_palist, pf_pabuf);
|
|
|
|
#define V_pf_pabuf VNET(pf_pabuf)
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
VNET_DECLARE(u_int32_t, ticket_altqs_active);
|
|
|
|
#define V_ticket_altqs_active VNET(ticket_altqs_active)
|
|
|
|
VNET_DECLARE(u_int32_t, ticket_altqs_inactive);
|
|
|
|
#define V_ticket_altqs_inactive VNET(ticket_altqs_inactive)
|
|
|
|
VNET_DECLARE(int, altqs_inactive_open);
|
|
|
|
#define V_altqs_inactive_open VNET(altqs_inactive_open)
|
|
|
|
VNET_DECLARE(u_int32_t, ticket_pabuf);
|
|
|
|
#define V_ticket_pabuf VNET(ticket_pabuf)
|
|
|
|
VNET_DECLARE(struct pf_altqqueue *, pf_altqs_active);
|
|
|
|
#define V_pf_altqs_active VNET(pf_altqs_active)
|
2019-02-11 05:17:31 +00:00
|
|
|
VNET_DECLARE(struct pf_altqqueue *, pf_altq_ifs_active);
|
|
|
|
#define V_pf_altq_ifs_active VNET(pf_altq_ifs_active)
|
2011-06-28 11:57:25 +00:00
|
|
|
VNET_DECLARE(struct pf_altqqueue *, pf_altqs_inactive);
|
|
|
|
#define V_pf_altqs_inactive VNET(pf_altqs_inactive)
|
2019-02-11 05:17:31 +00:00
|
|
|
VNET_DECLARE(struct pf_altqqueue *, pf_altq_ifs_inactive);
|
|
|
|
#define V_pf_altq_ifs_inactive VNET(pf_altq_ifs_inactive)
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
VNET_DECLARE(struct pf_krulequeue, pf_unlinked_rules);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
#define V_pf_unlinked_rules VNET(pf_unlinked_rules)
|
|
|
|
|
Back out r276841, r276756, r276747, r276746. The change in r276747 is very
very questionable, since it makes vimages more dependent on each other. But
the reason for the backout is that it screwed up shutting down the pf purge
threads, and now kernel immedially panics on pf module unload. Although module
unloading isn't an advertised feature of pf, it is very important for
development process.
I'd like to not backout r276746, since in general it is good. But since it
has introduced numerous build breakages, that later were addressed in
r276841, r276756, r276747, I need to back it out as well. Better replay it
in clean fashion from scratch.
2015-01-22 01:23:16 +00:00
|
|
|
void pf_initialize(void);
|
2014-03-29 09:05:25 +00:00
|
|
|
void pf_mtag_initialize(void);
|
|
|
|
void pf_mtag_cleanup(void);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
void pf_cleanup(void);
|
|
|
|
|
|
|
|
struct pf_mtag *pf_get_mtag(struct mbuf *);
|
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
extern void pf_calc_skip_steps(struct pf_krulequeue *);
|
2008-03-29 00:24:36 +00:00
|
|
|
#ifdef ALTQ
|
2011-06-28 11:57:25 +00:00
|
|
|
extern void pf_altq_ifnet_event(struct ifnet *, int);
|
2008-03-29 00:24:36 +00:00
|
|
|
#endif
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
VNET_DECLARE(uma_zone_t, pf_state_z);
|
|
|
|
#define V_pf_state_z VNET(pf_state_z)
|
|
|
|
VNET_DECLARE(uma_zone_t, pf_state_key_z);
|
|
|
|
#define V_pf_state_key_z VNET(pf_state_key_z)
|
|
|
|
VNET_DECLARE(uma_zone_t, pf_state_scrub_z);
|
|
|
|
#define V_pf_state_scrub_z VNET(pf_state_scrub_z)
|
|
|
|
|
2007-07-03 12:16:07 +00:00
|
|
|
extern void pf_purge_thread(void *);
|
2016-06-23 21:34:38 +00:00
|
|
|
extern void pf_unload_vnet_purge(void);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
extern void pf_intr(void *);
|
|
|
|
extern void pf_purge_expired_src_nodes(void);
|
|
|
|
|
|
|
|
extern int pf_unlink_state(struct pf_state *, u_int);
|
|
|
|
#define PF_ENTER_LOCKED 0x00000001
|
|
|
|
#define PF_RETURN_LOCKED 0x00000002
|
2011-06-28 11:57:25 +00:00
|
|
|
extern int pf_state_insert(struct pfi_kif *,
|
|
|
|
struct pf_state_key *,
|
|
|
|
struct pf_state_key *,
|
2004-06-16 23:24:02 +00:00
|
|
|
struct pf_state *);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
extern void pf_free_state(struct pf_state *);
|
|
|
|
|
|
|
|
static __inline void
|
|
|
|
pf_ref_state(struct pf_state *s)
|
|
|
|
{
|
|
|
|
|
|
|
|
refcount_acquire(&s->refs);
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline int
|
|
|
|
pf_release_state(struct pf_state *s)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (refcount_release(&s->refs)) {
|
|
|
|
pf_free_state(s);
|
|
|
|
return (1);
|
|
|
|
} else
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
extern struct pf_state *pf_find_state_byid(uint64_t, uint32_t);
|
2011-06-28 11:57:25 +00:00
|
|
|
extern struct pf_state *pf_find_state_all(struct pf_state_key_cmp *,
|
|
|
|
u_int, int *);
|
2020-12-23 13:51:52 +00:00
|
|
|
extern struct pf_ksrc_node *pf_find_src_node(struct pf_addr *,
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_krule *, sa_family_t, int);
|
2020-12-23 13:51:52 +00:00
|
|
|
extern void pf_unlink_src_node(struct pf_ksrc_node *);
|
|
|
|
extern u_int pf_free_src_nodes(struct pf_ksrc_node_list *);
|
2014-02-08 09:57:52 +00:00
|
|
|
extern void pf_print_state(struct pf_state *);
|
|
|
|
extern void pf_print_flags(u_int8_t);
|
2004-08-12 13:59:44 +00:00
|
|
|
extern u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t,
|
|
|
|
u_int8_t);
|
2015-10-14 16:21:41 +00:00
|
|
|
extern u_int16_t pf_proto_cksum_fixup(struct mbuf *, u_int16_t,
|
|
|
|
u_int16_t, u_int16_t, u_int8_t);
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
VNET_DECLARE(struct ifnet *, sync_ifp);
|
|
|
|
#define V_sync_ifp VNET(sync_ifp);
|
2020-12-05 13:32:54 +00:00
|
|
|
VNET_DECLARE(struct pf_krule, pf_default_rule);
|
2011-06-28 11:57:25 +00:00
|
|
|
#define V_pf_default_rule VNET(pf_default_rule)
|
2004-02-26 02:04:28 +00:00
|
|
|
extern void pf_addrcpy(struct pf_addr *, struct pf_addr *,
|
|
|
|
u_int8_t);
|
2020-12-05 13:32:54 +00:00
|
|
|
void pf_free_rule(struct pf_krule *);
|
2004-02-26 02:04:28 +00:00
|
|
|
|
|
|
|
#ifdef INET
|
2018-03-23 16:56:44 +00:00
|
|
|
int pf_test(int, int, struct ifnet *, struct mbuf **, struct inpcb *);
|
2015-02-16 23:50:53 +00:00
|
|
|
int pf_normalize_ip(struct mbuf **, int, struct pfi_kif *, u_short *,
|
|
|
|
struct pf_pdesc *);
|
2004-02-26 02:04:28 +00:00
|
|
|
#endif /* INET */
|
|
|
|
|
|
|
|
#ifdef INET6
|
2018-03-23 16:56:44 +00:00
|
|
|
int pf_test6(int, int, struct ifnet *, struct mbuf **, struct inpcb *);
|
2015-02-16 23:50:53 +00:00
|
|
|
int pf_normalize_ip6(struct mbuf **, int, struct pfi_kif *, u_short *,
|
|
|
|
struct pf_pdesc *);
|
2004-02-26 02:04:28 +00:00
|
|
|
void pf_poolmask(struct pf_addr *, struct pf_addr*,
|
|
|
|
struct pf_addr *, struct pf_addr *, u_int8_t);
|
|
|
|
void pf_addr_inc(struct pf_addr *, sa_family_t);
|
2015-02-16 21:52:28 +00:00
|
|
|
int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *);
|
2004-02-26 02:04:28 +00:00
|
|
|
#endif /* INET6 */
|
|
|
|
|
2007-07-03 12:16:07 +00:00
|
|
|
u_int32_t pf_new_isn(struct pf_state *);
|
2004-02-26 02:04:28 +00:00
|
|
|
void *pf_pull_hdr(struct mbuf *, int, void *, int, u_short *, u_short *,
|
|
|
|
sa_family_t);
|
|
|
|
void pf_change_a(void *, u_int16_t *, u_int32_t, u_int8_t);
|
2015-10-14 16:21:41 +00:00
|
|
|
void pf_change_proto_a(struct mbuf *, void *, u_int16_t *, u_int32_t,
|
|
|
|
u_int8_t);
|
|
|
|
void pf_change_tcp_a(struct mbuf *, void *, u_int16_t *, u_int32_t);
|
2020-12-20 20:06:32 +00:00
|
|
|
void pf_patch_16_unaligned(struct mbuf *, u_int16_t *, void *, u_int16_t,
|
|
|
|
bool, u_int8_t);
|
|
|
|
void pf_patch_32_unaligned(struct mbuf *, u_int16_t *, void *, u_int32_t,
|
|
|
|
bool, u_int8_t);
|
2011-06-28 11:57:25 +00:00
|
|
|
void pf_send_deferred_syn(struct pf_state *);
|
2004-02-26 02:04:28 +00:00
|
|
|
int pf_match_addr(u_int8_t, struct pf_addr *, struct pf_addr *,
|
|
|
|
struct pf_addr *, sa_family_t);
|
2011-06-28 11:57:25 +00:00
|
|
|
int pf_match_addr_range(struct pf_addr *, struct pf_addr *,
|
|
|
|
struct pf_addr *, sa_family_t);
|
2004-02-26 02:04:28 +00:00
|
|
|
int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t);
|
|
|
|
|
Back out r276841, r276756, r276747, r276746. The change in r276747 is very
very questionable, since it makes vimages more dependent on each other. But
the reason for the backout is that it screwed up shutting down the pf purge
threads, and now kernel immedially panics on pf module unload. Although module
unloading isn't an advertised feature of pf, it is very important for
development process.
I'd like to not backout r276746, since in general it is good. But since it
has introduced numerous build breakages, that later were addressed in
r276841, r276756, r276747, I need to back it out as well. Better replay it
in clean fashion from scratch.
2015-01-22 01:23:16 +00:00
|
|
|
void pf_normalize_init(void);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
void pf_normalize_cleanup(void);
|
2004-06-16 23:24:02 +00:00
|
|
|
int pf_normalize_tcp(int, struct pfi_kif *, struct mbuf *, int, int, void *,
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pf_pdesc *);
|
|
|
|
void pf_normalize_tcp_cleanup(struct pf_state *);
|
|
|
|
int pf_normalize_tcp_init(struct mbuf *, int, struct pf_pdesc *,
|
|
|
|
struct tcphdr *, struct pf_state_peer *, struct pf_state_peer *);
|
|
|
|
int pf_normalize_tcp_stateful(struct mbuf *, int, struct pf_pdesc *,
|
2005-05-03 16:43:32 +00:00
|
|
|
u_short *, struct tcphdr *, struct pf_state *,
|
|
|
|
struct pf_state_peer *, struct pf_state_peer *, int *);
|
2004-02-26 02:04:28 +00:00
|
|
|
u_int32_t
|
|
|
|
pf_state_expires(const struct pf_state *);
|
|
|
|
void pf_purge_expired_fragments(void);
|
2017-12-31 10:01:31 +00:00
|
|
|
void pf_purge_fragments(uint32_t);
|
2012-02-03 13:20:48 +00:00
|
|
|
int pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *,
|
|
|
|
int);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
int pf_socket_lookup(int, struct pf_pdesc *, struct mbuf *);
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_state_key *pf_alloc_state_key(int);
|
2004-02-26 02:04:28 +00:00
|
|
|
void pfr_initialize(void);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
void pfr_cleanup(void);
|
2004-02-26 02:04:28 +00:00
|
|
|
int pfr_match_addr(struct pfr_ktable *, struct pf_addr *, sa_family_t);
|
|
|
|
void pfr_update_stats(struct pfr_ktable *, struct pf_addr *, sa_family_t,
|
|
|
|
u_int64_t, int, int, int);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
int pfr_pool_get(struct pfr_ktable *, int *, struct pf_addr *, sa_family_t);
|
2004-06-16 23:24:02 +00:00
|
|
|
void pfr_dynaddr_update(struct pfr_ktable *, struct pfi_dynaddr *);
|
2004-02-26 02:04:28 +00:00
|
|
|
struct pfr_ktable *
|
2020-12-05 13:32:54 +00:00
|
|
|
pfr_attach_table(struct pf_kruleset *, char *);
|
2004-02-26 02:04:28 +00:00
|
|
|
void pfr_detach_table(struct pfr_ktable *);
|
|
|
|
int pfr_clr_tables(struct pfr_table *, int *, int);
|
|
|
|
int pfr_add_tables(struct pfr_table *, int, int *, int);
|
|
|
|
int pfr_del_tables(struct pfr_table *, int, int *, int);
|
2018-04-06 15:54:30 +00:00
|
|
|
int pfr_table_count(struct pfr_table *, int);
|
2004-02-26 02:04:28 +00:00
|
|
|
int pfr_get_tables(struct pfr_table *, struct pfr_table *, int *, int);
|
|
|
|
int pfr_get_tstats(struct pfr_table *, struct pfr_tstats *, int *, int);
|
|
|
|
int pfr_clr_tstats(struct pfr_table *, int, int *, int);
|
|
|
|
int pfr_set_tflags(struct pfr_table *, int, int, int, int *, int *, int);
|
|
|
|
int pfr_clr_addrs(struct pfr_table *, int *, int);
|
2005-05-03 16:43:32 +00:00
|
|
|
int pfr_insert_kentry(struct pfr_ktable *, struct pfr_addr *, long);
|
2004-02-26 02:04:28 +00:00
|
|
|
int pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
|
|
|
|
int);
|
|
|
|
int pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
|
|
|
|
int);
|
|
|
|
int pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
|
2007-07-03 12:16:07 +00:00
|
|
|
int *, int *, int *, int, u_int32_t);
|
2004-02-26 02:04:28 +00:00
|
|
|
int pfr_get_addrs(struct pfr_table *, struct pfr_addr *, int *, int);
|
|
|
|
int pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int);
|
|
|
|
int pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *,
|
|
|
|
int);
|
|
|
|
int pfr_tst_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
|
|
|
|
int);
|
|
|
|
int pfr_ina_begin(struct pfr_table *, u_int32_t *, int *, int);
|
2004-06-16 23:24:02 +00:00
|
|
|
int pfr_ina_rollback(struct pfr_table *, u_int32_t, int *, int);
|
2004-02-26 02:04:28 +00:00
|
|
|
int pfr_ina_commit(struct pfr_table *, u_int32_t, int *, int *, int);
|
|
|
|
int pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *,
|
|
|
|
int *, u_int32_t, int);
|
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
MALLOC_DECLARE(PFI_MTYPE);
|
2011-06-28 11:57:25 +00:00
|
|
|
VNET_DECLARE(struct pfi_kif *, pfi_all);
|
|
|
|
#define V_pfi_all VNET(pfi_all)
|
2007-07-03 12:16:07 +00:00
|
|
|
|
Back out r276841, r276756, r276747, r276746. The change in r276747 is very
very questionable, since it makes vimages more dependent on each other. But
the reason for the backout is that it screwed up shutting down the pf purge
threads, and now kernel immedially panics on pf module unload. Although module
unloading isn't an advertised feature of pf, it is very important for
development process.
I'd like to not backout r276746, since in general it is good. But since it
has introduced numerous build breakages, that later were addressed in
r276841, r276756, r276747, I need to back it out as well. Better replay it
in clean fashion from scratch.
2015-01-22 01:23:16 +00:00
|
|
|
void pfi_initialize(void);
|
2016-06-23 21:34:38 +00:00
|
|
|
void pfi_initialize_vnet(void);
|
2004-06-16 23:24:02 +00:00
|
|
|
void pfi_cleanup(void);
|
2016-06-23 21:34:38 +00:00
|
|
|
void pfi_cleanup_vnet(void);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
void pfi_kif_ref(struct pfi_kif *);
|
|
|
|
void pfi_kif_unref(struct pfi_kif *);
|
|
|
|
struct pfi_kif *pfi_kif_find(const char *);
|
|
|
|
struct pfi_kif *pfi_kif_attach(struct pfi_kif *, const char *);
|
2007-07-03 12:16:07 +00:00
|
|
|
int pfi_kif_match(struct pfi_kif *, struct pfi_kif *);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
void pfi_kif_purge(void);
|
2007-07-03 12:16:07 +00:00
|
|
|
int pfi_match_addr(struct pfi_dynaddr *, struct pf_addr *,
|
|
|
|
sa_family_t);
|
2004-06-16 23:24:02 +00:00
|
|
|
int pfi_dynaddr_setup(struct pf_addr_wrap *, sa_family_t);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
void pfi_dynaddr_remove(struct pfi_dynaddr *);
|
2007-07-03 12:16:07 +00:00
|
|
|
void pfi_dynaddr_copyout(struct pf_addr_wrap *);
|
2011-06-28 11:57:25 +00:00
|
|
|
void pfi_update_status(const char *, struct pf_status *);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
void pfi_get_ifaces(const char *, struct pfi_kif *, int *);
|
2005-05-03 16:43:32 +00:00
|
|
|
int pfi_set_flags(const char *, int);
|
|
|
|
int pfi_clear_flags(const char *, int);
|
2004-06-16 23:24:02 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
int pf_match_tag(struct mbuf *, struct pf_krule *, int *, int);
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
int pf_tag_packet(struct mbuf *, struct pf_pdesc *, int);
|
2015-02-16 06:02:46 +00:00
|
|
|
int pf_addr_cmp(struct pf_addr *, struct pf_addr *,
|
|
|
|
sa_family_t);
|
2007-07-03 12:16:07 +00:00
|
|
|
void pf_qid2qname(u_int32_t, char *);
|
2004-02-26 02:04:28 +00:00
|
|
|
|
2014-08-14 18:57:46 +00:00
|
|
|
VNET_DECLARE(struct pf_kstatus, pf_status);
|
|
|
|
#define V_pf_status VNET(pf_status)
|
2004-02-26 02:34:12 +00:00
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
struct pf_limit {
|
|
|
|
uma_zone_t zone;
|
|
|
|
u_int limit;
|
2004-02-26 02:34:12 +00:00
|
|
|
};
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
VNET_DECLARE(struct pf_limit, pf_limits[PF_LIMIT_MAX]);
|
|
|
|
#define V_pf_limits VNET(pf_limits)
|
2004-02-26 02:34:12 +00:00
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
#endif /* _KERNEL */
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
#ifdef _KERNEL
|
2020-12-05 13:32:54 +00:00
|
|
|
VNET_DECLARE(struct pf_kanchor_global, pf_anchors);
|
2011-06-28 11:57:25 +00:00
|
|
|
#define V_pf_anchors VNET(pf_anchors)
|
2020-12-05 13:32:54 +00:00
|
|
|
VNET_DECLARE(struct pf_kanchor, pf_main_anchor);
|
2011-06-28 11:57:25 +00:00
|
|
|
#define V_pf_main_anchor VNET(pf_main_anchor)
|
|
|
|
#define pf_main_ruleset V_pf_main_anchor.ruleset
|
2007-07-03 12:16:07 +00:00
|
|
|
|
|
|
|
int pf_get_ruleset_number(u_int8_t);
|
2020-12-05 13:32:54 +00:00
|
|
|
void pf_init_kruleset(struct pf_kruleset *);
|
|
|
|
int pf_kanchor_setup(struct pf_krule *,
|
|
|
|
const struct pf_kruleset *, const char *);
|
|
|
|
int pf_kanchor_copyout(const struct pf_kruleset *,
|
|
|
|
const struct pf_krule *, struct pfioc_rule *);
|
|
|
|
void pf_kanchor_remove(struct pf_krule *);
|
|
|
|
void pf_remove_if_empty_kruleset(struct pf_kruleset *);
|
|
|
|
struct pf_kruleset *pf_find_kruleset(const char *);
|
|
|
|
struct pf_kruleset *pf_find_or_create_kruleset(const char *);
|
2007-07-03 12:16:07 +00:00
|
|
|
void pf_rs_initialize(void);
|
2020-12-05 13:32:54 +00:00
|
|
|
#endif
|
2007-07-03 12:16:07 +00:00
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
/* The fingerprint functions can be linked into userland programs (tcpdump) */
|
|
|
|
int pf_osfp_add(struct pf_osfp_ioctl *);
|
|
|
|
#ifdef _KERNEL
|
|
|
|
struct pf_osfp_enlist *
|
|
|
|
pf_osfp_fingerprint(struct pf_pdesc *, struct mbuf *, int,
|
|
|
|
const struct tcphdr *);
|
|
|
|
#endif /* _KERNEL */
|
|
|
|
void pf_osfp_flush(void);
|
|
|
|
int pf_osfp_get(struct pf_osfp_ioctl *);
|
|
|
|
int pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t);
|
|
|
|
|
2011-06-28 11:57:25 +00:00
|
|
|
#ifdef _KERNEL
|
2014-02-08 09:57:52 +00:00
|
|
|
void pf_print_host(struct pf_addr *, u_int16_t, u_int8_t);
|
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
void pf_step_into_anchor(struct pf_kanchor_stackframe *, int *,
|
|
|
|
struct pf_kruleset **, int, struct pf_krule **,
|
|
|
|
struct pf_krule **, int *);
|
|
|
|
int pf_step_out_of_anchor(struct pf_kanchor_stackframe *, int *,
|
|
|
|
struct pf_kruleset **, int, struct pf_krule **,
|
|
|
|
struct pf_krule **, int *);
|
2011-06-28 11:57:25 +00:00
|
|
|
|
2020-12-05 13:32:54 +00:00
|
|
|
int pf_map_addr(u_int8_t, struct pf_krule *,
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_addr *, struct pf_addr *,
|
2020-12-23 13:51:52 +00:00
|
|
|
struct pf_addr *, struct pf_ksrc_node **);
|
2020-12-05 13:32:54 +00:00
|
|
|
struct pf_krule *pf_get_translation(struct pf_pdesc *, struct mbuf *,
|
2020-12-23 13:51:52 +00:00
|
|
|
int, int, struct pfi_kif *, struct pf_ksrc_node **,
|
2011-06-28 11:57:25 +00:00
|
|
|
struct pf_state_key **, struct pf_state_key **,
|
|
|
|
struct pf_addr *, struct pf_addr *,
|
2020-12-05 13:32:54 +00:00
|
|
|
uint16_t, uint16_t, struct pf_kanchor_stackframe *);
|
2011-06-28 11:57:25 +00:00
|
|
|
|
Merge the projects/pf/head branch, that was worked on for last six months,
into head. The most significant achievements in the new code:
o Fine grained locking, thus much better performance.
o Fixes to many problems in pf, that were specific to FreeBSD port.
New code doesn't have that many ifdefs and much less OpenBSDisms, thus
is more attractive to our developers.
Those interested in details, can browse through SVN log of the
projects/pf/head branch. And for reference, here is exact list of
revisions merged:
r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330,
r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656,
r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782,
r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868,
r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223,
r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456,
r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505,
r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168,
r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230,
r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398,
r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548,
r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672,
r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169,
r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442,
r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522,
r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661,
r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212.
I'd like to thank people who participated in early testing:
Tested by: Florian Smeets <flo freebsd.org>
Tested by: Chekaluk Vitaly <artemrts ukr.net>
Tested by: Ben Wilber <ben desync.com>
Tested by: Ian FREISLICH <ianf cloudseed.co.za>
2012-09-08 06:41:54 +00:00
|
|
|
struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct pf_addr *,
|
|
|
|
struct pf_addr *, u_int16_t, u_int16_t);
|
|
|
|
struct pf_state_key *pf_state_key_clone(struct pf_state_key *);
|
2011-06-28 11:57:25 +00:00
|
|
|
#endif /* _KERNEL */
|
|
|
|
|
2004-02-26 02:04:28 +00:00
|
|
|
#endif /* _NET_PFVAR_H_ */
|