projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
connectivity
/
src
/
ip_adapter
/
linux
/
caipnwmonitor.c
diff --git
a/resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c
b/resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c
index
b4e840d
..
802e41a
100644
(file)
--- a/
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c
+++ b/
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c
@@
-39,7
+39,7
@@
#include <linux/rtnetlink.h>
#endif
#include <linux/rtnetlink.h>
#endif
-#include "
camutex
.h"
+#include "
octhread
.h"
#include "caipnwmonitor.h"
#include "caadapterutils.h"
#include "logger.h"
#include "caipnwmonitor.h"
#include "caadapterutils.h"
#include "logger.h"
@@
-52,7
+52,7
@@
/**
* Mutex for synchronizing access to cached interface and IP address information.
*/
/**
* Mutex for synchronizing access to cached interface and IP address information.
*/
-static
ca
_mutex g_networkMonitorContextMutex = NULL;
+static
oc
_mutex g_networkMonitorContextMutex = NULL;
/**
* Used to storing network interface.
/**
* Used to storing network interface.
@@
-104,10
+104,10
@@
static CAResult_t CAIPInitializeNetworkMonitorList()
{
if (!g_networkMonitorContextMutex)
{
{
if (!g_networkMonitorContextMutex)
{
- g_networkMonitorContextMutex =
ca
_mutex_new();
+ g_networkMonitorContextMutex =
oc
_mutex_new();
if (!g_networkMonitorContextMutex)
{
if (!g_networkMonitorContextMutex)
{
- OIC_LOG(ERROR, TAG, "
ca
_mutex_new has failed");
+ OIC_LOG(ERROR, TAG, "
oc
_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
return CA_STATUS_FAILED;
}
}
@@
-135,7
+135,7
@@
static void CAIPDestroyNetworkMonitorList()
if (g_networkMonitorContextMutex)
{
if (g_networkMonitorContextMutex)
{
-
ca
_mutex_free(g_networkMonitorContextMutex);
+
oc
_mutex_free(g_networkMonitorContextMutex);
g_networkMonitorContextMutex = NULL;
}
}
g_networkMonitorContextMutex = NULL;
}
}
@@
-148,7
+148,7
@@
static bool CACmpNetworkList(uint32_t ifiindex)
return false;
}
return false;
}
-
ca
_mutex_lock(g_networkMonitorContextMutex);
+
oc
_mutex_lock(g_networkMonitorContextMutex);
uint32_t list_length = u_arraylist_length(g_netInterfaceList);
for (uint32_t list_index = 0; list_index < list_length; list_index++)
uint32_t list_length = u_arraylist_length(g_netInterfaceList);
for (uint32_t list_index = 0; list_index < list_length; list_index++)
@@
-157,11
+157,11
@@
static bool CACmpNetworkList(uint32_t ifiindex)
list_index);
if (currItem->index == ifiindex)
{
list_index);
if (currItem->index == ifiindex)
{
-
ca
_mutex_unlock(g_networkMonitorContextMutex);
+
oc
_mutex_unlock(g_networkMonitorContextMutex);
return true;
}
}
return true;
}
}
-
ca
_mutex_unlock(g_networkMonitorContextMutex);
+
oc
_mutex_unlock(g_networkMonitorContextMutex);
return false;
}
return false;
}
@@
-170,15
+170,15
@@
static CAResult_t CAAddNetworkMonitorList(CAInterface_t *ifitem)
VERIFY_NON_NULL(g_netInterfaceList, TAG, "g_netInterfaceList is NULL");
VERIFY_NON_NULL(ifitem, TAG, "ifitem is NULL");
VERIFY_NON_NULL(g_netInterfaceList, TAG, "g_netInterfaceList is NULL");
VERIFY_NON_NULL(ifitem, TAG, "ifitem is NULL");
-
ca
_mutex_lock(g_networkMonitorContextMutex);
+
oc
_mutex_lock(g_networkMonitorContextMutex);
bool result = u_arraylist_add(g_netInterfaceList, (void *) ifitem);
if (!result)
{
OIC_LOG(ERROR, TAG, "u_arraylist_add failed.");
bool result = u_arraylist_add(g_netInterfaceList, (void *) ifitem);
if (!result)
{
OIC_LOG(ERROR, TAG, "u_arraylist_add failed.");
-
ca
_mutex_unlock(g_networkMonitorContextMutex);
+
oc
_mutex_unlock(g_networkMonitorContextMutex);
return CA_STATUS_FAILED;
}
return CA_STATUS_FAILED;
}
-
ca
_mutex_unlock(g_networkMonitorContextMutex);
+
oc
_mutex_unlock(g_networkMonitorContextMutex);
return CA_STATUS_OK;
}
return CA_STATUS_OK;
}
@@
-186,7
+186,7
@@
static void CARemoveNetworkMonitorList(int ifiindex)
{
VERIFY_NON_NULL_VOID(g_netInterfaceList, TAG, "g_netInterfaceList is NULL");
{
VERIFY_NON_NULL_VOID(g_netInterfaceList, TAG, "g_netInterfaceList is NULL");
-
ca
_mutex_lock(g_networkMonitorContextMutex);
+
oc
_mutex_lock(g_networkMonitorContextMutex);
uint32_t list_length = u_arraylist_length(g_netInterfaceList);
for (uint32_t list_index = 0; list_index < list_length; list_index++)
uint32_t list_length = u_arraylist_length(g_netInterfaceList);
for (uint32_t list_index = 0; list_index < list_length; list_index++)
@@
-198,13
+198,13
@@
static void CARemoveNetworkMonitorList(int ifiindex)
if (u_arraylist_remove(g_netInterfaceList, list_index))
{
OICFree(removedifitem);
if (u_arraylist_remove(g_netInterfaceList, list_index))
{
OICFree(removedifitem);
-
ca
_mutex_unlock(g_networkMonitorContextMutex);
+
oc
_mutex_unlock(g_networkMonitorContextMutex);
return;
}
continue;
}
}
return;
}
continue;
}
}
-
ca
_mutex_unlock(g_networkMonitorContextMutex);
+
oc
_mutex_unlock(g_networkMonitorContextMutex);
return;
}
return;
}
@@
-238,6
+238,7
@@
static void CAIPPassNetworkChangesToAdapter(CANetworkStatus_t status)
if (cbitem && cbitem->adapter)
{
cbitem->callback(cbitem->adapter, status);
if (cbitem && cbitem->adapter)
{
cbitem->callback(cbitem->adapter, status);
+ CALogAdapterStateInfo(cbitem->adapter, status);
}
}
}
}
}
}
@@
-470,11
+471,15
@@
u_arraylist_t *CAIPGetInterfaceInformation(int desiredIndex)
OIC_LOG_V(DEBUG, TAG, "Added interface: %s (%d)", ifitem->name, ifitem->family);
}
}
OIC_LOG_V(DEBUG, TAG, "Added interface: %s (%d)", ifitem->name, ifitem->family);
}
}
+#ifndef __TIZENRT__
freeifaddrs(ifp);
freeifaddrs(ifp);
+#endif
return iflist;
exit:
return iflist;
exit:
+#ifndef __TIZENRT__
freeifaddrs(ifp);
freeifaddrs(ifp);
+#endif
u_arraylist_destroy(iflist);
return NULL;
}
u_arraylist_destroy(iflist);
return NULL;
}