Microsoft Azure IoTHub client AMQP transport

Dependents:   sht15_remote_monitoring RobotArmDemo iothub_client_sample_amqp iothub_client_sample_amqp ... more

This library implements the AMQP transport for Microsoft Azure IoTHub client. The code is replicated from https://github.com/Azure/azure-iot-sdks

Revision:
41:71c01aa3df1a
Parent:
40:e79ee1341949
Child:
42:c2eaa912a28c
--- a/uamqp_messaging.c	Fri Aug 25 11:22:00 2017 -0700
+++ b/uamqp_messaging.c	Mon Sep 11 09:22:16 2017 -0700
@@ -11,242 +11,438 @@
 #define RESULT_OK 0
 #endif
 
-static int addPropertiesTouAMQPMessage(IOTHUB_MESSAGE_HANDLE iothub_message_handle, MESSAGE_HANDLE uamqp_message)
+static int encode_callback(void* context, const unsigned char* bytes, size_t length)
 {
-	int result = RESULT_OK;
-	const char* messageId;
-	const char* correlationId;
-    const char* contentType;
-    const char* contentEncoding;
+    BINARY_DATA* message_body_binary = (BINARY_DATA*)context;
+    (void)memcpy((unsigned char*)message_body_binary->bytes + message_body_binary->length, bytes, length);
+    message_body_binary->length += length;
+    return 0;
+}
 
-	PROPERTIES_HANDLE uamqp_message_properties = NULL;
-	int api_call_result;
+// Codes_SRS_UAMQP_MESSAGING_31_112: [If optional message-id is present in the message, encode it into the AMQP message.]
+static int set_message_id_if_needed(IOTHUB_MESSAGE_HANDLE messageHandle, PROPERTIES_HANDLE uamqp_message_properties)
+{
+    int result;
+    const char* messageId;
 
-	// Codes_SRS_UAMQP_MESSAGING_09_060: [The uAMQP message properties shall be retrieved using message_get_properties().]
-	if ((api_call_result = message_get_properties(uamqp_message, &uamqp_message_properties)) != 0)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_061: [If message_get_properties() fails, message_create_from_iothub_message() shall fail and return immediately.]
-		LogError("Failed to get properties map from uAMQP message (error code %d).", api_call_result);
-		result = __FAILURE__;
-	}
-	// Codes_SRS_UAMQP_MESSAGING_09_062: [If UAMQP message properties were not present then a new properties container shall be created using properties_create()]
-	else if (uamqp_message_properties == NULL &&
-		(uamqp_message_properties = properties_create()) == NULL)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_063: [If properties_create() fails, message_create_from_iothub_message() shall fail and return immediately.]
-		LogError("Failed to create properties map for uAMQP message (error code %d).", api_call_result);
-		result = __FAILURE__;
-	}
-	else
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_064: [Message-id from the IOTHUB_MESSAGE shall be read using IoTHubMessage_GetMessageId()]
-		// Codes_SRS_UAMQP_MESSAGING_09_065: [As message-id is optional field, if it is not set on the IOTHUB_MESSAGE, message_create_from_iothub_message() shall ignore it and continue normally.]
-		if ((messageId = IoTHubMessage_GetMessageId(iothub_message_handle)) != NULL)
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_066: [The message-id value shall be stored on a AMQP_VALUE using amqpvalue_create_string()]
-			AMQP_VALUE uamqp_message_id;
-			if ((uamqp_message_id = amqpvalue_create_string(messageId)) == NULL)
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_067: [If amqpvalue_create_string() fails, message_create_from_iothub_message() shall fail and return immediately.]
-				LogError("Failed to create an AMQP_VALUE for the messageId property value.");
-				result = __FAILURE__;
-			}
-			else
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_068: [The message-id AMQP_VALUE shall be set on the uAMQP message using properties_set_message_id()]
-				if ((api_call_result = properties_set_message_id(uamqp_message_properties, uamqp_message_id)) != 0)
-				{
-					// Codes_SRS_UAMQP_MESSAGING_09_069: [If properties_set_message_id() fails, message_create_from_iothub_message() shall fail and return immediately.]
-					LogInfo("Failed to set value of uAMQP message 'message-id' property (%d).", api_call_result);
-					result = __FAILURE__;
-				}
-				// Codes_SRS_UAMQP_MESSAGING_09_070: [The uAMQP message-id AMQP_VALUE instance shall be destroyed using amqpvalue_destroy().]
-				amqpvalue_destroy(uamqp_message_id);
-			}
-		}
+    if (NULL != (messageId = IoTHubMessage_GetMessageId(messageHandle)))
+    {
+        AMQP_VALUE uamqp_message_id;
 
-		// Codes_SRS_UAMQP_MESSAGING_09_071: [Correlation-id from the IOTHUB_MESSAGE shall be read using IoTHubMessage_GetCorrelationId()]
-		// Codes_SRS_UAMQP_MESSAGING_09_072: [As correlation-id is optional field, if it is not set on the IOTHUB_MESSAGE, message_create_from_iothub_message() shall ignore it and continue normally.]
-		if (result == RESULT_OK && (correlationId = IoTHubMessage_GetCorrelationId(iothub_message_handle)) != NULL)
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_073: [The correlation-id value shall be stored on a AMQP_VALUE using amqpvalue_create_string()]
-			AMQP_VALUE uamqp_correlation_id;
-			if ((uamqp_correlation_id = amqpvalue_create_string(correlationId)) == NULL)
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_074: [If amqpvalue_create_string() fails, message_create_from_iothub_message() shall fail and return immediately.]
-				LogError("Failed to create an AMQP_VALUE for the messageId property value.");
-				result = __FAILURE__;
-			}
-			else
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_075: [The correlation-id AMQP_VALUE shall be set on the uAMQP message using properties_set_correlation_id()]
-				if ((api_call_result = properties_set_correlation_id(uamqp_message_properties, uamqp_correlation_id)) != 0)
-				{
-					// Codes_SRS_UAMQP_MESSAGING_09_076: [If properties_set_correlation_id() fails, message_create_from_iothub_message() shall fail and return immediately.]
-					LogInfo("Failed to set value of uAMQP message 'correlation-id' property (%d).", api_call_result);
-					result = __FAILURE__;
-				}
-
-				// Codes_SRS_UAMQP_MESSAGING_09_077: [The uAMQP correlation-id AMQP_VALUE instance shall be destroyed using amqpvalue_destroy().]
-				amqpvalue_destroy(uamqp_correlation_id);
-			}
-		}
-
-        // Codes_SRS_UAMQP_MESSAGING_09_106: [If the IOTHUB_MESSAGE contains property `content-type`, it shall be set on the uAMQP message]
-        if (result == RESULT_OK && (contentType = IoTHubMessage_GetContentTypeSystemProperty(iothub_message_handle)) != NULL)
+        if ((uamqp_message_id = amqpvalue_create_string(messageId)) == NULL)
+        {
+            LogError("Failed amqpvalue_create_string for message_id");
+            result = __FAILURE__;
+        }
+        else if (properties_set_message_id(uamqp_message_properties, uamqp_message_id) != 0)
         {
-            if ((api_call_result = properties_set_content_type(uamqp_message_properties, contentType)) != 0)
-            {
-                LogInfo("Failed to set value of uAMQP message 'content-type' property (%d).", api_call_result);
-                // Codes_SRS_UAMQP_MESSAGING_09_108: [If setting the `content-type` property on uAMQP message fails, message_create_from_iothub_message() shall fail and return immediately.]
-                result = __FAILURE__;
-            }
+            LogError("Failed properties_set_message_id");
+            result = __FAILURE__;
+        }
+        else
+        {
+            result = RESULT_OK;
         }
 
