Way Too Much Amplification Measurement (#271)

microsoft · Nov 11, 2024 · 7ac2752 · 7ac2752
1 parent 8e06a8e
commit 7ac2752
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/reach.yml b/.github/workflows/reach.yml
@@ -3,6 +3,8 @@ name: Reach
 on:
   push:
     branches: main
+  pull_request:
+    branches: main
   schedule:
     - cron: '0 */8 * * *' # every 8 hours
 
@@ -11,7 +13,7 @@ permissions: read-all
 jobs:
   reach-linux-openssl:
     permissions: write-all
-    name: Top 1000 Reachability Test (Linux-OpenSSL)
+    name: Top 5000 Reachability Test (Linux-OpenSSL)
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
@@ -28,6 +30,7 @@ jobs:
     - name: quicreach *
       run: /usr/local/lib/quicreach '*' --parallel 8 --stats --csv build/data.csv
     - name: Save results
+      if: github.event_name != 'pull_request'
       run: |
         git checkout data
         git pull
@@ -41,7 +44,7 @@ jobs:
         git checkout main
   reach-windows-schannel:
     permissions: write-all
-    name: Top 1000 Reachability Test (Windows-Schannel)
+    name: Top 5000 Reachability Test (Windows-Schannel)
     needs: []
     runs-on: windows-latest
     steps:

diff --git a/src/quicreach.cpp b/src/quicreach.cpp
@@ -32,6 +32,9 @@ const MsQuicApi* MsQuic;
 #define QUIC_VERSION_2          0x6b3343cfU     // Second official version (host byte order)
 #define QUIC_VERSION_1          0x00000001U     // First official version (host byte order)
 
+#define LOW_AMPLIFICATION_LIMIT     3.0         // Limit as specified by the QUIC spec
+#define HIGH_AMPLIFICATION_LIMIT    5.0         // Higher limit that seems to be practically used
+
 const uint32_t SupportedVersions[] = {QUIC_VERSION_1, QUIC_VERSION_2};
 const MsQuicVersionSettings VersionSettings(SupportedVersions, 2);
 
@@ -64,6 +67,7 @@ struct ReachResults {
     uint32_t TotalCount {0};
     uint32_t ReachableCount {0};
     uint32_t TooMuchCount {0};
+    uint32_t WayTooMuchCount {0};
     uint32_t MultiRttCount {0};
     uint32_t RetryCount {0};
     uint32_t IPv6Count {0};
@@ -269,8 +273,13 @@ struct ReachConnection : public MsQuicConnection {
             MultiRtt = true;
             IncStat(Results.MultiRttCount);
         } else {
-            TooMuch = Amplification > 3.0;
-            if (TooMuch) IncStat(Results.TooMuchCount);
+            TooMuch = Amplification > LOW_AMPLIFICATION_LIMIT;
+            if (TooMuch) {
+                IncStat(Results.TooMuchCount);
+                if (Amplification > HIGH_AMPLIFICATION_LIMIT) {
+                    IncStat(Results.WayTooMuchCount);
+                }
+            }
         }
         if (Retry) {
             IncStat(Results.RetryCount);
@@ -323,14 +332,15 @@ void DumpResultsToFile() {
             return;
         }
     } else {
-        fprintf(File, "UtcDateTime,Total,Reachable,TooMuch,MultiRtt,Retry,IPv6,QuicV2\n");
+        fprintf(File, "UtcDateTime,Total,Reachable,TooMuch,MultiRtt,Retry,IPv6,QuicV2,WayTooMuch\n");
     }
     char UtcDateTime[256];
     time_t Time = time(nullptr);
     struct tm* Tm = gmtime(&Time);
     strftime(UtcDateTime, sizeof(UtcDateTime), "%Y.%m.%d-%H:%M:%S", Tm);
-    fprintf(File, "%s,%u,%u,%u,%u,%u,%u,%u\n", UtcDateTime,
-        Results.TotalCount, Results.ReachableCount, Results.TooMuchCount, Results.MultiRttCount, Results.RetryCount, Results.IPv6Count, Results.Quicv2Count);
+    fprintf(File, "%s,%u,%u,%u,%u,%u,%u,%u,%u\n", UtcDateTime,
+        Results.TotalCount, Results.ReachableCount, Results.TooMuchCount, Results.MultiRttCount, Results.RetryCount,
+        Results.IPv6Count, Results.Quicv2Count, Results.WayTooMuchCount);
     fclose(File);
     printf("\nOutput written to %s\n", Config.OutCsvFile);
 }
@@ -376,6 +386,8 @@ bool TestReachability() {
                 printf("%4u domain(s) required multiple round trips (*)\n", Results.MultiRttCount);
             if (Results.TooMuchCount)
                 printf("%4u domain(s) exceeded amplification limits (!)\n", Results.TooMuchCount);
+            if (Results.WayTooMuchCount)
+                printf("%4u domain(s) well exceeded amplification limits (5x)\n", Results.WayTooMuchCount);
             if (Results.RetryCount)
                 printf("%4u domain(s) sent RETRY packets (R)\n", Results.RetryCount);
             if (Results.IPv6Count)