diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-12-15 09:10:27 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-12-15 09:10:27 +0000 |
| commit | f3811bfbb1cf07b69d11e1f4d3a4560aef381502 (patch) | |
| tree | 1d2b1d16f368f3bf3133ff3d33c72ae396f07791 /sys | |
| parent | afa22a19548bebda34455f97b0f6bda70a0d2bcd (diff) | |
ryan left a few for me ;-)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pf.c | 16 | ||||
| -rw-r--r-- | sys/net/pf_ioctl.c | 4 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 348a9ab3fe7..6aa353c9729 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.410 2003/12/15 07:28:25 mcbride Exp $ */ +/* $OpenBSD: pf.c,v 1.411 2003/12/15 09:10:25 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1732,7 +1732,7 @@ pf_map_addr(sa_family_t af, struct pf_rule *r, struct pf_addr *saddr, pf_print_host(naddr, 0, af); printf("\n"); } - return(0); + return (0); } } @@ -2064,7 +2064,7 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off, int direction, } break; case PF_RDR: { - if (pf_map_addr(r->af, r, saddr, naddr, NULL, sn)) + if (pf_map_addr(r->af, r, saddr, naddr, NULL, sn)) return (NULL); if (r->rpool.proxy_port[1]) { @@ -2445,7 +2445,7 @@ pf_test_tcp(struct pf_rule **rm, struct pf_state **sm, int direction, if (nr != NULL) { if (direction == PF_OUT) { pf_change_ap(saddr, &th->th_sport, pd->ip_sum, - &th->th_sum, &pd->baddr, bport, 0, af); + &th->th_sum, &pd->baddr, bport, 0, af); rewrite++; } else { pf_change_ap(daddr, &th->th_dport, pd->ip_sum, @@ -2496,7 +2496,7 @@ pf_test_tcp(struct pf_rule **rm, struct pf_state **sm, int direction, goto cleanup; /* src node for flter rule */ if ((r->rule_flag & PFRULE_SRCTRACK || - r->rpool.opts & PF_POOL_STICKYADDR) && + r->rpool.opts & PF_POOL_STICKYADDR) && pf_insert_src_node(&sn, r, saddr, af) != 0) goto cleanup; /* src node for translation rule */ @@ -2829,7 +2829,7 @@ pf_test_udp(struct pf_rule **rm, struct pf_state **sm, int direction, goto cleanup; /* src node for flter rule */ if ((r->rule_flag & PFRULE_SRCTRACK || - r->rpool.opts & PF_POOL_STICKYADDR) && + r->rpool.opts & PF_POOL_STICKYADDR) && pf_insert_src_node(&sn, r, saddr, af) != 0) goto cleanup; /* src node for translation rule */ @@ -3110,7 +3110,7 @@ pf_test_icmp(struct pf_rule **rm, struct pf_state **sm, int direction, goto cleanup; /* src node for flter rule */ if ((r->rule_flag & PFRULE_SRCTRACK || - r->rpool.opts & PF_POOL_STICKYADDR) && + r->rpool.opts & PF_POOL_STICKYADDR) && pf_insert_src_node(&sn, r, saddr, af) != 0) goto cleanup; /* src node for translation rule */ @@ -3372,7 +3372,7 @@ pf_test_other(struct pf_rule **rm, struct pf_state **sm, int direction, goto cleanup; /* src node for flter rule */ if ((r->rule_flag & PFRULE_SRCTRACK || - r->rpool.opts & PF_POOL_STICKYADDR) && + r->rpool.opts & PF_POOL_STICKYADDR) && pf_insert_src_node(&sn, r, saddr, af) != 0) goto cleanup; /* src node for translation rule */ diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 1a745da2b01..faaf255fead 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.91 2003/12/15 07:28:25 mcbride Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.92 2003/12/15 09:10:26 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -166,7 +166,7 @@ pfattach(int num) /* XXX do our best to avoid a conflict */ pf_status.hostid = arc4random(); - pf_status.stateid = 1; /* might want 0 for something special */ + pf_status.stateid = 1; /* might want 0 for something special */ } int diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 5789dcb5e11..cc9081f887d 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.178 2003/12/15 07:11:30 mcbride Exp $ */ +/* $OpenBSD: pfvar.h,v 1.179 2003/12/15 09:10:26 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -827,8 +827,8 @@ struct pf_pdesc { #define SCNT_SRC_NODE_SEARCH 0 #define SCNT_SRC_NODE_INSERT 1 -#define SCNT_SRC_NODE_REMOVALS 2 -#define SCNT_MAX 3 +#define SCNT_SRC_NODE_REMOVALS 2 +#define SCNT_MAX 3 #define ACTION_SET(a, x) \ do { \ @@ -1051,7 +1051,7 @@ struct pfioc_ruleset { }; #define PF_RULESET_ALTQ (PF_RULESET_MAX) -#define PF_RULESET_TABLE (PF_RULESET_MAX+1) +#define PF_RULESET_TABLE (PF_RULESET_MAX+1) struct pfioc_trans { int size; /* number of elements */ int esize; /* size of each element in bytes */ |