-        // Codes_SRS_UAMQP_MESSAGING_09_109: [If the IOTHUB_MESSAGE contains property `content-encoding`, it shall be set on the uAMQP message]
-        if (result == RESULT_OK && (contentEncoding = IoTHubMessage_GetContentEncodingSystemProperty(iothub_message_handle)) != NULL)
+        if (NULL != uamqp_message_id)
         {
-            if ((api_call_result = properties_set_content_encoding(uamqp_message_properties, contentEncoding)) != 0)
-            {
-                LogInfo("Failed to set value of uAMQP message 'content-encoding' property (%d).", api_call_result);
-                // Codes_SRS_UAMQP_MESSAGING_09_111: [If setting the `content-encoding` property on uAMQP message fails, message_create_from_iothub_message() shall fail and return immediately.]
-                result = __FAILURE__;
-            }
+            amqpvalue_destroy(uamqp_message_id);
+        }
+    }
+    else
+    {
+        result = RESULT_OK;
+    }
+
+    return result;
+}
+
+// Codes_SRS_UAMQP_MESSAGING_31_113: [If optional correlation-id is present in the message, encode it into the AMQP message.]
+static int set_message_correlation_id_if_needed(IOTHUB_MESSAGE_HANDLE messageHandle, PROPERTIES_HANDLE uamqp_message_properties)
+{
+    int result;
+    const char* correlationId;
+
+    if (NULL != (correlationId = IoTHubMessage_GetCorrelationId(messageHandle)))
+    {
+        AMQP_VALUE uamqp_correlation_id;
+
+        if ((uamqp_correlation_id = amqpvalue_create_string(correlationId)) == NULL)
+        {
+            LogError("Failed amqpvalue_create_string for message_id");
+            result = __FAILURE__;
+        }
+        else if (properties_set_correlation_id(uamqp_message_properties, uamqp_correlation_id) != 0)
+        {
+            LogError("Failed properties_set_correlation_id");
+            result = __FAILURE__;
+        }
+        else
+        {
+            result = RESULT_OK;
         }
 
-		// Codes_SRS_UAMQP_MESSAGING_09_078: [The updated PROPERTIES_HANDLE instance shall be set on the uAMQP message using message_set_properties()]
-		if (result == RESULT_OK && (api_call_result = message_set_properties(uamqp_message, uamqp_message_properties)) != 0)
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_079: [If message_set_properties() fails, message_create_from_iothub_message() shall fail and return immediately.]
-			LogError("Failed to set properties map on uAMQP message (error code %d).", api_call_result);
-			result = __FAILURE__;
-		}
-	}
+        if (uamqp_correlation_id != NULL)
+        {
+            amqpvalue_destroy(uamqp_correlation_id);
+        }
+    }
+    else
+    {
+        result = RESULT_OK;
+    }
+
+    return result;
+}
+
+// Codes_SRS_UAMQP_MESSAGING_31_114: [If optional content-type is present in the message, encode it into the AMQP message.]
+static int set_message_content_type_if_needed(IOTHUB_MESSAGE_HANDLE messageHandle, PROPERTIES_HANDLE uamqp_message_properties)
+{
+    int result;
+    const char* content_type;
+
+    if ((content_type = IoTHubMessage_GetContentTypeSystemProperty(messageHandle)) != NULL)
+    {
+        if (properties_set_content_type(uamqp_message_properties, content_type) != 0)
+        {
+            LogError("Failed properties_set_content_type");
+            result = __FAILURE__;
+        }
+        else
+        {
+            result = RESULT_OK;
+        }
+    }
+    else
+    {
+        result = RESULT_OK;
+    }
+
+    return result;
+}
+
+// Codes_SRS_UAMQP_MESSAGING_31_115: [If optional content-encoding is present in the message, encode it into the AMQP message.]
+static int set_message_content_encoding_if_needed(IOTHUB_MESSAGE_HANDLE messageHandle, PROPERTIES_HANDLE uamqp_message_properties)
+{
+    int result;
+    const char* content_encoding;
 
-	// Codes_SRS_UAMQP_MESSAGING_09_099: [The uAMQP message properties (obtained with message_get_properties()) shall be destroyed by calling properties_destroy().]
-	properties_destroy(uamqp_message_properties);
+    if ((content_encoding = IoTHubMessage_GetContentEncodingSystemProperty(messageHandle)) != NULL)
+    {
+        if (properties_set_content_encoding(uamqp_message_properties, content_encoding) != 0)
+        {
+            LogError("Failed properties_set_content_encoding");
+            result = __FAILURE__;
+        }
+        else
+        {
+            result = RESULT_OK;
+        }
+    }
+    else
+    {
+        result = RESULT_OK;
+    }
+
+    return result;
+}
+
+
+// Codes_SRS_UAMQP_MESSAGING_31_116: [Gets message properties associated with the IOTHUB_MESSAGE_HANDLE to encode, returning the properties and their encoded length.]
+static int create_message_properties_to_encode(IOTHUB_MESSAGE_HANDLE messageHandle, AMQP_VALUE *message_properties, size_t *message_properties_length)
+{
+    PROPERTIES_HANDLE uamqp_message_properties = NULL;
+    int result;
 
-	return result;
+    if ((uamqp_message_properties = properties_create()) == NULL)
+    {
+        LogError("Failed on properties_create()");
+        result = __FAILURE__;
+    }
+    else if (set_message_id_if_needed(messageHandle, uamqp_message_properties) != RESULT_OK)
+    {
+        LogError("Failed on set_message_id_if_needed()");
+        result = __FAILURE__;
+    }
+    else if (set_message_correlation_id_if_needed(messageHandle, uamqp_message_properties) != RESULT_OK)
+    {
+        LogError("Failed on set_message_correlation_id_if_needed()");
+        result = __FAILURE__;
+    }
+    else if (set_message_content_type_if_needed(messageHandle, uamqp_message_properties) != RESULT_OK)
+    {
+        LogError("Failed on set_message_content_type_if_needed()");
+        result = __FAILURE__;
+    }
+    else if (set_message_content_encoding_if_needed(messageHandle, uamqp_message_properties) != RESULT_OK)
+    {
+        LogError("Failed on set_message_content_encoding_if_needed()");
+        result = __FAILURE__;
+    }
+    else if ((*message_properties = amqpvalue_create_properties(uamqp_message_properties)) == NULL)
+    {
+        LogError("Failed on amqpvalue_create_properties()");
+        result = __FAILURE__;
+    }
+    else if ((amqpvalue_get_encoded_size(*message_properties, message_properties_length)) != 0)
+    {
+        LogError("Failed on amqpvalue_get_encoded_size()");
+        result = __FAILURE__;
+    }
+    else
+    {
+        result = RESULT_OK;
+    }
+
+    if (NULL != uamqp_message_properties)
+    {
+        properties_destroy(uamqp_message_properties);
+    }
+
+    return result;
 }
 
