Change port from uint16_t to uint32_t, to support VSOCK (#583)

awslabs · Dec 30, 2023 · 8ec54ac · 8ec54ac
1 parent 2f18149
commit 8ec54ac
Show file tree

Hide file tree

Showing 30 changed files with 62 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ instance of this class for each reservation.
         tlsCtxOptions.OverrideDefaultTrustStore(nullptr, caFile.c_str());
     }
 
-    uint16_t port = 8883;
+    uint32_t port = 8883;
     if (Io::TlsContextOptions::IsAlpnSupported())
     {
         /*

diff --git a/bin/elasticurl_cpp/main.cpp b/bin/elasticurl_cpp/main.cpp
@@ -256,7 +256,7 @@ int main(int argc, char **argv)
         apiHandle.InitializeLogging(appCtx.LogLevel, stderr);
     }
     bool useTls = true;
-    uint16_t port = 443;
+    uint32_t port = 443;
     if (!appCtx.uri.GetScheme().len && (appCtx.uri.GetPort() == 80 || appCtx.uri.GetPort() == 8080))
     {
         useTls = false;

diff --git a/bin/mqtt5_app/main.cpp b/bin/mqtt5_app/main.cpp
@@ -30,7 +30,7 @@ struct app_ctx
 {
     struct aws_allocator *allocator;
     Io::Uri uri;
-    uint16_t port;
+    uint32_t port;
     const char *cacert;
     const char *cert;
     const char *key;

diff --git a/bin/mqtt5_canary/main.cpp b/bin/mqtt5_canary/main.cpp
@@ -35,7 +35,7 @@ struct AppCtx
     Allocator *allocator;
     struct aws_mutex lock;
     Io::Uri uri;
-    uint16_t port;
+    uint32_t port;
     const char *cacert;
     const char *cert;
     const char *key;

diff --git a/crt/aws-c-auth b/crt/aws-c-auth
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
diff --git a/crt/aws-lc b/crt/aws-lc
diff --git a/crt/s2n b/crt/s2n
diff --git a/include/aws/crt/http/HttpConnection.h b/include/aws/crt/http/HttpConnection.h
@@ -298,7 +298,7 @@ namespace Aws
                  * The port of the proxy server to connect to.
                  * Required.
                  */
-                uint16_t Port;
+                uint32_t Port;
 
                 /**
                  * Sets the TLS options for the connection to the proxy.
@@ -391,7 +391,7 @@ namespace Aws
                  * The port of the http server to connect to.
                  * Required.
                  */
-                uint16_t Port;
+                uint32_t Port;
 
                 /**
                  * The socket options of the connection.

diff --git a/include/aws/crt/io/Uri.h b/include/aws/crt/io/Uri.h
@@ -80,7 +80,7 @@ namespace Aws
                  * be set to 0. In that case, it is your responsibility to determine the correct port
                  * based on the protocol you're using.
                  */
-                uint16_t GetPort() const noexcept;
+                uint32_t GetPort() const noexcept;
 
                 /** @return the Path and Query portion of the URI. In the case of Http, this likely the value for the
                  * URI parameter.

diff --git a/include/aws/crt/mqtt/Mqtt5Client.h b/include/aws/crt/mqtt/Mqtt5Client.h
@@ -474,7 +474,7 @@ namespace Aws
                  *
                  * @return this option object
                  */
-                Mqtt5ClientOptions &WithPort(uint16_t port) noexcept;
+                Mqtt5ClientOptions &WithPort(uint32_t port) noexcept;
 
                 /**
                  * Set booststrap for mqtt5 client
@@ -754,7 +754,7 @@ namespace Aws
                 /**
                  * Network port of the MQTT server to connect to.
                  */
-                uint16_t m_port;
+                uint32_t m_port;
 
                 /**
                  * Client bootstrap to use.  In almost all cases, this can be left undefined.

diff --git a/include/aws/crt/mqtt/MqttClient.h b/include/aws/crt/mqtt/MqttClient.h
@@ -91,7 +91,7 @@ namespace Aws
                  */
                 std::shared_ptr<MqttConnection> NewConnection(
                     const char *hostName,
-                    uint16_t port,
+                    uint32_t port,
                     const Io::SocketOptions &socketOptions,
                     const Crt::Io::TlsContext &tlsContext,
                     bool useWebsocket = false) noexcept;
@@ -109,7 +109,7 @@ namespace Aws
                  */
                 std::shared_ptr<MqttConnection> NewConnection(
                     const char *hostName,
-                    uint16_t port,
+                    uint32_t port,
                     const Io::SocketOptions &socketOptions,
                     bool useWebsocket = false) noexcept;
 

diff --git a/include/aws/crt/mqtt/MqttTypes.h b/include/aws/crt/mqtt/MqttTypes.h
@@ -27,7 +27,7 @@ namespace Aws
             struct MqttConnectionOptions
             {
                 const char *hostName = nullptr;
-                uint16_t port = 0;
+                uint32_t port = 0;
                 Io::SocketOptions socketOptions;
                 Crt::Io::TlsContext tlsContext;
                 Crt::Io::TlsConnectionOptions tlsConnectionOptions;

diff --git a/include/aws/crt/mqtt/private/MqttConnectionCore.h b/include/aws/crt/mqtt/private/MqttConnectionCore.h
@@ -363,7 +363,7 @@ namespace Aws
 
                 aws_mqtt_client_connection *m_underlyingConnection;
                 String m_hostName;
-                uint16_t m_port;
+                uint32_t m_port;
                 Crt::Io::TlsContext m_tlsContext;
                 Io::TlsConnectionOptions m_tlsOptions;
                 Io::SocketOptions m_socketOptions;

diff --git a/include/aws/iot/Mqtt5Client.h b/include/aws/iot/Mqtt5Client.h
@@ -266,7 +266,7 @@ namespace Aws
              *
              * @return this option object
              */
-            Mqtt5ClientBuilder &WithPort(uint16_t port) noexcept;
+            Mqtt5ClientBuilder &WithPort(uint32_t port) noexcept;
 
             /**
              * Set booststrap for mqtt5 client
@@ -542,7 +542,7 @@ namespace Aws
             /**
              * Network port of the MQTT server to connect to.
              */
-            uint16_t m_port;
+            uint32_t m_port;
 
             /**
              * TLS context for secure socket connections.

diff --git a/include/aws/iot/MqttClient.h b/include/aws/iot/MqttClient.h
@@ -37,7 +37,7 @@ namespace Aws
              */
             MqttClientConnectionConfig(
                 const Crt::String &endpoint,
-                uint16_t port,
+                uint32_t port,
                 const Crt::Io::SocketOptions &socketOptions,
                 Crt::Io::TlsContext &&tlsContext);
 
@@ -60,7 +60,7 @@ namespace Aws
              */
             MqttClientConnectionConfig(
                 const Crt::String &endpoint,
-                uint16_t port,
+                uint32_t port,
                 const Crt::Io::SocketOptions &socketOptions,
                 Crt::Io::TlsContext &&tlsContext,
                 Crt::Mqtt::OnWebSocketHandshakeIntercept &&interceptor,
@@ -81,13 +81,13 @@ namespace Aws
 
             MqttClientConnectionConfig(
                 const Crt::String &endpoint,
-                uint16_t port,
+                uint32_t port,
                 const Crt::Io::SocketOptions &socketOptions,
                 Crt::Io::TlsContext &&tlsContext,
                 const Crt::Optional<Crt::Http::HttpClientConnectionProxyOptions> &proxyOptions);
 
             Crt::String m_endpoint;
-            uint16_t m_port;
+            uint32_t m_port;
             Crt::Io::TlsContext m_context;
             Crt::Io::SocketOptions m_socketOptions;
             Crt::Mqtt::OnWebSocketHandshakeIntercept m_webSocketInterceptor;
@@ -219,7 +219,7 @@ namespace Aws
              *
              * @return this builder object
              */
-            MqttClientConnectionConfigBuilder &WithPortOverride(uint16_t port) noexcept;
+            MqttClientConnectionConfigBuilder &WithPortOverride(uint32_t port) noexcept;
 
             /**
              * Sets the certificate authority for the endpoint you're connecting to. This is a path to a file on disk
@@ -437,7 +437,7 @@ namespace Aws
 
             Crt::Allocator *m_allocator;
             Crt::String m_endpoint;
-            uint16_t m_portOverride;
+            uint32_t m_portOverride;
             Crt::Io::SocketOptions m_socketOptions;
             Crt::Io::TlsContextOptions m_contextOptions;
             Crt::Optional<WebsocketConfig> m_websocketConfig;

diff --git a/source/io/Uri.cpp b/source/io/Uri.cpp
@@ -135,7 +135,7 @@ namespace Aws
 
             ByteCursor Uri::GetHostName() const noexcept { return m_uri.host_name; }
 
-            uint16_t Uri::GetPort() const noexcept { return m_uri.port; }
+            uint32_t Uri::GetPort() const noexcept { return m_uri.port; }
 
             ByteCursor Uri::GetPathAndQuery() const noexcept { return m_uri.path_and_query; }
 

diff --git a/source/iot/Mqtt5Client.cpp b/source/iot/Mqtt5Client.cpp
@@ -308,7 +308,7 @@ namespace Aws
             return *this;
         }
 
-        Mqtt5ClientBuilder &Mqtt5ClientBuilder::WithPort(uint16_t port) noexcept
+        Mqtt5ClientBuilder &Mqtt5ClientBuilder::WithPort(uint32_t port) noexcept
         {
             m_port = port;
             return *this;
@@ -479,7 +479,7 @@ namespace Aws
                 return nullptr;
             }
 
-            uint16_t port = m_port;
+            uint32_t port = m_port;
 
             if (!port) // port is default to 0
             {

diff --git a/source/iot/MqttClient.cpp b/source/iot/MqttClient.cpp
@@ -29,7 +29,7 @@ namespace Aws
 
         MqttClientConnectionConfig::MqttClientConnectionConfig(
             const Crt::String &endpoint,
-            uint16_t port,
+            uint32_t port,
             const Crt::Io::SocketOptions &socketOptions,
             Crt::Io::TlsContext &&tlsContext)
             : m_endpoint(endpoint), m_port(port), m_context(std::move(tlsContext)), m_socketOptions(socketOptions),
@@ -39,7 +39,7 @@ namespace Aws
 
         MqttClientConnectionConfig::MqttClientConnectionConfig(
             const Crt::String &endpoint,
-            uint16_t port,
+            uint32_t port,
             const Crt::Io::SocketOptions &socketOptions,
             Crt::Io::TlsContext &&tlsContext,
             Crt::Mqtt::OnWebSocketHandshakeIntercept &&interceptor,
@@ -51,7 +51,7 @@ namespace Aws
 
         MqttClientConnectionConfig::MqttClientConnectionConfig(
             const Crt::String &endpoint,
-            uint16_t port,
+            uint32_t port,
             const Crt::Io::SocketOptions &socketOptions,
             Crt::Io::TlsContext &&tlsContext,
             const Crt::Optional<Crt::Http::HttpClientConnectionProxyOptions> &proxyOptions)
@@ -218,7 +218,7 @@ namespace Aws
             return *this;
         }
 
-        MqttClientConnectionConfigBuilder &MqttClientConnectionConfigBuilder::WithPortOverride(uint16_t port) noexcept
+        MqttClientConnectionConfigBuilder &MqttClientConnectionConfigBuilder::WithPortOverride(uint32_t port) noexcept
         {
             m_portOverride = port;
             return *this;
@@ -443,7 +443,7 @@ namespace Aws
                 return MqttClientConnectionConfig::CreateInvalid(m_lastError);
             }
 
-            uint16_t port = m_portOverride;
+            uint32_t port = m_portOverride;
 
             if (!m_portOverride)
             {

diff --git a/source/mqtt/Mqtt5Client.cpp b/source/mqtt/Mqtt5Client.cpp
@@ -242,7 +242,7 @@ namespace Aws
                 return *this;
             }
 
-            Mqtt5ClientOptions &Mqtt5ClientOptions::WithPort(uint16_t port) noexcept
+            Mqtt5ClientOptions &Mqtt5ClientOptions::WithPort(uint32_t port) noexcept
             {
                 m_port = port;
                 return *this;

diff --git a/source/mqtt/MqttClient.cpp b/source/mqtt/MqttClient.cpp
@@ -61,7 +61,7 @@ namespace Aws
 
             std::shared_ptr<MqttConnection> MqttClient::NewConnection(
                 const char *hostName,
-                uint16_t port,
+                uint32_t port,
                 const Io::SocketOptions &socketOptions,
                 const Crt::Io::TlsContext &tlsContext,
                 bool useWebsocket) noexcept
@@ -91,7 +91,7 @@ namespace Aws
 
             std::shared_ptr<MqttConnection> MqttClient::NewConnection(
                 const char *hostName,
-                uint16_t port,
+                uint32_t port,
                 const Io::SocketOptions &socketOptions,
                 bool useWebsocket) noexcept
 

diff --git a/tests/CredentialsTest.cpp b/tests/CredentialsTest.cpp
@@ -376,7 +376,7 @@ static int s_InitializeProxyOptions(
     ASSERT_SUCCESS(aws_get_environment_value(allocator, s_httpProxyPortEnvVariable, &proxy_port));
 
     proxyOptions.HostName = Aws::Crt::String(aws_string_c_str(proxy_host_name));
-    proxyOptions.Port = static_cast<uint16_t>(atoi(aws_string_c_str(proxy_port)));
+    proxyOptions.Port = static_cast<uint32_t>(atoi(aws_string_c_str(proxy_port)));
 
     aws_string_destroy(proxy_host_name);
     aws_string_destroy(proxy_port);