missed a few

awslabs · Dec 12, 2023 · 8cde796 · 8cde796
1 parent 04b7f95
commit 8cde796
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/include/aws/crt/mqtt/Mqtt5Client.h b/include/aws/crt/mqtt/Mqtt5Client.h
@@ -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/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
@@ -543,7 +543,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
@@ -438,7 +438,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/tests/Mqtt5ClientTest.cpp b/tests/Mqtt5ClientTest.cpp
@@ -204,7 +204,7 @@ struct Mqtt5TestEnvVars
                     return;
                 }
                 m_hostname_string = aws_string_c_str(m_hostname);
-                m_port_value = static_cast<uint16_t>(atoi(aws_string_c_str(m_port)));
+                m_port_value = static_cast<uint32_t>(atoi(aws_string_c_str(m_port)));
                 break;
             }
             case MQTT5CONNECT_DIRECT_BASIC_AUTH:
@@ -225,7 +225,7 @@ struct Mqtt5TestEnvVars
                     return;
                 }
                 m_hostname_string = aws_string_c_str(m_hostname);
-                m_port_value = static_cast<uint16_t>(atoi(aws_string_c_str(m_port)));
+                m_port_value = static_cast<uint32_t>(atoi(aws_string_c_str(m_port)));
                 m_username_string = aws_string_c_str(m_username);
                 m_password_cursor = ByteCursorFromArray(m_password->bytes, m_password->len);
                 break;
@@ -247,7 +247,7 @@ struct Mqtt5TestEnvVars
                     return;
                 }
                 m_hostname_string = aws_string_c_str(m_hostname);
-                m_port_value = static_cast<uint16_t>(atoi(aws_string_c_str(m_port)));
+                m_port_value = static_cast<uint32_t>(atoi(aws_string_c_str(m_port)));
                 m_certificate_path_string = aws_string_c_str(m_certificate_path);
                 m_private_key_path_string = aws_string_c_str(m_private_key_path);
                 break;
@@ -268,7 +268,7 @@ struct Mqtt5TestEnvVars
                 }
                 {
                     m_hostname_string = aws_string_c_str(m_hostname);
-                    m_port_value = static_cast<uint16_t>(atoi(aws_string_c_str(m_port)));
+                    m_port_value = static_cast<uint32_t>(atoi(aws_string_c_str(m_port)));
                 }
                 break;
             }
@@ -292,7 +292,7 @@ struct Mqtt5TestEnvVars
                 }
                 {
                     m_hostname_string = aws_string_c_str(m_hostname);
-                    m_port_value = static_cast<uint16_t>(atoi(aws_string_c_str(m_port)));
+                    m_port_value = static_cast<uint32_t>(atoi(aws_string_c_str(m_port)));
                     m_username_string = aws_string_c_str(m_username);
                     m_password_cursor = ByteCursorFromArray(m_password->bytes, m_password->len);
                 }
@@ -317,7 +317,7 @@ struct Mqtt5TestEnvVars
                 }
                 {
                     m_hostname_string = aws_string_c_str(m_hostname);
-                    m_port_value = static_cast<uint16_t>(atoi(aws_string_c_str(m_port)));
+                    m_port_value = static_cast<uint32_t>(atoi(aws_string_c_str(m_port)));
                     m_certificate_path_string = aws_string_c_str(m_certificate_path);
                     m_private_key_path_string = aws_string_c_str(m_private_key_path);
                 }
@@ -359,7 +359,7 @@ struct Mqtt5TestEnvVars
         if (m_error == AWS_OP_SUCCESS && m_httpproxy_hostname != NULL && m_httpproxy_port != NULL)
         {
             m_httpproxy_hostname_string = aws_string_c_str(m_httpproxy_hostname);
-            m_httpproxy_port_value = static_cast<uint16_t>(atoi(aws_string_c_str(m_httpproxy_port)));
+            m_httpproxy_port_value = static_cast<uint32_t>(atoi(aws_string_c_str(m_httpproxy_port)));
         }
     }
 
@@ -429,13 +429,13 @@ struct Mqtt5TestEnvVars
     struct aws_string *m_httpproxy_port = NULL;
 
     Aws::Crt::String m_hostname_string;
-    uint16_t m_port_value;
+    uint32_t m_port_value;
     Aws::Crt::String m_username_string;
     Aws::Crt::ByteCursor m_password_cursor;
     Aws::Crt::String m_certificate_path_string;
     Aws::Crt::String m_private_key_path_string;
     Aws::Crt::String m_httpproxy_hostname_string;
-    uint16_t m_httpproxy_port_value;
+    uint32_t m_httpproxy_port_value;
 };
 
 //////////////////////////////////////////////////////////