-static int addApplicationPropertiesTouAMQPMessage(IOTHUB_MESSAGE_HANDLE iothub_message_handle, MESSAGE_HANDLE uamqp_message)
+// Codes_SRS_UAMQP_MESSAGING_31_117: [Get application message properties associated with the IOTHUB_MESSAGE_HANDLE to encode, returning the properties and their encoded length.]
+static int create_application_properties_to_encode(IOTHUB_MESSAGE_HANDLE messageHandle, AMQP_VALUE *application_properties, size_t *application_properties_length)
 {
-	int result = RESULT_OK;
-	MAP_HANDLE properties_map;
-	const char* const* propertyKeys;
-	const char* const* propertyValues;
-	size_t propertyCount = 0;
+    MAP_HANDLE properties_map;
+    const char* const* property_keys;
+    const char* const* property_values;
+    size_t property_count = 0;
+    AMQP_VALUE uamqp_properties_map = NULL;
+    int result;
+
+    if ((properties_map = IoTHubMessage_Properties(messageHandle)) == NULL)
+    {
+        LogError("Failed to get property map from IoTHub message.");
+        result = __FAILURE__;
+    }
+    else if (Map_GetInternals(properties_map, &property_keys, &property_values, &property_count) != 0)
+    {
+        LogError("Failed reading the incoming uAMQP message properties");
+        result = __FAILURE__;
+    }
+    else if (property_count > 0)
+    {
+        size_t i;
+        if ((uamqp_properties_map = amqpvalue_create_map()) == NULL)
+        {
+            LogError("amqpvalue_create_map failed");
+            result = __FAILURE__;
+        }
+        else
+        {
+            result = RESULT_OK;
+
+            for (i = 0; i < property_count; i++)
+            {
+                AMQP_VALUE map_property_key;
+                AMQP_VALUE map_property_value;
+
+                if ((map_property_key = amqpvalue_create_string(property_keys[i])) == NULL)
+                {
+                    LogError("Failed amqpvalue_create_string for key");
+                    result = __FAILURE__;
+                    break;
+                }
 
-	// Codes_SRS_UAMQP_MESSAGING_09_080: [The IOTHUB_MESSAGE_HANDLE properties shall be obtained by calling IoTHubMessage_Properties.]
-	if ((properties_map = IoTHubMessage_Properties(iothub_message_handle)) == NULL)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_081: [If IoTHubMessage_Properties() fails, message_create_from_iothub_message() shall fail and return immediately..]
-		LogError("Failed to get property map from IoTHub message.");
-		result = __FAILURE__;
-	}
-	// Codes_SRS_UAMQP_MESSAGING_09_082: [The actual keys and values, as well as the number of properties shall be obtained by calling Map_GetInternals on the handle obtained from IoTHubMessage_Properties.]
-	else if (Map_GetInternals(properties_map, &propertyKeys, &propertyValues, &propertyCount) != MAP_OK)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_083: [If Map_GetInternals fails, message_create_from_iothub_message() shall fail and return immediately..]
-		LogError("Failed to get the internals of the property map.");
-		result = __FAILURE__;
-	}
-	else
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_085: [If the number of properties is greater than 0, message_create_from_iothub_message() shall iterate through all the properties and add them to the uAMQP message.]
-		if (propertyCount != 0)
-		{
-			size_t i;
-			AMQP_VALUE uamqp_map;
+                if ((map_property_value = amqpvalue_create_string(property_values[i])) == NULL)
+                {
+                    LogError("Failed amqpvalue_create_string for value");
+                    amqpvalue_destroy(map_property_key);
+                    result = __FAILURE__;
+                    break;
+                }
+
+                if (amqpvalue_set_map_value(uamqp_properties_map, map_property_key, map_property_value) != 0)
+                {
+                    LogError("Failed amqpvalue_set_map_value");
+                    amqpvalue_destroy(map_property_key);
+                    amqpvalue_destroy(map_property_value);
+                    result = __FAILURE__;
+                    break;
+                }
+
+                amqpvalue_destroy(map_property_key);
+                amqpvalue_destroy(map_property_value);
+            }
 
-			// Codes_SRS_UAMQP_MESSAGING_09_086: [A uAMQP property map shall be created by calling amqpvalue_create_map().]
-			if ((uamqp_map = amqpvalue_create_map()) == NULL)
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_087: [If amqpvalue_create_map() fails, message_create_from_iothub_message() shall fail and return immediately.]
-				LogError("Failed to create uAMQP map for the properties.");
-				result = __FAILURE__;
-			}
-			else
-			{
-				for (i = 0; result == RESULT_OK && i < propertyCount; i++)
-				{
-					AMQP_VALUE map_key_value = NULL;
-					AMQP_VALUE map_value_value = NULL;
+            if (RESULT_OK == result)
+            {
+                if ((*application_properties = amqpvalue_create_application_properties(uamqp_properties_map)) == NULL)
+                {
+                    LogError("Failed amqpvalue_create_application_properties");
+                    result = __FAILURE__;
+                }
+                else if (amqpvalue_get_encoded_size(*application_properties, application_properties_length) != 0)
+                {
+                    LogError("Failed amqpvalue_get_encoded_size");
+                    result = __FAILURE__;
+                }
+            }
+        }
+    }
+    else
+    {
+        result = RESULT_OK;
+    }
+
+    if (NULL != uamqp_properties_map)
+    {
+        amqpvalue_destroy(uamqp_properties_map);
+    }
+
+    return result;
+}
+
+
+// Codes_SRS_UAMQP_MESSAGING_31_118: [Gets data associated with IOTHUB_MESSAGE_HANDLE to encode, either from underlying byte array or string format.]
+static int create_data_to_encode(IOTHUB_MESSAGE_HANDLE messageHandle, AMQP_VALUE *data_value, size_t *data_length)
+{
+    int result;
+
+    IOTHUBMESSAGE_CONTENT_TYPE contentType = IoTHubMessage_GetContentType(messageHandle);
+    const char* messageContent = NULL;
+    size_t messageContentSize = 0;
 
-					// Codes_SRS_UAMQP_MESSAGING_09_088: [An AMQP_VALUE instance shall be created using amqpvalue_create_string() to hold each uAMQP property name.]
-					if ((map_key_value = amqpvalue_create_string(propertyKeys[i])) == NULL)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_089: [If amqpvalue_create_string() fails, message_create_from_iothub_message() shall fail and return immediately..]
-						LogError("Failed to create uAMQP property key name.");
-						result = __FAILURE__;
-					}
-					// Codes_SRS_UAMQP_MESSAGING_09_090: [An AMQP_VALUE instance shall be created using amqpvalue_create_string() to hold each uAMQP property value.]
-					else if ((map_value_value = amqpvalue_create_string(propertyValues[i])) == NULL)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_091: [If amqpvalue_create_string() fails, message_create_from_iothub_message() shall fail and return immediately..]
-						LogError("Failed to create uAMQP property key value.");
-						result = __FAILURE__;
-					}
-					// Codes_SRS_UAMQP_MESSAGING_09_092: [The property name and value (AMQP_VALUE instances) shall be added to the uAMQP property map by calling amqpvalue_map_set_value().]
-					else if (amqpvalue_set_map_value(uamqp_map, map_key_value, map_value_value) != 0)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_093: [If amqpvalue_map_set_value() fails, message_create_from_iothub_message() shall fail and return immediately..]
-						LogError("Failed to set key/value into the the uAMQP property map.");
-						result = __FAILURE__;
-					}
+    if ((contentType == IOTHUBMESSAGE_BYTEARRAY) &&
+        IoTHubMessage_GetByteArray(messageHandle, (const unsigned char **)&messageContent, &messageContentSize) != IOTHUB_MESSAGE_OK)
+    {
+        LogError("Failed getting the BYTE array representation of the IOTHUB_MESSAGE_HANDLE instance.");
+        result = __FAILURE__;
+    }
+    else if ((contentType == IOTHUBMESSAGE_STRING) &&
+        ((messageContent = IoTHubMessage_GetString(messageHandle)) == NULL))
+    {
+        LogError("Failed getting the STRING representation of the IOTHUB_MESSAGE_HANDLE instance.");
+        result = __FAILURE__;
+    }
+    else if (contentType == IOTHUBMESSAGE_UNKNOWN)
+    {
+        LogError("Cannot parse IOTHUB_MESSAGE_HANDLE with content type IOTHUBMESSAGE_UNKNOWN.");
+        result = __FAILURE__;
+    }
+    else
+    {
+        if (contentType == IOTHUBMESSAGE_STRING)
+        {
+            messageContentSize = strlen(messageContent);
+        }
+    
+        data bin_data;
+        bin_data.bytes = (const unsigned char *)messageContent;
+        bin_data.length = (uint32_t)messageContentSize;
 
-					// Codes_SRS_UAMQP_MESSAGING_09_094: [After adding the property name and value to the uAMQP property map, both AMQP_VALUE instances shall be destroyed using amqpvalue_destroy().]
-					if (map_key_value != NULL)
-						amqpvalue_destroy(map_key_value);
+        if ((*data_value = amqpvalue_create_data(bin_data)) == NULL)
+        {
+            LogError("amqpvalue_create_data failed");
+            result = __FAILURE__;
+        }
+        else if (amqpvalue_get_encoded_size(*data_value, data_length) != 0)
+        {
+            LogError("amqpvalue_get_encoded_size failed");
+            result = __FAILURE__;
+        }
+        else
+        {
+            result = RESULT_OK;
+        }
+    }
+
+    return result;
+}
+
+// Codes_SRS_UAMQP_MESSAGING_31_120: [Create a blob that contains AMQP encoding of IOTHUB_MESSAGE_HANDLE.]
+// Codes_SRS_UAMQP_MESSAGING_31_121: [Any errors during `message_create_uamqp_encoding_from_iothub_message` stop processing on this message.]
+int message_create_uamqp_encoding_from_iothub_message(IOTHUB_MESSAGE_HANDLE message_handle, BINARY_DATA* body_binary_data)
+{
+    int result;
+
+    AMQP_VALUE message_properties = NULL;
+    AMQP_VALUE application_properties = NULL;
+    AMQP_VALUE data_value = NULL;
+    size_t message_properties_length = 0;
+    size_t application_properties_length = 0;
+    size_t data_length = 0;
 
-					if (map_value_value != NULL)
-						amqpvalue_destroy(map_value_value);
-				}
+    body_binary_data->bytes = NULL;
+    body_binary_data->length = 0;
 
