Fix for issue with new client metrics

Fixes #115

Author: vareddy

src/aws_iot_mqtt_client.c

@@ -39,8 +39,17 @@
 extern "C" {
 #endif
 
+#include <string.h>
+
 #include "aws_iot_log.h"
 #include "aws_iot_mqtt_client_interface.h"
+#include "aws_iot_version.h"
+
+#if !DISABLE_METRICS
+#define SDK_METRICS_LEN 25
+#define SDK_METRICS_TEMPLATE "?SDK=C&Version=%d.%d.%d"
+static char pUsernameTemp[SDK_METRICS_LEN] = {0};
+#endif
 
 #ifdef _ENABLE_THREAD_SUPPORT_
 #include "threads_interface.h"
@@ -136,8 +145,16 @@ IoT_Error_t aws_iot_mqtt_set_connect_params(AWS_IoT_Client *pClient, IoT_Client_
 	pClient->clientData.options.MQTTVersion = pNewConnectParams->MQTTVersion;
 	pClient->clientData.options.pClientID = pNewConnectParams->pClientID;
 	pClient->clientData.options.clientIDLen = pNewConnectParams->clientIDLen;
+#if !DISABLE_METRICS
+	if (0 == strlen(pUsernameTemp)) {
+		snprintf(pUsernameTemp, SDK_METRICS_LEN, SDK_METRICS_TEMPLATE, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+	}
+	pClient->clientData.options.pUsername = (char*)&pUsernameTemp[0];
+	pClient->clientData.options.usernameLen = strlen(pUsernameTemp);
+#else
 	pClient->clientData.options.pUsername = pNewConnectParams->pUsername;
 	pClient->clientData.options.usernameLen = pNewConnectParams->usernameLen;
+#endif
 	pClient->clientData.options.pPassword = pNewConnectParams->pPassword;
 	pClient->clientData.options.passwordLen = pNewConnectParams->passwordLen;
 	pClient->clientData.options.will.pTopicName = pNewConnectParams->will.pTopicName;

src/aws_iot_mqtt_client_connect.c

@@ -44,12 +44,6 @@ extern "C" {
 #include <aws_iot_mqtt_client.h>
 #include "aws_iot_mqtt_client_interface.h"
 #include "aws_iot_mqtt_client_common_internal.h"
-#include "aws_iot_version.h"
-
-#if !DISABLE_METRICS
-#define SDK_METRICS_LEN 25
-#define SDK_METRICS_TEMPLATE "?SDK=C&Version=%d.%d.%d"
-#endif
 
 typedef union {
 	uint8_t all;    /**< all connect flags */
@@ -464,9 +458,6 @@ static IoT_Error_t _aws_iot_mqtt_internal_connect(AWS_IoT_Client *pClient, IoT_C
 IoT_Error_t aws_iot_mqtt_connect(AWS_IoT_Client *pClient, IoT_Client_Connect_Params *pConnectParams) {
 	IoT_Error_t rc, disconRc;
 	ClientState clientState;
-#if !DISABLE_METRICS
-	char pUsernameTemp[SDK_METRICS_LEN] = {0};
-#endif
 	FUNC_ENTRY;
 
 	if(NULL == pClient) {
@@ -483,13 +474,6 @@ IoT_Error_t aws_iot_mqtt_connect(AWS_IoT_Client *pClient, IoT_Client_Connect_Par
 
 	aws_iot_mqtt_set_client_state(pClient, clientState, CLIENT_STATE_CONNECTING);
 
-#if !DISABLE_METRICS
-	if (NULL != pConnectParams) {
-		pConnectParams->usernameLen = snprintf(pUsernameTemp, SDK_METRICS_LEN, SDK_METRICS_TEMPLATE, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
-		pConnectParams->pUsername = (char*)&pUsernameTemp;
-	}
-#endif
-
 	rc = _aws_iot_mqtt_internal_connect(pClient, pConnectParams);
 
 	if(SUCCESS != rc) {

tests/unit/src/aws_iot_tests_unit_helper_functions.c

@@ -23,6 +23,13 @@
 #include "aws_iot_mqtt_client.h"
 #include "aws_iot_tests_unit_mock_tls_params.h"
 #include "aws_iot_tests_unit_helper_functions.h"
+#include "aws_iot_version.h"
+
+#if !DISABLE_METRICS
+#define SDK_METRICS_LEN 25
+#define SDK_METRICS_TEMPLATE "?SDK=C&Version=%d.%d.%d"
+static char pUsernameTemp[SDK_METRICS_LEN] = {0};
+#endif
 
 #define CONNACK_SUBACK_PACKET_SIZE 9
 #define PUBACK_PACKET_SIZE 4
@@ -402,7 +409,11 @@ bool isConnectTxBufFlagCorrect(IoT_Client_Connect_Params *settings, ConnectBuffe
 	bool ret = true;
 	int i;
 	unsigned char myByte[8]; // Construct our own connect flag byte according to the settings
+#if !DISABLE_METRICS
+	myByte[0] = (unsigned char) (1); // User Name Flag
+#else
 	myByte[0] = (unsigned char) (settings->pUsername == NULL ? 0 : 1); // User Name Flag
+#endif
 	myByte[1] = (unsigned char) (settings->pPassword == NULL ? 0 : 1); // Password Flag
 	myByte[2] = 0; // Will Retain
 	// QoS
@@ -433,7 +444,15 @@ bool isConnectTxBufPayloadCorrect(IoT_Client_Connect_Params *settings, unsigned
 	unsigned int ClientIDLen = (unsigned int) strlen(settings->pClientID);
 	unsigned int WillTopicLen = (unsigned int) strlen(settings->will.pTopicName);
 	unsigned int WillMsgLen = (unsigned int) strlen(settings->will.pMessage);
+#if !DISABLE_METRICS
+	if (0 == strlen(pUsernameTemp)) {
+		snprintf(pUsernameTemp, SDK_METRICS_LEN, SDK_METRICS_TEMPLATE,
+			 VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+	}
+	unsigned int UsernameLen = (unsigned int)strlen(pUsernameTemp);
+#else
 	unsigned int UsernameLen = (unsigned int) settings->usernameLen;
+#endif
 	unsigned int PasswordLen = (unsigned int) settings->passwordLen;
 	unsigned int myPayloadLen = ClientIDLen + 2 + WillTopicLen + 2 + WillMsgLen + UsernameLen + 2 + PasswordLen;
 	char *myPayload = (char *) malloc(sizeof(char) * (myPayloadLen + 1)); // reserve 1 byte for '\0'
@@ -468,12 +487,20 @@ bool isConnectTxBufPayloadCorrect(IoT_Client_Connect_Params *settings, unsigned
 		}
 	}
 	// Username
+#if !DISABLE_METRICS
+	for(i = 0; i < strlen(pUsernameTemp); i++)
+	{
+		*op = pUsernameTemp[i];
+		op++;
+	}
+#else
 	if(NULL != settings->pUsername) {
 		for(i = 0; i < UsernameLen; i++) {
 			*op = settings->pUsername[i];
 			op++;
 		}
 	}
+#endif
 	// PasswordLen + Password
 	if(NULL != settings->pPassword) {
 		*op = (char) (PasswordLen & 0x0FF00); // MSB