Imported Upstream version 0.9.2

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / canetworkconfigurator.c

diff --git a/resource/csdk/connectivity/src/canetworkconfigurator.c b/resource/csdk/connectivity/src/canetworkconfigurator.c
index c5a89bc..01e9d4d 100644 (file)
--- a/resource/csdk/connectivity/src/canetworkconfigurator.c
+++ b/resource/csdk/connectivity/src/canetworkconfigurator.c
@@ -21,19 +21,22 @@
 #include <stdlib.h>
 
 #include "canetworkconfigurator.h"
-#include "cainterfacecontroller_singlethread.h"
+#include "cainterfacecontroller.h"
 #include "uarraylist.h"
 #include "logger.h"
 
-#define TAG "CANW"
+#define TAG "CA_NW_CONFIG"
 
 static u_arraylist_t *g_selectedNetworkList = NULL;
-static uint32_t NETWORK_IP = CA_IPV4;
-static uint32_t NETWORK_EDR = CA_EDR;
-static uint32_t NETWORK_LE = CA_LE;
+static uint32_t NETWORK_IP = CA_ADAPTER_IP;
+static uint32_t NETWORK_RFCOMM = CA_ADAPTER_RFCOMM_BTEDR;
+static uint32_t NETWORK_GATT = CA_ADAPTER_GATT_BTLE;
 
+#ifdef RA_ADAPTER
+static uint32_t NETWORK_RA = CA_ADAPTER_REMOTE_ACCESS;
+#endif
 
-CAResult_t CAAddNetworkType(CATransportType_t transportType)
+CAResult_t CAAddNetworkType(CATransportAdapter_t transportType)
 {
     OIC_LOG(DEBUG, TAG, "IN");
     if (NULL == g_selectedNetworkList)
@@ -50,9 +53,7 @@ CAResult_t CAAddNetworkType(CATransportType_t transportType)
     CAResult_t res = CA_STATUS_OK;
     switch (transportType)
     {
-        case CA_IPV4:
-        {
-
+        case CA_ADAPTER_IP:
 #ifndef IP_ADAPTER
             OIC_LOG(DEBUG, TAG, "Add network type(IP) - Not Supported");
             return CA_NOT_SUPPORTED;
@@ -64,48 +65,50 @@ CAResult_t CAAddNetworkType(CATransportType_t transportType)
                 goto exit;
             }
             res = u_arraylist_add(g_selectedNetworkList, &NETWORK_IP);
-        }
-        break;
-        case CA_IPV6:
-        {
-            OIC_LOG(ERROR, TAG, "Currently IPV6 is not supported");
-            return CA_NOT_SUPPORTED;
-        }
-
-        case CA_EDR:
-        {
+            break;
 
+        case CA_ADAPTER_RFCOMM_BTEDR:
 #ifndef EDR_ADAPTER
             OIC_LOG(DEBUG, TAG, "Add network type(EDR) - Not Supported");
             return CA_NOT_SUPPORTED;
 #endif /* EDR_ADAPTER */
 
             OIC_LOG(DEBUG, TAG, "Add network type(EDR)");
-            if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_EDR))
+            if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_RFCOMM))
             {
                 goto exit;
             }
-            res = u_arraylist_add(g_selectedNetworkList, &NETWORK_EDR);
-        }
-        break;
-
-        case CA_LE:
-        {
+            res = u_arraylist_add(g_selectedNetworkList, &NETWORK_RFCOMM);
+            break;
 
+        case CA_ADAPTER_GATT_BTLE:
 #ifndef LE_ADAPTER
             OIC_LOG(DEBUG, TAG, "Add network type(LE) - Not Supported");
             return CA_NOT_SUPPORTED;
 #endif /* LE_ADAPTER */
 
             OIC_LOG(DEBUG, TAG, "Add network type(LE)");
-            if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_LE))
+            if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_GATT))
             {
                 goto exit;
             }