-				if (result == RESULT_OK)
-				{
-					// Codes_SRS_UAMQP_MESSAGING_09_095: [If no errors occurred processing the properties, the uAMQP properties map shall be set on the uAMQP message by calling message_set_application_properties().]
-					if (message_set_application_properties(uamqp_message, uamqp_map) != 0)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_096: [If message_set_application_properties() fails, message_create_from_iothub_message() shall fail and return immediately..]
-						LogError("Failed to transfer the message properties to the uAMQP message.");
-						result = __FAILURE__;
-					}
-					else
-					{
-						result = RESULT_OK;
-					}
-				}
+    if (create_message_properties_to_encode(message_handle, &message_properties, &message_properties_length) != RESULT_OK)
+    {
+        LogError("create_message_properties_to_encode() failed");
+        result = __FAILURE__;
+    }
+    else if (create_application_properties_to_encode(message_handle, &application_properties, &application_properties_length) != RESULT_OK)
+    {
+        LogError("create_application_properties_to_encode() failed");
+        result = __FAILURE__;
+    }
+    else if (create_data_to_encode(message_handle, &data_value, &data_length) != RESULT_OK)
+    {
+        LogError("create_data_to_encode() failed");
+        result = __FAILURE__;
+    }
+    else if ((body_binary_data->bytes = malloc(message_properties_length + application_properties_length + data_length)) == NULL)
+    {
+        LogError("malloc of %d bytes failed", message_properties_length + application_properties_length + data_length);
+        result = __FAILURE__;
+    }
+    // Codes_SRS_UAMQP_MESSAGING_31_119: [Invoke underlying AMQP encode routines on data waiting to be encoded.]
+    else if (amqpvalue_encode(message_properties, &encode_callback, body_binary_data) != RESULT_OK)
+    {
+        LogError("amqpvalue_encode() for message properties failed");
+        result = __FAILURE__;
+    }
+    else if ((application_properties_length > 0) && (amqpvalue_encode(application_properties, &encode_callback, body_binary_data)  != RESULT_OK))
+    {
+        LogError("amqpvalue_encode() for application properties failed");
+        result = __FAILURE__;
+    }
+    else if (RESULT_OK != amqpvalue_encode(data_value, &encode_callback, body_binary_data))
+    {
+        LogError("amqpvalue_encode() for data value failed");
+        result = __FAILURE__;
+    }
+    else
+    {
+        body_binary_data->length = message_properties_length + application_properties_length + data_length;
+        result = RESULT_OK;
+    }
 
-				// Codes_SRS_UAMQP_MESSAGING_09_097: [The uAMQP properties map shall be destroyed using amqpvalue_destroy().]
-				amqpvalue_destroy(uamqp_map);
-			}
-		}
-		else
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_084: [If the number of properties is 0, no application properties shall be set on the uAMQP message and message_create_from_iothub_message() shall return with success.]
-			result = RESULT_OK;
-		}
-	}
+    if (NULL != data_value)
+    {
+        amqpvalue_destroy(data_value);
+    }
 
