diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-08-22 15:19:24 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-08-22 15:19:24 +0000 |
| commit | 50fd5e0cfedb98268a93bbe77ea94aa6a36b825d (patch) | |
| tree | 670b7c001ef86a141399ee8907f678e250d3c24b /sys | |
| parent | 2d58016afaa58720c541aca162d7ec3cc5227b5f (diff) | |
KNF
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pf_norm.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_table.c | 12 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c index 4ef322954ac..fdee9ba6dca 100644 --- a/sys/net/pf_norm.c +++ b/sys/net/pf_norm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.72 2003/08/21 19:12:08 frantzen Exp $ */ +/* $OpenBSD: pf_norm.c,v 1.73 2003/08/22 15:19:23 henning Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -881,7 +881,7 @@ pf_normalize_ip(struct mbuf **m0, int dir, struct ifnet *ifp, u_short *reason) DPFPRINTF(("max packet %d\n", fragoff + ip_len)); goto bad; } - max = fragoff + ip_len; + max = fragoff + ip_len; if ((r->rule_flag & (PFRULE_FRAGCROP|PFRULE_FRAGDROP)) == 0) { /* Fully buffer all of the fragments */ diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c index d5f44375126..e6ce25fa46e 100644 --- a/sys/net/pf_table.c +++ b/sys/net/pf_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_table.c,v 1.40 2003/08/09 14:56:48 cedric Exp $ */ +/* $OpenBSD: pf_table.c,v 1.41 2003/08/22 15:19:23 henning Exp $ */ /* * Copyright (c) 2002 Cedric Berger @@ -1917,7 +1917,7 @@ pfr_detach_table(struct pfr_ktable *kt) pfr_setflags_ktable(kt, kt->pfrkt_flags&~PFR_TFLAG_REFERENCED); } -int +int pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter, struct pf_addr **raddr, struct pf_addr **rmask, sa_family_t af) { @@ -1950,7 +1950,7 @@ _next_block: if (use_counter) { /* is supplied address within block? */ - if(!PF_MATCHA(0, *raddr, *rmask, counter, af)) { + if (!PF_MATCHA(0, *raddr, *rmask, counter, af)) { /* no, go to next block in table */ idx++; use_counter = 0; @@ -1968,7 +1968,7 @@ _next_block: *pidx = idx; return (0); } - for(;;) { + for (;;) { /* we don't want to use a nested block */ ke2 = (struct pfr_kentry *)(af == AF_INET ? rn_match(&pfr_sin, kt->pfrkt_ip4) : @@ -1985,7 +1985,7 @@ _next_block: pfr_prepare_network(&mask, AF_INET, ke2->pfrke_net); PF_POOLMASK(addr, addr, SUNION2PF(&mask, af), &pfr_ffaddr, af); PF_AINC(addr, af); - if(!PF_MATCHA(0, *raddr, *rmask, addr, af)) { + if (!PF_MATCHA(0, *raddr, *rmask, addr, af)) { /* ok, we reached the end of our main block */ /* go to next block in table */ idx++; @@ -2006,7 +2006,7 @@ pfr_kentry_byidx(struct pfr_ktable *kt, int idx, int af) switch(af) { case AF_INET: - rn_walktree(kt->pfrkt_ip4, pfr_walktree, &w); + rn_walktree(kt->pfrkt_ip4, pfr_walktree, &w); return w.pfrw_kentry; case AF_INET6: rn_walktree(kt->pfrkt_ip6, pfr_walktree, &w); diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 136b359bb20..d39894da2ac 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.168 2003/08/22 14:59:30 frantzen Exp $ */ +/* $OpenBSD: pfvar.h,v 1.169 2003/08/22 15:19:23 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -412,7 +412,7 @@ struct pf_os_fingerprint { }; struct pf_osfp_ioctl { - struct pf_osfp_entry fp_os; + struct pf_osfp_entry fp_os; pf_tcpopts_t fp_tcpopts; /* packed TCP options */ u_int16_t fp_wsize; /* TCP window size */ u_int16_t fp_psize; /* ip->ip_len */ |