Revert "Unconditionally remove timeouts from the queue before calling the callback."

[tinc] / src / event.c

diff --git a/src/event.c b/src/event.c
index 33d205a..331872a 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -300,9 +300,11 @@ static struct timeval *get_time_remaining(struct timeval *diff) {
                timersub(&timeout->tv, &now, diff);
 
                if(diff->tv_sec < 0) {
-                       timeout_cb_t cb = timeout->cb;
-                       timeout_del(timeout);
-                       cb(timeout->data);
+                       timeout->cb(timeout->data);
+
+                       if(timercmp(&timeout->tv, &now, <)) {
+                               timeout_del(timeout);
+                       }
                } else {
                        tv = diff;
                        break;