-	return result;
+    if (NULL != application_properties)
+    {
+        amqpvalue_destroy(application_properties);
+    }
+
+    if (NULL != message_properties)
+    {
+        amqpvalue_destroy(message_properties);
+    }
+
+    return result;
 }
 
 static int readPropertiesFromuAMQPMessage(IOTHUB_MESSAGE_HANDLE iothub_message_handle, MESSAGE_HANDLE uamqp_message)
 {
-	int return_value;
-	PROPERTIES_HANDLE uamqp_message_properties;
-	AMQP_VALUE uamqp_message_property;
-	const char* uamqp_message_property_value;
-	int api_call_result;
+    int return_value;
+    PROPERTIES_HANDLE uamqp_message_properties;
+    AMQP_VALUE uamqp_message_property;
+    const char* uamqp_message_property_value;
+    int api_call_result;
 
-	// Codes_SRS_UAMQP_MESSAGING_09_008: [The uAMQP message properties shall be retrieved using message_get_properties().]
-	if ((api_call_result = message_get_properties(uamqp_message, &uamqp_message_properties)) != 0)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_009: [If message_get_properties() fails, IoTHubMessage_CreateFromuAMQPMessage shall fail and return immediately.]
-		LogError("Failed to get property properties map from uAMQP message (error code %d).", api_call_result);
-		return_value = __FAILURE__;
-	}
+    // Codes_SRS_UAMQP_MESSAGING_09_008: [The uAMQP message properties shall be retrieved using message_get_properties().]
+    if ((api_call_result = message_get_properties(uamqp_message, &uamqp_message_properties)) != 0)
+    {
+        // Codes_SRS_UAMQP_MESSAGING_09_009: [If message_get_properties() fails, message_create_IoTHubMessage_from_uamqp_message shall fail and return immediately.]
+        LogError("Failed to get property properties map from uAMQP message (error code %d).", api_call_result);
+        return_value = __FAILURE__;
+    }
     else
     {
         return_value = 0; // Properties 'message-id' and 'correlation-id' are optional according to the AMQP 1.0 spec.
@@ -254,24 +450,24 @@
         // Codes_SRS_UAMQP_MESSAGING_09_010: [The message-id property shall be read from the uAMQP message by calling properties_get_message_id.]
         if ((api_call_result = properties_get_message_id(uamqp_message_properties, &uamqp_message_property)) != 0)
         {
-            // Codes_SRS_UAMQP_MESSAGING_09_011: [If properties_get_message_id fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
+            // Codes_SRS_UAMQP_MESSAGING_09_011: [If properties_get_message_id fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
             LogInfo("Failed to get value of uAMQP message 'message-id' property (%d). No failure, since it is optional.", api_call_result);
         }
         // Codes_SRS_UAMQP_MESSAGING_09_012: [The type of the message-id property value shall be obtained using amqpvalue_get_type().]
-        // Codes_SRS_UAMQP_MESSAGING_09_013: [If the type of the message-id property value is AMQP_TYPE_NULL, IoTHubMessage_CreateFromuAMQPMessage() shall skip processing the message-id (as it is optional) and continue normally.]
+        // Codes_SRS_UAMQP_MESSAGING_09_013: [If the type of the message-id property value is AMQP_TYPE_NULL, message_create_IoTHubMessage_from_uamqp_message() shall skip processing the message-id (as it is optional) and continue normally.]
         else if (amqpvalue_get_type(uamqp_message_property) != AMQP_TYPE_NULL)
         {
             // Codes_SRS_UAMQP_MESSAGING_09_014: [The message-id value shall be retrieved from the AMQP_VALUE as char* by calling amqpvalue_get_string().]
             if ((api_call_result = amqpvalue_get_string(uamqp_message_property, &uamqp_message_property_value)) != 0)
             {
-                // Codes_SRS_UAMQP_MESSAGING_09_015: [If amqpvalue_get_string fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
+                // Codes_SRS_UAMQP_MESSAGING_09_015: [If amqpvalue_get_string fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
                 LogError("Failed to get value of uAMQP message 'message-id' property (%d).", api_call_result);
                 return_value = __FAILURE__;
             }
             // Codes_SRS_UAMQP_MESSAGING_09_016: [The message-id property shall be set on the IOTHUB_MESSAGE_HANDLE instance by calling IoTHubMessage_SetMessageId(), passing the value read from the uAMQP message.]
             else if (IoTHubMessage_SetMessageId(iothub_message_handle, uamqp_message_property_value) != IOTHUB_MESSAGE_OK)
             {
-                // Codes_SRS_UAMQP_MESSAGING_09_017: [If IoTHubMessage_SetMessageId fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
+                // Codes_SRS_UAMQP_MESSAGING_09_017: [If IoTHubMessage_SetMessageId fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
                 LogError("Failed to set IOTHUB_MESSAGE_HANDLE 'message-id' property.");
                 return_value = __FAILURE__;
             }
@@ -280,311 +476,200 @@
         // Codes_SRS_UAMQP_MESSAGING_09_018: [The correlation-id property shall be read from the uAMQP message by calling properties_get_correlation_id.]
         if ((api_call_result = properties_get_correlation_id(uamqp_message_properties, &uamqp_message_property)) != 0)
         {
-            // Codes_SRS_UAMQP_MESSAGING_09_019: [If properties_get_correlation_id() fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
+            // Codes_SRS_UAMQP_MESSAGING_09_019: [If properties_get_correlation_id() fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
             LogError("Failed to get value of uAMQP message 'correlation-id' property (%d). No failure, since it is optional.", api_call_result);
         }
         // Codes_SRS_UAMQP_MESSAGING_09_020: [The type of the correlation-id property value shall be obtained using amqpvalue_get_type().]
-        // Codes_SRS_UAMQP_MESSAGING_09_021: [If the type of the correlation-id property value is AMQP_TYPE_NULL, IoTHubMessage_CreateFromuAMQPMessage() shall skip processing the correlation-id (as it is optional) and continue normally.]
+        // Codes_SRS_UAMQP_MESSAGING_09_021: [If the type of the correlation-id property value is AMQP_TYPE_NULL, message_create_IoTHubMessage_from_uamqp_message() shall skip processing the correlation-id (as it is optional) and continue normally.]
         else if (amqpvalue_get_type(uamqp_message_property) != AMQP_TYPE_NULL)
         {
             // Codes_SRS_UAMQP_MESSAGING_09_022: [The correlation-id value shall be retrieved from the AMQP_VALUE as char* by calling amqpvalue_get_string.]
             if ((api_call_result = amqpvalue_get_string(uamqp_message_property, &uamqp_message_property_value)) != 0)
             {
-                // Codes_SRS_UAMQP_MESSAGING_09_023: [If amqpvalue_get_string fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
+                // Codes_SRS_UAMQP_MESSAGING_09_023: [If amqpvalue_get_string fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
                 LogError("Failed to get value of uAMQP message 'correlation-id' property (%d).", api_call_result);
                 return_value = __FAILURE__;
             }
             // Codes_SRS_UAMQP_MESSAGING_09_024: [The correlation-id property shall be set on the IOTHUB_MESSAGE_HANDLE by calling IoTHubMessage_SetCorrelationId, passing the value read from the uAMQP message.]
             else if (IoTHubMessage_SetCorrelationId(iothub_message_handle, uamqp_message_property_value) != IOTHUB_MESSAGE_OK)
             {
-                // Codes_SRS_UAMQP_MESSAGING_09_025: [If IoTHubMessage_SetCorrelationId fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
+                // Codes_SRS_UAMQP_MESSAGING_09_025: [If IoTHubMessage_SetCorrelationId fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
                 LogError("Failed to set IOTHUB_MESSAGE_HANDLE 'correlation-id' property.");
                 return_value = __FAILURE__;
             }
         }
-
-        uamqp_message_property_value = NULL;
-
-        // Codes_SRS_UAMQP_MESSAGING_09_100: [If the uamqp message contains property `content-type`, it shall be set on IOTHUB_MESSAGE_HANDLE]
-        if (properties_get_content_type(uamqp_message_properties, &uamqp_message_property_value) == 0 && uamqp_message_property_value != NULL)
-        {
-            if (IoTHubMessage_SetContentTypeSystemProperty(iothub_message_handle, uamqp_message_property_value) != IOTHUB_MESSAGE_OK)
-            {
-                // Codes_SRS_UAMQP_MESSAGING_09_102: [If setting the `content-type` property on IOTHUB_MESSAGE_HANDLE fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-                LogError("Failed to set IOTHUB_MESSAGE_HANDLE 'content-type' property.");
-                return_value = __FAILURE__;
-            }
-        }
-        
-        uamqp_message_property_value = NULL;
+        // Codes_SRS_UAMQP_MESSAGING_09_026: [message_create_IoTHubMessage_from_uamqp_message() shall destroy the uAMQP message properties (obtained with message_get_properties()) by calling properties_destroy().]
+        properties_destroy(uamqp_message_properties);
+    }
 
-        // Codes_SRS_UAMQP_MESSAGING_09_103: [If the uAMQP message contains property `content-encoding`, it shall be set on IOTHUB_MESSAGE_HANDLE]
-        if (properties_get_content_encoding(uamqp_message_properties, &uamqp_message_property_value) == 0 && uamqp_message_property_value != NULL)
-        {
-            if (IoTHubMessage_SetContentEncodingSystemProperty(iothub_message_handle, uamqp_message_property_value) != IOTHUB_MESSAGE_OK)
-            {
-                // Codes_SRS_UAMQP_MESSAGING_09_105: [If setting the `content-encoding` property on IOTHUB_MESSAGE_HANDLE fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-                LogError("Failed to set IOTHUB_MESSAGE_HANDLE 'content-encoding' property.");
-                return_value = __FAILURE__;
-            }
-        }
-
-		// Codes_SRS_UAMQP_MESSAGING_09_026: [IoTHubMessage_CreateFromuAMQPMessage() shall destroy the uAMQP message properties (obtained with message_get_properties()) by calling properties_destroy().]
-		properties_destroy(uamqp_message_properties);
-	}
-
-	return return_value;
+    return return_value;
 }
 
 static int readApplicationPropertiesFromuAMQPMessage(IOTHUB_MESSAGE_HANDLE iothub_message_handle, MESSAGE_HANDLE uamqp_message)
 {
-	int result;
-	AMQP_VALUE uamqp_app_properties = NULL;
-	AMQP_VALUE uamqp_app_properties_ipdv = NULL;
-	uint32_t property_count = 0;
-	MAP_HANDLE iothub_message_properties_map;
+    int result;
+    AMQP_VALUE uamqp_app_properties = NULL;
+    AMQP_VALUE uamqp_app_properties_ipdv = NULL;
+    uint32_t property_count = 0;
+    MAP_HANDLE iothub_message_properties_map;
 
-	// Codes_SRS_UAMQP_MESSAGING_09_027: [The IOTHUB_MESSAGE_HANDLE properties shall be retrieved using IoTHubMessage_Properties.]
-	if ((iothub_message_properties_map = IoTHubMessage_Properties(iothub_message_handle)) == NULL)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_028: [If IoTHubMessage_Properties fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-		LogError("Failed to get property map from IoTHub message.");
-		result = __FAILURE__;
-	}
-	// Codes_SRS_UAMQP_MESSAGING_09_029: [The uAMQP message application properties shall be retrieved using message_get_application_properties.]
-	else if ((result = message_get_application_properties(uamqp_message, &uamqp_app_properties)) != 0)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_030: [If message_get_application_properties fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-		LogError("Failed reading the incoming uAMQP message properties (return code %d).", result);
-		result = __FAILURE__;
-	}
-	else
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_031: [If message_get_application_properties succeeds but returns a NULL application properties map (there are no properties), IoTHubMessage_CreateFromuAMQPMessage() shall skip processing the properties and continue normally.]
-		if (uamqp_app_properties == NULL)
-		{
-			result = 0;
-		}
-		else
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_032: [The actual uAMQP message application properties should be extracted from the result of message_get_application_properties using amqpvalue_get_inplace_described_value.]
-			if ((uamqp_app_properties_ipdv = amqpvalue_get_inplace_described_value(uamqp_app_properties)) == NULL)
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_033: [If amqpvalue_get_inplace_described_value fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-				LogError("Failed getting the map of uAMQP message application properties (return code %d).", result);
-				result = __FAILURE__;
-			}
-			// Codes_SRS_UAMQP_MESSAGING_09_034: [The number of items in the uAMQP message application properties shall be obtained using amqpvalue_get_map_pair_count.]
-			else if ((result = amqpvalue_get_map_pair_count(uamqp_app_properties_ipdv, &property_count)) != 0)
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_035: [If amqpvalue_get_map_pair_count fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-				LogError("Failed reading the number of values in the uAMQP property map (return code %d).", result);
-				result = __FAILURE__;
-			}
-			else
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_036: [IoTHubMessage_CreateFromuAMQPMessage() shall iterate through each uAMQP application property and add it to IOTHUB_MESSAGE_HANDLE properties.]
-				uint32_t i;
-				for (i = 0; result == RESULT_OK && i < property_count; i++)
-				{
-					AMQP_VALUE map_key_name = NULL;
-					AMQP_VALUE map_key_value = NULL;
-					const char *key_name;
-					const char* key_value;
+    // Codes_SRS_UAMQP_MESSAGING_09_027: [The IOTHUB_MESSAGE_HANDLE properties shall be retrieved using IoTHubMessage_Properties.]
+    if ((iothub_message_properties_map = IoTHubMessage_Properties(iothub_message_handle)) == NULL)
+    {
+        // Codes_SRS_UAMQP_MESSAGING_09_028: [If IoTHubMessage_Properties fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+        LogError("Failed to get property map from IoTHub message.");
+        result = __FAILURE__;
+    }
+    // Codes_SRS_UAMQP_MESSAGING_09_029: [The uAMQP message application properties shall be retrieved using message_get_application_properties.]
+    else if ((result = message_get_application_properties(uamqp_message, &uamqp_app_properties)) != 0)
+    {
+        // Codes_SRS_UAMQP_MESSAGING_09_030: [If message_get_application_properties fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+        LogError("Failed reading the incoming uAMQP message properties (return code %d).", result);
+        result = __FAILURE__;
+    }
+    else
+    {
+        // Codes_SRS_UAMQP_MESSAGING_09_031: [If message_get_application_properties succeeds but returns a NULL application properties map (there are no properties), message_create_IoTHubMessage_from_uamqp_message() shall skip processing the properties and continue normally.]
+        if (uamqp_app_properties == NULL)
+        {
+            result = 0;
+        }
+        else
+        {
+            // Codes_SRS_UAMQP_MESSAGING_09_032: [The actual uAMQP message application properties should be extracted from the result of message_get_application_properties using amqpvalue_get_inplace_described_value.]
+            if ((uamqp_app_properties_ipdv = amqpvalue_get_inplace_described_value(uamqp_app_properties)) == NULL)
+            {
+                // Codes_SRS_UAMQP_MESSAGING_09_033: [If amqpvalue_get_inplace_described_value fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+                LogError("Failed getting the map of uAMQP message application properties (return code %d).", result);
+                result = __FAILURE__;
+            }
+            // Codes_SRS_UAMQP_MESSAGING_09_034: [The number of items in the uAMQP message application properties shall be obtained using amqpvalue_get_map_pair_count.]
+            else if ((result = amqpvalue_get_map_pair_count(uamqp_app_properties_ipdv, &property_count)) != 0)
+            {
+                // Codes_SRS_UAMQP_MESSAGING_09_035: [If amqpvalue_get_map_pair_count fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+                LogError("Failed reading the number of values in the uAMQP property map (return code %d).", result);
+                result = __FAILURE__;
+            }
+            else
+            {
+                // Codes_SRS_UAMQP_MESSAGING_09_036: [message_create_IoTHubMessage_from_uamqp_message() shall iterate through each uAMQP application property and add it to IOTHUB_MESSAGE_HANDLE properties.]
+                uint32_t i;
+                for (i = 0; result == RESULT_OK && i < property_count; i++)
+                {
+                    AMQP_VALUE map_key_name = NULL;
+                    AMQP_VALUE map_key_value = NULL;
+                    const char *key_name;
+                    const char* key_value;
 
-					// Codes_SRS_UAMQP_MESSAGING_09_037: [The uAMQP application property name and value shall be obtained using amqpvalue_get_map_key_value_pair.]
-					if ((result = amqpvalue_get_map_key_value_pair(uamqp_app_properties_ipdv, i, &map_key_name, &map_key_value)) != 0)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_038: [If amqpvalue_get_map_key_value_pair fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-						LogError("Failed reading the key/value pair from the uAMQP property map (return code %d).", result);
-						result = __FAILURE__;
-					}
+                    // Codes_SRS_UAMQP_MESSAGING_09_037: [The uAMQP application property name and value shall be obtained using amqpvalue_get_map_key_value_pair.]
+                    if ((result = amqpvalue_get_map_key_value_pair(uamqp_app_properties_ipdv, i, &map_key_name, &map_key_value)) != 0)
+                    {
+                        // Codes_SRS_UAMQP_MESSAGING_09_038: [If amqpvalue_get_map_key_value_pair fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+                        LogError("Failed reading the key/value pair from the uAMQP property map (return code %d).", result);
+                        result = __FAILURE__;
+                    }
 
-					// Codes_SRS_UAMQP_MESSAGING_09_039: [The uAMQP application property name shall be extracted as string using amqpvalue_get_string.]
-					else if ((result = amqpvalue_get_string(map_key_name, &key_name)) != 0)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_040: [If amqpvalue_get_string fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-						LogError("Failed parsing the uAMQP property name (return code %d).", result);
-						result = __FAILURE__;
-					}
-					// Codes_SRS_UAMQP_MESSAGING_09_041: [The uAMQP application property value shall be extracted as string using amqpvalue_get_string.]
-					else if ((result = amqpvalue_get_string(map_key_value, &key_value)) != 0)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_042: [If amqpvalue_get_string fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-						LogError("Failed parsing the uAMQP property value (return code %d).", result);
-						result = __FAILURE__;
-					}
-					// Codes_SRS_UAMQP_MESSAGING_09_043: [The application property name and value shall be added to IOTHUB_MESSAGE_HANDLE properties using Map_AddOrUpdate.]
-					else if (Map_AddOrUpdate(iothub_message_properties_map, key_name, key_value) != MAP_OK)
-					{
-						// Codes_SRS_UAMQP_MESSAGING_09_044: [If Map_AddOrUpdate fails, IoTHubMessage_CreateFromuAMQPMessage() shall fail and return immediately.]
-						LogError("Failed to add/update IoTHub message property map.");
-						result = __FAILURE__;
-					}
+                    // Codes_SRS_UAMQP_MESSAGING_09_039: [The uAMQP application property name shall be extracted as string using amqpvalue_get_string.]
+                    else if ((result = amqpvalue_get_string(map_key_name, &key_name)) != 0)
+                    {
+                        // Codes_SRS_UAMQP_MESSAGING_09_040: [If amqpvalue_get_string fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+                        LogError("Failed parsing the uAMQP property name (return code %d).", result);
+                        result = __FAILURE__;
+                    }
+                    // Codes_SRS_UAMQP_MESSAGING_09_041: [The uAMQP application property value shall be extracted as string using amqpvalue_get_string.]
+                    else if ((result = amqpvalue_get_string(map_key_value, &key_value)) != 0)
+                    {
+                        // Codes_SRS_UAMQP_MESSAGING_09_042: [If amqpvalue_get_string fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+                        LogError("Failed parsing the uAMQP property value (return code %d).", result);
+                        result = __FAILURE__;
+                    }
+                    // Codes_SRS_UAMQP_MESSAGING_09_043: [The application property name and value shall be added to IOTHUB_MESSAGE_HANDLE properties using Map_AddOrUpdate.]
+                    else if (Map_AddOrUpdate(iothub_message_properties_map, key_name, key_value) != MAP_OK)
+                    {
+                        // Codes_SRS_UAMQP_MESSAGING_09_044: [If Map_AddOrUpdate fails, message_create_IoTHubMessage_from_uamqp_message() shall fail and return immediately.]
+                        LogError("Failed to add/update IoTHub message property map.");
+                        result = __FAILURE__;
+                    }
 
-					// Codes_SRS_UAMQP_MESSAGING_09_045: [IoTHubMessage_CreateFromuAMQPMessage() shall destroy the uAMQP message property name and value (obtained with amqpvalue_get_string) by calling amqpvalue_destroy().]
-					if (map_key_name != NULL)
-					{
-						amqpvalue_destroy(map_key_name);
-					}
+                    // Codes_SRS_UAMQP_MESSAGING_09_045: [message_create_IoTHubMessage_from_uamqp_message() shall destroy the uAMQP message property name and value (obtained with amqpvalue_get_string) by calling amqpvalue_destroy().]
+                    if (map_key_name != NULL)
+                    {
+                        amqpvalue_destroy(map_key_name);
+                    }
 
-					if (map_key_value != NULL)
-					{
-						amqpvalue_destroy(map_key_value);
-					}
-				}
-			}
+                    if (map_key_value != NULL)
+                    {
+                        amqpvalue_destroy(map_key_value);
+                    }
+                }
+            }
 
-			// Codes_SRS_UAMQP_MESSAGING_09_046: [IoTHubMessage_CreateFromuAMQPMessage() shall destroy the uAMQP message property (obtained with message_get_application_properties) by calling amqpvalue_destroy().]
-			amqpvalue_destroy(uamqp_app_properties);
-		}
-	}
+            // Codes_SRS_UAMQP_MESSAGING_09_046: [message_create_IoTHubMessage_from_uamqp_message() shall destroy the uAMQP message property (obtained with message_get_application_properties) by calling amqpvalue_destroy().]
+            amqpvalue_destroy(uamqp_app_properties);
+        }
+    }
 
