client: create_send()

diff --git a/client/sends.c b/client/sends.c
index c0607924fa286407344c535ab1489acb28112ddd..b2656347a80c0be912f19e7f4a69c4e15d02c74c 100644 (file)
--- a/client/sends.c
+++ b/client/sends.c
@@ -9,3 +9,17 @@ bool next_send_less_than(void *user_data, pheap_node_id_t a,
   send_t *sends = (send_t *)user_data;
   return next_send(&sends[a]) < next_send(&sends[b]);
 }
   send_t *sends = (send_t *)user_data;
   return next_send(&sends[a]) < next_send(&sends[b]);
 }

+
+void create_send(send_t *sleeping_sends, pheap_t *sleeps_heap,
+                 uint32_t timestamp, u16_t seq) {
+  pheap_node_id_t i = ph_new_node(sleeps_heap);
+  if (i == 0) {
+    /* TODO: Don't drop new presses just because sleeps_heap is full of old
+     * presses. */
+    return;
+  }
+  sleeping_sends[i].timestamp = timestamp;
+  sleeping_sends[i].seq = seq;
+  sleeping_sends[i].send_count = 0;
+  ph_insert_node(sleeps_heap, i);
+}

diff --git a/client/sends.h b/client/sends.h
index 02d49db846c767905da47ed83bfe65d7e2912dfc..651d0e48ab783d368f400d70d7dfa894db20b1d0 100644 (file)
--- a/client/sends.h
+++ b/client/sends.h
@@ -14,4 +14,7 @@ uint32_t next_send(send_t *s);
 
 bool next_send_less_than(void *user_data, pheap_node_id_t a, pheap_node_id_t b);
 
 
 bool next_send_less_than(void *user_data, pheap_node_id_t a, pheap_node_id_t b);
 

+void create_send(send_t *sleeping_sends, pheap_t *sleeps_heap,
+                 uint32_t timestamp, u16_t seq);
+

 #endif
 #endif

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 48db1b7f0bfa430961a1b62410e6d94875ff8a02..b433b4435b4950de5b561abb48a69aadc89aaa98 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -100,16 +100,7 @@ void service_queue() {
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case BUTTONPRESS: {
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case BUTTONPRESS: {

-      pheap_node_id_t i = ph_new_node(sleeps_heap);
-      if (i == 0) {
-        /* TODO: Don't drop new presses just because sleeps_heap is full of old
-         * presses. */
-        break;
-      }
-      sleeping_sends[i].timestamp = e.buttonpress.timestamp;
-      sleeping_sends[i].seq = seq++;
-      sleeping_sends[i].send_count = 0;
-      ph_insert_node(sleeps_heap, i);
+      create_send(sleeping_sends, sleeps_heap, e.buttonpress.timestamp, seq++);

     } break;
     case SEND: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the
     } break;
     case SEND: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the