in secure mode, in secure mode, use the host name instead of the IP adddress for the host, and the port number used in the Host header cause SSL handshake Error, disable it for now

Author: lo-simon

Development/nmos/client_utils.cpp

@@ -15,6 +15,7 @@
 #include "cpprest/ws_client.h"
 #include "nmos/certificate_settings.h"
 #include "nmos/json_fields.h"
+#include "nmos/mdns.h"
 #include "nmos/slog.h"
 #include "nmos/ssl_context_options.h"
 
@@ -263,14 +264,25 @@ namespace nmos
         {
             // unstash the host name for the Host header
             // cf. nmos::details::resolve_service
-            std::unique_ptr<web::http::client::http_client> client(new web::http::client::http_client(web::uri_builder(base_uri).set_user_info({}).to_uri(), client_config));
+            // Note: in secure mode, use the host name instead of the IP adddress for the host
+            web::uri base_uri_{ base_uri };
+            if (!base_uri.user_info().empty() && nmos::is_service_protocol_secure(utility::us2s(base_uri.scheme())))
+            {
+                auto host = base_uri.user_info();
+                base_uri_ = web::uri_builder(base_uri).set_user_info({}).set_host(host).to_uri();
+            }
+            std::unique_ptr<web::http::client::http_client> client(new web::http::client::http_client(base_uri_, client_config));
+
             if (!base_uri.user_info().empty())
             {
                 auto host = base_uri.user_info();
-                if (base_uri.port() > 0)
-                {
-                    host.append(U(":")).append(utility::conversions::details::to_string_t(base_uri.port()));
-                }
+
+                // hmm, in secure mode, the port number used in the Host header cause SSL handshake Error, disable it for now
+                //if (base_uri.port() > 0)
+                //{
+                //    host.append(U(":")).append(utility::conversions::details::to_string_t(base_uri.port()));
+                //}
+
                 client->add_handler([host](web::http::http_request request, std::shared_ptr<web::http::http_pipeline_stage> next_stage) -> pplx::task<web::http::http_response>
                 {
                     request.headers().add(web::http::header_names::host, host);

Development/nmos/mdns.cpp

@@ -563,23 +563,11 @@ namespace nmos
                         {
                             // sneakily stash the host name for the Host header in user info
                             // cf. nmos::details::make_http_client
-                            if (is_service_protocol_secure(resolved_proto))
-                            {
-                                results->push_back({ { *resolved_ver, resolved_pri }, resolved_uri
-                                    .set_user_info(host_name)
-                                    .set_host(host_name)
-                                    .to_uri()
-                                });
-                                break;
-                            }
-                            else
-                            {
-                                results->push_back({ { *resolved_ver, resolved_pri }, resolved_uri
-                                    .set_user_info(host_name)
-                                    .set_host(utility::s2us(ip_address))
-                                    .to_uri()
-                                });
-                            }
+                            results->push_back({ { *resolved_ver, resolved_pri }, resolved_uri
+                                .set_user_info(host_name)
+                                .set_host(utility::s2us(ip_address))
+                                .to_uri()
+                            });
                         }
 
                         return true;