From 5ed70a08484ae0136bf4d9f00dc17c497f8224d8 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Thu, 29 Aug 2019 17:53:49 +0200
Subject: [PATCH] Fix bug

---
 src/algo_thunder.c | 32 +++++++++++++++++++++++++++++---
 src/packet.h       |  1 +
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/algo_thunder.c b/src/algo_thunder.c
index 679bd6a..6151dc5 100644
--- a/src/algo_thunder.c
+++ b/src/algo_thunder.c
@@ -99,6 +99,7 @@ void pad(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct buffer
 }
 
 int schedule(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct buffer_packet* bp) {
+  char url[256];
   struct algo_ctx* app_ctx = fdinfo->cat->app_ctx;
   struct thunder_ctx* thunderc = app_ctx->misc;
   struct evt_core_fdinfo *to_fdinfo = NULL;
@@ -110,7 +111,13 @@ int schedule(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct bu
       if (ctx->verbose > 1) fprintf(stderr, "    [algo_thunder] No link available, packet will be dropped\n");
       break;
     }
-    thunderc->selected_link = (thunderc->selected_link + 1) % cat->socklist->len;
+
+    to_fdinfo = NULL;
+    do {
+      thunderc->selected_link = (thunderc->selected_link + 1) % thunderc->total_links;
+      sprintf(url, "tcp:write:127.0.0.1:%d", 7500 + thunderc->selected_link);
+      to_fdinfo = evt_core_get_from_url (ctx, url);
+    } while (to_fdinfo == NULL);
 
     // 2. We create the packet template
     union abstract_packet links = {
@@ -120,8 +127,6 @@ int schedule(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct bu
       .fmt.content.link_monitoring_thunder.links_status = {}
     };
 
-    to_fdinfo = g_array_index(cat->socklist, struct evt_core_fdinfo*, thunderc->selected_link);
-
     // 3. We append the template to the buffer
     struct buffer_packet* bp_dup = dup_buffer_tow (&app_ctx->br, bp, to_fdinfo);
     union abstract_packet *new_ap = buffer_append_ap (bp_dup, &links);
@@ -142,6 +147,7 @@ int schedule(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct bu
       fprintf(stderr, "    [algo_thunder] Will send this info\n");
     }
     main_on_tcp_write(ctx, to_fdinfo);
+
   } while (is_blacklisted (thunderc, thunderc->selected_link));
 
   if (ctx->verbose > 1) fprintf(stderr, "    [algo_thunder] Packets sent\n");
@@ -161,6 +167,7 @@ void on_block (struct evt_core_ctx* ctx, void* raw) {
   if (thunderc->received_pkts_on_link[bi->i] >= bi->missing) goto release;
   if (thunderc->blacklisted[bi->i] >= bi->missing) goto release;
 
+  //printf("[algo_thunder] Blacklisting link %d\n", bi->i);
   thunderc->blacklisted[bi->i] = bi->missing;
 
 release:
@@ -178,8 +185,13 @@ void classify(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct b
     exit(EXIT_FAILURE);
   }
 
+  if (ap->fmt.headers.flags & FLAG_RESET) {
+    for (int i = 0; i < MAX_LINKS; i++) thunderc->received_pkts_on_link[i] = 1;
+  }
+
   int link_id = url_get_port_int(fdinfo->url) - 7500;
   thunderc->received_pkts_on_link[link_id]++;
+  printf("Received %ld packets on link %d\n", thunderc->received_pkts_on_link[link_id], link_id);
 
   struct link_info *li = &ap->fmt.content.link_monitoring_thunder.links_status;
   for (uint8_t i = 0; i < thunderc->total_links; i++) {
@@ -193,12 +205,20 @@ void classify(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct b
     bi->i = i; bi->app_ctx = app_ctx; bi->missing = expected;
 
     set_timeout (ctx, timeout, bi, on_block);
+    printf("  Triggered timeout for link %d in %ldms (expected: %ld, seen: %ld)\n", i, timeout, expected, thunderc->received_pkts_on_link[i]);
     if (ctx->verbose > 1) {
       fprintf(stderr, "    [algo_thunder] Set timeout on link %d of %ld ms (packets expected: %ld, seen: %ld)\n",
               i, timeout, expected, thunderc->received_pkts_on_link[i]);
     }
   }
   if (ctx->verbose > 1) fprintf(stderr, "    [algo_thunder] Classify done\n");
+
+  printf("Blacklisted links: ");
+  for (int i = 0; i < thunderc->total_links; i++) {
+    if (is_blacklisted (thunderc, i)) printf("_");
+    else printf("U");
+  }
+  printf("\n");
 }
 
 struct unpad_info {
@@ -232,6 +252,7 @@ void adapt(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct buff
   struct thunder_ctx* thunderc = app_ctx->misc;
   char url[256];
   struct evt_core_fdinfo *to_fdinfo = NULL;
+  uint64_t delivered = 0;
 
   for (int i = ui->ap_arr_vals-1; i >= 0; i--) {
     //fprintf(stderr, "i=%d, ui->ap_arr_vals=%d\n", i, ui->ap_arr_vals);
@@ -250,6 +271,11 @@ void adapt(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo, struct buff
     //dump_buffer_packet (bp_dest);
     buffer_append_ap (bp_dest, ui->ap_arr_pl[i]);
     main_on_udp_write(ctx, to_fdinfo);
+    delivered++;
+  }
+
+  if (delivered != 1) {
+    //printf("[algo_thunder] Delivered %ld packets (now id=%d)\n", delivered, thunderc->recv_id);
   }
 
   mv_buffer_rtof (&app_ctx->br, fdinfo);
diff --git a/src/packet.h b/src/packet.h
index 81423df..c04376f 100644
--- a/src/packet.h
+++ b/src/packet.h
@@ -39,6 +39,7 @@ enum PKT_CMD {
 
 enum PKT_FLAGS {
   FLAG_READ_NEXT = 1 << 0,
+  FLAG_RESET = 1 << 1,
 };
 
 struct link_info {