diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2015-02-10 09:28:41 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2015-02-10 09:28:41 +0000 |
| commit | 67995875384350fb757db2f7491c2d58b088af0b (patch) | |
| tree | 8b73c7ad31df080c24bd48f6abadc5c641c14519 | |
| parent | 54d006ed012062423884374decf65fd4dd142d22 (diff) | |
include the "set prio" values.
no real compat issue since we're using spare bytes.
old -> new ends up with set prio (0, 0) equivalent
new -> old is entirely harmless, old ignores the prios.
requested by Alexey Suslikov <alexey.suslikov at gmail>
ok phessler pelikan dlg
| -rw-r--r-- | sys/net/if_pfsync.c | 4 | ||||
| -rw-r--r-- | sys/net/pf.c | 4 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 0cdf4bf167f..6f3a813fa42 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.216 2015/01/24 00:29:06 deraadt Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.217 2015/02/10 09:28:40 henning Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -594,6 +594,8 @@ pfsync_state_import(struct pfsync_state *sp, int flags) st->max_mss = ntohs(sp->max_mss); st->min_ttl = sp->min_ttl; st->set_tos = sp->set_tos; + st->set_prio[0] = sp->set_prio[0]; + st->set_prio[1] = sp->set_prio[1]; st->id = sp->id; st->creatorid = sp->creatorid; diff --git a/sys/net/pf.c b/sys/net/pf.c index 6ffab243aba..ec5f14a7f4d 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.903 2015/02/10 06:45:55 henning Exp $ */ +/* $OpenBSD: pf.c,v 1.904 2015/02/10 09:28:40 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1142,6 +1142,8 @@ pf_state_export(struct pfsync_state *sp, struct pf_state *st) sp->max_mss = htons(st->max_mss); sp->min_ttl = st->min_ttl; sp->set_tos = st->set_tos; + sp->set_prio[0] = st->set_prio[0]; + sp->set_prio[1] = st->set_prio[1]; } /* END state table stuff */ diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index e93bad57d3a..2a59eec3c67 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.410 2015/02/10 06:45:55 henning Exp $ */ +/* $OpenBSD: pfvar.h,v 1.411 2015/02/10 09:28:40 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -915,7 +915,7 @@ struct pfsync_state { u_int8_t min_ttl; u_int8_t set_tos; u_int16_t state_flags; - u_int8_t pad[2]; + u_int8_t set_prio[2]; } __packed; #define PFSYNC_FLAG_SRCNODE 0x04 |