From d51715291a2c9c9a238a79076e740eb8f4c2892f Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Sun, 7 Jul 2024 21:35:59 +0100
Subject: [PATCH 1/4] Add More Features

---
 src/quicreach.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/quicreach.cpp b/src/quicreach.cpp
index aa8d450..5836955 100644
--- a/src/quicreach.cpp
+++ b/src/quicreach.cpp
@@ -40,7 +40,10 @@ struct ReachConfig {
     bool RequireAll {false};
     std::vector<const char*> HostNames;
     QuicAddr Address;
+    QuicAddr SourceAddress;
     uint32_t Parallel {1};
+    uint32_t Repeat {0};
+    uint32_t Timeout {0};
     uint16_t Port {443};
     MsQuicAlpn Alpn {"h3"};
     MsQuicSettings Settings;
@@ -130,7 +133,10 @@ bool ParseConfig(int argc, char **argv) {
                " -m, --mtu <mtu>        The initial (IPv6) MTU to use (def=1288)\n"
                " -p, --port <port>      The UDP port to use (def=443)\n"
                " -r, --req-all          Require all hostnames to succeed\n"
+               " -R, --repeat <time>    Repeat the requests event N milliseconds\n"
                " -s, --stats            Print connection statistics\n"
+               " -S, --source <address> Specify a source IP address\n"
+               " -t, --timeout <time>   Timeout in milliseconds to wait for each handshake\n"
                " -u, --unsecure         Allows unsecure connections\n"
                " -v, --version          Prints out the version\n"
               );
@@ -159,7 +165,7 @@ bool ParseConfig(int argc, char **argv) {
         } else if (!strcmp(argv[i], "--ip") || !strcmp(argv[i], "-i")) {
             if (++i >= argc) { printf("Missing IP address\n"); return false; }
             if (!QuicAddrFromString(argv[i], 0, &Config.Address.SockAddr)) {
-                printf("Invalid address arg passed in\n"); return false;
+                printf("Invalid address arg\n"); return false;
             }
 
         } else if (!strcmp(argv[i], "--parallel") || !strcmp(argv[i], "-l")) {
@@ -173,9 +179,23 @@ bool ParseConfig(int argc, char **argv) {
         } else if (!strcmp(argv[i], "--stats") || !strcmp(argv[i], "-s")) {
             Config.PrintStatistics = true;
 
+        } else if (!strcmp(argv[i], "--source") || !strcmp(argv[i], "-S")) {
+            if (++i >= argc) { printf("Missing source address\n"); return false; }
+            if (!QuicAddrFromString(argv[i], 0, &Config.SourceAddress.SockAddr)) {
+                printf("Invalid source address arg\n"); return false;
+            }
+
         } else if (!strcmp(argv[i], "--req-all") || !strcmp(argv[i], "-r")) {
             Config.RequireAll = true;
 
+        } else if (!strcmp(argv[i], "--repeat") || !strcmp(argv[i], "-R")) {
+            if (++i >= argc) { printf("Missing repeat arg\n"); return false; }
+            Config.Repeat = (uint32_t)atoi(argv[i]);
+
+        } else if (!strcmp(argv[i], "--timeout") || !strcmp(argv[i], "-t")) {
+            if (++i >= argc) { printf("Missing timeout arg\n"); return false; }
+            Config.Timeout = (uint32_t)atoi(argv[i]);
+
         } else if (!strcmp(argv[i], "--unsecure") || !strcmp(argv[i], "-u")) {
             Config.CredFlags |= QUIC_CREDENTIAL_FLAG_NO_CERTIFICATE_VALIDATION;
 
@@ -201,6 +221,15 @@ struct ReachConnection : public MsQuicConnection {
         if (IsValid() && Config.Address.GetFamily() != QUIC_ADDRESS_FAMILY_UNSPEC) {
             InitStatus = SetRemoteAddr(Config.Address);
         }
+        if (IsValid() && Config.SourceAddress.GetFamily() != QUIC_ADDRESS_FAMILY_UNSPEC) {
+            InitStatus = SetLocalAddr(Config.SourceAddress);
+        }
+        if (IsValid() && Config.Timeout != 0) {
+            InitStatus = SetHandshakeIdleTimeoutMs(Config.Timeout);
+        }
+        if (IsValid() && Config.Timeout != 0) {
+            InitStatus = SetDisconnectTimeoutMs(Config.Timeout);
+        }
         if (IsValid()) {
             InitStatus = Start(Configuration, HostName, Config.Port);
         }
@@ -363,10 +392,18 @@ int QUIC_CALL main(int argc, char **argv) {
         return 1;
     }
 
-    bool Result = TestReachability();
-    if (!Config.PrintStatistics) {
-        printf("%s\n", Result ? "Success" : "Failure");
-    }
+    do {
+        bool Result = TestReachability();
+        if (!Config.PrintStatistics) {
+            printf("%s\n", Result ? "Success" : "Failure");
+        }
+
+        if (Config.Repeat) {
+            CxPlatSleep(Config.Repeat);
+        }
+
+    } while (Config.Repeat);
+
     delete MsQuic;
     return Result ? 0 : 1;
 }

From 57e7c2b3249eede56fad3c5a0319f15fa48795af Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Sun, 7 Jul 2024 21:45:14 +0100
Subject: [PATCH 2/4] fixes

---
 src/quicreach.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/quicreach.cpp b/src/quicreach.cpp
index 5836955..96cd502 100644
--- a/src/quicreach.cpp
+++ b/src/quicreach.cpp
@@ -14,6 +14,7 @@
 #include <vector>
 #include <mutex>
 #include <condition_variable>
+#include <quic_platform.h>
 #include <msquic.hpp>
 #include "quicreach.ver"
 #include "domains.hpp"
@@ -43,15 +44,16 @@ struct ReachConfig {
     QuicAddr SourceAddress;
     uint32_t Parallel {1};
     uint32_t Repeat {0};
-    uint32_t Timeout {0};
+    uint32_t Timeout {1000};
     uint16_t Port {443};
     MsQuicAlpn Alpn {"h3"};
     MsQuicSettings Settings;
     QUIC_CREDENTIAL_FLAGS CredFlags {QUIC_CREDENTIAL_FLAG_CLIENT};
     const char* OutCsvFile {nullptr};
-    ReachConfig() {
-        Settings.SetDisconnectTimeoutMs(1000);
-        Settings.SetHandshakeIdleTimeoutMs(1000);
+    ReachConfig() { }
+    void Set() {
+        Settings.SetDisconnectTimeoutMs(Timeout);
+        Settings.SetHandshakeIdleTimeoutMs(Timeout);
         Settings.SetPeerUnidiStreamCount(3);
         Settings.SetMinimumMtu(1288); /* We use a slightly larger than default MTU:
                                          1240 (QUIC) + 40 (IPv6) + 8 (UDP) */
@@ -204,6 +206,8 @@ bool ParseConfig(int argc, char **argv) {
         }
     }
 
+    Config.Set();
+
     return true;
 }
 
@@ -224,12 +228,6 @@ struct ReachConnection : public MsQuicConnection {
         if (IsValid() && Config.SourceAddress.GetFamily() != QUIC_ADDRESS_FAMILY_UNSPEC) {
             InitStatus = SetLocalAddr(Config.SourceAddress);
         }
-        if (IsValid() && Config.Timeout != 0) {
-            InitStatus = SetHandshakeIdleTimeoutMs(Config.Timeout);
-        }
-        if (IsValid() && Config.Timeout != 0) {
-            InitStatus = SetDisconnectTimeoutMs(Config.Timeout);
-        }
         if (IsValid()) {
             InitStatus = Start(Configuration, HostName, Config.Port);
         }
@@ -392,8 +390,9 @@ int QUIC_CALL main(int argc, char **argv) {
         return 1;
     }
 
+    bool Result = true;
     do {
-        bool Result = TestReachability();
+        Result &= TestReachability();
         if (!Config.PrintStatistics) {
             printf("%s\n", Result ? "Success" : "Failure");
         }

From 5f941ccc1a9d29150f7b7f71ae970ec0a626c84c Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Sun, 7 Jul 2024 21:57:05 +0100
Subject: [PATCH 3/4] Fixes

---
 src/quicreach.cpp | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/quicreach.cpp b/src/quicreach.cpp
index 96cd502..a368b9f 100644
--- a/src/quicreach.cpp
+++ b/src/quicreach.cpp
@@ -350,12 +350,23 @@ bool TestReachability() {
     if (Config.PrintStatistics)
         printf("%30s          RTT       TIME_I       TIME_H              SEND:RECV    C1     S1    VER                     IP\n", "SERVER");
 
-    for (auto HostName : Config.HostNames) {
-        new ReachConnection(Registration, Configuration, HostName);
-        Results.WaitForActiveCount();
-    }
+    do {
+        for (auto HostName : Config.HostNames) {
+            new ReachConnection(Registration, Configuration, HostName);
+            Results.WaitForActiveCount();
+        }
+
+        Results.WaitForAll();
+
+        if (Config.Repeat) {
+#ifdef _WIN32
+            Sleep(Config.Repeat);
+#else
+            usleep(Config.Repeat * 1000);
+#endif
+        }
 
-    Results.WaitForAll();
+    } while (Config.Repeat);
 
     if (Config.PrintStatistics) {
         if (Results.ReachableCount > 1) {
@@ -390,19 +401,10 @@ int QUIC_CALL main(int argc, char **argv) {
         return 1;
     }
 
-    bool Result = true;
-    do {
-        Result &= TestReachability();
-        if (!Config.PrintStatistics) {
-            printf("%s\n", Result ? "Success" : "Failure");
-        }
-
-        if (Config.Repeat) {
-            CxPlatSleep(Config.Repeat);
-        }
-
-    } while (Config.Repeat);
-
+    bool Result = TestReachability();
+    if (!Config.PrintStatistics) {
+        printf("%s\n", Result ? "Success" : "Failure");
+    }
     delete MsQuic;
     return Result ? 0 : 1;
 }

From 22566f19780e852e0a2f10c4f9f5623f72ca8fee Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Sun, 7 Jul 2024 21:58:34 +0100
Subject: [PATCH 4/4] Unnecessary header

---
 src/quicreach.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/quicreach.cpp b/src/quicreach.cpp
index a368b9f..8080341 100644
--- a/src/quicreach.cpp
+++ b/src/quicreach.cpp
@@ -14,7 +14,6 @@
 #include <vector>
 #include <mutex>
 #include <condition_variable>
-#include <quic_platform.h>
 #include <msquic.hpp>
 #include "quicreach.ver"
 #include "domains.hpp"