Apply coding rule
[platform/core/api/connection.git] / src / connection_profile.c
old mode 100644 (file)
new mode 100755 (executable)
index 922bc18..f63582e
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 
+#include <glib.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <arpa/inet.h>
-#include <glib.h>
 #include <vconf/vconf.h>
+
 #include "net_connection_private.h"
 
 #define HTTP_PROXY "http_proxy"
+#define MAX_PREFIX_LENGTH 6
 
 static net_dev_info_t* __profile_get_net_info(net_profile_info_t *profile_info)
 {
@@ -44,15 +46,26 @@ static net_dev_info_t* __profile_get_net_info(net_profile_info_t *profile_info)
        }
 }
 
-static char* __profile_convert_ip_to_string(net_addr_t *ip_addr)
+static char *__profile_convert_ip_to_string(net_addr_t *ip_addr, connection_address_family_e address_family)
 {
-       unsigned char *ipaddr = (unsigned char *)&ip_addr->Data.Ipv4.s_addr;
+       unsigned char *ipaddr = NULL;
+       char *ipstr = NULL;
 
-       char *ipstr = g_try_malloc0(16);
-       if (ipstr == NULL)
-               return NULL;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) {
+               ipaddr = (unsigned char *)&ip_addr->Data.Ipv4.s_addr;
+               ipstr = g_try_malloc0(INET_ADDRSTRLEN);
+               if (ipstr == NULL)
+                       return NULL;
 
-       snprintf(ipstr, 16, "%d.%d.%d.%d", ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
+               inet_ntop(AF_INET, ipaddr, ipstr, INET_ADDRSTRLEN);
+       } else {
+               ipaddr = (unsigned char *)&ip_addr->Data.Ipv6.s6_addr;
+               ipstr = g_try_malloc0(INET6_ADDRSTRLEN);
+               if (ipstr == NULL)
+                               return NULL;
+
+               inet_ntop(AF_INET6, ipaddr, ipstr, INET6_ADDRSTRLEN);
+       }
 
        return ipstr;
 }
