Merge "Suppose Device trying to connect with a wifi router which does not support...

[platform/core/api/connection.git] / src / connection_profile.c

diff --git a/src/connection_profile.c b/src/connection_profile.c
index cb631cf..eadfded 100755 (executable)
--- a/src/connection_profile.c
+++ b/src/connection_profile.c
@@ -22,6 +22,7 @@
 #include <vconf/vconf.h>
 
 #include "net_connection_private.h"
+#include "connection_extension.h"
 
 #define HTTP_PROXY "http_proxy"
 #define MAX_PREFIX_LENGTH 6
@@ -37,6 +38,8 @@ static net_dev_info_t* __profile_get_net_info(net_profile_info_t *profile_info)
                return &profile_info->ProfileInfo.Ethernet.net_info; //LCOV_EXCL_LINE
        case NET_DEVICE_BLUETOOTH:
                return &profile_info->ProfileInfo.Bluetooth.net_info;
+       case NET_DEVICE_MESH:
+               return &profile_info->ProfileInfo.Mesh.net_info;
        case NET_DEVICE_DEFAULT:
        case NET_DEVICE_USB:
        case NET_DEVICE_UNKNOWN:
@@ -372,6 +375,9 @@ EXPORT_API int connection_profile_get_name(connection_profile_h profile, char**
                bt_name++;
                *profile_name = g_strdup(bt_name);
        } break;
