From f89dbba9e9da6f9a839c570d19f3d695f3bda2cd Mon Sep 17 00:00:00 2001 From: Michael Graeb Date: Mon, 11 Dec 2023 11:18:33 -0800 Subject: [PATCH] Change `port` from uint16_t to uint32_t, to support VSOCK --- crt/aws-c-iot | 2 +- crt/aws-crt-cpp | 2 +- discovery/include/aws/discovery/ConnectivityInfo.h | 2 +- discovery/source/ConnectivityInfo.cpp | 2 +- discovery/source/DiscoveryClient.cpp | 2 +- .../include/aws/eventstreamrpc/EventStreamClient.h | 6 +++--- samples/device_defender/basic_report/main.cpp | 4 ++-- samples/device_defender/mqtt5_basic_report/main.cpp | 4 ++-- .../fleet_provisioning/mqtt5_fleet_provisioning/main.cpp | 4 ++-- samples/greengrass/basic_discovery/main.cpp | 2 +- samples/jobs/mqtt5_job_execution/main.cpp | 2 +- samples/mqtt/basic_connect/main.cpp | 4 ++-- samples/mqtt/cognito_connect/main.cpp | 2 +- samples/mqtt/websocket_connect/main.cpp | 4 ++-- samples/mqtt5/mqtt5_pubsub/main.cpp | 2 +- samples/pub_sub/basic_pub_sub/main.cpp | 4 ++-- samples/secure_tunneling/secure_tunnel/main.cpp | 2 +- samples/shadow/mqtt5_shadow_sync/main.cpp | 4 ++-- samples/shadow/shadow_sync/main.cpp | 4 ++-- servicetests/tests/FleetProvisioning/main.cpp | 2 +- servicetests/tests/JobsExecution/main.cpp | 2 +- servicetests/tests/ShadowUpdate/main.cpp | 2 +- 22 files changed, 32 insertions(+), 32 deletions(-) diff --git a/crt/aws-c-iot b/crt/aws-c-iot index 95be1338d..646f9e86e 160000 --- a/crt/aws-c-iot +++ b/crt/aws-c-iot @@ -1 +1 @@ -Subproject commit 95be1338da913ff632f388cf29d262c557bc907f +Subproject commit 646f9e86eb35e12f45180761e47ebb9ed47923d5 diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp index 2f1814978..b797ade60 160000 --- a/crt/aws-crt-cpp +++ b/crt/aws-crt-cpp @@ -1 +1 @@ -Subproject commit 2f1814978b7bc1771d8fc8508c89c6ad6f962629 +Subproject commit b797ade60e27b0e1df43871fab3325c5e3f1dfdd diff --git a/discovery/include/aws/discovery/ConnectivityInfo.h b/discovery/include/aws/discovery/ConnectivityInfo.h index 6f80ed6d1..d949d8631 100644 --- a/discovery/include/aws/discovery/ConnectivityInfo.h +++ b/discovery/include/aws/discovery/ConnectivityInfo.h @@ -25,7 +25,7 @@ namespace Aws Aws::Crt::Optional ID; Aws::Crt::Optional HostAddress; Aws::Crt::Optional Metadata; - Aws::Crt::Optional Port; + Aws::Crt::Optional Port; private: static void LoadFromObject(ConnectivityInfo &obj, const Crt::JsonView &doc); diff --git a/discovery/source/ConnectivityInfo.cpp b/discovery/source/ConnectivityInfo.cpp index f5796233d..1cc10ce95 100644 --- a/discovery/source/ConnectivityInfo.cpp +++ b/discovery/source/ConnectivityInfo.cpp @@ -22,7 +22,7 @@ namespace Aws if (doc.KeyExists("PortNumber")) { - obj.Port = static_cast(doc.GetInteger("PortNumber")); + obj.Port = static_cast(doc.GetInteger("PortNumber")); } if (doc.KeyExists("Metadata")) diff --git a/discovery/source/DiscoveryClient.cpp b/discovery/source/DiscoveryClient.cpp index 6d4f649b1..b0a5566f6 100644 --- a/discovery/source/DiscoveryClient.cpp +++ b/discovery/source/DiscoveryClient.cpp @@ -41,7 +41,7 @@ namespace Aws } Crt::Io::TlsConnectionOptions tlsConnectionOptions = clientConfig.TlsContext->NewConnectionOptions(); - uint16_t port = 443; + uint32_t port = 443; if (Crt::Io::TlsContextOptions::IsAlpnSupported()) { diff --git a/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h b/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h index 5a34863f5..34240a7ee 100644 --- a/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h +++ b/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h @@ -151,7 +151,7 @@ namespace Aws public: ConnectionConfig() noexcept : m_clientBootstrap(nullptr), m_connectRequestCallback(nullptr) {} Crt::Optional GetHostName() const noexcept { return m_hostName; } - Crt::Optional GetPort() const noexcept { return m_port; } + Crt::Optional GetPort() const noexcept { return m_port; } Crt::Optional GetSocketOptions() const noexcept { return m_socketOptions; } Crt::Optional GetConnectAmendment() const noexcept { return m_connectAmendment; } Crt::Optional GetTlsConnectionOptions() const noexcept @@ -166,7 +166,7 @@ namespace Aws } void SetHostName(Crt::String hostName) noexcept { m_hostName = hostName; } - void SetPort(uint16_t port) noexcept { m_port = port; } + void SetPort(uint32_t port) noexcept { m_port = port; } void SetSocketOptions(const Crt::Io::SocketOptions &socketOptions) noexcept { m_socketOptions = socketOptions; @@ -190,7 +190,7 @@ namespace Aws protected: Crt::Optional m_hostName; - Crt::Optional m_port; + Crt::Optional m_port; Crt::Optional m_socketOptions; Crt::Optional m_tlsConnectionOptions; Crt::Io::ClientBootstrap *m_clientBootstrap; diff --git a/samples/device_defender/basic_report/main.cpp b/samples/device_defender/basic_report/main.cpp index 59d4b3d23..014b2eba7 100644 --- a/samples/device_defender/basic_report/main.cpp +++ b/samples/device_defender/basic_report/main.cpp @@ -83,13 +83,13 @@ int main(int argc, char *argv[]) { Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions; proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None; clientConfigBuilder.WithHttpProxyOptions(proxyOptions); } if (cmdData.input_port != 0) { - clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); + clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); } // Create the MQTT connection from the MQTT builder diff --git a/samples/device_defender/mqtt5_basic_report/main.cpp b/samples/device_defender/mqtt5_basic_report/main.cpp index be8fc2f31..61f2bf522 100644 --- a/samples/device_defender/mqtt5_basic_report/main.cpp +++ b/samples/device_defender/mqtt5_basic_report/main.cpp @@ -83,13 +83,13 @@ int main(int argc, char *argv[]) { Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions; proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None; clientConfigBuilder->WithHttpProxyOptions(proxyOptions); } if (cmdData.input_port != 0) { - clientConfigBuilder->WithPort(static_cast(cmdData.input_port)); + clientConfigBuilder->WithPort(static_cast(cmdData.input_port)); } std::promise connectionPromise; diff --git a/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp b/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp index 78dde3699..994d83a56 100644 --- a/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp +++ b/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) builder->WithConnectOptions(connectOptions); if (cmdData.input_port != 0) { - builder->WithPort(static_cast(cmdData.input_port)); + builder->WithPort(static_cast(cmdData.input_port)); } std::promise connectionPromise; @@ -465,4 +465,4 @@ int main(int argc, char *argv[]) } return 0; -} \ No newline at end of file +} diff --git a/samples/greengrass/basic_discovery/main.cpp b/samples/greengrass/basic_discovery/main.cpp index 4499e9d40..a8a7cbb6b 100644 --- a/samples/greengrass/basic_discovery/main.cpp +++ b/samples/greengrass/basic_discovery/main.cpp @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) if (cmdData.input_proxyHost.length() > 0 && cmdData.input_proxyPort != 0) { proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); clientConfig.ProxyOptions = proxyOptions; } diff --git a/samples/jobs/mqtt5_job_execution/main.cpp b/samples/jobs/mqtt5_job_execution/main.cpp index 62aa70f97..65e91d520 100644 --- a/samples/jobs/mqtt5_job_execution/main.cpp +++ b/samples/jobs/mqtt5_job_execution/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) builder->WithConnectOptions(connectOptions); if (cmdData.input_port != 0) { - builder->WithPort(static_cast(cmdData.input_port)); + builder->WithPort(static_cast(cmdData.input_port)); } std::promise connectionPromise; diff --git a/samples/mqtt/basic_connect/main.cpp b/samples/mqtt/basic_connect/main.cpp index ed8955d0a..dbe4fd0c6 100644 --- a/samples/mqtt/basic_connect/main.cpp +++ b/samples/mqtt/basic_connect/main.cpp @@ -36,13 +36,13 @@ int main(int argc, char *argv[]) { Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions; proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None; clientConfigBuilder.WithHttpProxyOptions(proxyOptions); } if (cmdData.input_port != 0) { - clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); + clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); } // Create the MQTT connection from the MQTT builder diff --git a/samples/mqtt/cognito_connect/main.cpp b/samples/mqtt/cognito_connect/main.cpp index 8bb218796..b9591dc43 100644 --- a/samples/mqtt/cognito_connect/main.cpp +++ b/samples/mqtt/cognito_connect/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) { Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions; proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None; clientConfigBuilder.WithHttpProxyOptions(proxyOptions); } diff --git a/samples/mqtt/websocket_connect/main.cpp b/samples/mqtt/websocket_connect/main.cpp index cf6ce8480..29f7a1c02 100644 --- a/samples/mqtt/websocket_connect/main.cpp +++ b/samples/mqtt/websocket_connect/main.cpp @@ -44,13 +44,13 @@ void connection_setup( { Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions; proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None; clientConfigBuilder.WithHttpProxyOptions(proxyOptions); } if (cmdData.input_port != 0) { - clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); + clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); } clientConfigBuilder.WithEndpoint(cmdData.input_endpoint); } diff --git a/samples/mqtt5/mqtt5_pubsub/main.cpp b/samples/mqtt5/mqtt5_pubsub/main.cpp index 9870a2540..9f65cae4e 100644 --- a/samples/mqtt5/mqtt5_pubsub/main.cpp +++ b/samples/mqtt5/mqtt5_pubsub/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) builder->WithConnectOptions(connectOptions); if (cmdData.input_port != 0) { - builder->WithPort(static_cast(cmdData.input_port)); + builder->WithPort(static_cast(cmdData.input_port)); } std::promise connectionPromise; diff --git a/samples/pub_sub/basic_pub_sub/main.cpp b/samples/pub_sub/basic_pub_sub/main.cpp index 60cfef260..234cdf0f5 100644 --- a/samples/pub_sub/basic_pub_sub/main.cpp +++ b/samples/pub_sub/basic_pub_sub/main.cpp @@ -47,13 +47,13 @@ int main(int argc, char *argv[]) { Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions; proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None; clientConfigBuilder.WithHttpProxyOptions(proxyOptions); } if (cmdData.input_port != 0) { - clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); + clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); } // Create the MQTT connection from the MQTT builder diff --git a/samples/secure_tunneling/secure_tunnel/main.cpp b/samples/secure_tunneling/secure_tunnel/main.cpp index 896bf6f8e..e55b09243 100644 --- a/samples/secure_tunneling/secure_tunnel/main.cpp +++ b/samples/secure_tunneling/secure_tunnel/main.cpp @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) { auto proxyOptions = Aws::Crt::Http::HttpClientConnectionProxyOptions(); proxyOptions.HostName = cmdData.input_proxyHost != ""; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); // Set up Proxy Strategy if a user name and password is provided if (cmdData.input_proxyUserName != "" || cmdData.input_proxyPassword != "") diff --git a/samples/shadow/mqtt5_shadow_sync/main.cpp b/samples/shadow/mqtt5_shadow_sync/main.cpp index 831a98e6e..12bc00353 100644 --- a/samples/shadow/mqtt5_shadow_sync/main.cpp +++ b/samples/shadow/mqtt5_shadow_sync/main.cpp @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) builder->WithConnectOptions(connectOptions); if (cmdData.input_port != 0) { - builder->WithPort(static_cast(cmdData.input_port)); + builder->WithPort(static_cast(cmdData.input_port)); } std::promise connectionPromise; @@ -471,4 +471,4 @@ int main(int argc, char *argv[]) stoppedPromise.get_future().wait(); } return 0; -} \ No newline at end of file +} diff --git a/samples/shadow/shadow_sync/main.cpp b/samples/shadow/shadow_sync/main.cpp index 220358bf6..234a58e42 100644 --- a/samples/shadow/shadow_sync/main.cpp +++ b/samples/shadow/shadow_sync/main.cpp @@ -114,13 +114,13 @@ int main(int argc, char *argv[]) { Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions; proxyOptions.HostName = cmdData.input_proxyHost; - proxyOptions.Port = static_cast(cmdData.input_proxyPort); + proxyOptions.Port = static_cast(cmdData.input_proxyPort); proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None; clientConfigBuilder.WithHttpProxyOptions(proxyOptions); } if (cmdData.input_port != 0) { - clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); + clientConfigBuilder.WithPortOverride(static_cast(cmdData.input_port)); } // Create the MQTT connection from the MQTT builder diff --git a/servicetests/tests/FleetProvisioning/main.cpp b/servicetests/tests/FleetProvisioning/main.cpp index 76f5af546..ff4c042aa 100644 --- a/servicetests/tests/FleetProvisioning/main.cpp +++ b/servicetests/tests/FleetProvisioning/main.cpp @@ -146,7 +146,7 @@ std::shared_ptr build_mqtt5_client( builder->WithConnectOptions(connectOptions); if (cmdData.input_port != 0) { - builder->WithPort(static_cast(cmdData.input_port)); + builder->WithPort(static_cast(cmdData.input_port)); } // Setup lifecycle callbacks builder->WithClientConnectionSuccessCallback( diff --git a/servicetests/tests/JobsExecution/main.cpp b/servicetests/tests/JobsExecution/main.cpp index 5542cd680..667f8e092 100644 --- a/servicetests/tests/JobsExecution/main.cpp +++ b/servicetests/tests/JobsExecution/main.cpp @@ -138,7 +138,7 @@ std::shared_ptr build_mqtt5_client( builder->WithConnectOptions(connectOptions); if (cmdData.input_port != 0) { - builder->WithPort(static_cast(cmdData.input_port)); + builder->WithPort(static_cast(cmdData.input_port)); } // Setup lifecycle callbacks builder->WithClientConnectionSuccessCallback( diff --git a/servicetests/tests/ShadowUpdate/main.cpp b/servicetests/tests/ShadowUpdate/main.cpp index 32fd7f6a4..f0e14c944 100644 --- a/servicetests/tests/ShadowUpdate/main.cpp +++ b/servicetests/tests/ShadowUpdate/main.cpp @@ -163,7 +163,7 @@ std::shared_ptr build_mqtt5_client( builder->WithConnectOptions(connectOptions); if (cmdData.input_port != 0) { - builder->WithPort(static_cast(cmdData.input_port)); + builder->WithPort(static_cast(cmdData.input_port)); } // Setup lifecycle callbacks builder->WithClientConnectionSuccessCallback(