Add packet_id to the publish log message in examples.

wolfSSL · Nov 27, 2023 · 8a0cafe · 8a0cafe
1 parent 0336347
commit 8a0cafe
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 28 deletions.
diff --git a/examples/aws/awsiot.c b/examples/aws/awsiot.c
@@ -617,8 +617,9 @@ int awsiot_test(MQTTCtx *mqttCtx)
             if (rc == MQTT_CODE_CONTINUE) {
                 return rc;
             }
-            PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                mqttCtx->publish.topic_name, MqttClient_ReturnCodeToString(rc), rc);
+            PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
+                MqttClient_ReturnCodeToString(rc), rc);
             if (rc != MQTT_CODE_SUCCESS) {
                 goto disconn;
             }
@@ -676,8 +677,8 @@ int awsiot_test(MQTTCtx *mqttCtx)
                         mqttCtx->publish.buffer = (byte*)mqttCtx->app_ctx;
                         mqttCtx->publish.total_len = (word32)XSTRLEN((char*)mqttCtx->app_ctx);
                         rc = MqttClient_Publish(&mqttCtx->client, &mqttCtx->publish);
-                        PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                            mqttCtx->publish.topic_name,
+                        PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                            mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                             MqttClient_ReturnCodeToString(rc), rc);
                     }
                 }

diff --git a/examples/azure/azureiothub.c b/examples/azure/azureiothub.c
@@ -439,8 +439,9 @@ int azureiothub_test(MQTTCtx *mqttCtx)
             if (rc == MQTT_CODE_CONTINUE) {
                 return rc;
             }
-            PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                mqttCtx->publish.topic_name, MqttClient_ReturnCodeToString(rc), rc);
+            PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
+                MqttClient_ReturnCodeToString(rc), rc);
             if (rc != MQTT_CODE_SUCCESS) {
                 goto disconn;
             }
@@ -496,8 +497,8 @@ int azureiothub_test(MQTTCtx *mqttCtx)
                         mqttCtx->publish.total_len = (word16)rc;
 
                         rc = MqttClient_Publish(&mqttCtx->client, &mqttCtx->publish);
-                        PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                            mqttCtx->publish.topic_name,
+                        PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                            mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                             MqttClient_ReturnCodeToString(rc), rc);
                     }
                 }

diff --git a/examples/firmware/fwpush.c b/examples/firmware/fwpush.c
@@ -455,8 +455,8 @@ int fwpush_test(MQTTCtx *mqttCtx)
                 return rc;
             }
 
-            PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                mqttCtx->publish.topic_name,
+            PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                 MqttClient_ReturnCodeToString(rc), rc);
             if (rc != MQTT_CODE_SUCCESS) {
                 goto disconn;

diff --git a/examples/mqttclient/mqttclient.c b/examples/mqttclient/mqttclient.c
@@ -510,8 +510,8 @@ int mqttclient_test(MQTTCtx *mqttCtx)
             mqttCtx->pub_file = NULL; /* don't try and send file again */
         }
 
-        PRINTF("MQTT Publish: Topic %s, %s (%d)",
-            mqttCtx->publish.topic_name,
+        PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+            mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
             MqttClient_ReturnCodeToString(rc), rc);
     #ifdef WOLFMQTT_V5
         if (mqttCtx->qos > 0) {
@@ -576,8 +576,8 @@ int mqttclient_test(MQTTCtx *mqttCtx)
                 mqttCtx->publish.total_len = (word16)rc;
                 rc = MqttClient_Publish(&mqttCtx->client,
                        &mqttCtx->publish);
-                PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                    mqttCtx->publish.topic_name,
+                PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                    mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                     MqttClient_ReturnCodeToString(rc), rc);
             }
         }

diff --git a/examples/mqttsimple/mqttsimple.c b/examples/mqttsimple/mqttsimple.c
@@ -424,8 +424,9 @@ int mqttsimple_test(void)
     if (rc != MQTT_CODE_SUCCESS) {
         goto exit;
     }
