Merge branch 'bugfix/resolve_retry_policy_bug' into 'master'

azure-iot-sdk-c: Update azure-iot-sdk-c to resolve retry control bug See merge request esp-components/esp-azure!17
espressif · Mar 1, 2019 · b549f61 · b549f61
2 parents 6472bea + b12d4dc
commit b549f61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/azure-iot-sdk-c b/azure-iot-sdk-c
diff --git a/examples/iothub_client_sample_mqtt/main/iothub_client_sample_mqtt.c b/examples/iothub_client_sample_mqtt/main/iothub_client_sample_mqtt.c
@@ -113,9 +113,11 @@ static void SendConfirmationCallback(IOTHUB_CLIENT_CONFIRMATION_RESULT result, v
     EVENT_INSTANCE* eventInstance = (EVENT_INSTANCE*)userContextCallback;
     size_t id = eventInstance->messageTrackingId;
 
-    (void)printf("Confirmation[%d] received for message tracking id = %d with result = %s\r\n", callbackCounter, (int)id, ENUM_TO_STRING(IOTHUB_CLIENT_CONFIRMATION_RESULT, result));
-    /* Some device specific action code goes here... */
-    callbackCounter++;
+    if (result == IOTHUB_CLIENT_CONFIRMATION_OK) {
+        (void)printf("Confirmation[%d] received for message tracking id = %d with result = %s\r\n", callbackCounter, (int)id, ENUM_TO_STRING(IOTHUB_CLIENT_CONFIRMATION_RESULT, result));
+        /* Some device specific action code goes here... */
+        callbackCounter++;
+    }
     IoTHubMessage_Destroy(eventInstance->messageHandle);
 }
 
@@ -149,9 +151,6 @@ void iothub_client_sample_mqtt_run(void)
             bool traceOn = true;
             IoTHubClient_LL_SetOption(iotHubClientHandle, OPTION_LOG_TRACE, &traceOn);
 
-            IoTHubClient_LL_SetRetryPolicy(iotHubClientHandle,
-                                           IOTHUB_CLIENT_RETRY_INTERVAL,
-                                           0);
             // Setting the Trusted Certificate.  This is only necessary on system with without
             // built in certificate stores.
 #ifdef SET_TRUSTED_CERT_IN_SAMPLES
+4 −64		doc/devbox_setup.md
+5 −0		iothub_client/src/iothub_client_core_ll.c
+1 −7		iothub_client/src/iothubtransport_amqp_common.c
+3 −2		iothub_client/src/iothubtransport_amqp_connection.c
+6 −2		iothub_client/src/iothubtransport_mqtt_common.c
+39 −5		iothub_client/tests/iothubclientcore_ll_ut/iothub_client_core_ll_ut.c
+2 −1		iothub_client/tests/iothubtransport_amqp_common_ut/iothubtransport_amqp_common_ut.c
+22 −19		provisioning_client/src/iothub_auth_client.c
+40 −27		provisioning_client/src/prov_auth_client.c
+0 −4		provisioning_client/src/prov_transport_amqp_client.c
+0 −6		provisioning_client/src/prov_transport_amqp_ws_client.c
+0 −8		provisioning_client/src/prov_transport_mqtt_client.c
+0 −8		provisioning_client/src/prov_transport_mqtt_ws_client.c
+74 −0		provisioning_client/tests/prov_auth_client_ut/prov_auth_client_ut.c
+0 −11		provisioning_client/tests/prov_transport_amqp_client_ut/prov_transport_amqp_client_ut.c
+0 −12		provisioning_client/tests/prov_transport_amqp_ws_client_ut/prov_transport_amqp_ws_client_ut.c
+0 −9		provisioning_client/tests/prov_transport_mqtt_client_ut/prov_transport_mqtt_client_ut.c
+1 −9		provisioning_client/tests/prov_transport_mqtt_ws_client_ut/prov_transport_mqtt_ws_client_ut.c
+1 −2		readme.md
+12 −3		tools/CACertificates/certGen.sh