-	return result;
+    return result;
 }
 
-int IoTHubMessage_CreateFromUamqpMessage(MESSAGE_HANDLE uamqp_message, IOTHUB_MESSAGE_HANDLE* iothubclient_message)
+int message_create_IoTHubMessage_from_uamqp_message(MESSAGE_HANDLE uamqp_message, IOTHUB_MESSAGE_HANDLE* iothubclient_message)
 {
-	int result = __FAILURE__;
+    int result = __FAILURE__;
 
-	IOTHUB_MESSAGE_HANDLE iothub_message = NULL;
-	MESSAGE_BODY_TYPE body_type;
+    IOTHUB_MESSAGE_HANDLE iothub_message = NULL;
+    MESSAGE_BODY_TYPE body_type;
 
-	// Codes_SRS_UAMQP_MESSAGING_09_001: [The body type of the uAMQP message shall be retrieved using message_get_body_type().]
-	if (message_get_body_type(uamqp_message, &body_type) != 0)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_002: [If message_get_body_type() fails, IoTHubMessage_CreateFromuAMQPMessage shall fail and return immediately.]
-		LogError("Failed to get the type of the uamqp message.");
-		result = __FAILURE__;
-	}
-	else
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_003: [If the uAMQP message body type is MESSAGE_BODY_TYPE_DATA, the body data shall be treated as binary data.]
-		if (body_type == MESSAGE_BODY_TYPE_DATA)
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_004: [The uAMQP message body data shall be retrieved using message_get_body_amqp_data().]
-			BINARY_DATA binary_data;
-			if (message_get_body_amqp_data_in_place(uamqp_message, 0, &binary_data) != 0)
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_005: [If message_get_body_amqp_data() fails, IoTHubMessage_CreateFromuAMQPMessage shall fail and return immediately.]
-				LogError("Failed to get the body of the uamqp message.");
-				result = __FAILURE__;
-			}
-			// Codes_SRS_UAMQP_MESSAGING_09_006: [The IOTHUB_MESSAGE instance shall be created using IoTHubMessage_CreateFromByteArray(), passing the uAMQP body bytes as parameter.]
-			else if ((iothub_message = IoTHubMessage_CreateFromByteArray(binary_data.bytes, binary_data.length)) == NULL)
-			{
-				// Codes_SRS_UAMQP_MESSAGING_09_007: [If IoTHubMessage_CreateFromByteArray() fails, IoTHubMessage_CreateFromuAMQPMessage shall fail and return immediately.]
-				LogError("Failed creating the IOTHUB_MESSAGE_HANDLE instance (IoTHubMessage_CreateFromByteArray failed).");
-				result = __FAILURE__;
-			}
-		}
-	}
+    // Codes_SRS_UAMQP_MESSAGING_09_001: [The body type of the uAMQP message shall be retrieved using message_get_body_type().]
+    if (message_get_body_type(uamqp_message, &body_type) != 0)
+    {
+        // Codes_SRS_UAMQP_MESSAGING_09_002: [If message_get_body_type() fails, message_create_IoTHubMessage_from_uamqp_message shall fail and return immediately.]
+        LogError("Failed to get the type of the uamqp message.");
+        result = __FAILURE__;
+    }
+    else
+    {
+        // Codes_SRS_UAMQP_MESSAGING_09_003: [If the uAMQP message body type is MESSAGE_BODY_TYPE_DATA, the body data shall be treated as binary data.]
+        if (body_type == MESSAGE_BODY_TYPE_DATA)
+        {
+            // Codes_SRS_UAMQP_MESSAGING_09_004: [The uAMQP message body data shall be retrieved using message_get_body_amqp_data().]
+            BINARY_DATA binary_data;
+            if (message_get_body_amqp_data_in_place(uamqp_message, 0, &binary_data) != 0)
+            {
+                // Codes_SRS_UAMQP_MESSAGING_09_005: [If message_get_body_amqp_data() fails, message_create_IoTHubMessage_from_uamqp_message shall fail and return immediately.]
+                LogError("Failed to get the body of the uamqp message.");
+                result = __FAILURE__;
+            }
+            // Codes_SRS_UAMQP_MESSAGING_09_006: [The IOTHUB_MESSAGE instance shall be created using IoTHubMessage_CreateFromByteArray(), passing the uAMQP body bytes as parameter.]
+            else if ((iothub_message = IoTHubMessage_CreateFromByteArray(binary_data.bytes, binary_data.length)) == NULL)
+            {
+                // Codes_SRS_UAMQP_MESSAGING_09_007: [If IoTHubMessage_CreateFromByteArray() fails, message_create_IoTHubMessage_from_uamqp_message shall fail and return immediately.]
+                LogError("Failed creating the IOTHUB_MESSAGE_HANDLE instance (IoTHubMessage_CreateFromByteArray failed).");
+                result = __FAILURE__;
+            }
+        }
+    }
 
