svn commit: r221412 - in projects/pf/pf45: contrib/pf/pfctl
sys/contrib/pf/net sys/sys
Bjoern A. Zeeb
bz at FreeBSD.org
Tue May 3 20:47:16 UTC 2011
Author: bz
Date: Tue May 3 20:47:16 2011
New Revision: 221412
URL: http://svn.freebsd.org/changeset/base/221412
Log:
Another pass to cleanup most whitespace.
Modified:
projects/pf/pf45/contrib/pf/pfctl/parse.y
projects/pf/pf45/contrib/pf/pfctl/pfctl.c
projects/pf/pf45/contrib/pf/pfctl/pfctl.h
projects/pf/pf45/contrib/pf/pfctl/pfctl_altq.c
projects/pf/pf45/contrib/pf/pfctl/pfctl_parser.h
projects/pf/pf45/contrib/pf/pfctl/pfctl_qstats.c
projects/pf/pf45/contrib/pf/pfctl/pfctl_table.c
projects/pf/pf45/sys/contrib/pf/net/if_pflog.c
projects/pf/pf45/sys/contrib/pf/net/if_pflog.h
projects/pf/pf45/sys/contrib/pf/net/if_pflow.h
projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c
projects/pf/pf45/sys/contrib/pf/net/if_pfsync.h
projects/pf/pf45/sys/contrib/pf/net/pf.c
projects/pf/pf45/sys/contrib/pf/net/pf_if.c
projects/pf/pf45/sys/contrib/pf/net/pf_ioctl.c
projects/pf/pf45/sys/contrib/pf/net/pf_lb.c
projects/pf/pf45/sys/contrib/pf/net/pf_norm.c
projects/pf/pf45/sys/contrib/pf/net/pf_osfp.c
projects/pf/pf45/sys/contrib/pf/net/pf_ruleset.c
projects/pf/pf45/sys/contrib/pf/net/pf_table.c
projects/pf/pf45/sys/contrib/pf/net/pfvar.h
projects/pf/pf45/sys/sys/mbuf.h
Modified: projects/pf/pf45/contrib/pf/pfctl/parse.y
==============================================================================
--- projects/pf/pf45/contrib/pf/pfctl/parse.y Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/contrib/pf/pfctl/parse.y Tue May 3 20:47:16 2011 (r221412)
@@ -248,21 +248,21 @@ struct antispoof_opts {
} antispoof_opts;
struct scrub_opts {
- int marker;
+ int marker;
#define SOM_MINTTL 0x01
#define SOM_MAXMSS 0x02
#define SOM_FRAGCACHE 0x04
#define SOM_SETTOS 0x08
- int nodf;
- int minttl;
- int maxmss;
- int settos;
- int fragcache;
- int randomid;
- int reassemble_tcp;
- char *match_tag;
- u_int8_t match_tag_not;
- u_int rtableid;
+ int nodf;
+ int minttl;
+ int maxmss;
+ int settos;
+ int fragcache;
+ int randomid;
+ int reassemble_tcp;
+ char *match_tag;
+ u_int8_t match_tag_not;
+ u_int rtableid;
} scrub_opts;
struct queue_opts {
@@ -2371,9 +2371,9 @@ filter_opt : USER uids {
#ifdef __FreeBSD__
filter_opts.divert.port = $2.a;
if (!filter_opts.divert.port) {
- yyerror("invalid divert port: %u", ntohs($2.a));
- YYERROR;
- }
+ yyerror("invalid divert port: %u", ntohs($2.a));
+ YYERROR;
+ }
#endif
}
| DIVERTTO STRING PORT portplain {
Modified: projects/pf/pf45/contrib/pf/pfctl/pfctl.c
==============================================================================
--- projects/pf/pf45/contrib/pf/pfctl/pfctl.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/contrib/pf/pfctl/pfctl.c Tue May 3 20:47:16 2011 (r221412)
@@ -251,10 +251,10 @@ pfctl_enable(int dev, int opts)
if (ioctl(dev, DIOCSTART)) {
if (errno == EEXIST)
errx(1, "pf already enabled");
- #ifdef __FreeBSD__
- else if (errno == ESRCH)
- errx(1, "pfil registeration failed");
- #endif
+#ifdef __FreeBSD__
+ else if (errno == ESRCH)
+ errx(1, "pfil registeration failed");
+#endif
else
err(1, "DIOCSTART");
}
@@ -1208,7 +1208,7 @@ pfctl_add_rule(struct pfctl *pf, struct
r->anchor->ruleset.anchor = r->anchor;
if (strlcpy(r->anchor->path, anchor_call,
sizeof(rule->anchor->path)) >= sizeof(rule->anchor->path))
- errx(1, "pfctl_add_rule: strlcpy");
+ errx(1, "pfctl_add_rule: strlcpy");
if ((p = strrchr(anchor_call, '/')) != NULL) {
if (!strlen(p))
err(1, "pfctl_add_rule: bad anchor name %s",
@@ -1217,7 +1217,7 @@ pfctl_add_rule(struct pfctl *pf, struct
p = (char *)anchor_call;
if (strlcpy(r->anchor->name, p,
sizeof(rule->anchor->name)) >= sizeof(rule->anchor->name))
- errx(1, "pfctl_add_rule: strlcpy");
+ errx(1, "pfctl_add_rule: strlcpy");
}
if ((rule = calloc(1, sizeof(*rule))) == NULL)
@@ -1242,7 +1242,7 @@ pfctl_ruleset_trans(struct pfctl *pf, ch
return (1);
}
if (a == pf->astack[0] && ((altqsupport &&
- (pf->loadopt & PFCTL_FLAG_ALTQ) != 0))) {
+ (pf->loadopt & PFCTL_FLAG_ALTQ) != 0))) {
if (pfctl_add_trans(pf->trans, PF_RULESET_ALTQ, path))
return (2);
}
@@ -2197,9 +2197,9 @@ main(int argc, char *argv[])
/* turn off options */
opts &= ~ (PF_OPT_DISABLE | PF_OPT_ENABLE);
clearopt = showopt = debugopt = NULL;
- #if defined(__FreeBSD__) && !defined(ENABLE_ALTQ)
- altqsupport = 0;
- #else
+#if defined(__FreeBSD__) && !defined(ENABLE_ALTQ)
+ altqsupport = 0;
+#else
altqsupport = 1;
#endif
}
Modified: projects/pf/pf45/contrib/pf/pfctl/pfctl.h
==============================================================================
--- projects/pf/pf45/contrib/pf/pfctl/pfctl.h Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/contrib/pf/pfctl/pfctl.h Tue May 3 20:47:16 2011 (r221412)
@@ -89,7 +89,7 @@ FILE *pfctl_fopen(const char *, const ch
#ifdef __FreeBSD__
extern int altqsupport;
extern int dummynetsupport;
- #define HTONL(x) (x) = htonl((__uint32_t)(x))
+#define HTONL(x) (x) = htonl((__uint32_t)(x))
#endif
#ifndef DEFAULT_PRIORITY
Modified: projects/pf/pf45/contrib/pf/pfctl/pfctl_altq.c
==============================================================================
--- projects/pf/pf45/contrib/pf/pfctl/pfctl_altq.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/contrib/pf/pfctl/pfctl_altq.c Tue May 3 20:47:16 2011 (r221412)
@@ -194,8 +194,8 @@ print_queue(const struct pf_altq *a, uns
unsigned int i;
#ifdef __FreeBSD__
- if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
- printf("INACTIVE ");
+ if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
+ printf("INACTIVE ");
#endif
printf("queue ");
for (i = 0; i < level; ++i)
Modified: projects/pf/pf45/contrib/pf/pfctl/pfctl_parser.h
==============================================================================
--- projects/pf/pf45/contrib/pf/pfctl/pfctl_parser.h Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/contrib/pf/pfctl/pfctl_parser.h Tue May 3 20:47:16 2011 (r221412)
@@ -164,23 +164,23 @@ struct node_queue_opt {
* Absolutely this is not correct location to define this.
* Should we use an another sperate header file?
*/
-#define SIMPLEQ_HEAD STAILQ_HEAD
-#define SIMPLEQ_HEAD_INITIALIZER STAILQ_HEAD_INITIALIZER
-#define SIMPLEQ_ENTRY STAILQ_ENTRY
-#define SIMPLEQ_FIRST STAILQ_FIRST
-#define SIMPLEQ_END(head) NULL
-#define SIMPLEQ_EMPTY STAILQ_EMPTY
-#define SIMPLEQ_NEXT STAILQ_NEXT
-/*#define SIMPLEQ_FOREACH STAILQ_FOREACH*/
-#define SIMPLEQ_FOREACH(var, head, field) \
- for((var) = SIMPLEQ_FIRST(head); \
- (var) != SIMPLEQ_END(head); \
- (var) = SIMPLEQ_NEXT(var, field))
-#define SIMPLEQ_INIT STAILQ_INIT
-#define SIMPLEQ_INSERT_HEAD STAILQ_INSERT_HEAD
-#define SIMPLEQ_INSERT_TAIL STAILQ_INSERT_TAIL
-#define SIMPLEQ_INSERT_AFTER STAILQ_INSERT_AFTER
-#define SIMPLEQ_REMOVE_HEAD STAILQ_REMOVE_HEAD
+#define SIMPLEQ_HEAD STAILQ_HEAD
+#define SIMPLEQ_HEAD_INITIALIZER STAILQ_HEAD_INITIALIZER
+#define SIMPLEQ_ENTRY STAILQ_ENTRY
+#define SIMPLEQ_FIRST STAILQ_FIRST
+#define SIMPLEQ_END(head) NULL
+#define SIMPLEQ_EMPTY STAILQ_EMPTY
+#define SIMPLEQ_NEXT STAILQ_NEXT
+/*#define SIMPLEQ_FOREACH STAILQ_FOREACH*/
+#define SIMPLEQ_FOREACH(var, head, field) \
+ for((var) = SIMPLEQ_FIRST(head); \
+ (var) != SIMPLEQ_END(head); \
+ (var) = SIMPLEQ_NEXT(var, field))
+#define SIMPLEQ_INIT STAILQ_INIT
+#define SIMPLEQ_INSERT_HEAD STAILQ_INSERT_HEAD
+#define SIMPLEQ_INSERT_TAIL STAILQ_INSERT_TAIL
+#define SIMPLEQ_INSERT_AFTER STAILQ_INSERT_AFTER
+#define SIMPLEQ_REMOVE_HEAD STAILQ_REMOVE_HEAD
#endif
SIMPLEQ_HEAD(node_tinithead, node_tinit);
struct node_tinit { /* table initializer */
Modified: projects/pf/pf45/contrib/pf/pfctl/pfctl_qstats.c
==============================================================================
--- projects/pf/pf45/contrib/pf/pfctl/pfctl_qstats.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/contrib/pf/pfctl/pfctl_qstats.c Tue May 3 20:47:16 2011 (r221412)
@@ -73,7 +73,7 @@ void pfctl_insert_altq_node(struct pf
struct pf_altq_node *pfctl_find_altq_node(struct pf_altq_node *,
const char *, const char *);
void pfctl_print_altq_node(int, const struct pf_altq_node *,
- unsigned, int);
+ unsigned, int);
void print_cbqstats(struct queue_stats);
void print_priqstats(struct queue_stats);
void print_hfscstats(struct queue_stats);
@@ -185,17 +185,17 @@ pfctl_update_qstats(int dev, struct pf_a
}
}
#ifdef __FreeBSD__
- else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) {
- memset(&qstats.data, 0, sizeof(qstats.data));
- if ((node = pfctl_find_altq_node(*root, pa.altq.qname,
- pa.altq.ifname)) != NULL) {
- memcpy(&node->qstats.data, &qstats.data,
- sizeof(qstats.data));
- update_avg(node);
- } else {
- pfctl_insert_altq_node(root, pa.altq, qstats);
- }
- }
+ else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) {
+ memset(&qstats.data, 0, sizeof(qstats.data));
+ if ((node = pfctl_find_altq_node(*root, pa.altq.qname,
+ pa.altq.ifname)) != NULL) {
+ memcpy(&node->qstats.data, &qstats.data,
+ sizeof(qstats.data));
+ update_avg(node);
+ } else {
+ pfctl_insert_altq_node(root, pa.altq, qstats);
+ }
+ }
#endif
}
return (mnr);
@@ -304,8 +304,8 @@ pfctl_print_altq_nodestat(int dev, const
return;
#ifdef __FreeBSD__
- if (a->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
- return;
+ if (a->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
+ return;
#endif
switch (a->altq.scheduler) {
case ALTQT_CBQ:
Modified: projects/pf/pf45/contrib/pf/pfctl/pfctl_table.c
==============================================================================
--- projects/pf/pf45/contrib/pf/pfctl/pfctl_table.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/contrib/pf/pfctl/pfctl_table.c Tue May 3 20:47:16 2011 (r221412)
@@ -278,7 +278,7 @@ pfctl_table(int argc, char *argv[], char
PFRB_FOREACH(p, &b) {
((struct pfr_astats *)p)->pfras_a.pfra_fback = 0;
if (time(NULL) - ((struct pfr_astats *)p)->pfras_tzero >
- lifetime)
+ lifetime)
if (pfr_buf_add(&b2,
&((struct pfr_astats *)p)->pfras_a))
err(1, "duplicate buffer");
Modified: projects/pf/pf45/sys/contrib/pf/net/if_pflog.c
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/if_pflog.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/if_pflog.c Tue May 3 20:47:16 2011 (r221412)
@@ -2,7 +2,7 @@
/*
* The authors of this code are John Ioannidis (ji at tla.org),
* Angelos D. Keromytis (kermit at csd.uch.gr) and
- * Niels Provos (provos at physnet.uni hamburg.de).
+ * Niels Provos (provos at physnet.uni-hamburg.de).
*
* This code was written by John Ioannidis for BSD/OS in Athens, Greece,
* in November 1995.
@@ -116,9 +116,9 @@ __FBSDID("$FreeBSD$");
void pflogattach(int);
int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
#ifdef __FreeBSD__
- struct route *);
+ struct route *);
#else
- struct rtentry *);
+ struct rtentry *);
#endif
int pflogioctl(struct ifnet *, u_long, caddr_t);
void pflogstart(struct ifnet *);
Modified: projects/pf/pf45/sys/contrib/pf/net/if_pflog.h
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/if_pflog.h Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/if_pflog.h Tue May 3 20:47:16 2011 (r221412)
@@ -25,13 +25,13 @@
*/
#ifndef _NET_IF_PFLOG_H_
-#define _NET_IF_PFLOG_H_
+#define _NET_IF_PFLOG_H_
#define PFLOGIFS_MAX 16
struct pflog_softc {
#ifdef __FreeBSD__
- struct ifnet *sc_ifp; /* the interface pointer */
+ struct ifnet *sc_ifp;i /* the interface pointer */
#else
struct ifnet sc_if; /* the interface */
#endif
@@ -39,7 +39,7 @@ struct pflog_softc {
LIST_ENTRY(pflog_softc) sc_list;
};
-#define PFLOG_RULESET_NAME_SIZE 16
+#define PFLOG_RULESET_NAME_SIZE 16
struct pfloghdr {
u_int8_t length;
@@ -58,9 +58,9 @@ struct pfloghdr {
u_int8_t pad[3];
};
-#define PFLOG_HDRLEN sizeof(struct pfloghdr)
+#define PFLOG_HDRLEN sizeof(struct pfloghdr)
/* minus pad, also used as a signature */
-#define PFLOG_REAL_HDRLEN offsetof(struct pfloghdr, pad)
+#define PFLOG_REAL_HDRLEN offsetof(struct pfloghdr, pad)
/* XXX remove later when old format logs are no longer needed */
struct old_pfloghdr {
@@ -71,25 +71,25 @@ struct old_pfloghdr {
u_short action;
u_short dir;
};
-#define OLD_PFLOG_HDRLEN sizeof(struct old_pfloghdr)
+#define OLD_PFLOG_HDRLEN sizeof(struct old_pfloghdr)
#ifdef _KERNEL
#ifdef __FreeBSD__
- struct pf_rule;
- struct pf_ruleset;
- struct pfi_kif;
- struct pf_pdesc;
-
+struct pf_rule;
+struct pf_ruleset;
+struct pfi_kif;
+struct pf_pdesc;
+
#if 0
typedef int pflog_packet_t(struct pfi_kif *, struct mbuf *, sa_family_t,
u_int8_t, u_int8_t, struct pf_rule *, struct pf_rule *,
struct pf_ruleset *, struct pf_pdesc *);
extern pflog_packet_t *pflog_packet_ptr;
#endif
-#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g,h) do { \
- if (pflog_packet_ptr != NULL) \
- pflog_packet_ptr(i,a,b,c,d,e,f,g,h); \
- } while (0)
+#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g,h) do { \
+ if (pflog_packet_ptr != NULL) \
+ pflog_packet_ptr(i,a,b,c,d,e,f,g,h); \
+} while (0)
#else /* ! __FreeBSD__ */
#if NPFLOG > 0
#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g,h) pflog_packet(i,a,b,c,d,e,f,g,h)
Modified: projects/pf/pf45/sys/contrib/pf/net/if_pflow.h
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/if_pflow.h Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/if_pflow.h Tue May 3 20:47:16 2011 (r221412)
@@ -20,16 +20,16 @@
*/
#ifndef _NET_IF_PFLOW_H_
-#define _NET_IF_PFLOW_H_
+#define _NET_IF_PFLOW_H_
-#define PFLOW_ID_LEN sizeof(u_int64_t)
+#define PFLOW_ID_LEN sizeof(u_int64_t)
-#define PFLOW_MAXFLOWS 30
-#define PFLOW_VERSION 5
-#define PFLOW_ENGINE_TYPE 42
-#define PFLOW_ENGINE_ID 42
-#define PFLOW_MAXBYTES 0xffffffff
-#define PFLOW_TIMEOUT 30
+#define PFLOW_MAXFLOWS 30
+#define PFLOW_VERSION 5
+#define PFLOW_ENGINE_TYPE 42
+#define PFLOW_ENGINE_ID 42
+#define PFLOW_MAXBYTES 0xffffffff
+#define PFLOW_TIMEOUT 30
struct pflow_flow {
u_int32_t src_ip;
@@ -96,7 +96,7 @@ struct pflow_header {
u_int8_t reserved2;
} __packed;
-#define PFLOW_HDRLEN sizeof(struct pflow_header)
+#define PFLOW_HDRLEN sizeof(struct pflow_header)
struct pflowstats {
u_int64_t pflow_flows;
@@ -113,9 +113,9 @@ struct pflowreq {
struct in_addr receiver_ip;
u_int16_t receiver_port;
u_int16_t addrmask;
-#define PFLOW_MASK_SRCIP 0x01
-#define PFLOW_MASK_DSTIP 0x02
-#define PFLOW_MASK_DSTPRT 0x04
+#define PFLOW_MASK_SRCIP 0x01
+#define PFLOW_MASK_DSTIP 0x02
+#define PFLOW_MASK_DSTPRT 0x04
};
#ifdef _KERNEL
Modified: projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/if_pfsync.c Tue May 3 20:47:16 2011 (r221412)
@@ -3380,9 +3380,9 @@ vnet_pfsync_uninit(const void *unused)
}
/* Define startup order. */
-#define PFSYNC_SYSINIT_ORDER SI_SUB_PROTO_BEGIN
-#define PFSYNC_MODEVENT_ORDER (SI_ORDER_FIRST) /* On boot slot in here. */
-#define PFSYNC_VNET_ORDER (PFSYNC_MODEVENT_ORDER + 2) /* Later still. */
+#define PFSYNC_SYSINIT_ORDER SI_SUB_PROTO_BEGIN
+#define PFSYNC_MODEVENT_ORDER (SI_ORDER_FIRST) /* On boot slot in here. */
+#define PFSYNC_VNET_ORDER (PFSYNC_MODEVENT_ORDER + 2) /* Later still. */
/*
* Starting up.
Modified: projects/pf/pf45/sys/contrib/pf/net/if_pfsync.h
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/if_pfsync.h Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/if_pfsync.h Tue May 3 20:47:16 2011 (r221412)
@@ -43,27 +43,27 @@
*/
#ifndef _NET_IF_PFSYNC_H_
-#define _NET_IF_PFSYNC_H_
+#define _NET_IF_PFSYNC_H_
-#define PFSYNC_VERSION 5
-#define PFSYNC_DFLTTL 255
+#define PFSYNC_VERSION 5
+#define PFSYNC_DFLTTL 255
-#define PFSYNC_ACT_CLR 0 /* clear all states */
-#define PFSYNC_ACT_INS 1 /* insert state */
-#define PFSYNC_ACT_INS_ACK 2 /* ack of insterted state */
-#define PFSYNC_ACT_UPD 3 /* update state */
-#define PFSYNC_ACT_UPD_C 4 /* "compressed" update state */
-#define PFSYNC_ACT_UPD_REQ 5 /* request "uncompressed" state */
-#define PFSYNC_ACT_DEL 6 /* delete state */
-#define PFSYNC_ACT_DEL_C 7 /* "compressed" delete state */
-#define PFSYNC_ACT_INS_F 8 /* insert fragment */
-#define PFSYNC_ACT_DEL_F 9 /* delete fragments */
-#define PFSYNC_ACT_BUS 10 /* bulk update status */
-#define PFSYNC_ACT_TDB 11 /* TDB replay counter update */
-#define PFSYNC_ACT_EOF 12 /* end of frame */
-#define PFSYNC_ACT_MAX 13
+#define PFSYNC_ACT_CLR 0 /* clear all states */
+#define PFSYNC_ACT_INS 1 /* insert state */
+#define PFSYNC_ACT_INS_ACK 2 /* ack of insterted state */
+#define PFSYNC_ACT_UPD 3 /* update state */
+#define PFSYNC_ACT_UPD_C 4 /* "compressed" update state */
+#define PFSYNC_ACT_UPD_REQ 5 /* request "uncompressed" state */
+#define PFSYNC_ACT_DEL 6 /* delete state */
+#define PFSYNC_ACT_DEL_C 7 /* "compressed" delete state */
+#define PFSYNC_ACT_INS_F 8 /* insert fragment */
+#define PFSYNC_ACT_DEL_F 9 /* delete fragments */
+#define PFSYNC_ACT_BUS 10 /* bulk update status */
+#define PFSYNC_ACT_TDB 11 /* TDB replay counter update */
+#define PFSYNC_ACT_EOF 12 /* end of frame */
+#define PFSYNC_ACT_MAX 13
-#define PFSYNC_ACTIONS "CLR ST", \
+#define PFSYNC_ACTIONS "CLR ST", \
"INS ST", \
"INS ST ACK", \
"UPD ST", \
@@ -77,7 +77,7 @@
"TDB UPD", \
"EOF"
-#define PFSYNC_HMAC_LEN 20
+#define PFSYNC_HMAC_LEN 20
/*
* A pfsync frame is built from a header followed by several sections which
@@ -196,8 +196,8 @@ struct pfsync_bus {
u_int32_t creatorid;
u_int32_t endtime;
u_int8_t status;
-#define PFSYNC_BUS_START 1
-#define PFSYNC_BUS_END 2
+#define PFSYNC_BUS_START 1
+#define PFSYNC_BUS_END 2
u_int8_t _pad[3];
} __packed;
@@ -223,7 +223,7 @@ struct pfsync_eof {
u_int8_t hmac[PFSYNC_HMAC_LEN];
} __packed;
-#define PFSYNC_HDRLEN sizeof(struct pfsync_header)
+#define PFSYNC_HDRLEN sizeof(struct pfsync_header)
@@ -269,8 +269,8 @@ struct pfsyncreq {
};
#ifdef __FreeBSD__
-#define SIOCSETPFSYNC _IOW('i', 247, struct ifreq)
-#define SIOCGETPFSYNC _IOWR('i', 248, struct ifreq)
+#define SIOCSETPFSYNC _IOW('i', 247, struct ifreq)
+#define SIOCGETPFSYNC _IOWR('i', 248, struct ifreq)
#endif
#ifdef _KERNEL
@@ -278,15 +278,15 @@ struct pfsyncreq {
/*
* this shows where a pf state is with respect to the syncing.
*/
-#define PFSYNC_S_INS 0x00
-#define PFSYNC_S_IACK 0x01
-#define PFSYNC_S_UPD 0x02
-#define PFSYNC_S_UPD_C 0x03
-#define PFSYNC_S_DEL 0x04
-#define PFSYNC_S_COUNT 0x05
+#define PFSYNC_S_INS 0x00
+#define PFSYNC_S_IACK 0x01
+#define PFSYNC_S_UPD 0x02
+#define PFSYNC_S_UPD_C 0x03
+#define PFSYNC_S_DEL 0x04
+#define PFSYNC_S_COUNT 0x05
-#define PFSYNC_S_DEFER 0xfe
-#define PFSYNC_S_NONE 0xff
+#define PFSYNC_S_DEFER 0xfe
+#define PFSYNC_S_NONE 0xff
#ifdef __FreeBSD__
void pfsync_input(struct mbuf *, __unused int);
Modified: projects/pf/pf45/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/pf.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/pf.c Tue May 3 20:47:16 2011 (r221412)
@@ -876,7 +876,7 @@ int
pf_state_key_attach(struct pf_state_key *sk, struct pf_state *s, int idx)
{
struct pf_state_item *si;
- struct pf_state_key *cur;
+ struct pf_state_key *cur;
struct pf_state *olds = NULL;
#ifdef __FreeBSD__
@@ -1419,7 +1419,7 @@ pf_state_expires(const struct pf_state *
return (time_second);
if (state->timeout == PFTM_UNTIL_PACKET)
return (0);
-#ifdef __FreeBSD__
+#ifdef __FreeBSD__
KASSERT(state->timeout != PFTM_UNLINKED,
("pf_state_expires: timeout == PFTM_UNLINKED"));
KASSERT((state->timeout < PFTM_MAX),
@@ -2999,7 +2999,7 @@ pf_socket_lookup(int direction, struct p
#ifdef INET
case AF_INET:
#ifdef __FreeBSD__
- INP_INFO_RLOCK(pi); /* XXX LOR */
+ INP_INFO_RLOCK(pi); /* XXX LOR */
inp = in_pcblookup_hash(pi, saddr->v4, sport, daddr->v4,
dport, 0, NULL);
if (inp == NULL) {
@@ -6007,7 +6007,7 @@ pf_route(struct mbuf **m, struct pf_rule
* XXX: in_delayed_cksum assumes HBO for ip->ip_len (at least)
*/
NTOHS(ip->ip_len);
- NTOHS(ip->ip_off); /* XXX: needed? */
+ NTOHS(ip->ip_off); /* XXX: needed? */
in_delayed_cksum(m0);
HTONS(ip->ip_len);
HTONS(ip->ip_off);
@@ -6380,7 +6380,7 @@ pf_check_proto_cksum(struct mbuf *m, int
if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR) {
sum = m->m_pkthdr.csum_data;
} else {
- ip = mtod(m, struct ip *);
+ ip = mtod(m, struct ip *);
sum = in_pseudo(ip->ip_src.s_addr,
ip->ip_dst.s_addr, htonl((u_short)len +
m->m_pkthdr.csum_data + IPPROTO_UDP));
Modified: projects/pf/pf45/sys/contrib/pf/net/pf_if.c
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/pf_if.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/pf_if.c Tue May 3 20:47:16 2011 (r221412)
@@ -35,7 +35,7 @@
#if defined(__FreeBSD__)
#include "opt_inet.h"
#include "opt_inet6.h"
-
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#endif
@@ -118,12 +118,12 @@ int pfi_if_compare(struct pfi_kif *, s
int pfi_skip_if(const char *, struct pfi_kif *);
int pfi_unmask(void *);
#ifdef __FreeBSD__
-void pfi_attach_ifnet_event(void * __unused, struct ifnet *);
-void pfi_detach_ifnet_event(void * __unused, struct ifnet *);
-void pfi_attach_group_event(void *, struct ifg_group *);
-void pfi_change_group_event(void *, char *);
-void pfi_detach_group_event(void *, struct ifg_group *);
-void pfi_ifaddr_event(void * __unused, struct ifnet *);
+void pfi_attach_ifnet_event(void * __unused, struct ifnet *);
+void pfi_detach_ifnet_event(void * __unused, struct ifnet *);
+void pfi_attach_group_event(void *, struct ifg_group *);
+void pfi_change_group_event(void *, char *);
+void pfi_detach_group_event(void *, struct ifg_group *);
+void pfi_ifaddr_event(void * __unused, struct ifnet *);
#endif
RB_PROTOTYPE(pfi_ifhead, pfi_kif, pfik_tree, pfi_if_compare);
@@ -160,61 +160,61 @@ pfi_initialize(void)
if ((pfi_all = pfi_kif_get(IFG_ALL)) == NULL)
#endif
panic("pfi_kif_get for pfi_all failed");
- #ifdef __FreeBSD__
- struct ifg_group *ifg;
- struct ifnet *ifp;
-
- IFNET_RLOCK();
- TAILQ_FOREACH(ifg, &V_ifg_head, ifg_next)
- pfi_attach_ifgroup(ifg);
- TAILQ_FOREACH(ifp, &V_ifnet, if_link)
- pfi_attach_ifnet(ifp);
- IFNET_RUNLOCK();
-
- pfi_attach_cookie = EVENTHANDLER_REGISTER(ifnet_arrival_event,
- pfi_attach_ifnet_event, NULL, EVENTHANDLER_PRI_ANY);
- pfi_detach_cookie = EVENTHANDLER_REGISTER(ifnet_departure_event,
- pfi_detach_ifnet_event, NULL, EVENTHANDLER_PRI_ANY);
- pfi_attach_group_cookie = EVENTHANDLER_REGISTER(group_attach_event,
- pfi_attach_group_event, curvnet, EVENTHANDLER_PRI_ANY);
- pfi_change_group_cookie = EVENTHANDLER_REGISTER(group_change_event,
- pfi_change_group_event, curvnet, EVENTHANDLER_PRI_ANY);
- pfi_detach_group_cookie = EVENTHANDLER_REGISTER(group_detach_event,
- pfi_detach_group_event, curvnet, EVENTHANDLER_PRI_ANY);
- pfi_ifaddr_event_cookie = EVENTHANDLER_REGISTER(ifaddr_event,
- pfi_ifaddr_event, NULL, EVENTHANDLER_PRI_ANY);
- #endif
- }
-
- #ifdef __FreeBSD__
- void
- pfi_cleanup(void)
- {
- struct pfi_kif *p;
-
- PF_UNLOCK();
- EVENTHANDLER_DEREGISTER(ifnet_arrival_event, pfi_attach_cookie);
- EVENTHANDLER_DEREGISTER(ifnet_departure_event, pfi_detach_cookie);
- EVENTHANDLER_DEREGISTER(group_attach_event, pfi_attach_group_cookie);
- EVENTHANDLER_DEREGISTER(group_change_event, pfi_change_group_cookie);
- EVENTHANDLER_DEREGISTER(group_detach_event, pfi_detach_group_cookie);
- EVENTHANDLER_DEREGISTER(ifaddr_event, pfi_ifaddr_event_cookie);
- PF_LOCK();
-
- V_pfi_all = NULL;
- while ((p = RB_MIN(pfi_ifhead, &V_pfi_ifs))) {
- if (p->pfik_rules || p->pfik_states) {
- printf("pfi_cleanup: dangling refs for %s\n",
- p->pfik_name);
- }
-
- RB_REMOVE(pfi_ifhead, &V_pfi_ifs, p);
- free(p, PFI_MTYPE);
- }
-
- free(V_pfi_buffer, PFI_MTYPE);
- }
- #endif
+#ifdef __FreeBSD__
+ struct ifg_group *ifg;
+ struct ifnet *ifp;
+
+ IFNET_RLOCK();
+ TAILQ_FOREACH(ifg, &V_ifg_head, ifg_next)
+ pfi_attach_ifgroup(ifg);
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link)
+ pfi_attach_ifnet(ifp);
+ IFNET_RUNLOCK();
+
+ pfi_attach_cookie = EVENTHANDLER_REGISTER(ifnet_arrival_event,
+ pfi_attach_ifnet_event, NULL, EVENTHANDLER_PRI_ANY);
+ pfi_detach_cookie = EVENTHANDLER_REGISTER(ifnet_departure_event,
+ pfi_detach_ifnet_event, NULL, EVENTHANDLER_PRI_ANY);
+ pfi_attach_group_cookie = EVENTHANDLER_REGISTER(group_attach_event,
+ pfi_attach_group_event, curvnet, EVENTHANDLER_PRI_ANY);
+ pfi_change_group_cookie = EVENTHANDLER_REGISTER(group_change_event,
+ pfi_change_group_event, curvnet, EVENTHANDLER_PRI_ANY);
+ pfi_detach_group_cookie = EVENTHANDLER_REGISTER(group_detach_event,
+ pfi_detach_group_event, curvnet, EVENTHANDLER_PRI_ANY);
+ pfi_ifaddr_event_cookie = EVENTHANDLER_REGISTER(ifaddr_event,
+ pfi_ifaddr_event, NULL, EVENTHANDLER_PRI_ANY);
+#endif
+}
+
+#ifdef __FreeBSD__
+void
+pfi_cleanup(void)
+{
+ struct pfi_kif *p;
+
+ PF_UNLOCK();
+ EVENTHANDLER_DEREGISTER(ifnet_arrival_event, pfi_attach_cookie);
+ EVENTHANDLER_DEREGISTER(ifnet_departure_event, pfi_detach_cookie);
+ EVENTHANDLER_DEREGISTER(group_attach_event, pfi_attach_group_cookie);
+ EVENTHANDLER_DEREGISTER(group_change_event, pfi_change_group_cookie);
+ EVENTHANDLER_DEREGISTER(group_detach_event, pfi_detach_group_cookie);
+ EVENTHANDLER_DEREGISTER(ifaddr_event, pfi_ifaddr_event_cookie);
+ PF_LOCK();
+
+ V_pfi_all = NULL;
+ while ((p = RB_MIN(pfi_ifhead, &V_pfi_ifs))) {
+ if (p->pfik_rules || p->pfik_states) {
+ printf("pfi_cleanup: dangling refs for %s\n",
+ p->pfik_name);
+ }
+
+ RB_REMOVE(pfi_ifhead, &V_pfi_ifs, p);
+ free(p, PFI_MTYPE);
+ }
+
+ free(V_pfi_buffer, PFI_MTYPE);
+}
+#endif
struct pfi_kif *
pfi_kif_get(const char *kif_name)
@@ -232,24 +232,24 @@ pfi_kif_get(const char *kif_name)
return (kif);
/* create new one */
- #ifdef __FreeBSD__
- if ((kif = malloc(sizeof(*kif), PFI_MTYPE, M_NOWAIT | M_ZERO)) == NULL)
- #else
+#ifdef __FreeBSD__
+ if ((kif = malloc(sizeof(*kif), PFI_MTYPE, M_NOWAIT | M_ZERO)) == NULL)
+#else
if ((kif = malloc(sizeof(*kif), PFI_MTYPE, M_DONTWAIT|M_ZERO)) == NULL)
#endif
return (NULL);
strlcpy(kif->pfik_name, kif_name, sizeof(kif->pfik_name));
- #ifdef __FreeBSD__
- /*
- * It seems that the value of time_second is in unintialzied state
- * when pf sets interface statistics clear time in boot phase if pf
- * was statically linked to kernel. Instead of setting the bogus
- * time value have pfi_get_ifaces handle this case. In
- * pfi_get_ifaces it uses boottime.tv_sec if it sees the time is 0.
- */
- kif->pfik_tzero = time_second > 1 ? time_second : 0;
- #else
+#ifdef __FreeBSD__
+ /*
+ * It seems that the value of time_second is in unintialzied state
+ * when pf sets interface statistics clear time in boot phase if pf
+ * was statically linked to kernel. Instead of setting the bogus
+ * time value have pfi_get_ifaces handle this case. In
+ * pfi_get_ifaces it uses boottime.tv_sec if it sees the time is 0.
+ */
+ kif->pfik_tzero = time_second > 1 ? time_second : 0;
+#else
kif->pfik_tzero = time_second;
#endif
TAILQ_INIT(&kif->pfik_dynaddrs);
@@ -668,17 +668,17 @@ pfi_instance_add(struct ifnet *ifp, int
if (af != AF_INET && af != AF_INET6)
continue;
#ifdef __FreeBSD__
- /*
- * XXX: For point-to-point interfaces, (ifname:0) and IPv4,
- * jump over addresses without a proper route to work
- * around a problem with ppp not fully removing the
- * address used during IPCP.
- */
- if ((ifp->if_flags & IFF_POINTOPOINT) &&
- !(ia->ifa_flags & IFA_ROUTE) &&
- (flags & PFI_AFLAG_NOALIAS) && (af == AF_INET))
- continue;
- #endif
+ /*
+ * XXX: For point-to-point interfaces, (ifname:0) and IPv4,
+ * jump over addresses without a proper route to work
+ * around a problem with ppp not fully removing the
+ * address used during IPCP.
+ */
+ if ((ifp->if_flags & IFF_POINTOPOINT) &&
+ !(ia->ifa_flags & IFA_ROUTE) &&
+ (flags & PFI_AFLAG_NOALIAS) && (af == AF_INET))
+ continue;
+#endif
if ((flags & PFI_AFLAG_BROADCAST) && af == AF_INET6)
continue;
if ((flags & PFI_AFLAG_BROADCAST) &&
@@ -745,9 +745,9 @@ pfi_address_add(struct sockaddr *sa, int
return;
}
p = malloc(new_max * sizeof(*V_pfi_buffer), PFI_MTYPE,
- #ifdef __FreeBSD__
- M_NOWAIT);
- #else
+#ifdef __FreeBSD__
+ M_NOWAIT);
+#else
M_DONTWAIT);
#endif
if (p == NULL) {
@@ -915,9 +915,9 @@ pfi_get_ifaces(const char *name, struct
{
struct pfi_kif *p, *nextp;
int s, n = 0;
- #ifdef __FreeBSD__
- int error;
- #endif
+#ifdef __FreeBSD__
+ int error;
+#endif
s = splsoftnet();
#ifdef __FreeBSD__
@@ -933,10 +933,10 @@ pfi_get_ifaces(const char *name, struct
if (!p->pfik_tzero)
p->pfik_tzero = time_second;
pfi_kif_ref(p, PFI_KIF_REF_RULE);
- #ifdef __FreeBSD__
- PF_COPYOUT(p, buf++, sizeof(*buf), error);
- if (error) {
- #else
+#ifdef __FreeBSD__
+ PF_COPYOUT(p, buf++, sizeof(*buf), error);
+ if (error) {
+#else
if (copyout(p, buf++, sizeof(*buf))) {
#endif
pfi_kif_unref(p, PFI_KIF_REF_RULE);
@@ -1035,71 +1035,77 @@ pfi_unmask(void *addr)
return (b);
}
- #ifdef __FreeBSD__
- void
- pfi_attach_ifnet_event(void *arg __unused, struct ifnet *ifp)
- {
+#ifdef __FreeBSD__
+void
+pfi_attach_ifnet_event(void *arg __unused, struct ifnet *ifp)
+{
+
CURVNET_SET(ifp->if_vnet);
- PF_LOCK();
- pfi_attach_ifnet(ifp);
- #ifdef ALTQ
- pf_altq_ifnet_event(ifp, 0);
- #endif
- PF_UNLOCK();
+ PF_LOCK();
+ pfi_attach_ifnet(ifp);
+#ifdef ALTQ
+ pf_altq_ifnet_event(ifp, 0);
+#endif
+ PF_UNLOCK();
CURVNET_RESTORE();
- }
-
- void
- pfi_detach_ifnet_event(void *arg __unused, struct ifnet *ifp)
- {
+}
+
+void
+pfi_detach_ifnet_event(void *arg __unused, struct ifnet *ifp)
+{
+
CURVNET_SET(ifp->if_vnet);
- PF_LOCK();
- pfi_detach_ifnet(ifp);
- #ifdef ALTQ
- pf_altq_ifnet_event(ifp, 1);
- #endif
- PF_UNLOCK();
+ PF_LOCK();
+ pfi_detach_ifnet(ifp);
+#ifdef ALTQ
+ pf_altq_ifnet_event(ifp, 1);
+#endif
+ PF_UNLOCK();
CURVNET_RESTORE();
- }
-
- void
- pfi_attach_group_event(void *arg , struct ifg_group *ifg)
- {
+}
+
+void
+pfi_attach_group_event(void *arg , struct ifg_group *ifg)
+{
+
CURVNET_SET((struct vnet *)arg);
- PF_LOCK();
- pfi_attach_ifgroup(ifg);
- PF_UNLOCK();
+ PF_LOCK();
+ pfi_attach_ifgroup(ifg);
+ PF_UNLOCK();
CURVNET_RESTORE();
- }
-
- void
- pfi_change_group_event(void *arg, char *gname)
- {
+}
+
+void
+pfi_change_group_event(void *arg, char *gname)
+{
+
CURVNET_SET((struct vnet *)arg);
- PF_LOCK();
- pfi_group_change(gname);
- PF_UNLOCK();
+ PF_LOCK();
+ pfi_group_change(gname);
+ PF_UNLOCK();
CURVNET_RESTORE();
- }
+}
+
+void
+pfi_detach_group_event(void *arg, struct ifg_group *ifg)
+{
- void
- pfi_detach_group_event(void *arg, struct ifg_group *ifg)
- {
CURVNET_SET((struct vnet *)arg);
- PF_LOCK();
- pfi_detach_ifgroup(ifg);
- PF_UNLOCK();
+ PF_LOCK();
+ pfi_detach_ifgroup(ifg);
+ PF_UNLOCK();
CURVNET_RESTORE();
- }
-
- void
- pfi_ifaddr_event(void *arg __unused, struct ifnet *ifp)
- {
+}
+
+void
+pfi_ifaddr_event(void *arg __unused, struct ifnet *ifp)
+{
+
CURVNET_SET(ifp->if_vnet);
- PF_LOCK();
- if (ifp && ifp->if_pf_kif)
- pfi_kifaddr_update(ifp->if_pf_kif);
- PF_UNLOCK();
+ PF_LOCK();
+ if (ifp && ifp->if_pf_kif)
+ pfi_kifaddr_update(ifp->if_pf_kif);
+ PF_UNLOCK();
CURVNET_RESTORE();
- }
- #endif /* __FreeBSD__ */
+}
+#endif /* __FreeBSD__ */
Modified: projects/pf/pf45/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/pf_ioctl.c Tue May 3 20:34:02 2011 (r221411)
+++ projects/pf/pf45/sys/contrib/pf/net/pf_ioctl.c Tue May 3 20:47:16 2011 (r221412)
@@ -45,21 +45,21 @@ __FBSDID("$FreeBSD$");
#include "opt_pf.h"
#ifdef DEV_BPF
-#define NBPFILTER DEV_BPF
+#define NBPFILTER DEV_BPF
#else
-#define NBPFILTER 0
+#define NBPFILTER 0
#endif
#ifdef DEV_PFLOG
-#define NPFLOG DEV_PFLOG
+#define NPFLOG DEV_PFLOG
#else
-#define NPFLOG 0
+#define NPFLOG 0
#endif
#ifdef DEV_PFSYNC
-#define NPFSYNC DEV_PFSYNC
+#define NPFSYNC DEV_PFSYNC
#else
-#define NPFSYNC 0
+#define NPFSYNC 0
#endif
#else
@@ -140,9 +140,9 @@ __FBSDID("$FreeBSD$");
#endif /* __FreeBSD__ */
#ifdef __FreeBSD__
-void init_zone_var(void);
-void cleanup_pf_zone(void);
-int pfattach(void);
+void init_zone_var(void);
+void cleanup_pf_zone(void);
+int pfattach(void);
#else
void pfattach(int);
void pf_thread_create(void *);
@@ -184,7 +184,7 @@ VNET_DEFINE(struct sx, pf_consistency_
#ifdef ALTQ
static VNET_DEFINE(int, pf_altq_running);
-#define V_pf_altq_running VNET(pf_altq_running)
+#define V_pf_altq_running VNET(pf_altq_running)
#endif
TAILQ_HEAD(pf_tags, pf_tagname);
@@ -195,10 +195,10 @@ VNET_DEFINE(struct pf_tags, pf_tags);
VNET_DEFINE(struct pf_tags, pf_qids);
#else /* !__FreeBSD__ */
-struct pf_rule pf_default_rule;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list