-            res = u_arraylist_add(g_selectedNetworkList, &NETWORK_LE);
-        }
-        break;
-
+            res = u_arraylist_add(g_selectedNetworkList, &NETWORK_GATT);
+            break;
+
+#ifdef RA_ADAPTER
+        case CA_ADAPTER_REMOTE_ACCESS:
+
+           OIC_LOG(DEBUG, TAG, "Add network type(RA)");
+           if (u_arraylist_contains(g_selectedNetworkList, &NETWORK_RA))
+           {
+               goto exit;
+           }
+           res = u_arraylist_add(g_selectedNetworkList, &NETWORK_RA);
+           break;
+#endif /* RA_ADAPTER */
+
+        default:
+            break;
     }
 
     if (CA_STATUS_OK != res)
@@ -114,7 +117,7 @@ CAResult_t CAAddNetworkType(CATransportType_t transportType)
         return res;
     }
     // start selected interface adapter
-    res = CAStartAdapter((CATransportType_t)transportType);
+    res = CAStartAdapter(transportType);
     OIC_LOG(DEBUG, TAG, "OUT");
     return res;
 
@@ -123,7 +126,7 @@ exit:
     return CA_STATUS_OK;
 }
 
-CAResult_t CARemoveNetworkType(CATransportType_t transportType)
+CAResult_t CARemoveNetworkType(CATransportAdapter_t transportType)
 {
     OIC_LOG(DEBUG, TAG, "IN");
 
@@ -143,14 +146,13 @@ CAResult_t CARemoveNetworkType(CATransportType_t transportType)
             continue;
         }
 
-        CATransportType_t connType = *(CATransportType_t *) ptrType;
+        CATransportAdapter_t connType = *(CATransportAdapter_t *)ptrType;
 
         if (transportType == connType)
         {
             switch (transportType)
             {
-                case CA_IPV4:
-
+                case CA_ADAPTER_IP:
 #ifndef IP_ADAPTER
                     OIC_LOG(DEBUG, TAG, "Remove network type(IP) - Not Supported");
                     return CA_NOT_SUPPORTED;
@@ -161,14 +163,7 @@ CAResult_t CARemoveNetworkType(CATransportType_t transportType)
 #endif /* IP_ADAPTER */
                     break;
 
-                case CA_IPV6:
-                {
-                    OIC_LOG(ERROR, TAG, "Currently IPV6 is not supported");
-                    return CA_NOT_SUPPORTED;
-                }
-
-                case CA_EDR:
-
+                case CA_ADAPTER_RFCOMM_BTEDR:
 #ifndef EDR_ADAPTER
                     OIC_LOG(DEBUG, TAG, "Remove network type(EDR) - Not Supported");
                     return CA_NOT_SUPPORTED;
@@ -176,11 +171,9 @@ CAResult_t CARemoveNetworkType(CATransportType_t transportType)
                     OIC_LOG(DEBUG, TAG, "Remove network type(EDR)");
                     u_arraylist_remove(g_selectedNetworkList, index);
 #endif /* EDR_ADAPTER */
-
                     break;
 
-                case CA_LE:
-
+                case CA_ADAPTER_GATT_BTLE:
 #ifndef LE_ADAPTER
                     OIC_LOG(DEBUG, TAG, "Remove network type(LE) - Not Supported");
                     return CA_NOT_SUPPORTED;
@@ -190,6 +183,15 @@ CAResult_t CARemoveNetworkType(CATransportType_t transportType)
 #endif /* LE_ADAPTER */
 
                     break;
+#ifdef RA_ADAPTER
+                case CA_ADAPTER_REMOTE_ACCESS:
+                    OIC_LOG(DEBUG, TAG, "Remove network type(RA)");
+                    u_arraylist_remove(g_selectedNetworkList, index);
+                    break;
+#endif /* RA_ADAPTER */
+
+                default:
+                    break;
             }
 
             // stop selected interface adapter
@@ -206,7 +208,7 @@ u_arraylist_t *CAGetSelectedNetworkList()
     return g_selectedNetworkList;
 }
 
-CAResult_t CAGetNetworkInformationInternal(CALocalConnectivity_t **info, uint32_t *size)
+CAResult_t CAGetNetworkInformationInternal(CAEndpoint_t **info, uint32_t *size)
 {
     OIC_LOG(DEBUG, TAG, "get network information.");