#include <config.h>
#endif
+#include <errno.h>
+#include <stdio.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <linux/if_link.h>
#include "connman.h"
struct connman_ipconfig {
- gint refcount;
+ int refcount;
int index;
enum connman_ipconfig_type type;
struct connman_ipaddress *address;
struct connman_ipaddress *system;
- struct connman_ipconfig *ipv6;
+ int ipv6_privacy_config;
+ char *last_dhcp_address;
};
struct connman_ipdevice {
uint32_t tx_dropped;
GSList *address_list;
- char *gateway;
+ char *ipv4_gateway;
+ char *ipv6_gateway;
- struct connman_ipconfig *config;
+ char *pac;
- struct connman_ipconfig_driver *driver;
- struct connman_ipconfig *driver_config;
+ struct connman_ipconfig *config_ipv4;
+ struct connman_ipconfig *config_ipv6;
+
+ gboolean ipv6_enabled;
+ int ipv6_privacy;
};
static GHashTable *ipdevice_hash = NULL;
g_free(ipaddress);
}
-static unsigned char netmask2prefixlen(const char *netmask)
+unsigned char __connman_ipconfig_netmask_prefix_len(const char *netmask)
{
- unsigned char bits = 0;
- in_addr_t mask = inet_network(netmask);
- in_addr_t host = ~mask;
+ unsigned char bits;
+ in_addr_t mask;
+ in_addr_t host;
+
+ if (netmask == NULL)
+ return 32;
+
+ mask = inet_network(netmask);
+ host = ~mask;
/* a valid netmask must be 2^n - 1 */
if ((host & (host + 1)) != 0)
return -1;
+ bits = 0;
for (; mask; mask <<= 1)
++bits;
unsigned char buf[sizeof(struct in6_addr)];
int err;
+ if (address == NULL)
+ return FALSE;
+
err = inet_pton(AF_INET6, address, buf);
if (err > 0)
return TRUE;
}
int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress,
- const char *address, const char *gateway,
- unsigned char prefix_length)
+ const char *address,
+ unsigned char prefix_length,
+ const char *gateway)
{
if (ipaddress == NULL)
return -EINVAL;
DBG("prefix_len %d address %s gateway %s",
prefix_length, address, gateway);
+ ipaddress->family = AF_INET6;
+
ipaddress->prefixlen = prefix_length;
g_free(ipaddress->local);
return 0;
}
-void connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress,
+int connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress,
const char *address, const char *netmask, const char *gateway)
{
if (ipaddress == NULL)
- return;
+ return -EINVAL;
- if (netmask != NULL)
- ipaddress->prefixlen = netmask2prefixlen(netmask);
- else
- ipaddress->prefixlen = 32;
+ ipaddress->family = AF_INET;
+
+ ipaddress->prefixlen = __connman_ipconfig_netmask_prefix_len(netmask);
g_free(ipaddress->local);
ipaddress->local = g_strdup(address);
g_free(ipaddress->gateway);
ipaddress->gateway = g_strdup(gateway);
+
+ return 0;
+}
+
+void connman_ipaddress_set_peer(struct connman_ipaddress *ipaddress,
+ const char *peer)
+{
+ if (ipaddress == NULL)
+ return;
+
+ g_free(ipaddress->peer);
+ ipaddress->peer = g_strdup(peer);
}
void connman_ipaddress_clear(struct connman_ipaddress *ipaddress)
return NULL;
}
+const char *__connman_ipconfig_type2string(enum connman_ipconfig_type type)
+{
+ switch (type) {
+ case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+ return "unknown";
+ case CONNMAN_IPCONFIG_TYPE_IPV4:
+ return "IPv4";
+ case CONNMAN_IPCONFIG_TYPE_IPV6:
+ return "IPv6";
+ }
+
+ return NULL;
+}
+
static const char *type2str(unsigned short type)
{
switch (type) {
return "";
}
-static void free_ipdevice(gpointer data)
+static gboolean get_ipv6_state(gchar *ifname)
{
- struct connman_ipdevice *ipdevice = data;
+ int disabled;
+ gchar *path;
+ FILE *f;
+ gboolean enabled = FALSE;
- connman_info("%s {remove} index %d", ipdevice->ifname,
- ipdevice->index);
+ if (ifname == NULL)
+ path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+ else
+ path = g_strdup_printf(
+ "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
- if (ipdevice->config != NULL)
- connman_ipconfig_unref(ipdevice->config);
+ if (path == NULL)
+ return enabled;
- free_address_list(ipdevice);
- g_free(ipdevice->gateway);
+ f = fopen(path, "r");
- g_free(ipdevice->address);
- g_free(ipdevice->ifname);
- g_free(ipdevice);
+ g_free(path);
+
+ if (f != NULL) {
+ if (fscanf(f, "%d", &disabled) > 0)
+ enabled = !disabled;
+ fclose(f);
+ }
+
+ return enabled;
}
-static GSList *driver_list = NULL;
+static void set_ipv6_state(gchar *ifname, gboolean enable)
+{
+ gchar *path;
+ FILE *f;
+
+ if (ifname == NULL)
+ path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+ else
+ path = g_strdup_printf(
+ "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
+
+ if (path == NULL)
+ return;
+
+ f = fopen(path, "r+");
+
+ g_free(path);
+
+ if (f == NULL)
+ return;
+
+ if (enable == FALSE)
+ fprintf(f, "1");
+ else
+ fprintf(f, "0");
+
+ fclose(f);
+}
-static gint compare_priority(gconstpointer a, gconstpointer b)
+static int get_ipv6_privacy(gchar *ifname)
{
- const struct connman_ipconfig_driver *driver1 = a;
- const struct connman_ipconfig_driver *driver2 = b;
+ gchar *path;
+ FILE *f;
+ int value;
+
+ if (ifname == NULL)
+ return 0;
+
+ path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr",
+ ifname);
+
+ if (path == NULL)
+ return 0;
+
+ f = fopen(path, "r");
- return driver2->priority - driver1->priority;
+ g_free(path);
+
+ if (f == NULL)
+ return 0;
+
+ if (fscanf(f, "%d", &value) <= 0)
+ value = 0;
+
+ fclose(f);
+
+ return value;
}
-/**
- * connman_ipconfig_driver_register:
- * @driver: IP configuration driver
- *
- * Register a new IP configuration driver
- *
- * Returns: %0 on success
+/* Enable the IPv6 privacy extension for stateless address autoconfiguration.
+ * The privacy extension is described in RFC 3041 and RFC 4941
*/
-int connman_ipconfig_driver_register(struct connman_ipconfig_driver *driver)
+static void set_ipv6_privacy(gchar *ifname, int value)
{
- DBG("driver %p name %s", driver, driver->name);
+ gchar *path;
+ FILE *f;
- driver_list = g_slist_insert_sorted(driver_list, driver,
- compare_priority);
+ if (ifname == NULL)
+ return;
- return 0;
+ path = g_strdup_printf("/proc/sys/net/ipv6/conf/%s/use_tempaddr",
+ ifname);
+
+ if (path == NULL)
+ return;
+
+ if (value < 0)
+ value = 0;
+
+ f = fopen(path, "r+");
+
+ g_free(path);
+
+ if (f == NULL)
+ return;
+
+ fprintf(f, "%d", value);
+ fclose(f);
}
-/**
- * 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)
+static int get_rp_filter()
{
- DBG("driver %p name %s", driver, driver->name);
+ FILE *f;
+ int value = -EINVAL, tmp;
+
+ f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r");
+
+ if (f != NULL) {
+ if (fscanf(f, "%d", &tmp) == 1)
+ value = tmp;
+ fclose(f);
+ }
- driver_list = g_slist_remove(driver_list, driver);
+ return value;
}
-static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
+static void set_rp_filter(int value)
{
- GSList *list;
+ FILE *f;
- DBG("ipconfig %p", ipdevice->config);
+ f = fopen("/proc/sys/net/ipv4/conf/all/rp_filter", "r+");
- if (ipdevice->config == NULL)
+ if (f == 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;
- }
+ fprintf(f, "%d", value);
- if (ipdevice->driver != NULL)
- return;
+ fclose(f);
+}
- ipdevice->driver_config = connman_ipconfig_clone(ipdevice->config);
- if (ipdevice->driver_config == NULL)
- return;
+int __connman_ipconfig_set_rp_filter()
+{
+ int value;
- for (list = driver_list; list; list = list->next) {
- struct connman_ipconfig_driver *driver = list->data;
+ value = get_rp_filter();
- if (driver->request(ipdevice->driver_config) == 0) {
- ipdevice->driver = driver;
- break;
- }
- }
+ if (value < 0)
+ return value;
- if (ipdevice->driver == NULL) {
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
- }
+ set_rp_filter(2);
+
+ connman_info("rp_filter set to 2 (loose mode routing), "
+ "old value was %d", value);
+
+ return value;
}
-static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
+void __connman_ipconfig_unset_rp_filter(int old_value)
{
- DBG("ipconfig %p", ipdevice->config);
+ set_rp_filter(old_value);
- if (ipdevice->config == NULL)
- return;
+ connman_info("rp_filter restored to %d", old_value);
+}
- if (ipdevice->driver == NULL)
- return;
+static void free_ipdevice(gpointer data)
+{
+ struct connman_ipdevice *ipdevice = data;
+
+ connman_info("%s {remove} index %d", ipdevice->ifname,
+ ipdevice->index);
+
+ 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->ipv6_gateway);
+ g_free(ipdevice->pac);
+
+ g_free(ipdevice->address);
+
+ set_ipv6_state(ipdevice->ifname, ipdevice->ipv6_enabled);
+ set_ipv6_privacy(ipdevice->ifname, ipdevice->ipv6_privacy);
+
+ g_free(ipdevice->ifname);
+ g_free(ipdevice);
+}
- ipdevice->driver->release(ipdevice->driver_config);
+static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
+{
+ DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+ ipdevice->config_ipv6);
+}
- ipdevice->driver = NULL;
+static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
+{
+ DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+ ipdevice->config_ipv6);
- connman_ipconfig_unref(ipdevice->driver_config);
- ipdevice->driver_config = NULL;
+ if (ipdevice->config_ipv4)
+ connman_inet_clear_address(ipdevice->index,
+ ipdevice->config_ipv4->address);
- connman_inet_clear_address(ipdevice->index);
- 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_counter_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->ifname = connman_inet_ifname(index);
ipdevice->type = type;
+ ipdevice->ipv6_enabled = get_ipv6_state(ipdevice->ifname);
+ ipdevice->ipv6_privacy = get_ipv6_privacy(ipdevice->ifname);
+
ipdevice->address = g_strdup(address);
g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(index), ipdevice);
ipconfig->ops->down(ipconfig);
}
+#if defined TIZEN_EXT
+ if (g_strcmp0(ipdevice->address, address) != 0) {
+ g_free(ipdevice->address);
+ ipdevice->address = g_strdup(address);
+ }
+#endif
+
if (lower_up)
__connman_ipconfig_lower_up(ipdevice);
if (lower_down)
g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(index));
}
+static inline gint check_duplicate_address(gconstpointer a, gconstpointer b)
+{
+ const struct connman_ipaddress *addr1 = a;
+ const struct connman_ipaddress *addr2 = b;
+
+ if (addr1->prefixlen != addr2->prefixlen)
+ return addr2->prefixlen - addr1->prefixlen;
+
+ return g_strcmp0(addr1->local, addr2->local);
+}
+
void __connman_ipconfig_newaddr(int index, int family, const char *label,
unsigned char prefixlen, const char *address)
{
struct connman_ipdevice *ipdevice;
struct connman_ipaddress *ipaddress;
+ enum connman_ipconfig_type type;
GList *list;
DBG("index %d", index);
ipaddress->prefixlen = prefixlen;
ipaddress->local = g_strdup(address);
+ if (g_slist_find_custom(ipdevice->address_list, ipaddress,
+ check_duplicate_address)) {
+ connman_ipaddress_free(ipaddress);
+ return;
+ }
+
+ if (family == AF_INET)
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ else if (family == AF_INET6)
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ else
+ return;
+
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);
- if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
+ else if (ipdevice->config_ipv6 != NULL && family == AF_INET6)
+ connman_ipaddress_copy(ipdevice->config_ipv6->system,
+ ipaddress);
+ else
return;
- if (g_slist_length(ipdevice->address_list) > 1)
+ if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
return;
for (list = g_list_first(ipconfig_list); list;
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
if (ipconfig->ops == NULL)
continue;
{
struct connman_ipdevice *ipdevice;
struct connman_ipaddress *ipaddress;
+ enum connman_ipconfig_type type;
GList *list;
DBG("index %d", index);
if (ipaddress == NULL)
return;
+ if (family == AF_INET)
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ else if (family == AF_INET6)
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ else
+ return;
+
ipdevice->address_list = g_slist_remove(ipdevice->address_list,
ipaddress);
- connman_ipaddress_free(ipaddress);
+ connman_ipaddress_clear(ipaddress);
+ g_free(ipaddress);
connman_info("%s {del} address %s/%u label %s", ipdevice->ifname,
address, prefixlen, label);
if (index != ipconfig->index)
continue;
+ if (type != ipconfig->type)
+ continue;
+
if (ipconfig->ops == NULL)
continue;
}
}
-void __connman_ipconfig_newroute(int index, unsigned char scope,
+void __connman_ipconfig_newroute(int index, int family, unsigned char scope,
const char *dst, const char *gateway)
{
struct connman_ipdevice *ipdevice;
if (ipdevice == NULL)
return;
- if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
+ if (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 ||
+ g_strcmp0(dst, "::") == 0)) {
GSList *list;
-
- g_free(ipdevice->gateway);
- ipdevice->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);
- }
+ GList *config_list;
+ enum connman_ipconfig_type type;
+
+ if (family == AF_INET6) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ 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 if (family == AF_INET) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ g_free(ipdevice->ipv4_gateway);
+ ipdevice->ipv4_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);
+ }
+ } else
+ return;
for (list = ipdevice->address_list; list; list = list->next) {
struct connman_ipaddress *ipaddress = list->data;
g_free(ipaddress->gateway);
ipaddress->gateway = g_strdup(gateway);
}
+
+ for (config_list = g_list_first(ipconfig_list); config_list;
+ config_list = g_list_next(config_list)) {
+ struct connman_ipconfig *ipconfig = config_list->data;
+
+ if (index != ipconfig->index)
+ continue;
+
+ if (type != ipconfig->type)
+ continue;
+
+ if (ipconfig->ops == NULL)
+ continue;
+
+ if (ipconfig->ops->ip_bound)
+ ipconfig->ops->ip_bound(ipconfig);
+ }
}
connman_info("%s {add} route %s gw %s scope %u <%s>",
scope, scope2str(scope));
}
-void __connman_ipconfig_delroute(int index, unsigned char scope,
+void __connman_ipconfig_delroute(int index, int family, unsigned char scope,
const char *dst, const char *gateway)
{
struct connman_ipdevice *ipdevice;
if (ipdevice == NULL)
return;
- if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
+ if (scope == 0 && (g_strcmp0(dst, "0.0.0.0") == 0 ||
+ g_strcmp0(dst, "::") == 0)) {
GSList *list;
-
- g_free(ipdevice->gateway);
- ipdevice->gateway = NULL;
-
- if (ipdevice->config != NULL &&
- ipdevice->config->system != NULL) {
- g_free(ipdevice->config->system->gateway);
- ipdevice->config->system->gateway = NULL;
- }
+ GList *config_list;
+ enum connman_ipconfig_type type;
+
+ if (family == AF_INET6) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ 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 if (family == AF_INET) {
+ type = CONNMAN_IPCONFIG_TYPE_IPV4;
+ g_free(ipdevice->ipv4_gateway);
+ ipdevice->ipv4_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;
+ }
+ } else
+ return;
for (list = ipdevice->address_list; list; list = list->next) {
struct connman_ipaddress *ipaddress = list->data;
g_free(ipaddress->gateway);
ipaddress->gateway = NULL;
}
+
+ for (config_list = g_list_first(ipconfig_list); config_list;
+ config_list = g_list_next(config_list)) {
+ struct connman_ipconfig *ipconfig = config_list->data;
+
+ if (index != ipconfig->index)
+ continue;
+
+ if (type != ipconfig->type)
+ continue;
+
+ if (ipconfig->ops == NULL)
+ continue;
+
+ if (ipconfig->ops->ip_release)
+ ipconfig->ops->ip_release(ipconfig);
+ }
}
connman_info("%s {del} route %s gw %s scope %u <%s>",
g_list_free(keys);
}
-unsigned short __connman_ipconfig_get_type(int index)
+enum connman_ipconfig_type __connman_ipconfig_get_config_type(
+ struct connman_ipconfig *ipconfig)
+{
+ return ipconfig ? ipconfig->type : CONNMAN_IPCONFIG_TYPE_UNKNOWN;
+}
+
+unsigned short __connman_ipconfig_get_type_from_index(int index)
{
struct connman_ipdevice *ipdevice;
return ipdevice->type;
}
-unsigned int __connman_ipconfig_get_flags(int index)
+unsigned int __connman_ipconfig_get_flags_from_index(int index)
{
struct connman_ipdevice *ipdevice;
return ipdevice->flags;
}
-const char *__connman_ipconfig_get_gateway(int index)
+const char *__connman_ipconfig_get_gateway_from_index(int index)
{
struct connman_ipdevice *ipdevice;
if (ipdevice == NULL)
return NULL;
- if (ipdevice->gateway != NULL)
- return ipdevice->gateway;
+ if (ipdevice->ipv4_gateway != NULL)
+ return ipdevice->ipv4_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 != NULL &&
- ipdevice->config->address != NULL)
- return ipdevice->config->address->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)
+const char *__connman_ipconfig_get_local(struct connman_ipconfig *ipconfig)
{
- struct connman_ipconfig *ipv6config;
-
- DBG("index %d", index);
-
- ipv6config = g_try_new0(struct connman_ipconfig, 1);
- if (ipv6config == NULL)
+ if (ipconfig->address == NULL)
return NULL;
- ipv6config->index = index;
- ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
-
- ipv6config->address = connman_ipaddress_alloc(AF_INET6);
- if (ipv6config->address == NULL) {
- g_free(ipv6config);
- return NULL;
- }
+ return ipconfig->address->local;
+}
- ipv6config->system = connman_ipaddress_alloc(AF_INET6);
+void __connman_ipconfig_set_local(struct connman_ipconfig *ipconfig, const char *address)
+{
+ if (ipconfig->address == NULL)
+ return;
- ipv6config->ipv6 = NULL;
+ g_free(ipconfig->address->local);
+ ipconfig->address->local = g_strdup(address);
+}
- DBG("ipconfig %p", ipv6config);
+const char *__connman_ipconfig_get_peer(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig->address == NULL)
+ return NULL;
- return ipv6config;
+ return ipconfig->address->peer;
}
-/**
- * connman_ipconfig_create:
- *
- * Allocate a new ipconfig structure.
- *
- * Returns: a newly-allocated #connman_ipconfig structure
- */
-struct connman_ipconfig *connman_ipconfig_create(int index)
+void __connman_ipconfig_set_peer(struct connman_ipconfig *ipconfig, const char *address)
{
- struct connman_ipconfig *ipconfig;
+ if (ipconfig->address == NULL)
+ return;
- DBG("index %d", index);
+ g_free(ipconfig->address->peer);
+ ipconfig->address->peer = g_strdup(address);
+}
- ipconfig = g_try_new0(struct connman_ipconfig, 1);
- if (ipconfig == NULL)
+const char *__connman_ipconfig_get_broadcast(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig->address == NULL)
return NULL;
- ipconfig->refcount = 1;
+ return ipconfig->address->broadcast;
+}
- ipconfig->index = index;
- ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
+void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig, const char *broadcast)
+{
+ if (ipconfig->address == NULL)
+ return;
- ipconfig->address = connman_ipaddress_alloc(AF_INET);
- if (ipconfig->address == NULL) {
- g_free(ipconfig);
- return NULL;
- }
+ g_free(ipconfig->address->broadcast);
+ ipconfig->address->broadcast = g_strdup(broadcast);
+}
- ipconfig->system = connman_ipaddress_alloc(AF_INET);
+const char *__connman_ipconfig_get_gateway(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig->address == NULL)
+ return NULL;
- ipconfig->ipv6 = create_ipv6config(index);
+ return ipconfig->address->gateway;
+}
- DBG("ipconfig %p", ipconfig);
+void __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig, const char *gateway)
+{
+ DBG("");
- return ipconfig;
+ if (ipconfig->address == NULL)
+ return;
+ g_free(ipconfig->address->gateway);
+ ipconfig->address->gateway = g_strdup(gateway);
+}
+
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+int __connman_ipconfig_gateway_add(struct connman_ipconfig *ipconfig, struct connman_service *service)
+#else
+int __connman_ipconfig_gateway_add(struct connman_ipconfig *ipconfig)
+#endif
+{
+#if !defined TIZEN_EXT
+ struct connman_service *service;
+#endif
+
+ DBG("");
+
+ if (ipconfig->address == NULL)
+ return -EINVAL;
+
+#if !defined TIZEN_EXT
+ service = __connman_service_lookup_from_index(ipconfig->index);
+#endif
+ if (service == NULL)
+ return -EINVAL;
+
+ __connman_connection_gateway_remove(service, ipconfig->type);
+
+ DBG("type %d gw %s peer %s", ipconfig->type,
+ ipconfig->address->gateway, ipconfig->address->peer);
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6 ||
+ ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ return __connman_connection_gateway_add(service,
+ ipconfig->address->gateway,
+ ipconfig->type,
+ ipconfig->address->peer);
+
+ return 0;
+}
+
+void __connman_ipconfig_gateway_remove(struct connman_ipconfig *ipconfig)
+{
+ struct connman_service *service;
+
+ DBG("");
+
+ service = __connman_service_lookup_from_index(ipconfig->index);
+ if (service != NULL)
+ __connman_connection_gateway_remove(service, ipconfig->type);
+}
+
+unsigned char __connman_ipconfig_get_prefixlen(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig->address == NULL)
+ return 0;
+
+ return ipconfig->address->prefixlen;
+}
+
+void __connman_ipconfig_set_prefixlen(struct connman_ipconfig *ipconfig, unsigned char prefixlen)
+{
+ if (ipconfig->address == NULL)
+ return;
+
+ ipconfig->address->prefixlen = prefixlen;
+}
+
+static struct connman_ipconfig *create_ipv6config(int index)
+{
+ struct connman_ipconfig *ipv6config;
+
+ DBG("index %d", index);
+
+ ipv6config = g_try_new0(struct connman_ipconfig, 1);
+ if (ipv6config == NULL)
+ return NULL;
+
+ ipv6config->refcount = 1;
+
+ ipv6config->index = index;
+ ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
+ ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
+ ipv6config->ipv6_privacy_config = 0;
+
+ ipv6config->address = connman_ipaddress_alloc(AF_INET6);
+ if (ipv6config->address == NULL) {
+ g_free(ipv6config);
+ return NULL;
+ }
+
+ ipv6config->system = connman_ipaddress_alloc(AF_INET6);
+
+ DBG("ipconfig %p", ipv6config);
+
+ return ipv6config;
}
/**
- * connman_ipconfig_clone:
+ * connman_ipconfig_create:
*
- * Clone an ipconfig structure and create new reference.
+ * Allocate a new ipconfig structure.
*
* Returns: a newly-allocated #connman_ipconfig structure
*/
-struct connman_ipconfig *connman_ipconfig_clone(struct connman_ipconfig *ipconfig)
+struct connman_ipconfig *connman_ipconfig_create(int index,
+ enum connman_ipconfig_type type)
{
- struct connman_ipconfig *ipconfig_clone;
+ struct connman_ipconfig *ipconfig;
- DBG("ipconfig %p", ipconfig);
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ return create_ipv6config(index);
- ipconfig_clone = g_try_new0(struct connman_ipconfig, 1);
- if (ipconfig_clone == NULL)
+ DBG("index %d", index);
+
+ ipconfig = g_try_new0(struct connman_ipconfig, 1);
+ if (ipconfig == NULL)
return NULL;
- ipconfig_clone->refcount = 1;
+ ipconfig->refcount = 1;
- ipconfig_clone->origin = connman_ipconfig_ref(ipconfig);
+ ipconfig->index = index;
+ ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
+
+ ipconfig->address = connman_ipaddress_alloc(AF_INET);
+ if (ipconfig->address == NULL) {
+ g_free(ipconfig);
+ return NULL;
+ }
- ipconfig_clone->index = -1;
+ ipconfig->system = connman_ipaddress_alloc(AF_INET);
+
+ DBG("ipconfig %p", ipconfig);
- return ipconfig_clone;
+ return ipconfig;
}
+
/**
* connman_ipconfig_ref:
* @ipconfig: ipconfig structure
*/
struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
{
- g_atomic_int_inc(&ipconfig->refcount);
+ DBG("ipconfig %p refcount %d", ipconfig, ipconfig->refcount + 1);
- return ipconfig;
-}
+ __sync_fetch_and_add(&ipconfig->refcount, 1);
-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);
+ return ipconfig;
}
/**
*/
void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
{
- if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
- __connman_ipconfig_disable(ipconfig);
+ if (ipconfig == NULL)
+ return;
- connman_ipconfig_set_ops(ipconfig, NULL);
+ DBG("ipconfig %p refcount %d", ipconfig, ipconfig->refcount - 1);
- if (ipconfig->origin != NULL) {
- connman_ipconfig_unref(ipconfig->origin);
- ipconfig->origin = NULL;
- }
+ if (__sync_fetch_and_sub(&ipconfig->refcount, 1) != 1)
+ return;
- connman_ipaddress_free(ipconfig->system);
- connman_ipaddress_free(ipconfig->address);
- free_ipv6config(ipconfig->ipv6);
- g_free(ipconfig);
+ if (__connman_ipconfig_disable(ipconfig) < 0)
+ ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+
+ connman_ipconfig_set_ops(ipconfig, NULL);
+
+ if (ipconfig->origin != NULL) {
+ connman_ipconfig_unref(ipconfig->origin);
+ ipconfig->origin = NULL;
}
+
+ connman_ipaddress_free(ipconfig->system);
+ connman_ipaddress_free(ipconfig->address);
+ g_free(ipconfig->last_dhcp_address);
+ 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
return ipconfig->method;
}
-/**
- * connman_ipconfig_bind:
- * @ipconfig: ipconfig structure
- * @ipaddress: ipaddress structure
- *
- * Bind IP address details to configuration
- */
-void connman_ipconfig_bind(struct connman_ipconfig *ipconfig,
- struct connman_ipaddress *ipaddress)
-{
- struct connman_ipconfig *origin;
-
- origin = ipconfig->origin ? ipconfig->origin : ipconfig;
-
- connman_ipaddress_copy(origin->address, ipaddress);
-
- connman_inet_set_address(origin->index, origin->address);
-}
-
-void __connman_ipconfig_set_element_ipv6_gateway(
- struct connman_ipconfig *ipconfig,
- struct connman_element *element)
-{
- element->ipv6.gateway = ipconfig->ipv6->address->gateway;
-}
-
-/*
- * FIXME: The element soulution should be removed in the future
- * Set IPv4 and IPv6 gateway
- */
-int __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig,
- struct connman_element *parent)
-{
- struct connman_element *connection;
-
- connection = connman_element_create(NULL);
-
- DBG("ipconfig %p", ipconfig);
-
- connection->type = CONNMAN_ELEMENT_TYPE_CONNECTION;
- connection->index = ipconfig->index;
- connection->ipv4.gateway = ipconfig->address->gateway;
- connection->ipv6.gateway = ipconfig->ipv6->address->gateway;
-
- if (connman_element_register(connection, parent) < 0)
- connman_element_unref(connection);
-
- return 0;
-}
-
-int __connman_ipconfig_set_address(struct connman_ipconfig *ipconfig)
+int __connman_ipconfig_address_add(struct connman_ipconfig *ipconfig)
{
DBG("");
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
- break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
return connman_inet_set_address(ipconfig->index,
return 0;
}
-int __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig)
+int __connman_ipconfig_address_remove(struct connman_ipconfig *ipconfig)
{
+ int err;
+
DBG("");
if (ipconfig == NULL)
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ err = __connman_ipconfig_address_unset(ipconfig);
+ connman_ipaddress_clear(ipconfig->address);
+
+ return err;
+ }
+
+ return 0;
+}
+
+int __connman_ipconfig_address_unset(struct connman_ipconfig *ipconfig)
+{
+ int err;
+
+ DBG("");
+
+ if (ipconfig == NULL)
+ return 0;
+
+ DBG("method %d", ipconfig->method);
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
- return connman_inet_clear_address(ipconfig->index);
+ err = connman_inet_clear_address(ipconfig->index,
+ ipconfig->address);
else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
- return connman_inet_clear_ipv6_address(
+ err = connman_inet_clear_ipv6_address(
ipconfig->index,
ipconfig->address->local,
ipconfig->address->prefixlen);
+ else
+ err = -EINVAL;
+
+ return err;
}
return 0;
}
+int __connman_ipconfig_set_proxy_autoconfig(struct connman_ipconfig *ipconfig,
+ const char *url)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("ipconfig %p", ipconfig);
+
+ if (ipconfig == NULL || ipconfig->index < 0)
+ return -ENODEV;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return -ENXIO;
+
+ g_free(ipdevice->pac);
+ ipdevice->pac = g_strdup(url);
+
+ return 0;
+}
+
+const char *__connman_ipconfig_get_proxy_autoconfig(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("ipconfig %p", ipconfig);
+
+ if (ipconfig == NULL || ipconfig->index < 0)
+ return NULL;
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return NULL;
+
+ return ipdevice->pac;
+}
+
+void __connman_ipconfig_set_dhcp_address(struct connman_ipconfig *ipconfig,
+ const char *address)
+{
+ if (ipconfig == NULL)
+ return;
+
+ g_free(ipconfig->last_dhcp_address);
+ ipconfig->last_dhcp_address = g_strdup(address);
+}
+
+char *__connman_ipconfig_get_dhcp_address(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig == NULL)
+ return NULL;
+
+ return ipconfig->last_dhcp_address;
+}
+
+static void disable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return;
+
+ set_ipv6_state(ipdevice->ifname, FALSE);
+}
+
+static void enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return;
+
+ if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO)
+ set_ipv6_privacy(ipdevice->ifname,
+ ipconfig->ipv6_privacy_config);
+
+ set_ipv6_state(ipdevice->ifname, TRUE);
+}
+
+void __connman_ipconfig_enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
+ enable_ipv6(ipconfig);
+}
+
+void __connman_ipconfig_disable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ if (ipconfig == NULL || ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
+ disable_ipv6(ipconfig);
+}
+
int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig)
{
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;
+ enable_ipv6(ipconfig);
+ } 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;
+ if (ipdevice->config_ipv6->method ==
+ CONNMAN_IPCONFIG_METHOD_AUTO)
+ disable_ipv6(ipdevice->config_ipv6);
+
+ 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;
}
+static const char *privacy2string(int privacy)
+{
+ if (privacy <= 0)
+ return "disabled";
+ else if (privacy == 1)
+ return "enabled";
+ else if (privacy > 1)
+ return "prefered";
+
+ return "disabled";
+}
+
+static int string2privacy(const char *privacy)
+{
+ if (g_strcmp0(privacy, "disabled") == 0)
+ return 0;
+ else if (g_strcmp0(privacy, "enabled") == 0)
+ return 1;
+ else if (g_strcmp0(privacy, "prefered") == 0)
+ return 2;
+ else
+ return 0;
+}
+
void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
DBusMessageIter *iter)
{
DBG("");
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+ return;
+
str = __connman_ipconfig_method2string(ipconfig->method);
if (str == NULL)
return;
}
void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig,
- DBusMessageIter *iter)
+ DBusMessageIter *iter,
+ struct connman_ipconfig *ipconfig_ipv4)
{
- const char *str;
+ const char *str, *privacy;
DBG("");
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return;
+
str = __connman_ipconfig_method2string(ipconfig->method);
if (str == NULL)
return;
+ if (ipconfig_ipv4 != NULL &&
+ ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO) {
+ if (__connman_6to4_check(ipconfig_ipv4) == 1)
+ str = "6to4";
+ }
+
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
if (ipconfig->system == NULL)
if (ipconfig->system->gateway != NULL)
connman_dbus_dict_append_basic(iter, "Gateway",
DBUS_TYPE_STRING, &ipconfig->system->gateway);
+
+ privacy = privacy2string(ipconfig->ipv6_privacy_config);
+ connman_dbus_dict_append_basic(iter, "Privacy",
+ DBUS_TYPE_STRING, &privacy);
}
void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig,
DBusMessageIter *iter)
{
- const char *str;
+ const char *str, *privacy;
DBG("");
return;
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
}
if (ipconfig->address->gateway != NULL)
connman_dbus_dict_append_basic(iter, "Gateway",
DBUS_TYPE_STRING, &ipconfig->address->gateway);
+
+ privacy = privacy2string(ipconfig->ipv6_privacy_config);
+ connman_dbus_dict_append_basic(iter, "Privacy",
+ DBUS_TYPE_STRING, &privacy);
}
void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
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_FIXED:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
break;
}
}
int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
- enum connman_ipconfig_type type, DBusMessageIter *array)
+ DBusMessageIter *array)
{
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
const char *address = NULL, *netmask = NULL, *gateway = NULL,
- *prefix_length_string = NULL;
- int prefix_length = 0;
+ *prefix_length_string = NULL, *privacy_string = NULL;
+ int prefix_length = 0, privacy = 0;
DBusMessageIter dict;
- DBG("ipconfig %p type %d", ipconfig, type);
-
- if (type != CONNMAN_IPCONFIG_TYPE_IPV4 &&
- type != CONNMAN_IPCONFIG_TYPE_IPV6)
- return -EINVAL;
+ DBG("ipconfig %p", ipconfig);
if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
return -EINVAL;
return -EINVAL;
dbus_message_iter_get_basic(&entry, &gateway);
+ } else if (g_str_equal(key, "Privacy") == TRUE) {
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(&entry, &privacy_string);
+ privacy = string2privacy(privacy_string);
}
dbus_message_iter_next(&dict);
}
- DBG("method %d address %s netmask %s gateway %s prefix_length %d",
- method, address, netmask, gateway, prefix_length);
+ DBG("method %d address %s netmask %s gateway %s prefix_length %d "
+ "privacy %s",
+ method, address, netmask, gateway, prefix_length,
+ privacy_string);
switch (method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
return -EINVAL;
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ ipconfig->method = method;
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ disable_ipv6(ipconfig);
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ return -EINVAL;
+
+ ipconfig->method = method;
+ if (privacy_string != NULL)
+ ipconfig->ipv6_privacy_config = privacy;
+ enable_ipv6(ipconfig);
+ break;
+
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (address == NULL)
return -EINVAL;
ipconfig->method = method;
- if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
connman_ipaddress_set_ipv4(ipconfig->address,
address, netmask, gateway);
else
return connman_ipaddress_set_ipv6(
ipconfig->address, address,
- gateway, prefix_length);
+ prefix_length, gateway);
break;
case CONNMAN_IPCONFIG_METHOD_DHCP:
- if (ipconfig->method == method)
- return 0;
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+ return -EOPNOTSUPP;
ipconfig->method = method;
break;
return 0;
}
-void __connman_ipconfig_append_proxy(struct connman_ipconfig *ipconfig,
- DBusMessageIter *iter)
-{
- const char *method = "direct";
-
- connman_dbus_dict_append_basic(iter, "Method",
- DBUS_TYPE_STRING, &method);
-}
-
void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig,
DBusMessageIter *iter)
{
int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
GKeyFile *keyfile, const char *identifier, const char *prefix)
{
- const char *method;
+ char *method;
char *key;
+ char *str;
DBG("ipconfig %p identifier %s", ipconfig, identifier);
key = g_strdup_printf("%smethod", prefix);
method = g_key_file_get_string(keyfile, identifier, key, NULL);
- if (method == NULL)
- ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
- else
+ if (method == NULL) {
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
+ else
+ 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;
+
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO ||
+ ipconfig->method == CONNMAN_IPCONFIG_METHOD_MANUAL) {
+ char *privacy;
+ char *pprefix = g_strdup_printf("%sprivacy", prefix);
+ privacy = g_key_file_get_string(keyfile, identifier,
+ pprefix, NULL);
+ ipconfig->ipv6_privacy_config = string2privacy(privacy);
+ g_free(pprefix);
+ g_free(privacy);
+
+ __connman_ipconfig_enable(ipconfig);
+ enable_ipv6(ipconfig);
+ }
+ }
+
+ g_free(method);
g_free(key);
key = g_strdup_printf("%snetmask_prefixlen", prefix);
keyfile, identifier, key, NULL);
g_free(key);
+ key = g_strdup_printf("%sDHCP.LastAddress", prefix);
+ str = g_key_file_get_string(keyfile, identifier, key, NULL);
+ if (str != NULL) {
+ g_free(ipconfig->last_dhcp_address);
+ ipconfig->last_dhcp_address = str;
+ }
+ g_free(key);
+
return 0;
}
g_key_file_set_string(keyfile, identifier, key, method);
g_free(key);
+ if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+ const char *privacy;
+ privacy = privacy2string(ipconfig->ipv6_privacy_config);
+ key = g_strdup_printf("%sprivacy", prefix);
+ g_key_file_set_string(keyfile, identifier, key, privacy);
+ g_free(key);
+ }
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ break;
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ key = g_strdup_printf("%sDHCP.LastAddress", prefix);
+ if (ipconfig->last_dhcp_address != NULL &&
+ strlen(ipconfig->last_dhcp_address) > 0)
+ g_key_file_set_string(keyfile, identifier, key,
+ ipconfig->last_dhcp_address);
+ else
+ g_key_file_remove_key(keyfile, identifier, key, NULL);
+ g_free(key);
+ /* fall through */
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return 0;
+ }
+
key = g_strdup_printf("%snetmask_prefixlen", prefix);
g_key_file_set_integer(keyfile, identifier,
key, ipconfig->address->prefixlen);
projects / framework / connectivity / connman.git / blobdiff