Fixup server connection timeouts

1 files changed, 3 insertions, 9 deletions

diff --git a/announce.c b/announce.c
index eea668c..673d649 100644
--- a/announce.c
+++ b/announce.c
@@ -16,7 +16,6 @@ struct announce {
 	struct uring_task task;
 	struct ptimer_task ptask;
 	int mcast_fd;
-	bool active;
 };
 
 #define ANNOUNCE_INTERVAL 3
@@ -71,7 +70,7 @@ announce_stop()
 {
 	struct announce *announce = cfg->announce;
 
-	assert_return_silent(announce && announce->active);
+	assert_return_silent(announce);
 
 	ptimer_del_task(&announce->ptask);
 }
@@ -91,10 +90,7 @@ announce_start(unsigned duration)
 			    DIV_ROUND_UP(duration, ANNOUNCE_INTERVAL));
 
 	announce->ptask.times = times;
-	if (!announce->active) {
-		ptimer_add_task(&announce->ptask);
-		announce->active = true;
-	}
+	ptimer_add_task(&announce->ptask);
 }
 
 void
@@ -114,9 +110,7 @@ announce_init()
 		die("socket: %m");
 
 	uring_task_init(&announce->task, "announce", uring_parent(), announce_free);
-	announce->ptask.interval = ANNOUNCE_INTERVAL;
-	announce->ptask.cb = announce_cb;
-	announce->active = false;
+	ptask_init(&announce->ptask, ANNOUNCE_INTERVAL, 0, announce_cb);
 	announce->mcast_fd = sfd;
 	cfg->announce = announce;
 }