From 0c50ca5a428e9e6072e2cc8c1d5d677b2f769577 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 13 Aug 2019 10:53:11 +0200
Subject: [PATCH] Fix another bug!

---
 src/algo_dup2.c | 11 ++++-------
 src/packet.c    | 10 +++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/algo_dup2.c b/src/algo_dup2.c
index c3f1847..726821f 100644
--- a/src/algo_dup2.c
+++ b/src/algo_dup2.c
@@ -48,7 +48,7 @@ int algo_dup2_on_stream(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo
   // Check that received identifier has not been delivered
   if (ring_ge(dup2c->recv_id, id)) {
     if (ctx->verbose > 1) fprintf(stderr, "    [algo_dup2] Packet already delivered, dropping\n");
-    mv_buffer_atof(&app_ctx->br, fdinfo);
+    mv_buffer_rtof(&app_ctx->br, fdinfo);
     return 0;
   }
 
@@ -60,13 +60,13 @@ int algo_dup2_on_stream(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdinfo
   to_fdinfo = evt_core_get_from_url (ctx, url);
   if (to_fdinfo == NULL) {
     fprintf(stderr, "No fd for URL %s in tcp-read. Dropping packet :( \n", url);
-    mv_buffer_atof (&app_ctx->br, fdinfo);
+    mv_buffer_rtof (&app_ctx->br, fdinfo);
     return 1;
   }
 
   // 2. Move buffer
   if (ctx->verbose > 1) fprintf(stderr, "    [algo_dup2] Scheduling packet for write\n");
-  mv_buffer_atow (&app_ctx->br, fdinfo, to_fdinfo);
+  mv_buffer_rtow (&app_ctx->br, fdinfo, to_fdinfo);
   main_on_udp_write(ctx, to_fdinfo);
 
   return 0;
@@ -77,6 +77,7 @@ int algo_dup2_on_datagram(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdin
   struct algo_ctx* app_ctx = fdinfo->cat->app_ctx;
 
   struct dup2_ctx* dup2c = app_ctx->misc;
+  dup2c->emit_id = dup2c->emit_id + 1;
   union abstract_packet metadata = {
     .fmt.headers.cmd = CMD_UDP_METADATA_THUNDER,
     .fmt.headers.size = sizeof(metadata.fmt.headers) + sizeof(metadata.fmt.content.udp_metadata_thunder),
@@ -84,14 +85,10 @@ int algo_dup2_on_datagram(struct evt_core_ctx* ctx, struct evt_core_fdinfo* fdin
     .fmt.content.udp_metadata_thunder.id = dup2c->emit_id
   };
   buffer_append_ap (bp, &metadata);
-
   dump_buffer_packet(bp);
-
-  dup2c->emit_id = dup2c->emit_id + 1;
   if (ctx->verbose > 1) fprintf(stderr, "    [algo_dup2] Added metadata\n");
 
   struct evt_core_cat* cat = evt_core_get_from_cat (ctx, "tcp-write");
-
   for (int i = 0; i < app_ctx->ap.links; i++) {
     // 1. A whole packet has been read, we will find someone to write it
     to_fdinfo = cat->socklist->len > i ? g_array_index(cat->socklist, struct evt_core_fdinfo*, i) : NULL;
diff --git a/src/packet.c b/src/packet.c
index f5879c0..226fbe5 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -44,10 +44,10 @@ enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer
   size_t pkt_size_size = sizeof(ap->fmt.headers.size);
   if (bp->mode != BP_READING) return FDS_ERR;
 
-  fprintf(stderr, "Entering read_packet_from_tcp\n");
+  //fprintf(stderr, "Entering read_packet_from_tcp\n");
   do {
 
-    fprintf(stderr, "bp->ap_count=%d\n", bp->ap_count);
+    //fprintf(stderr, "bp->ap_count=%d\n", bp->ap_count);
     ap = (union abstract_packet*) &bp->ip;
     for (int i = 0; i < bp->ap_count; i++) {
       ap_aread += ap->fmt.headers.size;
@@ -55,7 +55,7 @@ enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer
     }
     cur_ap_aread = bp->aread - ap_aread;
 
-    fprintf(stderr, "[size] bp_aread=%d, prev_ap_aread=%ld, cur_ap_aread=%ld\n", bp->aread, ap_aread, cur_ap_aread);
+    //fprintf(stderr, "[size] bp_aread=%d, prev_ap_aread=%ld, cur_ap_aread=%ld\n", bp->aread, ap_aread, cur_ap_aread);
     while (cur_ap_aread < pkt_size_size) {
       nread = read(fdinfo->fd, &(ap->raw) + cur_ap_aread, pkt_size_size - cur_ap_aread);
       if (nread == 0) return FDS_AGAIN;
@@ -65,7 +65,7 @@ enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer
       cur_ap_aread += nread;
     }
 
-    fprintf(stderr, "[content] bp_aread=%d, prev_ap_aread=%ld, cur_ap_aread=%ld\n", bp->aread, ap_aread, cur_ap_aread);
+    //fprintf(stderr, "[content] bp_aread=%d, prev_ap_aread=%ld, cur_ap_aread=%ld\n", bp->aread, ap_aread, cur_ap_aread);
     while (cur_ap_aread < ap->fmt.headers.size) {
       nread = read(fdinfo->fd, &(ap->raw) + cur_ap_aread, ap->fmt.headers.size - cur_ap_aread);
       perror("read ap");
@@ -77,7 +77,7 @@ enum FD_STATE read_packet_from_tcp(struct evt_core_fdinfo* fdinfo, struct buffer
     }
 
     bp->ap_count++;
-    fprintf(stderr, "bp->ap_count=%d, buffer_count_ap(bp)=%ld\n", bp->ap_count, buffer_count_ap (bp));
+    //fprintf(stderr, "bp->ap_count=%d, buffer_count_ap(bp)=%ld\n", bp->ap_count, buffer_count_ap (bp));
   } while (bp->ap_count != buffer_count_ap (bp));
 
   bp->mode = BP_WRITING;