svn commit: r240131 - in projects/pf/head: contrib/pf/pfctl
sys/contrib/pf/net sys/modules/pf
Gleb Smirnoff
glebius at FreeBSD.org
Wed Sep 5 09:02:19 UTC 2012
Author: glebius
Date: Wed Sep 5 09:02:18 2012
New Revision: 240131
URL: http://svn.freebsd.org/changeset/base/240131
Log:
The device pflow had never been exported into FreeBSD,
so wipe its remnants around pf code.
Deleted:
projects/pf/head/sys/contrib/pf/net/if_pflow.h
Modified:
projects/pf/head/contrib/pf/pfctl/parse.y
projects/pf/head/contrib/pf/pfctl/pf_print_state.c
projects/pf/head/contrib/pf/pfctl/pfctl_parser.c
projects/pf/head/sys/contrib/pf/net/pf.c
projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
projects/pf/head/sys/contrib/pf/net/pf_lb.c
projects/pf/head/sys/contrib/pf/net/pfvar.h
projects/pf/head/sys/modules/pf/Makefile
Modified: projects/pf/head/contrib/pf/pfctl/parse.y
==============================================================================
--- projects/pf/head/contrib/pf/pfctl/parse.y Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/contrib/pf/pfctl/parse.y Wed Sep 5 09:02:18 2012 (r240131)
@@ -159,8 +159,7 @@ enum { PF_STATE_OPT_MAX, PF_STATE_OPT_NO
PF_STATE_OPT_MAX_SRC_STATES, PF_STATE_OPT_MAX_SRC_CONN,
PF_STATE_OPT_MAX_SRC_CONN_RATE, PF_STATE_OPT_MAX_SRC_NODES,
PF_STATE_OPT_OVERLOAD, PF_STATE_OPT_STATELOCK,
- PF_STATE_OPT_TIMEOUT, PF_STATE_OPT_SLOPPY,
- PF_STATE_OPT_PFLOW };
+ PF_STATE_OPT_TIMEOUT, PF_STATE_OPT_SLOPPY, };
enum { PF_SRCTRACK_NONE, PF_SRCTRACK, PF_SRCTRACK_GLOBAL, PF_SRCTRACK_RULE };
@@ -451,7 +450,7 @@ int parseport(char *, struct range *r, i
%token QUEUE PRIORITY QLIMIT RTABLE
%token LOAD RULESET_OPTIMIZATION
%token STICKYADDRESS MAXSRCSTATES MAXSRCNODES SOURCETRACK GLOBAL RULE
-%token MAXSRCCONN MAXSRCCONNRATE OVERLOAD FLUSH SLOPPY PFLOW
+%token MAXSRCCONN MAXSRCCONNRATE OVERLOAD FLUSH SLOPPY
%token TAGGED TAG IFBOUND FLOATING STATEPOLICY STATEDEFAULTS ROUTE SETTOS
%token DIVERTTO DIVERTREPLY
%token <v.string> STRING
@@ -2081,15 +2080,6 @@ pfrule : action dir logquick interface
}
r.rule_flag |= PFRULE_STATESLOPPY;
break;
- case PF_STATE_OPT_PFLOW:
- if (r.rule_flag & PFRULE_PFLOW) {
- yyerror("state pflow "
- "option: multiple "
- "definitions");
- YYERROR;
- }
- r.rule_flag |= PFRULE_PFLOW;
- break;
case PF_STATE_OPT_TIMEOUT:
if (o->data.timeout.number ==
PFTM_ADAPTIVE_START ||
@@ -3577,14 +3567,6 @@ state_opt_item : MAXIMUM NUMBER {
$$->next = NULL;
$$->tail = $$;
}
- | PFLOW {
- $$ = calloc(1, sizeof(struct node_state_opt));
- if ($$ == NULL)
- err(1, "state_opt_item: calloc");
- $$->type = PF_STATE_OPT_PFLOW;
- $$->next = NULL;
- $$->tail = $$;
- }
| STRING NUMBER {
int i;
@@ -5300,7 +5282,6 @@ lookup(char *s)
{ "out", OUT},
{ "overload", OVERLOAD},
{ "pass", PASS},
- { "pflow", PFLOW},
{ "port", PORT},
{ "priority", PRIORITY},
{ "priq", PRIQ},
Modified: projects/pf/head/contrib/pf/pfctl/pf_print_state.c
==============================================================================
--- projects/pf/head/contrib/pf/pfctl/pf_print_state.c Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/contrib/pf/pfctl/pf_print_state.c Wed Sep 5 09:02:18 2012 (r240131)
@@ -336,8 +336,6 @@ print_state(struct pfsync_state *s, int
printf(", rule %u", ntohl(s->rule));
if (s->state_flags & PFSTATE_SLOPPY)
printf(", sloppy");
- if (s->state_flags & PFSTATE_PFLOW)
- printf(", pflow");
if (s->sync_flags & PFSYNC_FLAG_SRCNODE)
printf(", source-track");
if (s->sync_flags & PFSYNC_FLAG_NATSRCNODE)
Modified: projects/pf/head/contrib/pf/pfctl/pfctl_parser.c
==============================================================================
--- projects/pf/head/contrib/pf/pfctl/pfctl_parser.c Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/contrib/pf/pfctl/pfctl_parser.c Wed Sep 5 09:02:18 2012 (r240131)
@@ -955,12 +955,6 @@ print_rule(struct pf_rule *r, const char
printf("sloppy");
opts = 0;
}
- if (r->rule_flag & PFRULE_PFLOW) {
- if (!opts)
- printf(", ");
- printf("pflow");
- opts = 0;
- }
for (i = 0; i < PFTM_MAX; ++i)
if (r->timeout[i]) {
int j;
Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/sys/contrib/pf/net/pf.c Wed Sep 5 09:02:18 2012 (r240131)
@@ -44,13 +44,6 @@ __FBSDID("$FreeBSD$");
#include "opt_bpf.h"
#include "opt_pf.h"
-#ifdef DEV_PFLOW
-#define NPFLOW DEV_PFLOW
-#else
-#define NPFLOW 0
-#endif
-
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -100,7 +93,6 @@ __FBSDID("$FreeBSD$");
#include <net/pfvar.h>
#include <net/if_pflog.h>
-#include <net/if_pflow.h>
#include <net/if_pfsync.h>
#ifdef INET6
@@ -1490,11 +1482,6 @@ pf_unlink_state(struct pf_state *s, u_in
}
LIST_REMOVE(s, entry);
-#if NPFLOW > 0
- if (s->state_flags & PFSTATE_PFLOW)
- if (export_pflow_ptr != NULL)
- export_pflow_ptr(s);
-#endif
pf_src_tree_remove_state(s);
PF_HASHROW_UNLOCK(ih);
@@ -3355,8 +3342,6 @@ pf_create_state(struct pf_rule *r, struc
s->state_flags |= PFSTATE_ALLOWOPTS;
if (r->rule_flag & PFRULE_STATESLOPPY)
s->state_flags |= PFSTATE_SLOPPY;
- if (r->rule_flag & PFRULE_PFLOW)
- s->state_flags |= PFSTATE_PFLOW;
s->log = r->log & PF_LOG_ALL;
s->sync_state = PFSYNC_S_NONE;
if (nr != NULL)
Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c Wed Sep 5 09:02:18 2012 (r240131)
@@ -210,8 +210,6 @@ pfsync_update_state_t *pfsync_update_st
pfsync_delete_state_t *pfsync_delete_state_ptr = NULL;
pfsync_clear_states_t *pfsync_clear_states_ptr = NULL;
pfsync_defer_t *pfsync_defer_ptr = NULL;
-/* pflow */
-export_pflow_t *export_pflow_ptr = NULL;
/* pflog */
pflog_packet_t *pflog_packet_ptr = NULL;
Modified: projects/pf/head/sys/contrib/pf/net/pf_lb.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_lb.c Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/sys/contrib/pf/net/pf_lb.c Wed Sep 5 09:02:18 2012 (r240131)
@@ -43,12 +43,6 @@ __FBSDID("$FreeBSD$");
#include "opt_pf.h"
-#ifdef DEV_PFLOW
-#define NPFLOW DEV_PFLOW
-#else
-#define NPFLOW 0
-#endif
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
@@ -88,7 +82,6 @@ __FBSDID("$FreeBSD$");
#include <net/pfvar.h>
#include <net/if_pflog.h>
-#include <net/if_pflow.h>
#ifdef INET6
#include <netinet/ip6.h>
Modified: projects/pf/head/sys/contrib/pf/net/pfvar.h
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pfvar.h Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/sys/contrib/pf/net/pfvar.h Wed Sep 5 09:02:18 2012 (r240131)
@@ -689,7 +689,6 @@ struct pf_rule {
/* rule flags again */
#define PFRULE_IFBOUND 0x00010000 /* if-bound */
#define PFRULE_STATESLOPPY 0x00020000 /* sloppy state tracking */
-#define PFRULE_PFLOW 0x00040000
#define PFSTATE_HIWAT 10000 /* default state table size */
#define PFSTATE_ADAPT_START 6000 /* default adaptive timeout start */
@@ -818,7 +817,7 @@ struct pf_state {
u_int8_t state_flags;
#define PFSTATE_ALLOWOPTS 0x01
#define PFSTATE_SLOPPY 0x02
-#define PFSTATE_PFLOW 0x04
+/* was PFSTATE_PFLOW 0x04 */
#define PFSTATE_NOSYNC 0x08
#define PFSTATE_ACK 0x10
u_int8_t timeout;
@@ -903,11 +902,6 @@ extern pfsync_defer_t *pfsync_defer_ptr
void pfsync_state_export(struct pfsync_state *,
struct pf_state *);
-/* pflow */
-typedef int export_pflow_t(struct pf_state *);
-
-extern export_pflow_t *export_pflow_ptr;
-
/* pflog */
struct pf_ruleset;
struct pf_pdesc;
Modified: projects/pf/head/sys/modules/pf/Makefile
==============================================================================
--- projects/pf/head/sys/modules/pf/Makefile Wed Sep 5 08:50:41 2012 (r240130)
+++ projects/pf/head/sys/modules/pf/Makefile Wed Sep 5 09:02:18 2012 (r240131)
@@ -33,7 +33,6 @@ opt_pf.h:
echo "#define DEV_PF 1" > ${.TARGET}
echo "#define DEV_PFLOG 1" >> ${.TARGET}
echo "#define DEV_PFSYNC 1" >> ${.TARGET}
- echo "#define DEV_PFLOW 1" >> ${.TARGET}
.if defined(VIMAGE)
opt_global.h:
More information about the svn-src-projects
mailing list