Use newer MQTT on-message callback in samples (#238)

Also update dependencies
aws · Feb 17, 2021 · bb70677 · bb70677
1 parent 8b095fd
commit bb70677
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp
diff --git a/samples/greengrass/basic_discovery/main.cpp b/samples/greengrass/basic_discovery/main.cpp
@@ -237,9 +237,12 @@ int main(int argc, char *argv[])
 
                     if (mode == "both" || mode == "subscribe")
                     {
-                        auto onPublish = [&](Mqtt::MqttConnection & /*connection*/,
+                        auto onMessage = [&](Mqtt::MqttConnection & /*connection*/,
                                              const String &receivedOnTopic,
-                                             const ByteBuf &payload) {
+                                             const ByteBuf &payload,
+                                             bool /*dup*/,
+                                             Mqtt::QOS /*qos*/,
+                                             bool /*retain*/) {
                             fprintf(stdout, "Publish received on topic %s\n", receivedOnTopic.c_str());
                             fprintf(stdout, "Message: \n");
                             fwrite(payload.buffer, 1, payload.len, stdout);
@@ -267,7 +270,7 @@ int main(int argc, char *argv[])
                             }
                         };
 
-                        conn.Subscribe(topic.c_str(), AWS_MQTT_QOS_AT_MOST_ONCE, onPublish, onSubAck);
+                        conn.Subscribe(topic.c_str(), AWS_MQTT_QOS_AT_MOST_ONCE, onMessage, onSubAck);
                     }
                     else
                     {

diff --git a/samples/mqtt/basic_pub_sub/main.cpp b/samples/mqtt/basic_pub_sub/main.cpp
@@ -456,7 +456,12 @@ int main(int argc, char *argv[])
     connection->OnConnectionInterrupted = std::move(onInterrupted);
     connection->OnConnectionResumed = std::move(onResumed);
 
-    connection->SetOnMessageHandler([](Mqtt::MqttConnection &, const String &topic, const ByteBuf &payload) {
+    connection->SetOnMessageHandler([](Mqtt::MqttConnection &,
+                                       const String &topic,
+                                       const ByteBuf &payload,
+                                       bool /*dup*/,
+                                       Mqtt::QOS /*qos*/,
+                                       bool /*retain*/) {
         fprintf(stdout, "Generic Publish received on topic %s, payload:\n", topic.c_str());
         fwrite(payload.buffer, 1, payload.len, stdout);
         fprintf(stdout, "\n");
@@ -479,7 +484,12 @@ int main(int argc, char *argv[])
         /*
          * This is invoked upon the receipt of a Publish on a subscribed topic.
          */
-        auto onPublish = [&](Mqtt::MqttConnection &, const String &topic, const ByteBuf &byteBuf) {
+        auto onMessage = [&](Mqtt::MqttConnection &,
+                             const String &topic,
+                             const ByteBuf &byteBuf,
+                             bool /*dup*/,
+                             Mqtt::QOS /*qos*/,
+                             bool /*retain*/) {
             fprintf(stdout, "Publish received on topic %s\n", topic.c_str());
             fprintf(stdout, "\n Message:\n");
             fwrite(byteBuf.buffer, 1, byteBuf.len, stdout);
@@ -512,7 +522,7 @@ int main(int argc, char *argv[])
                 subscribeFinishedPromise.set_value();
             };
 
-        connection->Subscribe(topic.c_str(), AWS_MQTT_QOS_AT_LEAST_ONCE, onPublish, onSubAck);
+        connection->Subscribe(topic.c_str(), AWS_MQTT_QOS_AT_LEAST_ONCE, onMessage, onSubAck);
         subscribeFinishedPromise.get_future().wait();
 
         while (true)

diff --git a/samples/mqtt/raw_pub_sub/main.cpp b/samples/mqtt/raw_pub_sub/main.cpp
@@ -329,7 +329,12 @@ int main(int argc, char *argv[])
     connection->OnConnectionInterrupted = std::move(onInterrupted);
     connection->OnConnectionResumed = std::move(onResumed);
 
-    connection->SetOnMessageHandler([](Mqtt::MqttConnection &, const String &topic, const ByteBuf &payload) {
+    connection->SetOnMessageHandler([](Mqtt::MqttConnection &,
+                                       const String &topic,
+                                       const ByteBuf &payload,
+                                       bool /*dup*/,
+                                       Mqtt::QOS /*qos*/,
+                                       bool /*retain*/) {
         fprintf(stdout, "Generic Publish received on topic %s, payload:\n", topic.c_str());
         fwrite(payload.buffer, 1, payload.len, stdout);
         fprintf(stdout, "\n");
@@ -352,7 +357,12 @@ int main(int argc, char *argv[])
         /*
          * This is invoked upon the receipt of a Publish on a subscribed topic.
          */
-        auto onPublish = [&](Mqtt::MqttConnection &, const String &topic, const ByteBuf &byteBuf) {
+        auto onMessage = [&](Mqtt::MqttConnection &,
+                             const String &topic,
+                             const ByteBuf &byteBuf,
+                             bool /*dup*/,
+                             Mqtt::QOS /*qos*/,
+                             bool /*retain*/) {
             fprintf(stdout, "Publish received on topic %s\n", topic.c_str());
             fprintf(stdout, "\n Message:\n");
             fwrite(byteBuf.buffer, 1, byteBuf.len, stdout);
@@ -385,7 +395,7 @@ int main(int argc, char *argv[])
                 subscribeFinishedPromise.set_value();
             };
 
-        connection->Subscribe(topic.c_str(), AWS_MQTT_QOS_AT_LEAST_ONCE, onPublish, onSubAck);
+        connection->Subscribe(topic.c_str(), AWS_MQTT_QOS_AT_LEAST_ONCE, onMessage, onSubAck);
         subscribeFinishedPromise.get_future().wait();
 
         while (true)