summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2015-10-29 14:01:01 +0000
committertedu <tedu@openbsd.org>2015-10-29 14:01:01 +0000
commit29535da24141a60fb1ed489b57a3f0fc4772db7e (patch)
tree69a69764272ddcb267e3a74c2ae229a4b1f5f122
parentbe a little more precise about checking filters (diff)
downloadwireguard-openbsd-29535da24141a60fb1ed489b57a3f0fc4772db7e.tar.xz
wireguard-openbsd-29535da24141a60fb1ed489b57a3f0fc4772db7e.zip
put timeout nullification in correct spot
-rw-r--r--usr.sbin/rebound/rebound.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/rebound/rebound.c b/usr.sbin/rebound/rebound.c
index a7f13c8a7fd..913cba7aab0 100644
--- a/usr.sbin/rebound/rebound.c
+++ b/usr.sbin/rebound/rebound.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rebound.c,v 1.38 2015/10/29 14:00:06 tedu Exp $ */
+/* $OpenBSD: rebound.c,v 1.39 2015/10/29 14:01:01 tedu Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
@@ -541,6 +541,8 @@ launch(const char *confname, int ud, int ld, int kq)
}
}
+ timeout = NULL;
+
if (stopaccepting) {
EV_SET(&ch[0], ld, EVFILT_READ, EV_DELETE, 0, 0, NULL);
kevent(kq, ch, 1, NULL, 0, NULL);
@@ -554,7 +556,6 @@ launch(const char *confname, int ud, int ld, int kq)
while (cachecount > cachemax)
freecacheent(TAILQ_FIRST(&cachefifo));
- timeout = NULL;
/* burn old cache entries */
while ((ent = TAILQ_FIRST(&cachefifo))) {
if (timespeccmp(&ent->ts, &now, <=))