Enable to connect to the host that hosting on non 443 port (#37)

MsH3ConnectionOpen has hard-coded port number "443".
But there are serving not 443 port of QUIC implementations are,
like nghttp2.org, quic.tech.
https://github.com/quicwg/base-drafts/wiki/Implementations

And, I confirmed that succeeded in connecting those hosts by original
msquic implementation.

The patch makes msh3 support QUIC with non 443 port also.

Author: unasuke

.github/workflows/build.yml

@@ -42,6 +42,8 @@ jobs:
       run: /usr/local/lib/msh3app www.cloudflare.com
     - name: GET www.google.com
       run: /usr/local/lib/msh3app www.google.com
+    - name: GET nghttp2.org:4433
+      run: /usr/local/lib/msh3app nghttp2:4433
   build-windows-openssl:
     permissions:
       contents: read
@@ -80,6 +82,9 @@ jobs:
     - name: GET www.google.com
       run: |
         & 'C:/Program Files/msh3/lib/msh3app' www.google.com
+    - name: GET nghttp2.org:4433
+      run: |
+        & 'C:/Program Files/msh3/lib/msh3app' nghttp2.org:4433
   build-windows-schannel:
     permissions:
       contents: read
@@ -112,3 +117,6 @@ jobs:
     - name: GET www.google.com
       run: |
         & 'C:/Program Files/msh3/lib/msh3app' www.google.com
+    - name: GET nghttp2.org:4433
+      run: |
+        & 'C:/Program Files/msh3/lib/msh3app' nghttp2.org:4433

README.md

@@ -25,7 +25,7 @@ const size_t HeadersCount = sizeof(Headers)/sizeof(MSH3_HEADER);
 
 MSH3_API* Api = MsH3ApiOpen();
 if (Api) {
-    MSH3_CONNECTION* Connection = MsH3ConnectionOpen(Api, Host, Unsecure);
+    MSH3_CONNECTION* Connection = MsH3ConnectionOpen(Api, Host, Port, Unsecure);
     if (Connection) {
         MSH3_REQUEST* Request = MsH3RequestOpen(Connection, &Callbacks, NULL, Headers, HeadersCount);
         // ...
@@ -60,4 +60,5 @@ cmake --build .
 msh3app outlook.office.com
 msh3app www.cloudflare.com
 msh3app www.google.com
+msh3app nghttp2.org:4433
 ```

lib/msh3.cpp

@@ -68,11 +68,12 @@ MSH3_CALL
 MsH3ConnectionOpen(
     MSH3_API* Handle,
     const char* ServerName,
+    uint16_t Port,
     bool Unsecure
     )
 {
     auto Reg = (MsQuicRegistration*)Handle;
-    auto H3 = new(std::nothrow) MsH3Connection(*Reg, ServerName, 443, Unsecure);
+    auto H3 = new(std::nothrow) MsH3Connection(*Reg, ServerName, Port, Unsecure);
     if (!H3 || QUIC_FAILED(H3->GetInitStatus())) {
         delete H3;
         return nullptr;

msh3.h

@@ -43,6 +43,7 @@ MSH3_CALL
 MsH3ConnectionOpen(
     MSH3_API* Handle,
     const char* ServerName,
+    uint16_t Port,
     bool Unsecure
     );
 

tool/msh3_app.cpp

@@ -45,11 +45,34 @@ int MSH3_CALL main(int argc, char **argv) {
     }
 
     const char* Host = "outlook.office.com";
+    int Port = 443;
+    char *givenHost = NULL;
     const char* Path = "/";
     bool Unsecure = false;
     uint32_t Count = 1;
 
-    if (argc > 1) Host = argv[1];
+    if (argc > 1) {
+        if(strrchr(argv[1], ':') != NULL) {
+            const int len = (int)strlen(argv[1]);
+            givenHost = (char *)calloc(len + sizeof(char), sizeof(char));
+            if (givenHost == NULL) {
+                printf("Failed to allocate memory\n");
+                return -1;
+            }
+#ifdef _WIN32
+            int cnt = sscanf_s(argv[1], "%[^:]:%d", givenHost, len, &Port);
+#else
+            int cnt = sscanf(argv[1], "%[^:]:%d", givenHost, &Port);
+#endif
+            if (cnt != 2) {
+                printf("Failed to parse server address\n");
+                return -1;
+            }
+            Host = givenHost;
+        } else {
+            Host = argv[1];
+        }
+    }
     if (argc > 2) Path = argv[2];
     if (argc > 3 && !strcmp(argv[3], "unsecure")) Unsecure = true;
     if (argc > 4) Count = (uint32_t)atoi(argv[4]);
@@ -65,11 +88,11 @@ int MSH3_CALL main(int argc, char **argv) {
     };
     const size_t HeadersCount = sizeof(Headers)/sizeof(MSH3_HEADER);
 
-    printf("HTTP/3 GET https://%s%s\n\n", Host, Path);
+    printf("HTTP/3 GET https://%s:%d%s\n\n", Host, Port, Path);
 
     auto Api = MsH3ApiOpen();
     if (Api) {
-        auto Connection = MsH3ConnectionOpen(Api, Host, Unsecure);
+        auto Connection = MsH3ConnectionOpen(Api, Host, (uint16_t)Port, Unsecure);
         if (Connection) {
             for (uint32_t i = 0; i < Count; ++i) {
                 auto Request = MsH3RequestOpen(Connection, &Callbacks, (void*)(size_t)(i+1), Headers, HeadersCount);
@@ -83,5 +106,7 @@ int MSH3_CALL main(int argc, char **argv) {
         MsH3ApiClose(Api);
     }
 
+    free(givenHost);
+
     return 0;
 }