Merge pull request #541 from Azure/ewertons/fix_blob_upload_fail_mbedtls_1995

Fail to upload long Blob using mbedtls+compact(Issue #1995)

Author: ewertons

adapters/httpapi_compact.c

@@ -235,7 +235,7 @@ HTTP_HANDLE HTTPAPI_CreateConnection(const char* hostName)
             tlsio_config.port = 443;
             tlsio_config.underlying_io_interface = NULL;
             tlsio_config.underlying_io_parameters = NULL;
-
+            tlsio_config.invoke_on_send_complete_callback_for_fragments = true;
             http_instance->xio_handle = xio_create(platform_get_default_tlsio(), (void*)&tlsio_config);
 
             /*Codes_SRS_HTTPAPI_COMPACT_21_016: [ If the HTTPAPI_CreateConnection failed to create the connection, it shall return NULL as the handle. ]*/
@@ -1408,6 +1408,7 @@ HTTPAPI_RESULT HTTPAPI_SetOption(HTTP_HANDLE handle, const char* optionName, con
                 tlsio_config.port = 443;
                 tlsio_config.underlying_io_interface =  http_proxy_io_get_interface_description();
                 tlsio_config.underlying_io_parameters = &proxy_config;
+                tlsio_config.invoke_on_send_complete_callback_for_fragments = true;
 
                 http_instance->xio_handle = xio_create(platform_get_default_tlsio(), (void*)&tlsio_config);
 
@@ -1567,4 +1568,3 @@ HTTPAPI_RESULT HTTPAPI_CloneOption(const char* optionName, const void* value, co
     }
     return result;
 }
-

adapters/tlsio_mbedtls.c

@@ -72,6 +72,7 @@ typedef struct TLS_IO_INSTANCE_TAG
     mbedtls_ssl_session ssn;
     char *trusted_certificates;
 
+    bool invoke_on_send_complete_callback_for_fragments;
     char *hostname;
     mbedtls_x509_crt owncert;
     mbedtls_pk_context pKey;
@@ -373,12 +374,14 @@ static void on_send_complete(void* context, IO_SEND_RESULT send_result)
         if (tls_io_instance->send_complete_info.on_send_complete != NULL &&
             tls_io_instance->tlsio_state != TLSIO_STATE_CLOSING)
         {
-            // trigger callback always on failure, otherwise call it on last fragment completion
-            if (send_result != IO_SEND_OK || !tls_io_instance->send_complete_info.is_fragmented_req)
-            {
+        	// trigger callback always on failure, otherwise call it on last fragment completion
+        	// In case of http communication (ie blob upload), the callback is called with each fragment
+        	if((tls_io_instance->invoke_on_send_complete_callback_for_fragments && tls_io_instance->send_complete_info.is_fragmented_req)||
+        			(send_result != IO_SEND_OK || !tls_io_instance->send_complete_info.is_fragmented_req))
+        	{
                 void *ctx = tls_io_instance->send_complete_info.on_send_complete_callback_context;
                 tls_io_instance->send_complete_info.on_send_complete(ctx, send_result);
-            }
+        	}
         }
     }
     else
@@ -558,6 +561,7 @@ CONCRETE_IO_HANDLE tlsio_mbedtls_create(void *io_create_parameters)
                     result->tls_status = TLS_STATE_NOT_INITIALIZED;
                     mbedtls_init((void*)result);
                     result->tlsio_state = TLSIO_STATE_NOT_OPEN;
+                    result->invoke_on_send_complete_callback_for_fragments = tls_io_config->invoke_on_send_complete_callback_for_fragments;
                 }
             }
         }

inc/azure_c_shared_utility/tlsio.h

@@ -4,6 +4,7 @@
 #ifndef TLSIO_H
 #define TLSIO_H
 
+#include <stdbool.h>
 #include "xio.h"
 
 #ifdef __cplusplus
@@ -16,6 +17,7 @@ typedef struct TLSIO_CONFIG_TAG
     int port;
     const IO_INTERFACE_DESCRIPTION* underlying_io_interface;
     void* underlying_io_parameters;
+    bool invoke_on_send_complete_callback_for_fragments;
 } TLSIO_CONFIG;
 
 #ifdef __cplusplus

tests/tlsio_mbedtls_ut/tlsio_mbedtls_ut.c

@@ -880,6 +880,7 @@ BEGIN_TEST_SUITE(tlsio_mbedtls_ut)
         tls_io_config.port = TEST_CONNECTION_PORT;
         tls_io_config.underlying_io_interface = TEST_INTERFACE_DESC;
         tls_io_config.underlying_io_parameters = NULL;
+        tls_io_config.invoke_on_send_complete_callback_for_fragments = false;
         CONCRETE_IO_HANDLE handle = tlsio_mbedtls_create(&tls_io_config);
         (void)tlsio_mbedtls_open(handle, on_io_open_complete, NULL, on_bytes_received, NULL, on_io_error, NULL);
         g_open_complete(g_open_complete_ctx, IO_OPEN_OK);
@@ -923,6 +924,7 @@ BEGIN_TEST_SUITE(tlsio_mbedtls_ut)
         tls_io_config.port = TEST_CONNECTION_PORT;
         tls_io_config.underlying_io_interface = TEST_INTERFACE_DESC;
         tls_io_config.underlying_io_parameters = NULL;
+        tls_io_config.invoke_on_send_complete_callback_for_fragments = false;
         CONCRETE_IO_HANDLE handle = tlsio_mbedtls_create(&tls_io_config);
         (void)tlsio_mbedtls_open(handle, on_io_open_complete, NULL, on_bytes_received, NULL, on_io_error, NULL);
         g_open_complete(g_open_complete_ctx, IO_OPEN_OK);