diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2006-11-16 13:17:16 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2006-11-16 13:17:16 +0000 |
| commit | b6d43dd839b8cc6893361f45d0da6e78e360554d (patch) | |
| tree | ddef4e6fd29eba954fc475cfc17fedaac803e60d /sys/net/pf.c | |
| parent | 4d9cfc393b54a0b6df9b7b0ab219450f4739985b (diff) | |
conditional for appending the pf mbuf tag in pf_test/pf_test6 was wrong,
we need to do so whenever we do have a (pf) tag != 0 on the state OR (that
part was missing) when rtableid on the rule is nonzero.
problem noticed by Andreas Lundin <lunde@dreamhosted.se> testing the
multiple routing tables enabling diff, ok mcbride
Diffstat (limited to 'sys/net/pf.c')
| -rw-r--r-- | sys/net/pf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 7db562e6291..a98efdea528 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.518 2006/10/31 14:49:01 henning Exp $ */ +/* $OpenBSD: pf.c,v 1.519 2006/11/16 13:17:15 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -6082,8 +6082,8 @@ done: ("pf: dropping packet with ip options\n")); } - if (s && s->tag) - pf_tag_packet(m, pd.pf_mtag, s->tag, r->rtableid); + if ((s && s->tag) || r->rtableid) + pf_tag_packet(m, pd.pf_mtag, s ? s->tag : 0, r->rtableid); #ifdef ALTQ if (action == PF_PASS && r->qid) { @@ -6428,8 +6428,8 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0, done: /* XXX handle IPv6 options, if not allowed. not implemented. */ - if (s && s->tag) - pf_tag_packet(m, pd.pf_mtag, s->tag, r->rtableid); + if ((s && s->tag) || r->rtableid) + pf_tag_packet(m, pd.pf_mtag, s ? s->tag : 0, r->rtableid); #ifdef ALTQ if (action == PF_PASS && r->qid) { |