diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2011-11-28 01:04:51 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2011-11-28 01:04:51 +0000 |
| commit | 4a643950db4eb34e40f6ec62e4ee776017ec0b0f (patch) | |
| tree | 97dc96cc3ae838960de88a5f83e5fb2935a59a2c | |
| parent | a0f186516cbc5189f93928704b768794a73d1dad (diff) | |
deprecate PFTM_UNTIL_PACKET. nothing in the tree uses it, and
pf_state_expires() handled it incorrectly.
discussed with mikeb@
ok henning@
| -rw-r--r-- | sys/net/pf.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_ioctl.c | 5 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 5 |
3 files changed, 5 insertions, 9 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 40dfd890de4..30fc5a03959 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.787 2011/11/26 03:28:46 mcbride Exp $ */ +/* $OpenBSD: pf.c,v 1.788 2011/11/28 01:04:50 dlg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1062,8 +1062,6 @@ pf_state_expires(const struct pf_state *state) /* handle all PFTM_* > PFTM_MAX here */ if (state->timeout == PFTM_PURGE) return (time_second); - if (state->timeout == PFTM_UNTIL_PACKET) - return (0); KASSERT(state->timeout != PFTM_UNLINKED); KASSERT(state->timeout < PFTM_MAX); timeout = state->rule.ptr->timeout[state->timeout]; diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 88e667244bc..980d5d29d4f 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.245 2011/11/25 12:52:10 dlg Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.246 2011/11/28 01:04:50 dlg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1394,8 +1394,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) struct pfioc_state *ps = (struct pfioc_state *)addr; struct pfsync_state *sp = &ps->state; - if (sp->timeout >= PFTM_MAX && - sp->timeout != PFTM_UNTIL_PACKET) { + if (sp->timeout >= PFTM_MAX) { error = EINVAL; break; } diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index f7e0bfcdbb5..f1d2b1c51e5 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.355 2011/11/26 03:28:46 mcbride Exp $ */ +/* $OpenBSD: pfvar.h,v 1.356 2011/11/28 01:04:50 dlg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -82,8 +82,7 @@ enum { PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED, PFTM_OTHER_FIRST_PACKET, PFTM_OTHER_SINGLE, PFTM_OTHER_MULTIPLE, PFTM_FRAG, PFTM_INTERVAL, PFTM_ADAPTIVE_START, PFTM_ADAPTIVE_END, PFTM_SRC_NODE, - PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED, - PFTM_UNTIL_PACKET }; + PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED }; /* PFTM default values */ #define PFTM_TCP_FIRST_PACKET_VAL 120 /* First TCP packet */ |