client: Exponential backoff resend intervals

diff --git a/client/config.c b/client/config.c
index 9bd216dba00dca5639c6e59e56e9391f3c7dbd71..8a31cf5beb04bf0b4a856e611565370cd7babf1d 100644 (file)
--- a/client/config.c
+++ b/client/config.c
@@ -24,4 +24,3 @@ u32_t config_minimum_seconds_between_button_presses = 1;
 
 /* Send each report multiple times. */
 uint config_resend_count = 5;
 
 /* Send each report multiple times. */
 uint config_resend_count = 5;

-u32_t config_resend_interval_ms = 1000;

diff --git a/client/config.h b/client/config.h
index 91345f9a78ab32e5c376ad2a64f7040c5c552bf7..744e58626dc0b053b51ea74009ac4ab6da63f8a5 100644 (file)
--- a/client/config.h
+++ b/client/config.h
@@ -27,6 +27,5 @@ extern u32_t config_minimum_seconds_between_button_presses;
 
 /* Send each report multiple times. */
 extern uint config_resend_count;
 
 /* Send each report multiple times. */
 extern uint config_resend_count;

-extern u32_t config_resend_interval_ms;

 
 #endif
 
 #endif

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 9af9b5aef2f12e8e7147035f844af1d8aac557ef..c38de126d50245cd3a9ba08d128e170b6c23d75c 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -14,7 +14,9 @@ typedef struct {
   u8_t send_count;
 } send_t;
 
   u8_t send_count;
 } send_t;
 

-uint32_t next_send(send_t *s) { return s->timestamp + s->send_count; }
+uint32_t next_send(send_t *s) {
+  return s->timestamp + (1 << s->send_count) - 1;
+}

 
 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) {