Fix for the issue reported in [IOT-1923]

There are invalid signed vs. unsigned checks in cainterfacecontroller. Those needs to be fixed.

Change-Id: I780203e68d66e170714356192ea2469dece4c5ed
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18055
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

diff --git a/resource/csdk/connectivity/src/cainterfacecontroller.c b/resource/csdk/connectivity/src/cainterfacecontroller.c
index 44245d8..4e6573c 100644 (file)
--- a/resource/csdk/connectivity/src/cainterfacecontroller.c
+++ b/resource/csdk/connectivity/src/cainterfacecontroller.c
@@ -58,16 +58,17 @@ static CANetworkPacketReceivedCallback g_networkPacketReceivedCallback = NULL;
 
 static CAErrorHandleCallback g_errorHandleCallback = NULL;
 
-static struct CANetworkCallback_t * g_networkChangeCallbackList = NULL;
+static struct CANetworkCallback_t *g_networkChangeCallbackList = NULL;
 
 /**
  * network callback structure is handling
  * for adapter state changed and connection state changed event.
  */
-typedef struct CANetworkCallback_t {
+typedef struct CANetworkCallback_t
+{
 
     /** Linked list; for multiple callback list.*/
-    struct CANetworkCallback_t * next;
+    struct CANetworkCallback_t *next;
 
     /** Adapter state changed event callback. */
     CAAdapterStateChangedCB adapter;
@@ -77,16 +78,17 @@ typedef struct CANetworkCallback_t {
 
 } CANetworkCallback_t;
 
-static size_t CAGetAdapterIndex(CATransportAdapter_t cType)
+static CAResult_t CAGetAdapterIndex(CATransportAdapter_t cType, size_t *adapterIndex)
 {
     for (size_t index = 0 ; index < g_numberOfAdapters ; index++)
     {
         if (cType == g_adapterHandler[index].cType )
-         {
-             return index;
-         }
+        {
+            *adapterIndex = index;
+            return CA_STATUS_OK;
+        }
     }
-    return -1;
+    return CA_STATUS_FAILED;
 }
 
 static void CARegisterCallback(CAConnectivityHandler_t handler)
@@ -107,7 +109,7 @@ static void CARegisterCallback(CAConnectivityHandler_t handler)
     }
     size_t numberofAdapters = g_numberOfAdapters + 1;
     CAConnectivityHandler_t *adapterHandler = OICRealloc(g_adapterHandler,
-                                   (numberofAdapters) * sizeof(*adapterHandler));
+            (numberofAdapters) * sizeof(*adapterHandler));
     if (NULL == adapterHandler)
     {
         OIC_LOG(ERROR, TAG, "Memory allocation failed during registration");
@@ -115,7 +117,7 @@ static void CARegisterCallback(CAConnectivityHandler_t handler)
     }
     g_adapterHandler = adapterHandler;
     g_numberOfAdapters = numberofAdapters;
-    g_adapterHandler[g_numberOfAdapters-1] = handler;
+    g_adapterHandler[g_numberOfAdapters - 1] = handler;
 
     OIC_LOG_V(DEBUG, TAG, "%d type adapter, register complete!", handler.cType);
 }
