Merge branch 'main' into tcp_keep_alive

aws · Sep 18, 2024 · 8dd4f7a · 8dd4f7a
2 parents 39af4ea + 6bf060a
commit 8dd4f7a
Show file tree

Hide file tree

Showing 9 changed files with 417 additions and 409 deletions.
diff --git a/samples/device_defender/mqtt5_basic_report/main.cpp b/samples/device_defender/mqtt5_basic_report/main.cpp
@@ -73,8 +73,19 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputDeviceDefender(argc, argv, &apiHandle);
 
     // Create the MQTT builder and populate it with data from cmdData.
-    auto clientConfigBuilder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto clientConfigBuilder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
+    if (clientConfigBuilder == nullptr)
+    {
+        fprintf(
+            stdout,
+            "Failed to setup MQTT5 client builder with error code %d: %s",
+            LastError(),
+            ErrorDebugString(LastError()));
+        return -1;
+    }
+
     if (cmdData.input_ca != "")
     {
         clientConfigBuilder->WithCertificateAuthority(cmdData.input_ca.c_str());
@@ -119,9 +130,6 @@ int main(int argc, char *argv[])
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = clientConfigBuilder->Build();
 
-    // Clean up the builder
-    delete clientConfigBuilder;
-
     if (client == nullptr)
     {
         fprintf(

diff --git a/samples/fleet_provisioning/fleet_provisioning/main.cpp b/samples/fleet_provisioning/fleet_provisioning/main.cpp
@@ -426,7 +426,7 @@ int main(int argc, char *argv[])
 {
     /************************ Setup ****************************/
 
-    //  Do the global initialization for the API
+    // Do the global initialization for the API
     ApiHandle apiHandle;
 
     /**

diff --git a/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp b/samples/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp
@@ -79,11 +79,12 @@ struct RegisterThingContext
 /**
  * Create MQTT5 client.
  */
-std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> createMqtt5Client(Mqtt5ClientContext &ctx, const Utils::cmdData &cmdData)
+std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> createMqtt5Client(const Utils::cmdData &cmdData, Mqtt5ClientContext &ctx)
 {
     // Create the MQTT5 builder and populate it with data from cmdData.
-    Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
 
     // Check if the builder setup correctly.
     if (builder == nullptr)
@@ -128,7 +129,6 @@ std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> createMqtt5Client(Mqtt5ClientConte
 
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = builder->Build();
-    delete builder;
 
     return client;
 }
@@ -418,7 +418,7 @@ int main(int argc, char *argv[])
 {
     /************************ Setup ****************************/
 
-    //  Do the global initialization for the API
+    // Do the global initialization for the API
     ApiHandle apiHandle;
 
     /**
@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputFleetProvisioning(argc, argv, &apiHandle);
 
     Mqtt5ClientContext mqtt5ClientContext;
-    auto client = createMqtt5Client(mqtt5ClientContext, cmdData);
+    auto client = createMqtt5Client(cmdData, mqtt5ClientContext);
 
     /************************ Run the sample ****************************/
 

diff --git a/samples/jobs/mqtt5_job_execution/main.cpp b/samples/jobs/mqtt5_job_execution/main.cpp
@@ -57,8 +57,9 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputJobs(argc, argv, &apiHandle);
 
     // Create the MQTT5 builder and populate it with data from cmdData.
-    Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
 
     // Check if the builder setup correctly.
     if (builder == nullptr)
@@ -101,7 +102,6 @@ int main(int argc, char *argv[])
 
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = builder->Build();
-    delete builder;
     /************************ Run the sample ****************************/
 
     fprintf(stdout, "Connecting...\n");

diff --git a/samples/mqtt5/mqtt5_pubsub/main.cpp b/samples/mqtt5/mqtt5_pubsub/main.cpp
@@ -34,8 +34,9 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputPubSub(argc, argv, &apiHandle, "mqtt5-pubsub");
 
     // Create the MQTT5 builder and populate it with data from cmdData.
-    Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
+    auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
 
     // Check if the builder setup correctly.
     if (builder == nullptr)
@@ -107,9 +108,6 @@ int main(int argc, char *argv[])
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = builder->Build();
 
-    // Clean up the builder
-    delete builder;
-
     if (client == nullptr)
     {
         fprintf(

diff --git a/samples/mqtt5/mqtt5_shared_subscription/main.cpp b/samples/mqtt5/mqtt5_shared_subscription/main.cpp
@@ -45,8 +45,9 @@ class sample_mqtt5_client
         std::shared_ptr<sample_mqtt5_client> result = std::make_shared<sample_mqtt5_client>();
         result->name = input_clientName;
 
-        Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-            input_endpoint, input_cert.c_str(), input_key.c_str());
+        auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+            Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+                input_endpoint, input_cert.c_str(), input_key.c_str()));
         if (builder == nullptr)
         {
             return nullptr;
@@ -136,7 +137,6 @@ class sample_mqtt5_client
         });
 
         result->client = builder->Build();
-        delete builder;
         return result;
     }
 };

diff --git a/samples/secure_tunneling/secure_tunnel/main.cpp b/samples/secure_tunneling/secure_tunnel/main.cpp
@@ -133,6 +133,7 @@ int main(int argc, char *argv[])
      * In a real world application you probably don't want to enforce synchronous behavior
      * but this is a sample console application, so we'll just do that with a condition variable.
      */
+    std::promise<void> clientConnectedPromise;
     std::promise<bool> clientStoppedPromise;
 
     // service id storage for use in sample
@@ -285,6 +286,7 @@ int main(int argc, char *argv[])
                 fprintf(stdout, "Sending Stream Start request\n");
                 secureTunnel->SendStreamStart();
             }
+            clientConnectedPromise.set_value();
         }
     });
 
@@ -345,6 +347,8 @@ int main(int argc, char *argv[])
         exit(-1);
     }
 
+    clientConnectedPromise.get_future().wait_for(std::chrono::seconds(5));
+
     /*
      * In Destination mode the Secure Tunnel Client will remain open and echo messages that come in.
      * In Source mode the Secure Tunnel Client will send 4 messages and then disconnect and terminate.

diff --git a/samples/shadow/mqtt5_shadow_sync/main.cpp b/samples/shadow/mqtt5_shadow_sync/main.cpp
@@ -104,9 +104,9 @@ int main(int argc, char *argv[])
     Utils::cmdData cmdData = Utils::parseSampleInputShadow(argc, argv, &apiHandle);
 
     // Create the MQTT5 builder and populate it with data from cmdData.
-    Aws::Iot::Mqtt5ClientBuilder *builder = Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
-        cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str());
-
+    auto builder = std::unique_ptr<Aws::Iot::Mqtt5ClientBuilder>(
+        Aws::Iot::Mqtt5ClientBuilder::NewMqtt5ClientBuilderWithMtlsFromPath(
+            cmdData.input_endpoint, cmdData.input_cert.c_str(), cmdData.input_key.c_str()));
     // Check if the builder setup correctly.
     if (builder == nullptr)
     {
@@ -148,7 +148,6 @@ int main(int argc, char *argv[])
 
     // Create Mqtt5Client
     std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> client = builder->Build();
-    delete builder;
     /************************ Run the sample ****************************/
 
     fprintf(stdout, "Connecting...\n");