Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change port from uint16_t to uint32_t, to support VSOCK #665

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Change port from uint16_t to uint32_t, to support VSOCK #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crt/aws-c-iot
Open in desktop
Submodule aws-c-iot updated 1 files
+1 −1 source/secure_tunneling_operations.c
2 changes: 1 addition & 1 deletion crt/aws-crt-cpp
Open in desktop
Submodule aws-crt-cpp updated 31 files
+1 −1 README.md
+1 −1 VERSION
+1 −1 bin/elasticurl_cpp/main.cpp
+1 −1 bin/mqtt5_app/main.cpp
+1 −1 bin/mqtt5_canary/main.cpp
+1 −1 crt/aws-c-auth
+1 −1 crt/aws-c-common
+1 −1 crt/aws-c-event-stream
+1 −1 crt/aws-c-http
+1 −1 crt/aws-c-io
+1 −1 crt/aws-c-mqtt
+1 −1 crt/aws-c-s3
+1 −1 crt/aws-lc
+1 −1 crt/s2n
+2 −2 include/aws/crt/http/HttpConnection.h
+1 −1 include/aws/crt/io/Uri.h
+2 −2 include/aws/crt/mqtt/Mqtt5Client.h
+2 −2 include/aws/crt/mqtt/MqttClient.h
+1 −1 include/aws/crt/mqtt/MqttTypes.h
+1 −1 include/aws/crt/mqtt/private/MqttConnectionCore.h
+2 −2 include/aws/iot/Mqtt5Client.h
+6 −6 include/aws/iot/MqttClient.h
+1 −1 source/io/Uri.cpp
+2 −2 source/iot/Mqtt5Client.cpp
+5 −5 source/iot/MqttClient.cpp
+1 −1 source/mqtt/Mqtt5Client.cpp
+2 −2 source/mqtt/MqttClient.cpp
+1 −1 tests/CredentialsTest.cpp
+9 −9 tests/Mqtt5ClientTest.cpp
+10 −10 tests/MqttClientTest.cpp
+1 −1 tests/ProxyTest.cpp
2 changes: 1 addition & 1 deletion discovery/include/aws/discovery/ConnectivityInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Aws
Aws::Crt::Optional<Aws::Crt::String> ID;
Aws::Crt::Optional<Aws::Crt::String> HostAddress;
Aws::Crt::Optional<Aws::Crt::String> Metadata;
Aws::Crt::Optional<uint16_t> Port;
Aws::Crt::Optional<uint32_t> Port;

private:
static void LoadFromObject(ConnectivityInfo &obj, const Crt::JsonView &doc);
Expand Down
2 changes: 1 addition & 1 deletion discovery/source/ConnectivityInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Aws

if (doc.KeyExists("PortNumber"))
{
obj.Port = static_cast<uint16_t>(doc.GetInteger("PortNumber"));
obj.Port = static_cast<uint32_t>(doc.GetInteger("PortNumber"));
}

if (doc.KeyExists("Metadata"))
Expand Down
2 changes: 1 addition & 1 deletion discovery/source/DiscoveryClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down
6 changes: 3 additions & 3 deletions eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ namespace Aws
public:
ConnectionConfig() noexcept : m_clientBootstrap(nullptr), m_connectRequestCallback(nullptr) {}
Crt::Optional<Crt::String> GetHostName() const noexcept { return m_hostName; }
Crt::Optional<uint16_t> GetPort() const noexcept { return m_port; }
Crt::Optional<uint32_t> GetPort() const noexcept { return m_port; }
Crt::Optional<Crt::Io::SocketOptions> GetSocketOptions() const noexcept { return m_socketOptions; }
Crt::Optional<MessageAmendment> GetConnectAmendment() const noexcept { return m_connectAmendment; }
Crt::Optional<Crt::Io::TlsConnectionOptions> GetTlsConnectionOptions() const noexcept
Expand All @@ -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;
Expand All @@ -190,7 +190,7 @@ namespace Aws

