enum connman_ipconfig_method method;
struct connman_ipaddress *address;
struct connman_ipaddress *system;
-
- struct connman_ipconfig *ipv6;
};
struct connman_ipdevice {
char *pac;
- struct connman_ipconfig *config;
-
- struct connman_ipconfig_driver *driver;
- struct connman_ipconfig *driver_config;
+ struct connman_ipconfig *config_ipv4;
+ struct connman_ipconfig *config_ipv6;
};
static GHashTable *ipdevice_hash = NULL;
connman_info("%s {remove} index %d", ipdevice->ifname,
ipdevice->index);
- if (ipdevice->config != NULL)
- connman_ipconfig_unref(ipdevice->config);
+ if (ipdevice->config_ipv4 != NULL) {
+ connman_ipconfig_unref(ipdevice->config_ipv4);
+ ipdevice->config_ipv4 = NULL;
+ }
+
+ if (ipdevice->config_ipv6 != NULL) {
+ connman_ipconfig_unref(ipdevice->config_ipv6);
+ ipdevice->config_ipv6 = NULL;
+ }
free_address_list(ipdevice);
g_free(ipdevice->ipv4_gateway);
g_free(ipdevice);
}
-static GSList *driver_list = NULL;
-
-static gint compare_priority(gconstpointer a, gconstpointer b)
-{
- const struct connman_ipconfig_driver *driver1 = a;
- const struct connman_ipconfig_driver *driver2 = b;
-
- return driver2->priority - driver1->priority;
-}
-
-/**
- * connman_ipconfig_driver_register:
- * @driver: IP configuration driver
- *
- * Register a new IP configuration driver
- *
- * Returns: %0 on success
- */
-int connman_ipconfig_driver_register(struct connman_ipconfig_driver *driver)
-{
- DBG("driver %p name %s", driver, driver->name);
-
- driver_list = g_slist_insert_sorted(driver_list, driver,
- compare_priority);
-
- return 0;
-}
-
-/**
- * connman_ipconfig_driver_unregister:
- * @driver: IP configuration driver
- *
- * Remove a previously registered IP configuration driver.
- */
-void connman_ipconfig_driver_unregister(struct connman_ipconfig_driver *driver)
-{
- DBG("driver %p name %s", driver, driver->name);
-
- driver_list = g_slist_remove(driver_list, driver);
-}
-
static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
{
- GSList *list;
-
- DBG("ipconfig %p", ipdevice->config);
-
- if (ipdevice->config == NULL)
- return;
-
- switch (ipdevice->config->method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
- case CONNMAN_IPCONFIG_METHOD_FIXED:
- case CONNMAN_IPCONFIG_METHOD_MANUAL:
- return;
- case CONNMAN_IPCONFIG_METHOD_DHCP:
- break;
- }
-
- if (ipdevice->driver != NULL)
- return;
-
- ipdevice->driver_config = connman_ipconfig_clone(ipdevice->config);
- if (ipdevice->driver_config == NULL)
- return;
-
- for (list = driver_list; list; list = list->next) {
- struct connman_ipconfig_driver *driver = list->data;
-
- if (driver->request(ipdevice->driver_config) == 0) {
- ipdevice->driver = driver;
- break;
- }
- }
-
- if (ipdevice->driver == NULL) {
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
- }
+ DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+ ipdevice->config_ipv6);
}
static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
{
- DBG("ipconfig %p", ipdevice->config);
-
- if (ipdevice->config == NULL)
- return;
+ DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+ ipdevice->config_ipv6);
- if (ipdevice->driver == NULL)
- return;
-
- ipdevice->driver->release(ipdevice->driver_config);
-
- ipdevice->driver = NULL;
+ if (ipdevice->config_ipv4)
+ connman_inet_clear_address(ipdevice->index,
+ ipdevice->config_ipv4->address);
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
-
- connman_inet_clear_address(ipdevice->index, ipdevice->config->address);
- connman_inet_clear_ipv6_address(ipdevice->index,
- ipdevice->driver_config->address->local,
- ipdevice->driver_config->address->prefixlen);
+ if (ipdevice->config_ipv6)
+ connman_inet_clear_ipv6_address(ipdevice->index,
+ ipdevice->config_ipv6->address->local,
+ ipdevice->config_ipv6->address->prefixlen);
}
static void update_stats(struct connman_ipdevice *ipdevice,
struct rtnl_link_stats *stats)
{
+ struct connman_service *service;
+
if (stats->rx_packets == 0 && stats->tx_packets == 0)
return;
connman_info("%s {TX} %u packets %u bytes", ipdevice->ifname,
stats->tx_packets, stats->tx_bytes);
- if (ipdevice->config == NULL)
+ if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
+ return;
+
+ if (ipdevice->config_ipv4)
+ service = connman_ipconfig_get_data(ipdevice->config_ipv4);
+ else if (ipdevice->config_ipv6)
+ service = connman_ipconfig_get_data(ipdevice->config_ipv6);
+ else
+ return;
+
+ if (service == NULL)
return;
ipdevice->rx_packets = stats->rx_packets;
ipdevice->rx_dropped = stats->rx_dropped;
ipdevice->tx_dropped = stats->tx_dropped;
- __connman_service_notify(ipdevice->config,
+ __connman_service_notify(service,
ipdevice->rx_packets, ipdevice->tx_packets,
ipdevice->rx_bytes, ipdevice->tx_bytes,
ipdevice->rx_errors, ipdevice->tx_errors,
ipdevice->address_list = g_slist_append(ipdevice->address_list,
ipaddress);
- connman_info("%s {add} address %s/%u label %s", ipdevice->ifname,
- address, prefixlen, label);
+ connman_info("%s {add} address %s/%u label %s family %d",
+ ipdevice->ifname, address, prefixlen, label, family);
- if (ipdevice->config != NULL) {
- if (family == AF_INET6 && ipdevice->config->ipv6 != NULL)
- connman_ipaddress_copy(ipdevice->config->ipv6->system,
- ipaddress);
- else
- connman_ipaddress_copy(ipdevice->config->system,
- ipaddress);
- }
+ if (ipdevice->config_ipv4 != NULL && family == AF_INET)
+ connman_ipaddress_copy(ipdevice->config_ipv4->system,
+ ipaddress);
+
+ else if (ipdevice->config_ipv6 != NULL && family == AF_INET6)
+ connman_ipaddress_copy(ipdevice->config_ipv6->system,
+ ipaddress);
+ else
+ return;
if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
return;
if (family == AF_INET6) {
g_free(ipdevice->ipv6_gateway);
ipdevice->ipv6_gateway = g_strdup(gateway);
+
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->system != NULL) {
+ g_free(ipdevice->config_ipv6->system->gateway);
+ ipdevice->config_ipv6->system->gateway =
+ g_strdup(gateway);
+ }
} else {
g_free(ipdevice->ipv4_gateway);
ipdevice->ipv4_gateway = g_strdup(gateway);
- }
- if (ipdevice->config != NULL &&
- ipdevice->config->system != NULL) {
- g_free(ipdevice->config->system->gateway);
- ipdevice->config->system->gateway = g_strdup(gateway);
+ if (ipdevice->config_ipv4 != NULL &&
+ ipdevice->config_ipv4->system != NULL) {
+ g_free(ipdevice->config_ipv4->system->gateway);
+ ipdevice->config_ipv4->system->gateway =
+ g_strdup(gateway);
+ }
}
for (list = ipdevice->address_list; list; list = list->next) {
if (family == AF_INET6) {
g_free(ipdevice->ipv6_gateway);
ipdevice->ipv6_gateway = NULL;
+
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->system != NULL) {
+ g_free(ipdevice->config_ipv6->system->gateway);
+ ipdevice->config_ipv6->system->gateway = NULL;
+ }
} else {
g_free(ipdevice->ipv4_gateway);
ipdevice->ipv4_gateway = NULL;
- }
- if (ipdevice->config != NULL &&
- ipdevice->config->system != NULL) {
- g_free(ipdevice->config->system->gateway);
- ipdevice->config->system->gateway = NULL;
+ if (ipdevice->config_ipv4 != NULL &&
+ ipdevice->config_ipv4->system != NULL) {
+ g_free(ipdevice->config_ipv4->system->gateway);
+ ipdevice->config_ipv4->system->gateway = NULL;
+ }
}
for (list = ipdevice->address_list; list; list = list->next) {
if (ipdevice->ipv4_gateway != NULL)
return ipdevice->ipv4_gateway;
- if (ipdevice->config != NULL &&
- ipdevice->config->address != NULL)
- return ipdevice->config->address->gateway;
+ if (ipdevice->config_ipv4 != NULL &&
+ ipdevice->config_ipv4->address != NULL)
+ return ipdevice->config_ipv4->address->gateway;
+
+ if (ipdevice->ipv6_gateway != NULL)
+ return ipdevice->ipv6_gateway;
+
+ if (ipdevice->config_ipv6 != NULL &&
+ ipdevice->config_ipv6->address != NULL)
+ return ipdevice->config_ipv6->address->gateway;
return NULL;
}
void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index)
{
ipconfig->index = index;
-
- if (ipconfig->ipv6 != NULL)
- ipconfig->ipv6->index = index;
}
static struct connman_ipconfig *create_ipv6config(int index)
if (ipv6config == NULL)
return NULL;
+ ipv6config->refcount = 1;
+
ipv6config->index = index;
ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
- ipv6config->method = CONNMAN_IPCONFIG_METHOD_OFF;
+ ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
ipv6config->address = connman_ipaddress_alloc(AF_INET6);
if (ipv6config->address == NULL) {
ipv6config->system = connman_ipaddress_alloc(AF_INET6);
- ipv6config->ipv6 = NULL;
-
DBG("ipconfig %p", ipv6config);
return ipv6config;
*
* Returns: a newly-allocated #connman_ipconfig structure
*/
-struct connman_ipconfig *connman_ipconfig_create(int index)
+struct connman_ipconfig *connman_ipconfig_create(int index,
+ enum connman_ipconfig_type type)
{
struct connman_ipconfig *ipconfig;
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ return create_ipv6config(index);
+
DBG("index %d", index);
ipconfig = g_try_new0(struct connman_ipconfig, 1);
ipconfig->system = connman_ipaddress_alloc(AF_INET);
- ipconfig->ipv6 = create_ipv6config(index);
-
DBG("ipconfig %p", ipconfig);
return ipconfig;
}
-/**
- * connman_ipconfig_clone:
- *
- * Clone an ipconfig structure and create new reference.
- *
- * Returns: a newly-allocated #connman_ipconfig structure
- */
-struct connman_ipconfig *connman_ipconfig_clone(struct connman_ipconfig *ipconfig)
-{
- struct connman_ipconfig *ipconfig_clone;
-
- DBG("ipconfig %p", ipconfig);
-
- ipconfig_clone = g_try_new0(struct connman_ipconfig, 1);
- if (ipconfig_clone == NULL)
- return NULL;
-
- ipconfig_clone->refcount = 1;
-
- ipconfig_clone->origin = connman_ipconfig_ref(ipconfig);
-
- ipconfig_clone->index = -1;
-
- return ipconfig_clone;
-}
/**
* connman_ipconfig_ref:
*/
struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
{
+ DBG("ipconfig %p refcount %d", ipconfig,
+ g_atomic_int_get(&ipconfig->refcount) + 1);
+
g_atomic_int_inc(&ipconfig->refcount);
return ipconfig;
}
-static void free_ipv6config(struct connman_ipconfig *ipconfig)
-{
- if (ipconfig == NULL)
- return;
-
- connman_ipconfig_set_ops(ipconfig, NULL);
- connman_ipaddress_free(ipconfig->system);
- connman_ipaddress_free(ipconfig->address);
- g_free(ipconfig->ipv6);
-}
-
/**
* connman_ipconfig_unref:
* @ipconfig: ipconfig structure
*/
void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
{
- if (ipconfig &&
- g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
+ if (ipconfig == NULL)
+ return;
+
+ DBG("ipconfig %p refcount %d", ipconfig,
+ g_atomic_int_get(&ipconfig->refcount) - 1);
+
+ if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
__connman_ipconfig_disable(ipconfig);
connman_ipconfig_set_ops(ipconfig, NULL);
connman_ipaddress_free(ipconfig->system);
connman_ipaddress_free(ipconfig->address);
- free_ipv6config(ipconfig->ipv6);
g_free(ipconfig);
}
}
*/
void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig)
{
+ if (ipconfig == NULL)
+ return NULL;
+
return ipconfig->ops_data;
}
ipconfig->ops = ops;
}
-struct connman_ipconfig *connman_ipconfig_get_ipv6config(
- struct connman_ipconfig *ipconfig)
-{
- if (ipconfig == NULL)
- return NULL;
-
- return ipconfig->ipv6;
-}
-
/**
* connman_ipconfig_set_method:
* @ipconfig: ipconfig structure
struct connman_ipconfig *ipconfig,
struct connman_element *element)
{
- element->ipv6.gateway = ipconfig->ipv6->address->gateway;
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ element->ipv6.gateway = ipconfig->address->gateway;
}
/*
connection->type = CONNMAN_ELEMENT_TYPE_CONNECTION;
connection->index = ipconfig->index;
- connection->ipv4.gateway = ipconfig->address->gateway;
- connection->ipv6.gateway = ipconfig->ipv6->address->gateway;
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ connection->ipv4.gateway = ipconfig->address->gateway;
+ else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ connection->ipv6.gateway = ipconfig->address->gateway;
if (connman_element_register(connection, parent) < 0)
connman_element_unref(connection);
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
struct connman_ipdevice *ipdevice;
gboolean up = FALSE, down = FALSE;
gboolean lower_up = FALSE, lower_down = FALSE;
+ enum connman_ipconfig_type type;
DBG("ipconfig %p", ipconfig);
if (ipdevice == NULL)
return -ENXIO;
- if (ipdevice->config == ipconfig)
- return -EALREADY;
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+ if (ipdevice->config_ipv4 == ipconfig)
+ return -EALREADY;
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ } else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ if (ipdevice->config_ipv6 == ipconfig)
+ return -EALREADY;
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ } else
+ return -EINVAL;
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
+ ipdevice->config_ipv4 != NULL) {
+ ipconfig_list = g_list_remove(ipconfig_list,
+ ipdevice->config_ipv4);
- if (ipdevice->config != NULL) {
- ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+ connman_ipaddress_clear(ipdevice->config_ipv4->system);
+
+ connman_ipconfig_unref(ipdevice->config_ipv4);
+ }
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
+ ipdevice->config_ipv6 != NULL) {
+ ipconfig_list = g_list_remove(ipconfig_list,
+ ipdevice->config_ipv6);
- connman_ipaddress_clear(ipdevice->config->system);
+ connman_ipaddress_clear(ipdevice->config_ipv6->system);
- connman_ipconfig_unref(ipdevice->config);
+ connman_ipconfig_unref(ipdevice->config_ipv6);
}
- ipdevice->config = connman_ipconfig_ref(ipconfig);
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ ipdevice->config_ipv4 = connman_ipconfig_ref(ipconfig);
+ else if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ ipdevice->config_ipv6 = connman_ipconfig_ref(ipconfig);
ipconfig_list = g_list_append(ipconfig_list, ipconfig);
if (ipdevice == NULL)
return -ENXIO;
- if (ipdevice->config == NULL || ipdevice->config != ipconfig)
+ if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
return -EINVAL;
- ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+ if (ipdevice->config_ipv4 == ipconfig) {
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
- connman_ipaddress_clear(ipdevice->config->system);
- connman_ipaddress_clear(ipdevice->config->ipv6->system);
+ connman_ipaddress_clear(ipdevice->config_ipv4->system);
+ connman_ipconfig_unref(ipdevice->config_ipv4);
+ ipdevice->config_ipv4 = NULL;
+ return 0;
+ }
- connman_ipconfig_unref(ipdevice->config);
- ipdevice->config = NULL;
+ if (ipdevice->config_ipv6 == ipconfig) {
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
- return 0;
+ connman_ipaddress_clear(ipdevice->config_ipv6->system);
+ connman_ipconfig_unref(ipdevice->config_ipv6);
+ ipdevice->config_ipv6 = NULL;
+ return 0;
+ }
+
+ return -EINVAL;
}
const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method)
return "manual";
case CONNMAN_IPCONFIG_METHOD_DHCP:
return "dhcp";
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return "auto";
}
return NULL;
return CONNMAN_IPCONFIG_METHOD_MANUAL;
else if (g_strcmp0(method, "dhcp") == 0)
return CONNMAN_IPCONFIG_METHOD_DHCP;
+ else if (g_strcmp0(method, "auto") == 0)
+ return CONNMAN_IPCONFIG_METHOD_AUTO;
else
return CONNMAN_IPCONFIG_METHOD_UNKNOWN;
}
DBG("");
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+ return;
+
str = __connman_ipconfig_method2string(ipconfig->method);
if (str == NULL)
return;
DBG("");
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
str = __connman_ipconfig_method2string(ipconfig->method);
if (str == NULL)
return;
return;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
}
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
return;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
break;
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
return -EINVAL;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
GKeyFile *keyfile, const char *identifier, const char *prefix)
{
- const char *method;
+ char *method;
char *key;
DBG("ipconfig %p identifier %s", ipconfig, identifier);
ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
} else
ipconfig->method = __connman_ipconfig_string2method(method);
+
+ if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_UNKNOWN)
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+
+ g_free(method);
g_free(key);
key = g_strdup_printf("%snetmask_prefixlen", prefix);