struct connman_service *service);
struct connman_ipconfig *__connman_service_get_ip6config(
struct connman_service *service);
+struct connman_ipconfig *__connman_service_get_ipconfig(
+ struct connman_service *service, int family);
const char *__connman_service_get_ident(struct connman_service *service);
const char *__connman_service_get_path(struct connman_service *service);
unsigned int __connman_service_get_order(struct connman_service *service);
DBG("prefix_len %d address %s gateway %s",
prefix_length, address, gateway);
- ipaddress->family = CONNMAN_IPCONFIG_TYPE_IPV6;
+ ipaddress->family = AF_INET6;
ipaddress->prefixlen = prefix_length;
if (ipaddress == NULL)
return -EINVAL;
- ipaddress->family = CONNMAN_IPCONFIG_TYPE_IPV4;
+ ipaddress->family = AF_INET;
ipaddress->prefixlen = __connman_ipconfig_netmask_prefix_len(netmask);
if (service == NULL)
return -EINVAL;
- if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV4)
- ipconfig = __connman_service_get_ip4config(service);
- else if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV6)
- ipconfig = __connman_service_get_ip6config(service);
-
+ ipconfig = __connman_service_get_ipconfig(service, ipaddress->family);
if (ipconfig == NULL)
return -EINVAL;
{
struct connman_ipconfig *ipconfig = NULL;
- if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV4) {
- ipconfig = __connman_service_get_ip4config(
- provider->vpn_service);
- } else if (ipaddress->family == CONNMAN_IPCONFIG_TYPE_IPV6) {
- ipconfig = __connman_service_get_ip6config(
- provider->vpn_service);
- }
-
+ ipconfig = __connman_service_get_ipconfig(provider->vpn_service,
+ ipaddress->family);
if (ipconfig == NULL)
return -EINVAL;
return service->ipconfig_ipv6;
}
+struct connman_ipconfig *
+__connman_service_get_ipconfig(struct connman_service *service, int family)
+{
+ if (family == AF_INET)
+ return __connman_service_get_ip4config(service);
+ else if (family == AF_INET6)
+ return __connman_service_get_ip6config(service);
+ else
+ return NULL;
+
+}
+
enum connman_service_security __connman_service_get_security(struct connman_service *service)
{
if (service == NULL)