Added connection_profile_get_dhcp_lease_duration API

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

diff --git a/src/connection_profile.c b/src/connection_profile.c
index f088a27..e617348 100755 (executable)
--- a/src/connection_profile.c
+++ b/src/connection_profile.c
@@ -106,7 +106,7 @@ static void __profile_init_wifi_profile(net_profile_info_t *profile_info)
 }
 
 //LCOV_EXCL_START
-static const char* __profile_get_ethernet_proxy(void)
+static char* __profile_get_ethernet_proxy(void)
 {
        char *proxy;
 
@@ -588,8 +588,6 @@ 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)) ||
@@ -600,22 +598,18 @@ EXPORT_API int connection_profile_get_subnet_mask(connection_profile_h profile,
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               CONNECTION_LOG(CONNECTION_ERROR,
+                               "Please uses connection_profile_get_prefix_length()");
+               return CONNECTION_ERROR_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;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
-               //LCOV_EXCL_START
-               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;
-               //LCOV_EXCL_STOP
-       } else
-               *subnet_mask = __profile_convert_ip_to_string(&net_info->SubnetMask,
+       *subnet_mask = __profile_convert_ip_to_string(&net_info->SubnetMask,
                                address_family);
 
        if (*subnet_mask == NULL)
@@ -655,6 +649,66 @@ EXPORT_API int connection_profile_get_gateway_address(connection_profile_h profi
        return CONNECTION_ERROR_NONE;
 }
 
+EXPORT_API int connection_profile_get_dhcp_server_address(
+               connection_profile_h profile,
+               connection_address_family_e address_family, char** dhcp_server)
+{
+       CHECK_FEATURE_SUPPORTED(TELEPHONY_FEATURE, WIFI_FEATURE, TETHERING_BLUETOOTH_FEATURE, ETHERNET_FEATURE);
+
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Not supported");
+               return CONNECTION_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED;
+       }
+
+       if (!(_connection_libnet_check_profile_validity(profile)) ||
+           (address_family != CONNECTION_ADDRESS_FAMILY_IPV4) ||
+           dhcp_server == NULL) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       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;
+
+       CONNECTION_LOG(CONNECTION_INFO, "IP Config %d, DHCP Server Address %s",
+                       net_info->IpConfigType, (net_info->BServerAddr ? "TRUE" : "FALSE"));
+
+       *dhcp_server = __profile_convert_ip_to_string(&net_info->ServerAddr,
+                       address_family);
+
+       if (*dhcp_server == NULL)
+               return CONNECTION_ERROR_OUT_OF_MEMORY;
+
+       return CONNECTION_ERROR_NONE;
+}
+
+EXPORT_API int connection_profile_get_dhcp_lease_duration(
+               connection_profile_h profile,
+               connection_address_family_e address_family, int* dhcp_lease_duration)
+{
+       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)) {
+               CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
+               return CONNECTION_ERROR_INVALID_PARAMETER;
+       }
+
+       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;
+
+       CONNECTION_LOG(CONNECTION_INFO, "Lease duration : %d",
+                       net_info->DHCPLeaseDuration);
+
+       *dhcp_lease_duration = net_info->DHCPLeaseDuration;
+
+       return CONNECTION_ERROR_NONE;
+}
+
 EXPORT_API int connection_profile_get_dns_address(connection_profile_h profile, int order,
                connection_address_family_e address_family, char** dns_address)
 {
@@ -681,8 +735,6 @@ EXPORT_API int connection_profile_get_dns_address(connection_profile_h profile,
        else if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) //LCOV_EXCL_LINE
                *dns_address = __profile_convert_ip_to_string(&net_info->DnsAddr6[order-1], //LCOV_EXCL_LINE
                                address_family);
-       else
-               CONNECTION_LOG(CONNECTION_ERROR, "Invalid address family\n"); //LCOV_EXCL_LINE
 
        if (*dns_address == NULL)
                return CONNECTION_ERROR_OUT_OF_MEMORY;
@@ -699,7 +751,6 @@ EXPORT_API int connection_profile_get_proxy_type(connection_profile_h profile, c
                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)
@@ -707,11 +758,13 @@ EXPORT_API int connection_profile_get_proxy_type(connection_profile_h profile, c
 
        //LCOV_EXCL_START
        if (profile_info->profile_type == NET_DEVICE_ETHERNET) {
-               proxy = __profile_get_ethernet_proxy();
-               if (proxy == NULL)
+               char *proxy = __profile_get_ethernet_proxy();
+               if (proxy == NULL) {
                        *type = CONNECTION_PROXY_TYPE_DIRECT;
-               else
+               } else {
                        *type = CONNECTION_PROXY_TYPE_MANUAL;
+                       free(proxy);
+               }
 
                return CONNECTION_ERROR_NONE;
        }
@@ -887,32 +940,29 @@ EXPORT_API int connection_profile_set_subnet_mask(connection_profile_h profile,
        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)) {
+                       (address_family != CONNECTION_ADDRESS_FAMILY_IPV4 &&
+                        address_family != CONNECTION_ADDRESS_FAMILY_IPV6)) {
                CONNECTION_LOG(CONNECTION_ERROR, "Invalid parameter");
                return CONNECTION_ERROR_INVALID_PARAMETER;
        }
 
+       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
+               CONNECTION_LOG(CONNECTION_ERROR,
+                               "Please uses connection_profile_set_prefix_length()");
+               return CONNECTION_ERROR_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;
 
-       if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) {
-               //LCOV_EXCL_START
-               if (subnet_mask == NULL)
-                       net_info->PrefixLen6 = 0 ;
-               else
-                       net_info->PrefixLen6 = atoi(subnet_mask) ;
-               //LCOV_EXCL_STOP
-       } 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;
+       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;
 