@@ -92,9 +105,9 @@ static const char* __profile_get_ethernet_proxy(void)
 {
        char *proxy;
 
-       proxy = getenv(HTTP_PROXY);
+       proxy = vconf_get_str(VCONFKEY_NETWORK_PROXY);
 
-       if(proxy == NULL) {
+       if (proxy == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Fail to get system proxy");
                return NULL;
        }
@@ -195,12 +208,32 @@ net_state_type_t _connection_profile_convert_to_net_state(connection_profile_sta
 /* Connection profile ********************************************************/
 EXPORT_API int connection_profile_create(connection_profile_type_e type, const char* keyword, connection_profile_h* profile)
 {
-       if ((type != CONNECTION_PROFILE_TYPE_CELLULAR &&
-            type != CONNECTION_PROFILE_TYPE_WIFI) || profile == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE);
+
+       if (type == CONNECTION_PROFILE_TYPE_CELLULAR)
+               CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+       else if (type == CONNECTION_PROFILE_TYPE_WIFI)
+               CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
+       if (type != CONNECTION_PROFILE_TYPE_CELLULAR &&
+            type != CONNECTION_PROFILE_TYPE_WIFI) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       if (profile == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
+       int rv  = _connection_libnet_check_profile_privilege();
+       if (rv == CONNECTION_ERROR_PERMISSION_DENIED)
+               return rv;
+       else if (rv != CONNECTION_ERROR_NONE) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Failed to create profile");
+               return CONNECTION_ERROR_OPERATION_FAILED;
+       }
+
        net_profile_info_t *profile_info = g_try_malloc0(sizeof(net_profile_info_t));
        if (profile_info == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
@@ -208,7 +241,7 @@ EXPORT_API int connection_profile_create(connection_profile_type_e type, const c
        switch (type) {
        case CONNECTION_PROFILE_TYPE_CELLULAR:
                if (keyword == NULL) {
-                       CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+                       CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                        g_free(profile_info);
                        return CONNECTION_ERROR_INVALID_PARAMETER;
                }
@@ -229,8 +262,10 @@ EXPORT_API int connection_profile_create(connection_profile_type_e type, const c
 
 EXPORT_API int connection_profile_destroy(connection_profile_h profile)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -241,8 +276,10 @@ EXPORT_API int connection_profile_destroy(connection_profile_h profile)
 
 EXPORT_API int connection_profile_clone(connection_profile_h* cloned_profile, connection_profile_h origin_profile)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(origin_profile)) || cloned_profile == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -258,8 +295,10 @@ EXPORT_API int connection_profile_clone(connection_profile_h* cloned_profile, co
 
 EXPORT_API int connection_profile_get_id(connection_profile_h profile, char** profile_id)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || profile_id == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -280,8 +319,10 @@ EXPORT_API int connection_profile_get_id(connection_profile_h profile, char** pr
 
 EXPORT_API int connection_profile_get_name(connection_profile_h profile, char** profile_name)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || profile_name == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -317,8 +358,10 @@ EXPORT_API int connection_profile_get_name(connection_profile_h profile, char**
 
 EXPORT_API int connection_profile_get_type(connection_profile_h profile, connection_profile_type_e* type)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || type == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -338,7 +381,7 @@ EXPORT_API int connection_profile_get_type(connection_profile_h profile, connect
                *type = CONNECTION_PROFILE_TYPE_BT;
                break;
        default:
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid profile type\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid profile type");
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
@@ -347,8 +390,10 @@ EXPORT_API int connection_profile_get_type(connection_profile_h profile, connect
 
 EXPORT_API int connection_profile_get_network_interface_name(connection_profile_h profile, char** interface_name)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || interface_name == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -367,8 +412,11 @@ EXPORT_API int connection_profile_get_network_interface_name(connection_profile_
 EXPORT_API int connection_profile_refresh(connection_profile_h profile)
 {
        int rv;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -391,15 +439,15 @@ EXPORT_API int connection_profile_refresh(connection_profile_h profile)
 
 EXPORT_API int connection_profile_get_state(connection_profile_h profile, connection_profile_state_e* state)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || state == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
        *state = _profile_convert_to_cp_state(profile_info->ProfileState);
-       if (*state < 0)
-               return CONNECTION_ERROR_OPERATION_FAILED;
 
        return CONNECTION_ERROR_NONE;
 }
@@ -407,40 +455,70 @@ EXPORT_API int connection_profile_get_state(connection_profile_h profile, connec
 EXPORT_API int connection_profile_get_ip_config_type(connection_profile_h profile,
                connection_address_family_e address_family, connection_ip_config_type_e* type)
 {
+       net_ip_config_type_t profile_type;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
            type == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
        net_profile_info_t *profile_info = profile;
        net_dev_info_t *net_info = __profile_get_net_info(profile_info);
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       switch (net_info->IpConfigType) {
-       case NET_IP_CONFIG_TYPE_STATIC:
-               *type = CONNECTION_IP_CONFIG_TYPE_STATIC;
-               break;
-       case NET_IP_CONFIG_TYPE_DYNAMIC:
-               *type = CONNECTION_IP_CONFIG_TYPE_DYNAMIC;
-               break;
-       case NET_IP_CONFIG_TYPE_AUTO_IP:
-               *type = CONNECTION_IP_CONFIG_TYPE_AUTO;
-               break;
-       case NET_IP_CONFIG_TYPE_FIXED:
-               *type = CONNECTION_IP_CONFIG_TYPE_FIXED;
-               break;
-       case NET_IP_CONFIG_TYPE_OFF:
-               *type = CONNECTION_IP_CONFIG_TYPE_NONE;
-               break;
-       default:
-               return CONNECTION_ERROR_OPERATION_FAILED;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4)
+               profile_type = net_info->IpConfigType;
+       else
+               profile_type = net_info->IpConfigType6;
+
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) {
+               switch (profile_type) {
+               case NET_IP_CONFIG_TYPE_STATIC:
+                       *type = CONNECTION_IP_CONFIG_TYPE_STATIC;
+                       break;
+
+               case NET_IP_CONFIG_TYPE_DYNAMIC:
+                       *type = CONNECTION_IP_CONFIG_TYPE_DYNAMIC;
+                       break;
+
+               case NET_IP_CONFIG_TYPE_AUTO_IP:
+                       *type = CONNECTION_IP_CONFIG_TYPE_AUTO;
+                       break;
+
+               case NET_IP_CONFIG_TYPE_FIXED:
+                       *type = CONNECTION_IP_CONFIG_TYPE_FIXED;
+                       break;
+
+               case NET_IP_CONFIG_TYPE_OFF:
+                       *type = CONNECTION_IP_CONFIG_TYPE_NONE;
+                       break;
+               default:
+                       return CONNECTION_ERROR_OPERATION_FAILED;
+               }
+       } else {
+               switch (profile_type) {
+               case NET_IP_CONFIG_TYPE_STATIC:
+                       *type = CONNECTION_IP_CONFIG_TYPE_STATIC;
+                       break;
+
+               case NET_IP_CONFIG_TYPE_AUTO_IP:
+                       *type = CONNECTION_IP_CONFIG_TYPE_AUTO;
+                       break;
+
+               case NET_IP_CONFIG_TYPE_OFF:
+                       *type = CONNECTION_IP_CONFIG_TYPE_NONE;
+                       break;
+
+               default:
+                       return  CONNECTION_ERROR_OPERATION_FAILED;
+
+               }
        }
 
        return CONNECTION_ERROR_NONE;
@@ -449,11 +527,13 @@ EXPORT_API int connection_profile_get_ip_config_type(connection_profile_h profil
 EXPORT_API int connection_profile_get_ip_address(connection_profile_h profile,
                connection_address_family_e address_family, char** ip_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
            ip_address == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -463,9 +543,12 @@ EXPORT_API int connection_profile_get_ip_address(connection_profile_h profile,
                return CONNECTION_ERROR_OPERATION_FAILED;
 
        if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
+               *ip_address = __profile_convert_ip_to_string(&net_info->IpAddr6,
+                               address_family);
+       else
+               *ip_address = __profile_convert_ip_to_string(&net_info->IpAddr,
+                               address_family);
 
-       *ip_address = __profile_convert_ip_to_string(&net_info->IpAddr);
        if (*ip_address == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
 
@@ -475,11 +558,15 @@ EXPORT_API int connection_profile_get_ip_address(connection_profile_h profile,
 EXPORT_API int connection_profile_get_subnet_mask(connection_profile_h profile,
                connection_address_family_e address_family, char** subnet_mask)
 {
+       char* prefixlen;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
            subnet_mask == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -488,10 +575,17 @@ EXPORT_API int connection_profile_get_subnet_mask(connection_profile_h profile,
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               prefixlen = g_try_malloc0(MAX_PREFIX_LENGTH);
+               if (prefixlen != NULL) {
+                       snprintf(prefixlen, MAX_PREFIX_LENGTH, "%d", net_info->PrefixLen6);
+                       *subnet_mask = prefixlen;
+               } else
+                       *subnet_mask = NULL;
+       } else
+               *subnet_mask = __profile_convert_ip_to_string(&net_info->SubnetMask,
+                               address_family);
 
-       *subnet_mask = __profile_convert_ip_to_string(&net_info->SubnetMask);
        if (*subnet_mask == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
 
@@ -501,11 +595,13 @@ EXPORT_API int connection_profile_get_subnet_mask(connection_profile_h profile,
 EXPORT_API int connection_profile_get_gateway_address(connection_profile_h profile,
                connection_address_family_e address_family, char** gateway_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
            gateway_address == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -515,9 +611,12 @@ EXPORT_API int connection_profile_get_gateway_address(connection_profile_h profi
                return CONNECTION_ERROR_OPERATION_FAILED;
 
        if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
+               *gateway_address = __profile_convert_ip_to_string(
+                                       &net_info->GatewayAddr6, address_family);
+       else
+               *gateway_address = __profile_convert_ip_to_string(
+                                       &net_info->GatewayAddr, address_family);
 
-       *gateway_address = __profile_convert_ip_to_string(&net_info->GatewayAddr);
        if (*gateway_address == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
 
@@ -527,13 +626,15 @@ EXPORT_API int connection_profile_get_gateway_address(connection_profile_h profi
 EXPORT_API int connection_profile_get_dns_address(connection_profile_h profile, int order,
                connection_address_family_e address_family, char** dns_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
            dns_address == NULL ||
            order <= 0 ||
            order > NET_DNS_ADDR_MAX) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -542,10 +643,15 @@ EXPORT_API int connection_profile_get_dns_address(connection_profile_h profile,
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4)
+               *dns_address = __profile_convert_ip_to_string(&net_info->DnsAddr[order-1],
+                               address_family);
+       else if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
+               *dns_address = __profile_convert_ip_to_string(&net_info->DnsAddr6[order-1],
+                               address_family);
+       else
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid address family\n");
 
-       *dns_address = __profile_convert_ip_to_string(&net_info->DnsAddr[order-1]);
        if (*dns_address == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
 
@@ -554,8 +660,10 @@ EXPORT_API int connection_profile_get_dns_address(connection_profile_h profile,
 
 EXPORT_API int connection_profile_get_proxy_type(connection_profile_h profile, connection_proxy_type_e* type)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || type == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -596,31 +704,22 @@ EXPORT_API int connection_profile_get_proxy_type(connection_profile_h profile, c
 EXPORT_API int connection_profile_get_proxy_address(connection_profile_h profile,
                connection_address_family_e address_family, char** proxy_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
             proxy_address == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
-       const char *proxy;
        net_profile_info_t *profile_info = profile;
        net_dev_info_t *net_info = __profile_get_net_info(profile_info);
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
-       if (profile_info->profile_type == NET_DEVICE_ETHERNET) {
-               proxy = __profile_get_ethernet_proxy();
-               if (proxy == NULL)
-                       return CONNECTION_ERROR_OPERATION_FAILED;
-
-               *proxy_address = g_strdup(proxy);
-       } else
-               *proxy_address = g_strdup(net_info->ProxyAddr);
+       *proxy_address = g_strdup(net_info->ProxyAddr);
 
        if (*proxy_address == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
@@ -631,10 +730,14 @@ EXPORT_API int connection_profile_get_proxy_address(connection_profile_h profile
 EXPORT_API int connection_profile_set_ip_config_type(connection_profile_h profile,
                connection_address_family_e address_family, connection_ip_config_type_e type)
 {
+       net_ip_config_type_t *profile_type = NULL;
+
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -643,30 +746,60 @@ EXPORT_API int connection_profile_set_ip_config_type(connection_profile_h profil
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
-       switch (type) {
-       case CONNECTION_IP_CONFIG_TYPE_STATIC:
-               net_info->IpConfigType = NET_IP_CONFIG_TYPE_STATIC;
-               net_info->IpAddr.Data.Ipv4.s_addr = 0;
-               net_info->SubnetMask.Data.Ipv4.s_addr = 0;
-               net_info->GatewayAddr.Data.Ipv4.s_addr = 0;
-               break;
-       case CONNECTION_IP_CONFIG_TYPE_DYNAMIC:
-               net_info->IpConfigType = NET_IP_CONFIG_TYPE_DYNAMIC;
-               break;
-       case CONNECTION_IP_CONFIG_TYPE_AUTO:
-               net_info->IpConfigType = NET_IP_CONFIG_TYPE_AUTO_IP;
-               break;
-       case CONNECTION_IP_CONFIG_TYPE_FIXED:
-               net_info->IpConfigType = NET_IP_CONFIG_TYPE_FIXED;
-               break;
-       case CONNECTION_IP_CONFIG_TYPE_NONE:
-               net_info->IpConfigType = NET_IP_CONFIG_TYPE_OFF;
-               break;
-       default:
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4)
+               profile_type = &net_info->IpConfigType ;
+       else
+               profile_type = &net_info->IpConfigType6 ;
+
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) {
+               switch (type) {
+               case CONNECTION_IP_CONFIG_TYPE_STATIC:
+                       *profile_type = NET_IP_CONFIG_TYPE_STATIC;
+                       net_info->IpAddr.Data.Ipv4.s_addr = 0;
+                       net_info->SubnetMask.Data.Ipv4.s_addr = 0;
+                       net_info->GatewayAddr.Data.Ipv4.s_addr = 0 ;
+                       break;
+
+               case CONNECTION_IP_CONFIG_TYPE_DYNAMIC:
+                       *profile_type = NET_IP_CONFIG_TYPE_DYNAMIC;
+                       break;
+
+               case CONNECTION_IP_CONFIG_TYPE_AUTO:
+                       *profile_type = NET_IP_CONFIG_TYPE_AUTO_IP;
+                       break;
+
+               case CONNECTION_IP_CONFIG_TYPE_FIXED:
+                       net_info->IpConfigType = NET_IP_CONFIG_TYPE_FIXED;
+                       break;
+
+               case CONNECTION_IP_CONFIG_TYPE_NONE:
+                       *profile_type = NET_IP_CONFIG_TYPE_OFF;
+                       break;
+
+               default:
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+               }
+       } else {
+               switch (type) {
+               case CONNECTION_IP_CONFIG_TYPE_STATIC:
+                       *profile_type = NET_IP_CONFIG_TYPE_STATIC;
+                       inet_pton(AF_INET6, "::", &net_info->IpAddr6.Data.Ipv6);
+                       net_info->PrefixLen6 = 0 ;
+                       inet_pton(AF_INET6, "::",
+                                       &net_info->GatewayAddr6.Data.Ipv6);
+                       break;
+
+               case CONNECTION_IP_CONFIG_TYPE_AUTO:
+                       *profile_type = NET_IP_CONFIG_TYPE_AUTO_IP;
+                       break;
+
+               case CONNECTION_IP_CONFIG_TYPE_NONE:
+                       *profile_type = NET_IP_CONFIG_TYPE_OFF;
+                       break;
+
+               default:
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+               }
        }
 
        return CONNECTION_ERROR_NONE;
@@ -675,10 +808,12 @@ EXPORT_API int connection_profile_set_ip_config_type(connection_profile_h profil
 EXPORT_API int connection_profile_set_ip_address(connection_profile_h profile,
                connection_address_family_e address_family, const char* ip_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -687,13 +822,19 @@ EXPORT_API int connection_profile_set_ip_address(connection_profile_h profile,
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
-       if (ip_address == NULL)
-               net_info->IpAddr.Data.Ipv4.s_addr = 0;
-       else if (inet_aton(ip_address, &(net_info->IpAddr.Data.Ipv4)) == 0)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               if (ip_address == NULL)
+                       inet_pton(AF_INET6, "::", &net_info->IpAddr6.Data.Ipv6);
+               else if (inet_pton(AF_INET6, ip_address,
+                                       &net_info->IpAddr6.Data.Ipv6) < 1)
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+       } else {
+               if (ip_address == NULL)
+                       net_info->IpAddr.Data.Ipv4.s_addr = 0;
+               else if (inet_pton(AF_INET, ip_address,
+                                       &net_info->IpAddr.Data.Ipv4) < 1)
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        return CONNECTION_ERROR_NONE;
 }
@@ -701,10 +842,12 @@ EXPORT_API int connection_profile_set_ip_address(connection_profile_h profile,
 EXPORT_API int connection_profile_set_subnet_mask(connection_profile_h profile,
                connection_address_family_e address_family, const char* subnet_mask)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -713,13 +856,17 @@ EXPORT_API int connection_profile_set_subnet_mask(connection_profile_h profile,
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
-       if (subnet_mask == NULL)
-               net_info->SubnetMask.Data.Ipv4.s_addr = 0;
-       else if (inet_aton(subnet_mask, &(net_info->SubnetMask.Data.Ipv4)) == 0)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               if (subnet_mask == NULL)
+                       net_info->PrefixLen6 = 0 ;
+               else
+                       net_info->PrefixLen6 = atoi(subnet_mask) ;
+       } else {
+               if (subnet_mask == NULL)
+                       net_info->SubnetMask.Data.Ipv4.s_addr = 0;
+               else if (inet_pton(AF_INET, subnet_mask , &net_info->SubnetMask.Data.Ipv4)  < 1)
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        return CONNECTION_ERROR_NONE;
 }
@@ -727,10 +874,12 @@ EXPORT_API int connection_profile_set_subnet_mask(connection_profile_h profile,
 EXPORT_API int connection_profile_set_gateway_address(connection_profile_h profile,
                connection_address_family_e address_family, const char* gateway_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -739,13 +888,17 @@ EXPORT_API int connection_profile_set_gateway_address(connection_profile_h profi
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
-       if (gateway_address == NULL)
-               net_info->GatewayAddr.Data.Ipv4.s_addr = 0;
-       else if (inet_aton(gateway_address, &(net_info->GatewayAddr.Data.Ipv4)) == 0)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               if (gateway_address == NULL)
+                       inet_pton(AF_INET6, "::", &net_info->GatewayAddr6.Data.Ipv6);
+               else if (inet_pton(AF_INET6, gateway_address, &net_info->GatewayAddr6.Data.Ipv6) < 1)
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+       } else {
+               if (gateway_address == NULL)
+                       net_info->GatewayAddr.Data.Ipv4.s_addr = 0;
+               else if (inet_pton(AF_INET, gateway_address, &(net_info->GatewayAddr.Data.Ipv4)) < 1)
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        return CONNECTION_ERROR_NONE;
 }
@@ -753,12 +906,14 @@ EXPORT_API int connection_profile_set_gateway_address(connection_profile_h profi
 EXPORT_API int connection_profile_set_dns_address(connection_profile_h profile, int order,
                connection_address_family_e address_family, const char* dns_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6) ||
            order <= 0 ||
            order > NET_DNS_ADDR_MAX) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -767,24 +922,33 @@ EXPORT_API int connection_profile_set_dns_address(connection_profile_h profile,
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
-       if (dns_address == NULL)
-               net_info->DnsAddr[order-1].Data.Ipv4.s_addr = 0;
-       else if (inet_aton(dns_address, &(net_info->DnsAddr[order-1].Data.Ipv4)) == 0)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
-
-       if (net_info->DnsCount < order)
-               net_info->DnsCount = order;
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               net_info->DnsAddr6[order-1].Type = NET_ADDR_IPV6;
+               if (dns_address == NULL)
+                       inet_pton(AF_INET6, "::", &net_info->DnsAddr6[order-1].Data.Ipv6);
+               else if (inet_pton(AF_INET6, dns_address, &net_info->DnsAddr6[order-1].Data.Ipv6) < 1)
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+               if (net_info->DnsCount6 < order)
+                       net_info->DnsCount6 = order;
+       } else {
+               net_info->DnsAddr[order-1].Type = NET_ADDR_IPV4;
+               if (dns_address == NULL)
+                       net_info->DnsAddr[order-1].Data.Ipv4.s_addr = 0;
+               else if (inet_pton(AF_INET, dns_address, &(net_info->DnsAddr[order-1].Data.Ipv4)) < 1)
+                       return CONNECTION_ERROR_INVALID_PARAMETER;
+               if (net_info->DnsCount < order)
+                       net_info->DnsCount = order;
+       }
 
        return CONNECTION_ERROR_NONE;
 }
 
 EXPORT_API int connection_profile_set_proxy_type(connection_profile_h profile, connection_proxy_type_e type)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -813,10 +977,12 @@ EXPORT_API int connection_profile_set_proxy_type(connection_profile_h profile, c
 EXPORT_API int connection_profile_set_proxy_address(connection_profile_h profile,
                connection_address_family_e address_family, const char* proxy_address)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
             address_family != CONNECTION_ADDRESS_FAMILY_IPV6)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -825,9 +991,6 @@ EXPORT_API int connection_profile_set_proxy_address(connection_profile_h profile
        if (net_info == NULL)
                return CONNECTION_ERROR_OPERATION_FAILED;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6)
-               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
-
        if (proxy_address == NULL)
                net_info->ProxyAddr[0] = '\0';
        else
@@ -839,8 +1002,10 @@ EXPORT_API int connection_profile_set_proxy_address(connection_profile_h profile
 EXPORT_API int connection_profile_set_state_changed_cb(connection_profile_h profile,
                connection_profile_state_changed_cb callback, void* user_data)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || callback == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -852,8 +1017,10 @@ EXPORT_API int connection_profile_set_state_changed_cb(connection_profile_h prof
 
 EXPORT_API int connection_profile_unset_state_changed_cb(connection_profile_h profile)
 {
-       if (!(_connection_libnet_check_profile_cb_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (!(_connection_libnet_check_profile_validity(profile))) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -867,8 +1034,10 @@ EXPORT_API int connection_profile_unset_state_changed_cb(connection_profile_h pr
 /* Wi-Fi profile *************************************************************/
 EXPORT_API int connection_profile_get_wifi_essid(connection_profile_h profile, char** essid)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || essid == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -886,8 +1055,10 @@ EXPORT_API int connection_profile_get_wifi_essid(connection_profile_h profile, c
 
 EXPORT_API int connection_profile_get_wifi_bssid(connection_profile_h profile, char** bssid)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || bssid == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -905,8 +1076,10 @@ EXPORT_API int connection_profile_get_wifi_bssid(connection_profile_h profile, c
 
 EXPORT_API int connection_profile_get_wifi_rssi(connection_profile_h profile, int* rssi)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || rssi == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -922,8 +1095,10 @@ EXPORT_API int connection_profile_get_wifi_rssi(connection_profile_h profile, in
 
 EXPORT_API int connection_profile_get_wifi_frequency(connection_profile_h profile, int* frequency)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || frequency == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -939,8 +1114,10 @@ EXPORT_API int connection_profile_get_wifi_frequency(connection_profile_h profil
 
 EXPORT_API int connection_profile_get_wifi_max_speed(connection_profile_h profile, int* max_speed)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || max_speed == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -956,8 +1133,10 @@ EXPORT_API int connection_profile_get_wifi_max_speed(connection_profile_h profil
 
 EXPORT_API int connection_profile_get_wifi_security_type(connection_profile_h profile, connection_wifi_security_type_e* type)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || type == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -991,8 +1170,10 @@ EXPORT_API int connection_profile_get_wifi_security_type(connection_profile_h pr
 
 EXPORT_API int connection_profile_get_wifi_encryption_type(connection_profile_h profile, connection_wifi_encryption_type_e* type)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || type == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -1026,8 +1207,10 @@ EXPORT_API int connection_profile_get_wifi_encryption_type(connection_profile_h
 
 EXPORT_API int connection_profile_is_wifi_passphrase_required(connection_profile_h profile, bool* required)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || required == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -1060,8 +1243,10 @@ EXPORT_API int connection_profile_is_wifi_passphrase_required(connection_profile
 
 EXPORT_API int connection_profile_set_wifi_passphrase(connection_profile_h profile, const char* passphrase)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || passphrase == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -1078,8 +1263,10 @@ EXPORT_API int connection_profile_set_wifi_passphrase(connection_profile_h profi
 
 EXPORT_API int connection_profile_is_wifi_wps_supported(connection_profile_h profile, bool* supported)
 {
+       CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || supported == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
@@ -1098,65 +1285,27 @@ EXPORT_API int connection_profile_is_wifi_wps_supported(connection_profile_h pro
 
 
 /* Cellular profile **********************************************************/
-EXPORT_API int connection_profile_get_cellular_network_type(connection_profile_h profile, connection_cellular_network_type_e* type)
-{
-       if (!(_connection_libnet_check_profile_validity(profile)) || type == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
-               return CONNECTION_ERROR_INVALID_PARAMETER;
-       }
-
-       int network_type;
-       net_profile_info_t *profile_info = profile;
-
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
-               return CONNECTION_ERROR_INVALID_PARAMETER;
-
-       if (vconf_get_int(VCONFKEY_TELEPHONY_SVC_ACT, &network_type)) {
-               CONNECTION_LOG(CONNECTION_ERROR, "vconf_get_int Failed\n");
-               return CONNECTION_ERROR_OPERATION_FAILED;
-       }
-
-       CONNECTION_LOG(CONNECTION_INFO, "Cellular network type = %d\n", network_type);
-
-       switch (network_type) {
-       case VCONFKEY_TELEPHONY_SVC_ACT_NONE:
-               *type = CONNECTION_CELLULAR_NETWORK_TYPE_UNKNOWN;
-               break;
-       case VCONFKEY_TELEPHONY_SVC_ACT_GPRS:
-               *type = CONNECTION_CELLULAR_NETWORK_TYPE_GPRS;
-               break;
-       case VCONFKEY_TELEPHONY_SVC_ACT_EGPRS:
-               *type = CONNECTION_CELLULAR_NETWORK_TYPE_EDGE;
-               break;
-       case VCONFKEY_TELEPHONY_SVC_ACT_UMTS:
-               *type = CONNECTION_CELLULAR_NETWORK_TYPE_UMTS;
-               break;
-       default:
-               return CONNECTION_ERROR_OPERATION_FAILED;
-       }
-
-       return CONNECTION_ERROR_NONE;
-}
-
 EXPORT_API int connection_profile_get_cellular_service_type(connection_profile_h profile,
                                                connection_cellular_service_type_e* type)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || type == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
        if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid profile type Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        *type = _profile_convert_to_connection_cellular_service_type(profile_info->ProfileInfo.Pdp.ServiceType);
 
        if (*type == CONNECTION_CELLULAR_SERVICE_TYPE_UNKNOWN) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid service type Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid service type Passed");
                return CONNECTION_ERROR_OPERATION_FAILED;
        }
 
@@ -1165,15 +1314,19 @@ EXPORT_API int connection_profile_get_cellular_service_type(connection_profile_h
 
 EXPORT_API int connection_profile_get_cellular_apn(connection_profile_h profile, char** apn)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || apn == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        *apn = g_strdup(profile_info->ProfileInfo.Pdp.Apn);
        if (*apn == NULL)
@@ -1185,16 +1338,20 @@ EXPORT_API int connection_profile_get_cellular_apn(connection_profile_h profile,
 EXPORT_API int connection_profile_get_cellular_auth_info(connection_profile_h profile,
                connection_cellular_auth_type_e* type, char** user_name, char** password)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            type == NULL || user_name == NULL || password == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        switch (profile_info->ProfileInfo.Pdp.AuthInfo.AuthType) {
        case NET_PDP_AUTH_NONE:
@@ -1225,15 +1382,19 @@ EXPORT_API int connection_profile_get_cellular_auth_info(connection_profile_h pr
 
 EXPORT_API int connection_profile_get_cellular_home_url(connection_profile_h profile, char** home_url)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || home_url == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        *home_url = g_strdup(profile_info->ProfileInfo.Pdp.HomeURL);
        if (*home_url == NULL)
@@ -1244,15 +1405,19 @@ EXPORT_API int connection_profile_get_cellular_home_url(connection_profile_h pro
 
 EXPORT_API int connection_profile_is_cellular_roaming(connection_profile_h profile, bool* is_roaming)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || is_roaming == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        if (profile_info->ProfileInfo.Pdp.Roaming)
                *is_roaming = true;
@@ -1264,6 +1429,8 @@ EXPORT_API int connection_profile_is_cellular_roaming(connection_profile_h profi
 
 EXPORT_API int connection_profile_is_cellular_hidden(connection_profile_h profile, bool* is_hidden)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || is_hidden == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -1286,6 +1453,8 @@ EXPORT_API int connection_profile_is_cellular_hidden(connection_profile_h profil
 
 EXPORT_API int connection_profile_is_cellular_editable(connection_profile_h profile, bool* is_editable)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || is_editable == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -1308,6 +1477,8 @@ EXPORT_API int connection_profile_is_cellular_editable(connection_profile_h prof
 
 EXPORT_API int connection_profile_is_cellular_default(connection_profile_h profile, bool* is_default)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || is_default == NULL) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -1331,15 +1502,19 @@ EXPORT_API int connection_profile_is_cellular_default(connection_profile_h profi
 EXPORT_API int connection_profile_set_cellular_service_type(connection_profile_h profile,
                connection_cellular_service_type_e service_type)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile))) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        switch (service_type) {
        case CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET:
@@ -1370,15 +1545,19 @@ EXPORT_API int connection_profile_set_cellular_service_type(connection_profile_h
 
 EXPORT_API int connection_profile_set_cellular_apn(connection_profile_h profile, const char* apn)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || apn == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        g_strlcpy(profile_info->ProfileInfo.Pdp.Apn, apn, NET_PDP_APN_LEN_MAX+1);
 
@@ -1388,16 +1567,20 @@ EXPORT_API int connection_profile_set_cellular_apn(connection_profile_h profile,
 EXPORT_API int connection_profile_set_cellular_auth_info(connection_profile_h profile,
                connection_cellular_auth_type_e type, const char* user_name, const char* password)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) ||
            user_name == NULL || password == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        switch (type) {
        case CONNECTION_CELLULAR_AUTH_TYPE_NONE:
@@ -1421,15 +1604,19 @@ EXPORT_API int connection_profile_set_cellular_auth_info(connection_profile_h pr
 
 EXPORT_API int connection_profile_set_cellular_home_url(connection_profile_h profile, const char* home_url)
 {
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE);
+
        if (!(_connection_libnet_check_profile_validity(profile)) || home_url == NULL) {
-               CONNECTION_LOG(CONNECTION_ERROR, "Wrong Parameter Passed\n");
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
        net_profile_info_t *profile_info = profile;
 
-       if (profile_info->profile_type != NET_DEVICE_CELLULAR)
+       if (profile_info->profile_type != NET_DEVICE_CELLULAR) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
 
        g_strlcpy(profile_info->ProfileInfo.Pdp.HomeURL, home_url, NET_HOME_URL_LEN_MAX);