@@ -130,7 +132,7 @@ static void CARegisterCallback(CAConnectivityHandler_t handler)
  *     CAResult_t
  */
 static CAResult_t AddNetworkStateChangedCallback(CAAdapterStateChangedCB adapterCB,
-                                                 CAConnectionStateChangedCB connCB)
+        CAConnectionStateChangedCB connCB)
 {
     OIC_LOG(DEBUG, TAG, "Add NetworkStateChanged Callback");
 
@@ -148,7 +150,7 @@ static CAResult_t AddNetworkStateChangedCallback(CAAdapterStateChangedCB adapter
     }
 #endif
 
-    CANetworkCallback_t* callback = NULL;
+    CANetworkCallback_t *callback = NULL;
     LL_FOREACH(g_networkChangeCallbackList, callback)
     {
         if (callback && adapterCB == callback->adapter && connCB == callback->conn)
@@ -184,11 +186,11 @@ static CAResult_t AddNetworkStateChangedCallback(CAAdapterStateChangedCB adapter
  *     CAResult_t
  */
 static CAResult_t RemoveNetworkStateChangedCallback(CAAdapterStateChangedCB adapterCB,
-                                                    CAConnectionStateChangedCB connCB)
+        CAConnectionStateChangedCB connCB)
 {
     OIC_LOG(DEBUG, TAG, "Remove NetworkStateChanged Callback");
 
-    CANetworkCallback_t* callback = NULL;
+    CANetworkCallback_t *callback = NULL;
     LL_FOREACH(g_networkChangeCallbackList, callback)
     {
         if (callback && adapterCB == callback->adapter && connCB == callback->conn)
@@ -209,7 +211,7 @@ static void RemoveAllNetworkStateChangedCallback()
 {
     OIC_LOG(DEBUG, TAG, "Remove All NetworkStateChanged Callback");
 
-    CANetworkCallback_t* callback = NULL;
+    CANetworkCallback_t *callback = NULL;
     LL_FOREACH(g_networkChangeCallbackList, callback)
     {
         OIC_LOG(DEBUG, TAG, "remove all callbacks");
@@ -242,7 +244,7 @@ static void CAReceivedPacketCallback(const CASecureEndpoint_t *sep,
 static void CAAdapterChangedCallback(CATransportAdapter_t adapter, CANetworkStatus_t status)
 {
     // Call the callback.
-    CANetworkCallback_t* callback  = NULL;
+    CANetworkCallback_t *callback  = NULL;
     LL_FOREACH(g_networkChangeCallbackList, callback)
     {
         if (callback && callback->adapter)
@@ -264,7 +266,7 @@ static void CAAdapterChangedCallback(CATransportAdapter_t adapter, CANetworkStat
 static void CAConnectionChangedCallback(const CAEndpoint_t *info, bool isConnected)
 {
     // Call the callback.
-    CANetworkCallback_t* callback = NULL;
+    CANetworkCallback_t *callback = NULL;
     LL_FOREACH(g_networkChangeCallbackList, callback)
     {
         if (callback && callback->conn)
@@ -277,8 +279,8 @@ static void CAConnectionChangedCallback(const CAEndpoint_t *info, bool isConnect
 #endif
 
 static void CAAdapterErrorHandleCallback(const CAEndpoint_t *endpoint,
-                                         const void *data, size_t dataLen,
-                                         CAResult_t result)
+        const void *data, size_t dataLen,
+        CAResult_t result)
 {
     OIC_LOG(DEBUG, TAG, "received error from adapter in interfacecontroller");
 
@@ -296,7 +298,7 @@ void CAInitializeAdapters(ca_thread_pool_t handle, CATransportAdapter_t transpor
     // Initialize adapters and register callback.
 #ifdef IP_ADAPTER
     if ((transportType & CA_ADAPTER_IP) || (CA_DEFAULT_ADAPTER == transportType)
-            || (transportType & CA_ALL_ADAPTERS))
+        || (transportType & CA_ALL_ADAPTERS))
     {
         CAInitializeIP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback,
                        CAAdapterErrorHandleCallback, handle);
@@ -305,7 +307,7 @@ void CAInitializeAdapters(ca_thread_pool_t handle, CATransportAdapter_t transpor
 
 #ifdef EDR_ADAPTER
     if ((transportType & CA_ADAPTER_RFCOMM_BTEDR) || (CA_DEFAULT_ADAPTER == transportType)
-            || (transportType == CA_ALL_ADAPTERS))
+        || (transportType == CA_ALL_ADAPTERS))
     {
         CAInitializeEDR(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback,
                         CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle);
@@ -314,7 +316,7 @@ void CAInitializeAdapters(ca_thread_pool_t handle, CATransportAdapter_t transpor
 
 #ifdef LE_ADAPTER
     if ((transportType & CA_ADAPTER_GATT_BTLE) || (CA_DEFAULT_ADAPTER == transportType)
-            || (transportType == CA_ALL_ADAPTERS))
+        || (transportType == CA_ALL_ADAPTERS))
     {
         CAInitializeLE(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback,
                        CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle);
@@ -323,7 +325,7 @@ void CAInitializeAdapters(ca_thread_pool_t handle, CATransportAdapter_t transpor
 
 #ifdef RA_ADAPTER
     if ((transportType & CA_ADAPTER_REMOTE_ACCESS) || (CA_DEFAULT_ADAPTER == transportType)
-            || (transportType == CA_ALL_ADAPTERS))
+        || (transportType == CA_ALL_ADAPTERS))
     {
         CAInitializeRA(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback,
                        handle);
@@ -332,7 +334,7 @@ void CAInitializeAdapters(ca_thread_pool_t handle, CATransportAdapter_t transpor
 
 #ifdef TCP_ADAPTER
     if ((transportType & CA_ADAPTER_TCP) || (CA_DEFAULT_ADAPTER == transportType)
-            || (transportType == CA_ALL_ADAPTERS))
+        || (transportType == CA_ALL_ADAPTERS))
     {
         CAInitializeTCP(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback,
                         CAConnectionChangedCallback, CAAdapterErrorHandleCallback, handle);
@@ -341,7 +343,7 @@ void CAInitializeAdapters(ca_thread_pool_t handle, CATransportAdapter_t transpor
 
 #ifdef NFC_ADAPTER
     if ((transportType & CA_ADAPTER_NFC) || (CA_DEFAULT_ADAPTER == transportType)
-            || (transportType == CA_ALL_ADAPTERS))
+        || (transportType == CA_ALL_ADAPTERS))
     {
         CAInitializeNFC(CARegisterCallback, CAReceivedPacketCallback, CAAdapterChangedCallback,
                         CAAdapterErrorHandleCallback, handle);
@@ -370,7 +372,7 @@ CAResult_t CASetNetworkMonitorCallbacks(CAAdapterStateChangedCB adapterCB,
 }
 
 CAResult_t CAUnsetNetworkMonitorCallbacks(CAAdapterStateChangedCB adapterCB,
-                                          CAConnectionStateChangedCB connCB)
+        CAConnectionStateChangedCB connCB)
 {
     OIC_LOG(DEBUG, TAG, "Unset network monitoring callback");
     CAResult_t res = RemoveNetworkStateChangedCallback(adapterCB, connCB);
@@ -390,16 +392,18 @@ void CASetErrorHandleCallback(CAErrorHandleCallback errorCallback)
 
 CAResult_t CAStartAdapter(CATransportAdapter_t transportType)
 {
+    size_t index = 0;
+    CAResult_t res = CA_STATUS_FAILED;
+
     OIC_LOG_V(DEBUG, TAG, "Start the adapter of CAConnectivityType[%d]", transportType);
 
-    size_t index = CAGetAdapterIndex(transportType);
-    if (0 > index)
+    res = CAGetAdapterIndex(transportType, &index);
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "unknown connectivity type!");
         return CA_STATUS_FAILED;
     }
 
-    CAResult_t res = CA_STATUS_FAILED;
     if (g_adapterHandler[index].startAdapter != NULL)
     {
         res = g_adapterHandler[index].startAdapter();
@@ -410,10 +414,13 @@ CAResult_t CAStartAdapter(CATransportAdapter_t transportType)
 
 void CAStopAdapter(CATransportAdapter_t transportType)
 {
+    size_t index = 0;
+    CAResult_t res = CA_STATUS_FAILED;
+
     OIC_LOG_V(DEBUG, TAG, "Stop the adapter of CATransportType[%d]", transportType);
 
-    size_t index = CAGetAdapterIndex(transportType);
-    if (0 > index)
+    res = CAGetAdapterIndex(transportType, &index);
+    if (CA_STATUS_OK != res)
     {
         OIC_LOG(ERROR, TAG, "unknown transport type!");
         return;
@@ -430,13 +437,13 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, size_t *size)
     VERIFY_NON_NULL(info, TAG, "info is null");
     VERIFY_NON_NULL(size, TAG, "size is null");
 
-    CAEndpoint_t **tempInfo = (CAEndpoint_t**) OICCalloc(g_numberOfAdapters, sizeof(*tempInfo));
+    CAEndpoint_t **tempInfo = (CAEndpoint_t **) OICCalloc(g_numberOfAdapters, sizeof(*tempInfo));
     if (!tempInfo)
     {
         OIC_LOG(ERROR, TAG, "Out of memory!");
         return CA_MEMORY_ALLOC_FAILED;
     }
-    size_t *tempSize = (size_t*)OICCalloc(g_numberOfAdapters, sizeof(*tempSize));
+    size_t *tempSize = (size_t *)OICCalloc(g_numberOfAdapters, sizeof(*tempSize));
     if (!tempSize)
     {
         OIC_LOG(ERROR, TAG, "Out of memory!");
@@ -452,7 +459,7 @@ CAResult_t CAGetNetworkInfo(CAEndpoint_t **info, size_t *size)
         {
             // #1. get information for each adapter
             res = g_adapterHandler[index].GetnetInfo(&tempInfo[index],
-                                                     &tempSize[index]);
+                    &tempSize[index]);
 
             // #2. total size
             if (res == CA_STATUS_OK)
@@ -535,6 +542,9 @@ memory_error_exit:
 CAResult_t CASendUnicastData(const CAEndpoint_t *endpoint, const void *data, uint32_t length,
                              CADataType_t dataType)
 {
+    size_t index = 0;
+    CAResult_t res = CA_STATUS_FAILED;
+
     VERIFY_NON_NULL(endpoint, TAG, "endpoint is null");
 
     u_arraylist_t *list = CAGetSelectedNetworkList();
@@ -547,7 +557,7 @@ CAResult_t CASendUnicastData(const CAEndpoint_t *endpoint, const void *data, uin
 
     for (size_t i = 0; i < u_arraylist_length(list); i++)
     {
-        void* ptrType = u_arraylist_get(list, i);
+        void *ptrType = u_arraylist_get(list, i);
 
         if (NULL == ptrType)
         {
@@ -560,9 +570,8 @@ CAResult_t CASendUnicastData(const CAEndpoint_t *endpoint, const void *data, uin
             continue;
         }
 
-        size_t index = CAGetAdapterIndex(connType);
-
-        if (-1 == index)
+        res = CAGetAdapterIndex(connType, &index);
+        if (CA_STATUS_OK != res)
         {
             OIC_LOG(ERROR, TAG, "unknown transport type!");
             return CA_STATUS_INVALID_PARAM;
@@ -593,6 +602,9 @@ CAResult_t CASendUnicastData(const CAEndpoint_t *endpoint, const void *data, uin
 CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, uint32_t length,
                                CADataType_t dataType)
 {
+    size_t index = 0;
+    CAResult_t res = CA_STATUS_FAILED;
+
     VERIFY_NON_NULL(endpoint, TAG, "endpoint is null");
 
     u_arraylist_t *list = CAGetSelectedNetworkList();
@@ -606,7 +618,7 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u
     size_t selectedLength = u_arraylist_length(list);
     for (size_t i = 0; i < selectedLength; i++)
     {
-        void* ptrType = u_arraylist_get(list, i);
+        void *ptrType = u_arraylist_get(list, i);
 
         if (NULL == ptrType)
         {
@@ -619,8 +631,8 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u
             continue;
         }
 
-        size_t index = CAGetAdapterIndex(connType);
-        if (0 > index)
+        res = CAGetAdapterIndex(connType, &index);
+        if (CA_STATUS_OK != res)
         {
             OIC_LOG(ERROR, TAG, "unknown connectivity type!");
             continue;
@@ -656,6 +668,7 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u
 
 CAResult_t CAStartListeningServerAdapters()
 {
+    size_t index = 0;
     CAResult_t result = CA_STATUS_FAILED;
 
     u_arraylist_t *list = CAGetSelectedNetworkList();
@@ -668,17 +681,16 @@ CAResult_t CAStartListeningServerAdapters()
     size_t length = u_arraylist_length(list);
     for (size_t i = 0; i < length; i++)
     {
-        void* ptrType = u_arraylist_get(list, i);
+        void *ptrType = u_arraylist_get(list, i);
 
-        if(ptrType == NULL)
+        if (ptrType == NULL)
         {
             continue;
         }
 
         CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType;
 
-        size_t index = CAGetAdapterIndex(connType);
-        if (0 > index)
+        if (CA_STATUS_OK != CAGetAdapterIndex(connType, &index))
         {
             OIC_LOG(ERROR, TAG, "unknown connectivity type!");
             continue;
@@ -702,6 +714,8 @@ CAResult_t CAStartListeningServerAdapters()
 
 CAResult_t CAStopListeningServerAdapters()
 {
+    size_t index = 0;
+    CAResult_t res = CA_STATUS_FAILED;
     u_arraylist_t *list = CAGetSelectedNetworkList();
     if (!list)
     {
@@ -712,16 +726,16 @@ CAResult_t CAStopListeningServerAdapters()
     size_t length = u_arraylist_length(list);
     for (size_t i = 0; i < length; i++)
     {
-        void* ptrType = u_arraylist_get(list, i);
-        if(ptrType == NULL)
+        void *ptrType = u_arraylist_get(list, i);
+        if (ptrType == NULL)
         {
             continue;
         }
 
         CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType;
 
-        size_t index = CAGetAdapterIndex(connType);
-        if (0 > index)
+        res = CAGetAdapterIndex(connType, &index);
+        if (CA_STATUS_OK != res)
         {
             OIC_LOG(ERROR, TAG, "unknown connectivity type!");
             continue;
@@ -738,6 +752,7 @@ CAResult_t CAStopListeningServerAdapters()
 
 CAResult_t CAStartDiscoveryServerAdapters()
 {
+    size_t index = 0;
     CAResult_t result = CA_STATUS_FAILED;
 
     u_arraylist_t *list = CAGetSelectedNetworkList();
@@ -751,17 +766,16 @@ CAResult_t CAStartDiscoveryServerAdapters()
     size_t length = u_arraylist_length(list);
     for (size_t i = 0; i < length; i++)
     {
-        void* ptrType = u_arraylist_get(list, i);
+        void *ptrType = u_arraylist_get(list, i);
 
-        if(ptrType == NULL)
+        if (ptrType == NULL)
         {
             continue;
         }
 
         CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType;
 
-        size_t index = CAGetAdapterIndex(connType);
-        if (0 > index)
+        if (CA_STATUS_OK != CAGetAdapterIndex(connType, &index))
         {
             OIC_LOG(DEBUG, TAG, "unknown connectivity type!");
             continue;
@@ -816,6 +830,8 @@ void CATerminateAdapters()
 #ifdef SINGLE_THREAD
 CAResult_t CAReadData()
 {
+    size_t index = 0;
+    CAResult_t res = CA_STATUS_FAILED;
     u_arraylist_t *list = CAGetSelectedNetworkList();
 
     if (!list)
@@ -835,8 +851,8 @@ CAResult_t CAReadData()
 
         CATransportAdapter_t connType = *(CATransportAdapter_t *) ptrType;
 
-        size_t index = CAGetAdapterIndex(connType);
-        if (0 > index)
+        res = CAGetAdapterIndex(connType, &index);
+        if (CA_STATUS_OK != res)
         {
             OIC_LOG(DEBUG, TAG, "unknown connectivity type!");
             continue;