-    PRINTF("MQTT Publish: Topic %s, Qos %d, Message %s",
-        mqttObj.publish.topic_name, mqttObj.publish.qos, mqttObj.publish.buffer);
+    PRINTF("MQTT Publish: Topic %s, ID %d, Qos %d, Message %s",
+        mqttObj.publish.topic_name, mqttObj.publish.packet_id,
+        mqttObj.publish.qos, mqttObj.publish.buffer);
 
     /* Wait for messages */
     while (1) {

diff --git a/examples/multithread/multithread.c b/examples/multithread/multithread.c
@@ -559,8 +559,8 @@ static void *waitMessage_task(void *param)
                     MqttClient_CancelMessage(&mqttCtx->client,
                         (MqttObject*)&mqttCtx->publish);
                 }
-                PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                    mqttCtx->publish.topic_name,
+                PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                    mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                     MqttClient_ReturnCodeToString(rc), rc);
             }
         }
@@ -637,8 +637,8 @@ static void *publish_task(void *param)
             MqttClient_CancelMessage(&mqttCtx->client, (MqttObject*)&publish[i]);
         }
 
-        PRINTF("MQTT Publish: Topic %s, %s (%d)",
-            publish[i].topic_name,
+        PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+            publish[i].topic_name, publish[i].packet_id,
             MqttClient_ReturnCodeToString(rc[i]), rc[i]);
 
         wm_SemLock(&mtLock);

diff --git a/examples/nbclient/nbclient.c b/examples/nbclient/nbclient.c
@@ -450,8 +450,8 @@ int mqttclient_test(MQTTCtx *mqttCtx)
                     mqttCtx->pub_file = NULL; /* don't try and send file again */
                 }
 
-                PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                    mqttCtx->publish.topic_name,
+                PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                    mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                     MqttClient_ReturnCodeToString(rc), rc);
                 if (rc != MQTT_CODE_SUCCESS) {
                     goto disconn;

diff --git a/examples/pub-sub/mqtt-pub.c b/examples/pub-sub/mqtt-pub.c
@@ -387,8 +387,8 @@ int pub_client(MQTTCtx *mqttCtx)
             mqttCtx->pub_file = NULL; /* don't try and send file again */
         }
         if (mqttCtx->debug_on) {
-            PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                mqttCtx->publish.topic_name,
+            PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                 MqttClient_ReturnCodeToString(rc), rc);
         }
         if (rc != MQTT_CODE_SUCCESS) {

diff --git a/examples/wiot/wiot.c b/examples/wiot/wiot.c
@@ -265,8 +265,9 @@ int wiot_test(MQTTCtx *mqttCtx)
 
     rc = MqttClient_Publish(&mqttCtx->client, &mqttCtx->publish);
 
-    PRINTF("MQTT Publish: Topic %s, %s (%d)",
-        mqttCtx->publish.topic_name, MqttClient_ReturnCodeToString(rc), rc);
+    PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+        mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
+        MqttClient_ReturnCodeToString(rc), rc);
     if (rc != MQTT_CODE_SUCCESS) {
         goto disconn;
     }
@@ -316,8 +317,8 @@ int wiot_test(MQTTCtx *mqttCtx)
                 mqttCtx->publish.buffer = mqttCtx->rx_buf;
                 mqttCtx->publish.total_len = (word16)rc;
                 rc = MqttClient_Publish(&mqttCtx->client, &mqttCtx->publish);
-                PRINTF("MQTT Publish: Topic %s, %s (%d)",
-                    mqttCtx->publish.topic_name,
+                PRINTF("MQTT Publish: Topic %s, ID %d, %s (%d)",
+                    mqttCtx->publish.topic_name, mqttCtx->publish.packet_id,
                     MqttClient_ReturnCodeToString(rc), rc);
             }
         }