diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2013-06-02 23:06:37 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2013-06-02 23:06:37 +0000 |
| commit | e153cbca3be8c7213a7982563cd79dfd6d5d0157 (patch) | |
| tree | bf51639a930b899d6810f175451d0b4ca414cf60 | |
| parent | 080a430c818cf2db7bea5174e9fde6d2c63d5f85 (diff) | |
set up osport and odport (original src/dst port) in pf_setup_pdesc instead
of late in pf_test_rule - need that for upcoming changes. ok ryan
| -rw-r--r-- | sys/net/pf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 30cb2553590..ae1a0a1a352 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.826 2013/06/01 21:18:02 henning Exp $ */ +/* $OpenBSD: pf.c,v 1.827 2013/06/02 23:06:36 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -3373,9 +3373,6 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm, #endif /* INET6 */ } - pd->osport = pd->nsport; - pd->odport = pd->ndport; - r = TAILQ_FIRST(pf_main_ruleset.rules.active.ptr); while (r != NULL) { r->evaluations++; @@ -6625,9 +6622,9 @@ pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir, } if (pd->sport) - pd->nsport = *pd->sport; + pd->osport = pd->nsport = *pd->sport; if (pd->dport) - pd->ndport = *pd->dport; + pd->odport = pd->ndport = *pd->dport; return (PF_PASS); } |