-	if (iothub_message != NULL)
-	{
-		if (readPropertiesFromuAMQPMessage(iothub_message, uamqp_message) != RESULT_OK)
-		{
-			LogError("Failed reading properties of the uamqp message.");
-			IoTHubMessage_Destroy(iothub_message);
-			result = __FAILURE__;
-		}
-		else if (readApplicationPropertiesFromuAMQPMessage(iothub_message, uamqp_message) != RESULT_OK)
-		{
-			LogError("Failed reading application properties of the uamqp message.");
-			IoTHubMessage_Destroy(iothub_message);
-			result = __FAILURE__;
-		}
-		else
-		{
-			*iothubclient_message = iothub_message;
-			result = RESULT_OK;
-		}
-	}
+    if (iothub_message != NULL)
+    {
+        if (readPropertiesFromuAMQPMessage(iothub_message, uamqp_message) != RESULT_OK)
+        {
+            LogError("Failed reading properties of the uamqp message.");
+            IoTHubMessage_Destroy(iothub_message);
+            result = __FAILURE__;
+        }
+        else if (readApplicationPropertiesFromuAMQPMessage(iothub_message, uamqp_message) != RESULT_OK)
+        {
+            LogError("Failed reading application properties of the uamqp message.");
+            IoTHubMessage_Destroy(iothub_message);
+            result = __FAILURE__;
+        }
+        else
+        {
+            *iothubclient_message = iothub_message;
+            result = RESULT_OK;
+        }
+    }
 
