X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconnection_profile.c;h=57bd958fd0779b6c448d3bfb9cfc0351fdc2029e;hb=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20170510.012958;hp=39fbc8ced4a08f41ab7ae20cf13ac466cdee3311;hpb=1b49fec64d044d39aa94bf06112447b10bea557f;p=platform%2Fcore%2Fapi%2Fconnection.git diff --git a/src/connection_profile.c b/src/connection_profile.c index 39fbc8c..57bd958 100755 --- 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; @@ -121,6 +121,25 @@ static const char* __profile_get_ethernet_proxy(void) } //LCOV_EXCL_STOP +static int __profile_convert_netmask_to_prefix_len(const char *netmask) +{ + if (netmask == NULL) + return 0; + + in_addr_t mask = inet_network(netmask); + int prefix_len = 0; + + for (; mask; mask <<= 1) + ++prefix_len; + + return prefix_len; +} + +static in_addr_t __profile_convert_prefix_len_to_netmask(int prefix_len) +{ + return (prefix_len ? (in_addr_t) 0xFFFFFFFFu >> (32 - prefix_len) : 0); +} + //LCOV_EXCL_START connection_cellular_service_type_e _profile_convert_to_connection_cellular_service_type(net_service_type_t svc_type) { @@ -569,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)) || @@ -581,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) @@ -636,6 +649,41 @@ 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_dns_address(connection_profile_h profile, int order, connection_address_family_e address_family, char** dns_address) { @@ -662,8 +710,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; @@ -680,7 +726,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) @@ -688,11 +733,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; } @@ -868,30 +915,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); return CONNECTION_ERROR_NONE; } @@ -1769,6 +1815,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; @@ -1804,6 +1855,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; @@ -1907,7 +1963,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; @@ -1931,7 +1988,11 @@ EXPORT_API int connection_profile_set_prefix_length(connection_profile_h profile if (net_info == NULL) return CONNECTION_ERROR_OPERATION_FAILED; - net_info->PrefixLen6 = prefix_len; + if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) { + net_info->PrefixLen = prefix_len; + net_info->SubnetMask.Data.Ipv4.s_addr = __profile_convert_prefix_len_to_netmask(prefix_len); + } else + net_info->PrefixLen6 = prefix_len; return CONNECTION_ERROR_NONE; } @@ -1955,7 +2016,10 @@ EXPORT_API int connection_profile_get_prefix_length(connection_profile_h profile if (net_info == NULL) return CONNECTION_ERROR_OPERATION_FAILED; - *prefix_len = net_info->PrefixLen6; + if (address_family == CONNECTION_ADDRESS_FAMILY_IPV4) + *prefix_len = net_info->PrefixLen; + else if (address_family == CONNECTION_ADDRESS_FAMILY_IPV6) + *prefix_len = net_info->PrefixLen6; return CONNECTION_ERROR_NONE; }