protected:
Crt::Optional<Crt::String> m_hostName;
Crt::Optional<uint16_t> m_port;
Crt::Optional<uint32_t> m_port;
Crt::Optional<Crt::Io::SocketOptions> m_socketOptions;
Crt::Optional<Crt::Io::TlsConnectionOptions> m_tlsConnectionOptions;
Crt::Io::ClientBootstrap *m_clientBootstrap;
Expand Down
4 changes: 2 additions & 2 deletions samples/device_defender/basic_report/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ int main(int argc, char *argv[])
{
Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions;
proxyOptions.HostName = cmdData.input_proxyHost;
proxyOptions.Port = static_cast<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None;
clientConfigBuilder.WithHttpProxyOptions(proxyOptions);
}
if (cmdData.input_port != 0)
{
clientConfigBuilder.WithPortOverride(static_cast<uint16_t>(cmdData.input_port));
clientConfigBuilder.WithPortOverride(static_cast<uint32_t>(cmdData.input_port));
}

// Create the MQTT connection from the MQTT builder
Expand Down
4 changes: 2 additions & 2 deletions samples/device_defender/mqtt5_basic_report/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ int main(int argc, char *argv[])
{
Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions;
proxyOptions.HostName = cmdData.input_proxyHost;
proxyOptions.Port = static_cast<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None;
clientConfigBuilder->WithHttpProxyOptions(proxyOptions);
}
if (cmdData.input_port != 0)
{
clientConfigBuilder->WithPort(static_cast<uint16_t>(cmdData.input_port));
clientConfigBuilder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}

std::promise<bool> connectionPromise;
Expand Down
4 changes: 2 additions & 2 deletions samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ int main(int argc, char *argv[])
builder->WithConnectOptions(connectOptions);
if (cmdData.input_port != 0)
{
builder->WithPort(static_cast<uint16_t>(cmdData.input_port));
builder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}

std::promise<bool> connectionPromise;
Expand Down Expand Up @@ -465,4 +465,4 @@ int main(int argc, char *argv[])
}

return 0;
}
}
2 changes: 1 addition & 1 deletion samples/greengrass/basic_discovery/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
clientConfig.ProxyOptions = proxyOptions;
}

Expand Down
2 changes: 1 addition & 1 deletion samples/jobs/mqtt5_job_execution/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
builder->WithConnectOptions(connectOptions);
if (cmdData.input_port != 0)
{
builder->WithPort(static_cast<uint16_t>(cmdData.input_port));
builder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}

std::promise<bool> connectionPromise;
Expand Down
4 changes: 2 additions & 2 deletions samples/mqtt/basic_connect/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ int main(int argc, char *argv[])
{
Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions;
proxyOptions.HostName = cmdData.input_proxyHost;
proxyOptions.Port = static_cast<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None;
clientConfigBuilder.WithHttpProxyOptions(proxyOptions);
}
if (cmdData.input_port != 0)
{
clientConfigBuilder.WithPortOverride(static_cast<uint16_t>(cmdData.input_port));
clientConfigBuilder.WithPortOverride(static_cast<uint32_t>(cmdData.input_port));
}

// Create the MQTT connection from the MQTT builder
Expand Down
2 changes: 1 addition & 1 deletion samples/mqtt/cognito_connect/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int main(int argc, char *argv[])
{
Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions;
proxyOptions.HostName = cmdData.input_proxyHost;
proxyOptions.Port = static_cast<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None;
clientConfigBuilder.WithHttpProxyOptions(proxyOptions);
}
Expand Down
4 changes: 2 additions & 2 deletions samples/mqtt/websocket_connect/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ void connection_setup(
{
Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions;
proxyOptions.HostName = cmdData.input_proxyHost;
proxyOptions.Port = static_cast<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None;
clientConfigBuilder.WithHttpProxyOptions(proxyOptions);
}
if (cmdData.input_port != 0)
{
clientConfigBuilder.WithPortOverride(static_cast<uint16_t>(cmdData.input_port));
clientConfigBuilder.WithPortOverride(static_cast<uint32_t>(cmdData.input_port));
}
clientConfigBuilder.WithEndpoint(cmdData.input_endpoint);
}
Expand Down
2 changes: 1 addition & 1 deletion samples/mqtt5/mqtt5_pubsub/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int main(int argc, char *argv[])
builder->WithConnectOptions(connectOptions);
if (cmdData.input_port != 0)
{
builder->WithPort(static_cast<uint16_t>(cmdData.input_port));
builder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}

