diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-10-28 03:20:42 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-10-28 03:20:42 +0000 |
| commit | 3d017e35da7661b71557b6f94fd59de0c084ac54 (patch) | |
| tree | 0ef1fb34e777eefc7f8ee55a6ce75c5b93e67b1c /sys | |
| parent | 65b9659083a29018d8bfc2b1b6fbc516a4197f20 (diff) | |
s/rmatch/chksum_flag/ to clarify what's going on. Pointed out by dhartmei@
Oh. and a KNF nit.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_pfsync.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 28720ef3ab7..c43b3b7d5f0 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.56 2005/10/27 12:34:40 mcbride Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.57 2005/10/28 03:20:41 mcbride Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -185,7 +185,7 @@ pfsync_alloc_scrub_memory(struct pfsync_state_peer *s, } int -pfsync_insert_net_state(struct pfsync_state *sp, u_int8_t rmatch) +pfsync_insert_net_state(struct pfsync_state *sp, u_int8_t chksum_flag) { struct pf_state *st = NULL; struct pf_rule *r = NULL; @@ -210,7 +210,7 @@ pfsync_insert_net_state(struct pfsync_state *sp, u_int8_t rmatch) * If the ruleset checksums match, it's safe to associate the state * with the rule of that number. */ - if (sp->rule != htonl(-1) && sp->anchor == htonl(-1) && rmatch) + if (sp->rule != htonl(-1) && sp->anchor == htonl(-1) && chksum_flag) r = pf_main_ruleset.rules[ PF_RULESET_FILTER].active.ptr_array[ntohl(sp->rule)]; else @@ -296,7 +296,7 @@ pfsync_input(struct mbuf *m, ...) struct in_addr src; struct mbuf *mp; int iplen, action, error, i, s, count, offp, sfail, stale = 0; - u_int8_t rmatch = 0; + u_int8_t chksum_flag = 0; pfsyncstats.pfsyncs_ipackets++; @@ -351,7 +351,7 @@ pfsync_input(struct mbuf *m, ...) src = ip->ip_src; if (!bcmp(&ph->pf_chksum, &pf_status.pf_chksum, PF_MD5_DIGEST_LENGTH)) - rmatch++; + chksum_flag++; switch (action) { case PFSYNC_ACT_CLR: { @@ -418,7 +418,8 @@ pfsync_input(struct mbuf *m, ...) continue; } - if ((error = pfsync_insert_net_state(sp, rmatch))) { + if ((error = pfsync_insert_net_state(sp, + chksum_flag))) { if (error == ENOMEM) { splx(s); goto done; @@ -457,7 +458,7 @@ pfsync_input(struct mbuf *m, ...) st = pf_find_state_byid(&key); if (st == NULL) { /* insert the update */ - if (pfsync_insert_net_state(sp, rmatch)) + if (pfsync_insert_net_state(sp, chksum_flag)) pfsyncstats.pfsyncs_badstate++; continue; } @@ -702,7 +703,7 @@ pfsync_input(struct mbuf *m, ...) if (key.id == 0 && key.creatorid == 0) { sc->sc_ureq_received = time_uptime; if (sc->sc_bulk_send_next == NULL) - sc->sc_bulk_send_next = + sc->sc_bulk_send_next = TAILQ_FIRST(&state_list); sc->sc_bulk_terminator = sc->sc_bulk_send_next; if (pf_status.debug >= PF_DEBUG_MISC) |