summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2019-11-17 08:25:05 +0000
committerotto <otto@openbsd.org>2019-11-17 08:25:05 +0000
commitca571ff055e4f2146be1dae512004ce24778b6c7 (patch)
treeb1feb58a2e7aa0c90e8b3d425c3ede83ab948358
parentMove the TLSv1.3 server message handling stubs. (diff)
downloadwireguard-openbsd-ca571ff055e4f2146be1dae512004ce24778b6c7.tar.xz
wireguard-openbsd-ca571ff055e4f2146be1dae512004ce24778b6c7.zip
"set delay" never worked as committed: the delay field was not copied
in and the pf_pktdelay struct ws not declared and initialzed properly. ok rob@ kn@
-rw-r--r--sys/net/pf.c6
-rw-r--r--sys/net/pf_ioctl.c3
-rw-r--r--sys/net/pfvar.h5
3 files changed, 8 insertions, 6 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 5865554108a..ebe339921fa 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.1090 2019/10/17 11:23:49 millert Exp $ */
+/* $OpenBSD: pf.c,v 1.1091 2019/11/17 08:25:05 otto Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -7577,8 +7577,8 @@ pf_delay_pkt(struct mbuf *m, u_int ifidx)
}
pdy->ifidx = ifidx;
pdy->m = m;
- timeout_set(pdy->to, pf_pktenqueue_delayed, pdy);
- timeout_add_msec(pdy->to, m->m_pkthdr.pf.delay);
+ timeout_set(&pdy->to, pf_pktenqueue_delayed, pdy);
+ timeout_add_msec(&pdy->to, m->m_pkthdr.pf.delay);
m->m_pkthdr.pf.delay = 0;
return (0);
}
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 8e781bd7ce1..e126a28d687 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_ioctl.c,v 1.344 2019/05/09 14:59:30 claudio Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.345 2019/11/17 08:25:05 otto Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -2863,6 +2863,7 @@ pf_rule_copyin(struct pf_rule *from, struct pf_rule *to,
if ((to->match_tag = pf_tagname2tag(to->match_tagname, 1)) == 0)
return (EBUSY);
to->scrub_flags = from->scrub_flags;
+ to->delay = from->delay;
to->uid = from->uid;
to->gid = from->gid;
to->rule_flag = from->rule_flag;
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index aa6dfd89692..f06a1fa0e07 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfvar.h,v 1.492 2019/07/09 11:30:19 yasuoka Exp $ */
+/* $OpenBSD: pfvar.h,v 1.493 2019/11/17 08:25:05 otto Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -39,6 +39,7 @@
#include <sys/rwlock.h>
#include <sys/syslimits.h>
#include <sys/refcnt.h>
+#include <sys/timeout.h>
#include <netinet/in.h>
@@ -1432,7 +1433,7 @@ enum pf_divert_types {
};
struct pf_pktdelay {
- struct timeout *to;
+ struct timeout to;
struct mbuf *m;
u_int ifidx;
};