std::promise<bool> connectionPromise;
Expand Down
4 changes: 2 additions & 2 deletions samples/pub_sub/basic_pub_sub/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ int main(int argc, char *argv[])
{
Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions;
proxyOptions.HostName = cmdData.input_proxyHost;
proxyOptions.Port = static_cast<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None;
clientConfigBuilder.WithHttpProxyOptions(proxyOptions);
}
if (cmdData.input_port != 0)
{
clientConfigBuilder.WithPortOverride(static_cast<uint16_t>(cmdData.input_port));
clientConfigBuilder.WithPortOverride(static_cast<uint32_t>(cmdData.input_port));
}

// Create the MQTT connection from the MQTT builder
Expand Down
2 changes: 1 addition & 1 deletion samples/secure_tunneling/secure_tunnel/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);

// Set up Proxy Strategy if a user name and password is provided
if (cmdData.input_proxyUserName != "" || cmdData.input_proxyPassword != "")
Expand Down
4 changes: 2 additions & 2 deletions samples/shadow/mqtt5_shadow_sync/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ int main(int argc, char *argv[])
builder->WithConnectOptions(connectOptions);
if (cmdData.input_port != 0)
{
builder->WithPort(static_cast<uint16_t>(cmdData.input_port));
builder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}

std::promise<bool> connectionPromise;
Expand Down Expand Up @@ -471,4 +471,4 @@ int main(int argc, char *argv[])
stoppedPromise.get_future().wait();
}
return 0;
}
}
4 changes: 2 additions & 2 deletions samples/shadow/shadow_sync/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ int main(int argc, char *argv[])
{
Aws::Crt::Http::HttpClientConnectionProxyOptions proxyOptions;
proxyOptions.HostName = cmdData.input_proxyHost;
proxyOptions.Port = static_cast<uint16_t>(cmdData.input_proxyPort);
proxyOptions.Port = static_cast<uint32_t>(cmdData.input_proxyPort);
proxyOptions.AuthType = Aws::Crt::Http::AwsHttpProxyAuthenticationType::None;
clientConfigBuilder.WithHttpProxyOptions(proxyOptions);
}
if (cmdData.input_port != 0)
{
clientConfigBuilder.WithPortOverride(static_cast<uint16_t>(cmdData.input_port));
clientConfigBuilder.WithPortOverride(static_cast<uint32_t>(cmdData.input_port));
}

// Create the MQTT connection from the MQTT builder
Expand Down
2 changes: 1 addition & 1 deletion servicetests/tests/FleetProvisioning/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ std::shared_ptr<IotIdentityClient> build_mqtt5_client(
builder->WithConnectOptions(connectOptions);
if (cmdData.input_port != 0)
{
builder->WithPort(static_cast<uint16_t>(cmdData.input_port));
builder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}
// Setup lifecycle callbacks
builder->WithClientConnectionSuccessCallback(
Expand Down
2 changes: 1 addition & 1 deletion servicetests/tests/JobsExecution/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ std::shared_ptr<IotJobsClient> build_mqtt5_client(
builder->WithConnectOptions(connectOptions);
if (cmdData.input_port != 0)
{
builder->WithPort(static_cast<uint16_t>(cmdData.input_port));
builder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}
// Setup lifecycle callbacks
builder->WithClientConnectionSuccessCallback(
Expand Down
2 changes: 1 addition & 1 deletion servicetests/tests/ShadowUpdate/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ std::shared_ptr<IotShadowClient> build_mqtt5_client(
builder->WithConnectOptions(connectOptions);
if (cmdData.input_port != 0)
{
builder->WithPort(static_cast<uint16_t>(cmdData.input_port));
builder->WithPort(static_cast<uint32_t>(cmdData.input_port));
}
// Setup lifecycle callbacks
builder->WithClientConnectionSuccessCallback(
Expand Down
Loading