-	return result;
+    return result;
 }
 
-int message_create_from_iothub_message(IOTHUB_MESSAGE_HANDLE iothub_message, MESSAGE_HANDLE* uamqp_message)
-{
-	int result = __FAILURE__;
-	// Codes_SRS_UAMQP_MESSAGING_09_047: [The content type of the IOTHUB_MESSAGE_HANDLE instance shall be obtained using IoTHubMessage_GetContentType().]
-	IOTHUBMESSAGE_CONTENT_TYPE contentType = IoTHubMessage_GetContentType(iothub_message);
-	const char* messageContent = NULL;
-	size_t messageContentSize = 0;
-	MESSAGE_HANDLE uamqp_message_tmp = NULL;
-
-	// Codes_SRS_UAMQP_MESSAGING_09_048: [If the content type of the IOTHUB_MESSAGE_HANDLE instance is IOTHUBMESSAGE_BYTEARRAY, the content shall be obtained using IoTHubMessage_GetByteArray().]
-	if (contentType == IOTHUBMESSAGE_BYTEARRAY &&
-		IoTHubMessage_GetByteArray(iothub_message, (const unsigned char **)&messageContent, &messageContentSize) != IOTHUB_MESSAGE_OK)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_049: [If IoTHubMessage_GetByteArray() fails, message_create_from_iothub_message() shall fail and return.]
-		LogError("Failed getting the BYTE array representation of the IOTHUB_MESSAGE_HANDLE instance.");
-		result = __FAILURE__;
-	}
-	// Codes_SRS_UAMQP_MESSAGING_09_050: [If the content type of the IOTHUB_MESSAGE_HANDLE instance is IOTHUBMESSAGE_STRING, the content shall be obtained using IoTHubMessage_GetString().]
-	else if (contentType == IOTHUBMESSAGE_STRING &&
-		((messageContent = IoTHubMessage_GetString(iothub_message)) == NULL))
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_051: [If IoTHubMessage_GetString() fails, message_create_from_iothub_message() shall fail and return.]
-		LogError("Failed getting the STRING representation of the IOTHUB_MESSAGE_HANDLE instance.");
-		result = __FAILURE__;
-	}
-	// Codes_SRS_UAMQP_MESSAGING_09_052: [If the content type of the IOTHUB_MESSAGE_HANDLE instance is IOTHUBMESSAGE_UNKNOWN, message_create_from_iothub_message() shall fail and return.]
-	else if (contentType == IOTHUBMESSAGE_UNKNOWN)
-	{
-		LogError("Cannot parse IOTHUB_MESSAGE_HANDLE with content type IOTHUBMESSAGE_UNKNOWN.");
-		result = __FAILURE__;
-	}
-	// Codes_SRS_UAMQP_MESSAGING_09_053: [A uAMQP MESSAGE_HANDLE shall be created using message_create().]
-	else if ((uamqp_message_tmp = message_create()) == NULL)
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_054: [If message_create() fails, message_create_from_iothub_message() shall fail and return.]
-		LogError("Failed allocating the uAMQP message.");
-		result = __FAILURE__;
-	}
-	else
-	{
-		// Codes_SRS_UAMQP_MESSAGING_09_055: [The IOTHUB_MESSAGE instance content bytes and size shall be stored on a BINARY_DATA structure.]
-		BINARY_DATA binary_data;
-
-		if (contentType == IOTHUBMESSAGE_STRING)
-		{
-			messageContentSize = strlen(messageContent);
-		}
-
-		binary_data.bytes = (const unsigned char *)messageContent;
-		binary_data.length = messageContentSize;
-
-		// Codes_SRS_UAMQP_MESSAGING_09_056: [The BINARY_DATA instance shall be set as the uAMQP message body using message_add_body_amqp_data().]
-		if (message_add_body_amqp_data(uamqp_message_tmp, binary_data) != RESULT_OK)
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_057: [If message_add_body_amqp_data() fails, message_create_from_iothub_message() shall fail and return.]
-			LogError("Failed setting the body of the uAMQP message.");
-			result = __FAILURE__;
-		}
-		else if (addPropertiesTouAMQPMessage(iothub_message, uamqp_message_tmp) != RESULT_OK)
-		{
-			LogError("Failed setting properties of the uAMQP message.");
-			result = __FAILURE__;
-		}
-		else if (addApplicationPropertiesTouAMQPMessage(iothub_message, uamqp_message_tmp) != RESULT_OK)
-		{
-			LogError("Failed setting application properties of the uAMQP message.");
-			result = __FAILURE__;
-		}
-		else
-		{
-			// Codes_SRS_UAMQP_MESSAGING_09_058: [The uAMQP message created by message_create_from_iothub_message() shall be returned only if no failures occurr.]
-			*uamqp_message = uamqp_message_tmp;
-			// Codes_SRS_UAMQP_MESSAGING_09_098: [If no errors occurr, message_create_from_iothub_message() shall return 0 (success).]
-			result = RESULT_OK;
-		}
-		// Codes_SRS_UAMQP_MESSAGING_09_059: [If message_create_from_iothub_message() fails, the uAMQP message (created with message_create()) shall be destroyed.]
-		if (result != RESULT_OK)
-		{
-			message_destroy(uamqp_message_tmp);
-		}
-	}
-
-	return result;
-}