From: dlg <dlg@openbsd.org>
Date: Tue, 4 Jul 2017 01:09:42 +0000 (+0000)
Subject: consistently use the evtimer wrappers around the connection timeout.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=270badb5cddd9778eeba6d015e6cf8fcd9ffbb54;p=openbsd

consistently use the evtimer wrappers around the connection timeout.

this is instead of setting the timeout up with event_set and
event_add, but removing it with evtimer_del. this uses evtimer_set
and evtimer_add.
---

diff --git a/usr.sbin/identd/identd.c b/usr.sbin/identd/identd.c
index 0529e1737af..431c2481318 100644
--- a/usr.sbin/identd/identd.c
+++ b/usr.sbin/identd/identd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identd.c,v 1.37 2017/07/04 01:07:32 dlg Exp $ */
+/*	$OpenBSD: identd.c,v 1.38 2017/07/04 01:09:42 dlg Exp $ */
 
 /*
  * Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
@@ -753,8 +753,8 @@ identd_accept(int fd, short events, void *arg)
 	event_set(&c->ev, s, EV_READ | EV_PERSIST, identd_request, c);
 	event_add(&c->ev, NULL);
 
-	event_set(&c->tmo, s, 0, identd_timeout, c);
-	event_add(&c->tmo, &timeout);
+	evtimer_set(&c->tmo, identd_timeout, c);
+	evtimer_add(&c->tmo, &timeout);
 }
 
 void