X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/67001c93828f1e4beb2386d415f0ed5b15afc960..adf355dc420c072b09c5d40187a62c300234d85d:/client/tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index b433b44..2fc604b 100644
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -55,26 +55,30 @@ static void time_to_send(uint _) {
   queue_try_add_ignoring_errors(&queue, &e);
 }
 
+void set_send_alarm(int alarm, uint32_t now, uint32_t next_act_time) {
+  uint32_t sleep_duration = next_act_time - now;
+  if (hardware_alarm_set_target(alarm,
+                                make_timeout_time_ms(sleep_duration * 1000)))
+    signal_error_by_blinking();
+  return;
+}
+
 void service_sleeps(int alarm, send_t *sleeping_sends, pheap_t *sleeps_heap) {
   hardware_alarm_cancel(alarm);
 
   while (1) {
     uint32_t now = time_s();
-    pheap_node_id_t i = ph_peek_head(sleeps_heap);
-    if (i == 0)
+    int32_t act_time = next_scheduled_send(sleeping_sends, sleeps_heap);
+    if (act_time == -1)
       return;
-    send_t *send = &sleeping_sends[i];
-    if (next_send(send) > now) {
-      uint32_t sleep_duration = next_send(send) - now;
-      if (hardware_alarm_set_target(
-              alarm, make_timeout_time_ms(sleep_duration * 1000)))
-        signal_error_by_blinking();
+    if (act_time > now) {
+      set_send_alarm(alarm, now, act_time);
       return;
     }
-    if (ph_remove_head(sleeps_heap, false) != i)
-      signal_error_by_blinking();
+    pheap_node_id_t i = ph_remove_head(sleeps_heap, false);
+    send_t *send = &sleeping_sends[i];
     uint32_t ago = now - send->timestamp;
-    send_report(send->seq, ago);
+    send_report_packet(send->seq, ago);
     send->send_count++;
     if (send->send_count < config_resend_count)
       ph_insert_node(sleeps_heap, i);