+       case NET_DEVICE_MESH:
+               *profile_name = g_strdup(profile_info->ProfileInfo.Mesh.essid);
+               break;
        default:
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
@@ -406,6 +412,9 @@ EXPORT_API int connection_profile_get_type(connection_profile_h profile, connect
        case NET_DEVICE_BLUETOOTH:
                *type = CONNECTION_PROFILE_TYPE_BT;
                break;
+       case NET_DEVICE_MESH:
+               *type = CONNECTION_PROFILE_TYPE_MESH;
+               break;
        default:
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid profile type");
                return CONNECTION_ERROR_OPERATION_FAILED;
@@ -1161,10 +1170,15 @@ EXPORT_API int connection_profile_get_wifi_essid(connection_profile_h profile, c
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_WIFI)
+       if (profile_info->profile_type != NET_DEVICE_WIFI &&
+                               profile_info->profile_type != NET_DEVICE_MESH)
                return CONNECTION_ERROR_INVALID_PARAMETER;
 
-       *essid = g_strdup(profile_info->ProfileInfo.Wlan.essid);
+       if (profile_info->profile_type == NET_DEVICE_WIFI)
+               *essid = g_strdup(profile_info->ProfileInfo.Wlan.essid);
+       else
+               *essid = g_strdup(profile_info->ProfileInfo.Mesh.essid);
+
        if (*essid == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
 
@@ -1182,10 +1196,15 @@ EXPORT_API int connection_profile_get_wifi_bssid(connection_profile_h profile, c
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_WIFI)
+       if (profile_info->profile_type != NET_DEVICE_WIFI &&
+                               profile_info->profile_type != NET_DEVICE_MESH)
                return CONNECTION_ERROR_INVALID_PARAMETER;
 
-       *bssid = g_strdup(profile_info->ProfileInfo.Wlan.bssid);
+       if (profile_info->profile_type == NET_DEVICE_WIFI)
+               *bssid = g_strdup(profile_info->ProfileInfo.Wlan.bssid);
+       else
+               *bssid = g_strdup(profile_info->ProfileInfo.Mesh.bssid);
+
        if (*bssid == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
 
@@ -1203,10 +1222,15 @@ EXPORT_API int connection_profile_get_wifi_rssi(connection_profile_h profile, in
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_WIFI)
+       if (profile_info->profile_type != NET_DEVICE_WIFI &&
+                               profile_info->profile_type != NET_DEVICE_MESH)
                return CONNECTION_ERROR_INVALID_PARAMETER;
 
-       *rssi = (int)profile_info->ProfileInfo.Wlan.Strength;
+       if (profile_info->profile_type == NET_DEVICE_WIFI)
+               *rssi = (int)profile_info->ProfileInfo.Wlan.Strength;
+       else
+               *rssi = (int)profile_info->ProfileInfo.Mesh.Strength;
+
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1222,10 +1246,15 @@ EXPORT_API int connection_profile_get_wifi_frequency(connection_profile_h profil
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_WIFI)
+       if (profile_info->profile_type != NET_DEVICE_WIFI &&
+                               profile_info->profile_type != NET_DEVICE_MESH)
                return CONNECTION_ERROR_INVALID_PARAMETER;
 
-       *frequency = (int)profile_info->ProfileInfo.Wlan.frequency;
+       if (profile_info->profile_type == NET_DEVICE_WIFI)
+               *frequency = (int)profile_info->ProfileInfo.Wlan.frequency;
+       else
+               *frequency = (int)profile_info->ProfileInfo.Mesh.frequency;
+
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1260,10 +1289,17 @@ EXPORT_API int connection_profile_get_wifi_security_type(connection_profile_h pr
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_WIFI)
+       wlan_security_mode_type_t sec_mode;
+       if (profile_info->profile_type != NET_DEVICE_WIFI &&
+                               profile_info->profile_type != NET_DEVICE_MESH)
                return CONNECTION_ERROR_INVALID_PARAMETER;
 
-       switch (profile_info->ProfileInfo.Wlan.security_info.sec_mode) {
+       if (profile_info->profile_type == NET_DEVICE_WIFI)
+               sec_mode = profile_info->ProfileInfo.Wlan.security_info.sec_mode;
+       else
+               sec_mode = profile_info->ProfileInfo.Mesh.security_info.sec_mode;
+
+       switch (sec_mode) {
        //LCOV_EXCL_START
        case WLAN_SEC_MODE_NONE:
                *type = CONNECTION_WIFI_SECURITY_TYPE_NONE;
@@ -1280,6 +1316,9 @@ EXPORT_API int connection_profile_get_wifi_security_type(connection_profile_h pr
        case WLAN_SEC_MODE_WPA2_PSK:
                *type = CONNECTION_WIFI_SECURITY_TYPE_WPA2_PSK;
                break;
+       case WLAN_SEC_MODE_SAE:
+               *type = CONNECTION_WIFI_SECURITY_TYPE_SAE;
+               break;
        default:
                return CONNECTION_ERROR_OPERATION_FAILED;
        //LCOV_EXCL_STOP
@@ -1338,7 +1377,9 @@ EXPORT_API int connection_profile_is_wifi_passphrase_required(connection_profile
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_WIFI)
+       wlan_security_mode_type_t sec_mode;
+       if (profile_info->profile_type != NET_DEVICE_WIFI &&
+                               profile_info->profile_type != NET_DEVICE_MESH)
                return CONNECTION_ERROR_INVALID_PARAMETER;
 
        if (profile_info->Favourite) {
@@ -1346,7 +1387,12 @@ EXPORT_API int connection_profile_is_wifi_passphrase_required(connection_profile
                return CONNECTION_ERROR_NONE;
        }
 
-       switch (profile_info->ProfileInfo.Wlan.security_info.sec_mode) {
+       if (profile_info->profile_type == NET_DEVICE_WIFI)
+               sec_mode = profile_info->ProfileInfo.Wlan.security_info.sec_mode;
+       else
+               sec_mode = profile_info->ProfileInfo.Mesh.security_info.sec_mode;
+
+       switch (sec_mode) {
        //LCOV_EXCL_START
        case WLAN_SEC_MODE_NONE:
                *required = false;
@@ -1355,6 +1401,7 @@ EXPORT_API int connection_profile_is_wifi_passphrase_required(connection_profile
        case WLAN_SEC_MODE_IEEE8021X:
        case WLAN_SEC_MODE_WPA_PSK:
        case WLAN_SEC_MODE_WPA2_PSK:
+       case WLAN_SEC_MODE_SAE:
                *required = true;
                break;
        default:
@@ -1376,11 +1423,16 @@ EXPORT_API int connection_profile_set_wifi_passphrase(connection_profile_h profi
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_WIFI)
+       if (profile_info->profile_type != NET_DEVICE_WIFI &&
+                               profile_info->profile_type != NET_DEVICE_MESH)
                return CONNECTION_ERROR_INVALID_PARAMETER;
 
-       g_strlcpy(profile_info->ProfileInfo.Wlan.security_info.authentication.psk.pskKey,
-                                               passphrase, NETPM_WLAN_MAX_PSK_PASSPHRASE_LEN);
+       if (profile_info->profile_type == NET_DEVICE_WIFI)
+               g_strlcpy(profile_info->ProfileInfo.Wlan.security_info.authentication.psk.pskKey,
+                                 passphrase, NETPM_WLAN_MAX_PSK_PASSPHRASE_LEN);
+       else
+               g_strlcpy(profile_info->ProfileInfo.Mesh.security_info.authentication.sae.saeKey,
+                                 passphrase, NETPM_WLAN_MAX_PSK_PASSPHRASE_LEN);
 
        return CONNECTION_ERROR_NONE;
 }