-               net_info->PrefixLen = __profile_convert_netmask_to_prefix_len(subnet_mask);
-       }
+       net_info->PrefixLen = __profile_convert_netmask_to_prefix_len(subnet_mask);
 
        return CONNECTION_ERROR_NONE;
 }
@@ -1790,6 +1840,11 @@ EXPORT_API int connection_profile_set_cellular_pdn_type(connection_profile_h pro
                break;
        case CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPv6:
                profile_info->ProfileInfo.Pdp.PdnType = NET_PDN_TYPE_IPV4_IPV6;
+               CONNECTION_LOG(CONNECTION_WARN, "DEPRECATION WARNINIG: CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPv6 " \
+                                               "from next release. Use CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPV6 instead");
+               break;
+       case CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPV6:
+               profile_info->ProfileInfo.Pdp.PdnType = NET_PDN_TYPE_IPV4_IPV6;
                break;
        default:
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -1825,6 +1880,11 @@ EXPORT_API int connection_profile_set_cellular_roam_pdn_type(connection_profile_
                break;
        case CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPv6:
                profile_info->ProfileInfo.Pdp.RoamPdnType = NET_PDN_TYPE_IPV4_IPV6;
+               CONNECTION_LOG(CONNECTION_WARN, "DEPRECATION WARNINIG: CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPv6 " \
+                                               "from next release. Use CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPV6 instead");
+               break;
+       case CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPV6:
+               profile_info->ProfileInfo.Pdp.RoamPdnType = NET_PDN_TYPE_IPV4_IPV6;
                break;
        default:
                return CONNECTION_ERROR_INVALID_PARAMETER;
@@ -1928,7 +1988,8 @@ EXPORT_API int connection_profile_get_dns_config_type(connection_profile_h profi
                *type = CONNECTION_DNS_CONFIG_TYPE_DYNAMIC;
                break;
        default:
-               return CONNECTION_ERROR_OPERATION_FAILED;
+               *type = CONNECTION_DNS_CONFIG_TYPE_NONE;
+               break;
        }
 
        return CONNECTION_ERROR_NONE;