X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fconnection_profile.c;h=e61734857ca441139353714e3d72bfbb77a45f3e;hb=47d6150437cba7fe5a3925990ef46c0226a65971;hp=17d06b3bc17ccefb6dd97c6ca7a3119816e92ac9;hpb=c2a4594418164ffbcfd65576700c93c6419b0196;p=platform%2Fcore%2Fapi%2Fconnection.git

diff --git a/src/connection_profile.c b/src/connection_profile.c
index 17d06b3..e617348 100755
--- a/src/connection_profile.c
+++ b/src/connection_profile.c
@@ -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)
@@ -690,6 +684,31 @@ EXPORT_API int connection_profile_get_dhcp_server_address(
 	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)
 {
@@ -921,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;
 }
@@ -1866,7 +1882,7 @@ EXPORT_API int connection_profile_set_cellular_roam_pdn_type(connection_profile_
 		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
+		break;
 	case CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPV6:
 		profile_info->ProfileInfo.Pdp.RoamPdnType = NET_PDN_TYPE_IPV4_IPV6;
 		break;