diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pf.c | 6 | ||||
| -rw-r--r-- | sys/net/pf_if.c | 10 | ||||
| -rw-r--r-- | sys/net/pf_ioctl.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_table.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index a74f21ecd73..0b7aefb390f 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.414 2003/12/31 11:18:25 cedric Exp $ */ +/* $OpenBSD: pf.c,v 1.415 2003/12/31 22:14:42 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -241,7 +241,7 @@ struct pf_pool_limit pf_pool_limits[PF_LIMIT_MAX] = #define LOCKED_IF(r, k) (((r)->rule_flag & PFRULE_IFBOUND) ? (k) : \ ((r)->rule_flag & PFRULE_GRBOUND) ? (k)->pfik_parent : \ (k)->pfik_parent->pfik_parent) - + static __inline int pf_src_compare(struct pf_src_node *, struct pf_src_node *); static __inline int pf_state_compare_lan_ext(struct pf_state *, struct pf_state *); @@ -2033,7 +2033,7 @@ pf_match_translation(struct pf_pdesc *pd, struct mbuf *m, int off, } r->evaluations++; - if (r->kif != NULL && + if (r->kif != NULL && (r->kif != kif && r->kif != kif->pfik_parent) == !r->ifnot) r = r->skip[PF_SKIP_IFP].ptr; else if (r->direction && r->direction != direction) diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c index 0a1ff795a9d..5fff2f401e4 100644 --- a/sys/net/pf_if.c +++ b/sys/net/pf_if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_if.c,v 1.3 2003/12/31 15:32:43 markus Exp $ */ +/* $OpenBSD: pf_if.c,v 1.4 2003/12/31 22:14:42 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -136,7 +136,7 @@ pfi_attach_ifnet(struct ifnet *ifp) s = splsoftnet(); pfi_update++; if (ifp->if_index >= pfi_indexlim) { - /* + /* * grow pfi_index2kif, similar to ifindex2ifnet code in if.c */ size_t m, n, oldlim; @@ -404,7 +404,7 @@ pfi_instance_add(struct ifnet *ifp, int net, int flags) struct ifaddr *ia; int got4 = 0, got6 = 0; int net2, af; - + if (ifp == NULL) return; TAILQ_FOREACH(ia, &ifp->if_addrlist, ifa_list) { @@ -713,7 +713,7 @@ pfi_clr_istats(const char *name, int *nzero, int flags) struct pfi_kif *p; int n = 0, s; long tzero = time.tv_sec; - + s = splsoftnet(); ACCEPT_FLAGS(PFI_FLAG_GROUP|PFI_FLAG_INSTANCE); RB_FOREACH(p, pfi_ifhead, &pfi_ifs) { @@ -759,7 +759,7 @@ struct pfi_kif * pfi_lookup_if(const char *name) { struct pfi_kif *p, key; - + strlcpy(key.pfik_name, name, sizeof(key.pfik_name)); p = RB_FIND(pfi_ifhead, &pfi_ifs, &key); return (p); diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 71e048c4233..15ff41b7d42 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.97 2003/12/31 11:18:25 cedric Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.98 2003/12/31 22:14:42 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1300,7 +1300,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) state->creation = time.tv_sec; state->packets[0] = state->packets[1] = 0; state->bytes[0] = state->bytes[1] = 0; - + if (pf_insert_state(kif, state)) { pfi_maybe_destroy(kif); pool_put(&pf_state_pl, state); diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c index 8862b22b647..1b0d3d68f8e 100644 --- a/sys/net/pf_table.c +++ b/sys/net/pf_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_table.c,v 1.43 2003/12/31 11:18:25 cedric Exp $ */ +/* $OpenBSD: pf_table.c,v 1.44 2003/12/31 22:14:42 deraadt Exp $ */ /* * Copyright (c) 2002 Cedric Berger @@ -58,7 +58,7 @@ ((flags & PFR_FLAG_USERIOCTL) ? \ copyout((from), (to), (size)) : \ (bcopy((from), (to), (size)), 0)) - + #define FILLIN_SIN(sin, addr) \ do { \ (sin).sin_len = sizeof(sin); \ |