re-enable ack probing. simplifies code some

holepunchto · Nov 8, 2023 · 18275b2 · 18275b2
1 parent 5b7e626
commit 18275b2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 47 deletions.
diff --git a/docs/wireshark/udx.lua b/docs/wireshark/udx.lua
@@ -63,9 +63,10 @@ function udx.dissector(tvb, pinfo, tree)
 
     local data_offset = tvb(3,1):uint()
     local pos = 20
+    local sacks = ""
 
     if bit.band(type, TYPE_SACK) > 0 then
-        local sacks = " "
+        sacks = " "
         local header_end = data_offset > 0 and 20 + data_offset or len
         while pos + 8 <= header_end do
             local from = tvb(pos, 4):le_uint()
@@ -89,6 +90,7 @@ function udx.dissector(tvb, pinfo, tree)
         " Id=" .. id ..
         " Seq=" .. seq ..
         " Ack=" .. ack ..
+        sacks .. 
         " " .. type_names
     pinfo.cols.info:set(info)
 end

diff --git a/include/udx.h b/include/udx.h
@@ -212,7 +212,6 @@ struct udx_stream_s {
   int mtu_probe_count;
   int mtu_probe_size; // size of the outstanding probe
   int mtu_max;        // min(UDX_MTU_MAX, get_link_mtu(remote_addr))
-  uint32_t mtu_probe_seq[UDX_MTU_MAX_PROBES];
   uint16_t mtu;
 
   uint32_t seq;
@@ -272,6 +271,7 @@ struct udx_packet_s {
   udx_stream_t *stream;   // pointer to the stream if stream packet
 
   uint8_t transmits;
+  bool is_mtu_probe;
   uint16_t size;
   uint64_t time_sent;
 

diff --git a/src/debug.h b/src/debug.h
@@ -33,27 +33,22 @@ debug_print_cwnd_stats (udx_stream_t *stream) {
 static void
 debug_print_outgoing (udx_stream_t *stream) {
   if (DEBUG) {
-    uint32_t i = stream->seq_flushed - stream->remote_acked;
-    uint32_t j = stream->seq - stream->seq_flushed;
-
-    debug_printf("%-*s%-*s%s\n", i, "RA", j, "SF", "Seq");
-
     for (uint32_t s = stream->remote_acked; s < stream->seq; s++) {
       udx_packet_t *pkt = (udx_packet_t *) udx__cirbuf_get(&stream->outgoing, s);
       if (pkt == NULL) {
         debug_printf("-");
         continue;
       }
 
-      if (pkt->type == UDX_PACKET_INFLIGHT) {
+      if (pkt->status == UDX_PACKET_INFLIGHT) {
         debug_printf("I");
         continue;
       }
-      if (pkt->type == UDX_PACKET_SENDING) {
+      if (pkt->status == UDX_PACKET_SENDING) {
         debug_printf("S");
         continue;
       }
-      if (pkt->type == UDX_PACKET_WAITING) {
+      if (pkt->status == UDX_PACKET_WAITING) {
         debug_printf("W");
         continue;
       }

diff --git a/src/udx.c b/src/udx.c
@@ -526,6 +526,7 @@ init_stream_packet (udx_packet_t *pkt, int type, udx_stream_t *stream, const uv_
   pkt->dest_len = stream->remote_addr_len;
   pkt->send_queue = NULL;
   pkt->stream = stream;
+  pkt->is_mtu_probe = false;
 
   pkt->bufs_len = 2;
 
@@ -553,15 +554,28 @@ mtu_probeify_packet (udx_packet_t *pkt, int wanted_size) {
   pkt->bufs[1].base = probe_data;
   pkt->header[3] = padding_size;
   pkt->bufs_len = 3;
+  pkt->is_mtu_probe = true;
   return 1;
 }
 
 static void
-mtu_unprobeify_packet (udx_packet_t *pkt) {
-  assert(pkt->bufs_len == 3);
+mtu_unprobeify_packet (udx_packet_t *pkt, udx_stream_t *stream) {
+  assert(pkt->bufs_len == 3 && pkt->is_mtu_probe);
   pkt->header[3] = 0;
   pkt->bufs[1] = pkt->bufs[2];
   pkt->bufs_len = 2;
+  pkt->is_mtu_probe = false;
+
+  debug_printf("mtu: probe %d/%d", stream->mtu_probe_count, UDX_MTU_MAX_PROBES);
+  if (stream->mtu_state == UDX_MTU_STATE_SEARCH) {
+    if (stream->mtu_probe_count >= UDX_MTU_MAX_PROBES) {
+      debug_printf(" established mtu=%d via timeout", stream->mtu);
+      stream->mtu_state = UDX_MTU_STATE_SEARCH_COMPLETE;
+    } else {
+      stream->mtu_probe_wanted = true;
+    }
+  }
+  debug_printf("\n");
 }
 
 static int
@@ -736,7 +750,6 @@ fill_window (udx_stream_t *stream) {
     stream->inflight += pkt->size;
 
     if (stream->mtu_probe_wanted && mtu_probeify_packet(pkt, stream->mtu_probe_size)) {
-      stream->mtu_probe_seq[stream->mtu_probe_count] = pkt->seq;
       stream->mtu_probe_count++;
       stream->mtu_probe_wanted = false;
     }
@@ -838,16 +851,6 @@ rack_update_reo_wnd (udx_stream_t *stream) {
   return r < stream->srtt ? r : stream->srtt;
 }
 
-static inline bool
-seq_was_probe (udx_stream_t *s, uint32_t seq) {
-  for (int i = 0; i < s->mtu_probe_count; i++) {
-    if (s->mtu_probe_seq[i] == seq) {
-      return true;
-    }
-  }
-  return false;
-}
-
 static void
 rack_detect_loss (udx_stream_t *stream) {
   uint64_t timeout = 0;
@@ -881,20 +884,9 @@ rack_detect_loss (udx_stream_t *stream) {
       stream->pkts_inflight--;
       stream->retransmits_waiting++;
 
-      debug_printf("rack to on seq=%d\n", seq);
-
-      if (seq_was_probe(stream, seq)) {
+      if (pkt->is_mtu_probe) {
+        mtu_unprobeify_packet(pkt, stream);
         mtu_probes_lost++;
-        if (seq == stream->mtu_probe_seq[stream->mtu_probe_count - 1] && stream->mtu_state == UDX_MTU_STATE_SEARCH) {
-          mtu_unprobeify_packet(pkt);
-          debug_printf("mtu: rack to on last probe, seq=%d count=%d/%d\n", seq, stream->mtu_probe_count, UDX_MTU_MAX_PROBES);
-          if (stream->mtu_probe_count >= UDX_MTU_MAX_PROBES) {
-            stream->mtu_state = UDX_MTU_STATE_SEARCH_COMPLETE;
-            debug_printf("mtu: established via probe timeout, mtu=%d\n", stream->mtu);
-          } else {
-            stream->mtu_probe_wanted = true;
-          }
-        }
       }
 
       // todo: state check unnecessary?
@@ -969,8 +961,8 @@ ack_packet (udx_stream_t *stream, uint32_t seq, int sack) {
     return 0;
   }
 
-  if (stream->mtu_state == UDX_MTU_STATE_SEARCH && stream->mtu_probe_count > 0 && seq == stream->mtu_probe_seq[stream->mtu_probe_count - 1]) {
-    debug_printf("mtu: probe acked seq=%d mtu=%d->%d\n", seq, stream->mtu, stream->mtu_probe_size);
+  if (stream->mtu_state == UDX_MTU_STATE_SEARCH && stream->mtu_probe_count > 0 && pkt->is_mtu_probe) {
+    debug_printf("mtu: probe acked seq=%d mtu=%d->%d sack=%d\n", seq, stream->mtu, stream->mtu_probe_size, sack);
 
     stream->mtu_probe_count = 0;
     stream->mtu = stream->mtu_probe_size;
@@ -1913,16 +1905,11 @@ udx_stream_check_timeouts (udx_stream_t *handle) {
       handle->pkts_waiting++;
       handle->pkts_inflight--;
       handle->retransmits_waiting++;
-    }
-
-    // todo: handle possibility of downward MTU change
-    // this would require re-sending in-flight packets that were too big to send.
-    // resizing is easier if sequence numbers are based on bytes
 
-    // handle->mtu = UDX_MTU_BASE;
-    // handle->mtu_state = UDX_MTU_STATE_ERROR;
-    // handle->mtu_probe_count = 0;
-    // handle->mtu_probe_size = UDX_MTU_BASE;
+      if (pkt->is_mtu_probe) {
+        mtu_unprobeify_packet(pkt, handle);
+      }
+    }
 
     debug_printf("timeout! pkt loss detected - inflight=%zu ssthresh=%u cwnd=%u acked=%u seq=%u rtt=%u\n", handle->inflight, handle->ssthresh, handle->cwnd, handle->remote_acked, handle->seq_flushed, handle->srtt);
   }