X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fipconfig.c;h=7fc887b7ddd93eef611bb50a1d0f9b766fb380bf;hb=0198bed1ceed7a84e10a4bd8cd428ac729a3ac85;hp=0503b35524213b363f94c0e9a647853970431e1c;hpb=af5998abd8865e7890a8bdd907d778dd34e13e6b;p=platform%2Fupstream%2Fconnman.git diff --git a/src/ipconfig.c b/src/ipconfig.c index 0503b35..7fc887b 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -23,8 +23,12 @@ #include #endif +#include #include #include +#include +#include +#include #ifndef IFF_LOWER_UP #define IFF_LOWER_UP 0x10000 @@ -34,9 +38,21 @@ #include "connman.h" -struct connman_ipaddress { - unsigned char prefixlen; - char *address; +struct connman_ipconfig { + gint refcount; + int index; + enum connman_ipconfig_type type; + + struct connman_ipconfig *origin; + + const struct connman_ipconfig_ops *ops; + void *ops_data; + + enum connman_ipconfig_method method; + struct connman_ipaddress *address; + struct connman_ipaddress *system; + + int ipv6_privacy_config; }; struct connman_ipdevice { @@ -44,24 +60,182 @@ struct connman_ipdevice { char *ifname; unsigned short type; unsigned int flags; + char *address; + uint16_t mtu; + uint32_t rx_packets; + uint32_t tx_packets; + uint32_t rx_bytes; + uint32_t tx_bytes; + uint32_t rx_errors; + uint32_t tx_errors; + uint32_t rx_dropped; + uint32_t tx_dropped; GSList *address_list; - char *gateway; -}; + char *ipv4_gateway; + char *ipv6_gateway; -struct connman_ipconfig { - gint refcount; - int index; + char *pac; - const struct connman_ipconfig_ops *ops; - void *ops_data; + struct connman_ipconfig *config_ipv4; + struct connman_ipconfig *config_ipv6; - enum connman_ipconfig_method method; + gboolean ipv6_enabled; + int ipv6_privacy; }; static GHashTable *ipdevice_hash = NULL; static GList *ipconfig_list = NULL; +struct connman_ipaddress *connman_ipaddress_alloc(int family) +{ + struct connman_ipaddress *ipaddress; + + ipaddress = g_try_new0(struct connman_ipaddress, 1); + if (ipaddress == NULL) + return NULL; + + ipaddress->family = family; + ipaddress->prefixlen = 0; + ipaddress->local = NULL; + ipaddress->peer = NULL; + ipaddress->broadcast = NULL; + ipaddress->gateway = NULL; + + return ipaddress; +} + +void connman_ipaddress_free(struct connman_ipaddress *ipaddress) +{ + if (ipaddress == NULL) + return; + + g_free(ipaddress->broadcast); + g_free(ipaddress->peer); + g_free(ipaddress->local); + g_free(ipaddress->gateway); + g_free(ipaddress); +} + +unsigned char __connman_ipconfig_netmask_prefix_len(const char *netmask) +{ + 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; + + return bits; +} + +static gboolean check_ipv6_address(const char *address) +{ + unsigned char buf[sizeof(struct in6_addr)]; + int err; + + err = inet_pton(AF_INET6, address, buf); + if (err > 0) + return TRUE; + + return FALSE; +} + +int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress, + const char *address, const char *gateway, + unsigned char prefix_length) +{ + if (ipaddress == NULL) + return -EINVAL; + + if (check_ipv6_address(address) == FALSE) + return -EINVAL; + + if (check_ipv6_address(gateway) == FALSE) + return -EINVAL; + + DBG("prefix_len %d address %s gateway %s", + prefix_length, address, gateway); + + ipaddress->prefixlen = prefix_length; + + g_free(ipaddress->local); + ipaddress->local = g_strdup(address); + + g_free(ipaddress->gateway); + ipaddress->gateway = g_strdup(gateway); + + return 0; +} + +void connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress, + const char *address, const char *netmask, const char *gateway) +{ + if (ipaddress == NULL) + return; + + 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); +} + +void connman_ipaddress_clear(struct connman_ipaddress *ipaddress) +{ + if (ipaddress == NULL) + return; + + ipaddress->prefixlen = 0; + + g_free(ipaddress->local); + ipaddress->local = NULL; + + g_free(ipaddress->peer); + ipaddress->peer = NULL; + + g_free(ipaddress->broadcast); + ipaddress->broadcast = NULL; + + g_free(ipaddress->gateway); + ipaddress->gateway = NULL; +} + +void connman_ipaddress_copy(struct connman_ipaddress *ipaddress, + struct connman_ipaddress *source) +{ + if (ipaddress == NULL || source == NULL) + return; + + ipaddress->family = source->family; + ipaddress->prefixlen = source->prefixlen; + + g_free(ipaddress->local); + ipaddress->local = g_strdup(source->local); + + g_free(ipaddress->peer); + ipaddress->peer = g_strdup(source->peer); + + g_free(ipaddress->broadcast); + ipaddress->broadcast = g_strdup(source->broadcast); + + g_free(ipaddress->gateway); + ipaddress->gateway = g_strdup(source->gateway); +} + static void free_address_list(struct connman_ipdevice *ipdevice) { GSList *list; @@ -69,8 +243,7 @@ static void free_address_list(struct connman_ipdevice *ipdevice) for (list = ipdevice->address_list; list; list = list->next) { struct connman_ipaddress *ipaddress = list->data; - g_free(ipaddress->address); - g_free(ipaddress); + connman_ipaddress_free(ipaddress); list->data = NULL; } @@ -79,14 +252,14 @@ static void free_address_list(struct connman_ipdevice *ipdevice) } static struct connman_ipaddress *find_ipaddress(struct connman_ipdevice *ipdevice, - unsigned char prefixlen, const char *address) + unsigned char prefixlen, const char *local) { GSList *list; for (list = ipdevice->address_list; list; list = list->next) { struct connman_ipaddress *ipaddress = list->data; - if (g_strcmp0(ipaddress->address, address) == 0 && + if (g_strcmp0(ipaddress->local, local) == 0 && ipaddress->prefixlen == prefixlen) return ipaddress; } @@ -124,6 +297,125 @@ static const char *scope2str(unsigned char scope) return ""; } +static gboolean get_ipv6_state(gchar *ifname) +{ + int disabled; + gchar *path; + FILE *f; + gboolean enabled = FALSE; + + 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 enabled; + + f = fopen(path, "r"); + + g_free(path); + + if (f != NULL) { + if (fscanf(f, "%d", &disabled) > 0) + enabled = !disabled; + fclose(f); + } + + return enabled; +} + +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 int get_ipv6_privacy(gchar *ifname) +{ + 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"); + + g_free(path); + + if (f == NULL) + return 0; + + if (fscanf(f, "%d", &value) <= 0) + value = 0; + + fclose(f); + + return value; +} + +/* Enable the IPv6 privacy extension for stateless address autoconfiguration. + * The privacy extension is described in RFC 3041 and RFC 4941 + */ +static void set_ipv6_privacy(gchar *ifname, int value) +{ + gchar *path; + FILE *f; + + if (ifname == NULL) + return; + + 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); +} + static void free_ipdevice(gpointer data) { struct connman_ipdevice *ipdevice = data; @@ -131,15 +423,97 @@ static void free_ipdevice(gpointer 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->gateway); + 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); } +static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice) +{ + DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4, + ipdevice->config_ipv6); +} + +static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice) +{ + DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4, + ipdevice->config_ipv6); + + if (ipdevice->config_ipv4) + connman_inet_clear_address(ipdevice->index, + ipdevice->config_ipv4->address); + + 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 {RX} %u packets %u bytes", ipdevice->ifname, + stats->rx_packets, stats->rx_bytes); + connman_info("%s {TX} %u packets %u bytes", ipdevice->ifname, + stats->tx_packets, stats->tx_bytes); + + 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->tx_packets = stats->tx_packets; + ipdevice->rx_bytes = stats->rx_bytes; + ipdevice->tx_bytes = stats->tx_bytes; + ipdevice->rx_errors = stats->rx_errors; + ipdevice->tx_errors = stats->tx_errors; + ipdevice->rx_dropped = stats->rx_dropped; + ipdevice->tx_dropped = stats->tx_dropped; + + __connman_service_notify(service, + ipdevice->rx_packets, ipdevice->tx_packets, + ipdevice->rx_bytes, ipdevice->tx_bytes, + ipdevice->rx_errors, ipdevice->tx_errors, + ipdevice->rx_dropped, ipdevice->tx_dropped); +} + void __connman_ipconfig_newlink(int index, unsigned short type, - unsigned int flags) + unsigned int flags, const char *address, + unsigned short mtu, + struct rtnl_link_stats *stats) { struct connman_ipdevice *ipdevice; GList *list; @@ -149,6 +523,9 @@ void __connman_ipconfig_newlink(int index, unsigned short type, DBG("index %d", index); + if (type == ARPHRD_LOOPBACK) + return; + ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index)); if (ipdevice != NULL) goto update; @@ -161,12 +538,21 @@ void __connman_ipconfig_newlink(int index, unsigned short type, 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); connman_info("%s {create} index %d type %d <%s>", ipdevice->ifname, index, type, type2str(type)); update: + ipdevice->mtu = mtu; + + update_stats(ipdevice, stats); + if (flags == ipdevice->flags) return; @@ -215,26 +601,39 @@ update: if (index != ipconfig->index) continue; - if (ipconfig->ops) { - if (up == TRUE && ipconfig->ops->up) - ipconfig->ops->up(ipconfig); - if (lower_up == TRUE && ipconfig->ops->lower_up) - ipconfig->ops->lower_up(ipconfig); + if (ipconfig->ops == NULL) + continue; + + if (up == TRUE && ipconfig->ops->up) + ipconfig->ops->up(ipconfig); + if (lower_up == TRUE && ipconfig->ops->lower_up) + ipconfig->ops->lower_up(ipconfig); - if (lower_down == TRUE && ipconfig->ops->lower_down) - ipconfig->ops->lower_down(ipconfig); - if (down == TRUE && ipconfig->ops->down) - ipconfig->ops->down(ipconfig); - } + if (lower_down == TRUE && ipconfig->ops->lower_down) + ipconfig->ops->lower_down(ipconfig); + if (down == TRUE && ipconfig->ops->down) + ipconfig->ops->down(ipconfig); } + + if (lower_up) + __connman_ipconfig_lower_up(ipdevice); + if (lower_down) + __connman_ipconfig_lower_down(ipdevice); } -void __connman_ipconfig_dellink(int index) +void __connman_ipconfig_dellink(int index, struct rtnl_link_stats *stats) { + struct connman_ipdevice *ipdevice; GList *list; DBG("index %d", index); + ipdevice = g_hash_table_lookup(ipdevice_hash, GINT_TO_POINTER(index)); + if (ipdevice == NULL) + return; + + update_stats(ipdevice, stats); + for (list = g_list_first(ipconfig_list); list; list = g_list_next(list)) { struct connman_ipconfig *ipconfig = list->data; @@ -244,20 +643,37 @@ void __connman_ipconfig_dellink(int index) ipconfig->index = -1; - if (ipconfig->ops && ipconfig->ops->lower_down) + if (ipconfig->ops == NULL) + continue; + + if (ipconfig->ops->lower_down) ipconfig->ops->lower_down(ipconfig); - if (ipconfig->ops && ipconfig->ops->down) + if (ipconfig->ops->down) ipconfig->ops->down(ipconfig); } + __connman_ipconfig_lower_down(ipdevice); + g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(index)); } -void __connman_ipconfig_newaddr(int index, const char *label, +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; + GList *list; DBG("index %d", index); @@ -265,25 +681,59 @@ void __connman_ipconfig_newaddr(int index, const char *label, if (ipdevice == NULL) return; - ipaddress = g_try_new0(struct connman_ipaddress, 1); + ipaddress = connman_ipaddress_alloc(family); if (ipaddress == NULL) return; ipaddress->prefixlen = prefixlen; - ipaddress->address = g_strdup(address); + ipaddress->local = g_strdup(address); + + if (g_slist_find_custom(ipdevice->address_list, ipaddress, + check_duplicate_address)) { + connman_ipaddress_free(ipaddress); + 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_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; + + for (list = g_list_first(ipconfig_list); list; + list = g_list_next(list)) { + struct connman_ipconfig *ipconfig = list->data; + + if (index != ipconfig->index) + continue; + + if (ipconfig->ops == NULL) + continue; + + if (ipconfig->ops->ip_bound) + ipconfig->ops->ip_bound(ipconfig); + } } -void __connman_ipconfig_deladdr(int index, const char *label, +void __connman_ipconfig_deladdr(int index, int family, const char *label, unsigned char prefixlen, const char *address) { struct connman_ipdevice *ipdevice; struct connman_ipaddress *ipaddress; + GList *list; DBG("index %d", index); @@ -298,14 +748,34 @@ void __connman_ipconfig_deladdr(int index, const char *label, ipdevice->address_list = g_slist_remove(ipdevice->address_list, ipaddress); - g_free(ipaddress->address); + connman_ipaddress_clear(ipaddress); g_free(ipaddress); connman_info("%s {del} address %s/%u label %s", ipdevice->ifname, address, prefixlen, label); + + if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP)) + return; + + if (g_slist_length(ipdevice->address_list) > 0) + return; + + for (list = g_list_first(ipconfig_list); list; + list = g_list_next(list)) { + struct connman_ipconfig *ipconfig = list->data; + + if (index != ipconfig->index) + continue; + + if (ipconfig->ops == NULL) + continue; + + if (ipconfig->ops->ip_release) + ipconfig->ops->ip_release(ipconfig); + } } -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; @@ -317,8 +787,51 @@ void __connman_ipconfig_newroute(int index, unsigned char scope, return; if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) { - g_free(ipdevice->gateway); - ipdevice->gateway = g_strdup(gateway); + GSList *list; + GList *config_list; + + 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_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) { + 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 (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>", @@ -326,7 +839,7 @@ void __connman_ipconfig_newroute(int index, unsigned char scope, 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; @@ -338,16 +851,57 @@ void __connman_ipconfig_delroute(int index, unsigned char scope, return; if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) { - g_free(ipdevice->gateway); - ipdevice->gateway = NULL; - } + GSList *list; + GList *config_list; + + 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_ipv4 != NULL && + ipdevice->config_ipv4->system != NULL) { + g_free(ipdevice->config_ipv4->system->gateway); + ipdevice->config_ipv4->system->gateway = NULL; + } + } - connman_info("%s {del} route %s gw %s scope %u <%s>", - ipdevice->ifname, dst, gateway, - scope, scope2str(scope)); -} + for (list = ipdevice->address_list; list; list = list->next) { + struct connman_ipaddress *ipaddress = list->data; -void __connman_ipconfig_foreach(void (*function) (int index, void *user_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 (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>", + ipdevice->ifname, dst, gateway, + scope, scope2str(scope)); +} + +void __connman_ipconfig_foreach(void (*function) (int index, void *user_data), void *user_data) { GList *list, *keys; @@ -365,7 +919,13 @@ void __connman_ipconfig_foreach(void (*function) (int index, void *user_data), 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; @@ -376,7 +936,7 @@ unsigned short __connman_ipconfig_get_type(int index) 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; @@ -387,7 +947,7 @@ unsigned int __connman_ipconfig_get_flags(int index) 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; @@ -395,7 +955,160 @@ const char *__connman_ipconfig_get_gateway(int index) if (ipdevice == NULL) return 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_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; +} + +const char *__connman_ipconfig_get_local(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->local; +} + +void __connman_ipconfig_set_local(struct connman_ipconfig *ipconfig, const char *address) +{ + if (ipconfig->address == NULL) + return; + + g_free(ipconfig->address->local); + ipconfig->address->local = g_strdup(address); +} + +const char *__connman_ipconfig_get_peer(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->peer; +} + +void __connman_ipconfig_set_peer(struct connman_ipconfig *ipconfig, const char *address) +{ + if (ipconfig->address == NULL) + return; + + g_free(ipconfig->address->peer); + ipconfig->address->peer = g_strdup(address); +} + +const char *__connman_ipconfig_get_broadcast(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->broadcast; +} + +void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig, const char *broadcast) +{ + if (ipconfig->address == NULL) + return; + + g_free(ipconfig->address->broadcast); + ipconfig->address->broadcast = g_strdup(broadcast); +} + +const char *__connman_ipconfig_get_gateway(struct connman_ipconfig *ipconfig) +{ + if (ipconfig->address == NULL) + return NULL; + + return ipconfig->address->gateway; +} + +void __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig, const char *gateway) +{ + struct connman_service *service; + + if (ipconfig->address == NULL) + return; + + service = __connman_service_lookup_from_index(ipconfig->index); + if (service != NULL) + __connman_connection_gateway_remove(service); + + g_free(ipconfig->address->gateway); + ipconfig->address->gateway = g_strdup(gateway); + + if (service != NULL && ipconfig->address->gateway != NULL) { + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) { + __connman_connection_gateway_add(service, + NULL, + ipconfig->address->gateway, + ipconfig->address->peer); + } else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) { + __connman_connection_gateway_add(service, + ipconfig->address->gateway, + NULL, + ipconfig->address->peer); + } + } +} + +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; } /** @@ -405,10 +1118,14 @@ const char *__connman_ipconfig_get_gateway(int index) * * 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); @@ -418,14 +1135,22 @@ struct connman_ipconfig *connman_ipconfig_create(int index) ipconfig->refcount = 1; ipconfig->index = index; + ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4; - DBG("ipconfig %p", ipconfig); + ipconfig->address = connman_ipaddress_alloc(AF_INET); + if (ipconfig->address == NULL) { + g_free(ipconfig); + return NULL; + } - ipconfig_list = g_list_append(ipconfig_list, ipconfig); + ipconfig->system = connman_ipaddress_alloc(AF_INET); + + DBG("ipconfig %p", ipconfig); return ipconfig; } + /** * connman_ipconfig_ref: * @ipconfig: ipconfig structure @@ -434,6 +1159,9 @@ struct connman_ipconfig *connman_ipconfig_create(int index) */ 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; @@ -447,9 +1175,24 @@ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig) */ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) { + 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) { - ipconfig_list = g_list_remove(ipconfig_list, ipconfig); + __connman_ipconfig_disable(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); } } @@ -462,6 +1205,9 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) */ void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig) { + if (ipconfig == NULL) + return NULL; + return ipconfig->ops_data; } @@ -485,6 +1231,12 @@ void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data) */ int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig) { + if (ipconfig == NULL) + return -1; + + if (ipconfig->origin != NULL) + return ipconfig->origin->index; + return ipconfig->index; } @@ -498,6 +1250,9 @@ const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig) { struct connman_ipdevice *ipdevice; + if (ipconfig == NULL) + return NULL; + if (ipconfig->index < 0) return NULL; @@ -537,17 +1292,309 @@ int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, return 0; } +enum connman_ipconfig_method __connman_ipconfig_get_method(struct connman_ipconfig *ipconfig) +{ + if (ipconfig == NULL) + return CONNMAN_IPCONFIG_METHOD_UNKNOWN; + + 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) +{ + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) + element->ipv6.gateway = ipconfig->address->gateway; +} + +int __connman_ipconfig_set_address(struct connman_ipconfig *ipconfig) +{ + DBG(""); + + 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: + break; + case CONNMAN_IPCONFIG_METHOD_MANUAL: + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) + return connman_inet_set_address(ipconfig->index, + ipconfig->address); + else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) + return connman_inet_set_ipv6_address( + ipconfig->index, ipconfig->address); + } + + return 0; +} + +int __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig) +{ + 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_FIXED: + case CONNMAN_IPCONFIG_METHOD_DHCP: + case CONNMAN_IPCONFIG_METHOD_AUTO: + break; + case CONNMAN_IPCONFIG_METHOD_MANUAL: + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) + return connman_inet_clear_address(ipconfig->index, + ipconfig->address); + else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) + return connman_inet_clear_ipv6_address( + ipconfig->index, + ipconfig->address->local, + ipconfig->address->prefixlen); + } + + 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; +} + +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_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 (ipconfig == NULL || ipconfig->index < 0) + return -ENODEV; + + ipdevice = g_hash_table_lookup(ipdevice_hash, + GINT_TO_POINTER(ipconfig->index)); + if (ipdevice == NULL) + return -ENXIO; + + 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); + + 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_ipv6->system); + + connman_ipconfig_unref(ipdevice->config_ipv6); + } + + 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->flags & IFF_UP) + up = TRUE; + else + down = TRUE; + + if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) == + (IFF_RUNNING | IFF_LOWER_UP)) + lower_up = TRUE; + else if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) == 0) + lower_down = TRUE; + + if (up == TRUE && ipconfig->ops->up) + ipconfig->ops->up(ipconfig); + if (lower_up == TRUE && ipconfig->ops->lower_up) + ipconfig->ops->lower_up(ipconfig); + + if (lower_down == TRUE && ipconfig->ops->lower_down) + ipconfig->ops->lower_down(ipconfig); + if (down == TRUE && ipconfig->ops->down) + ipconfig->ops->down(ipconfig); + + return 0; +} + +int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig) +{ + 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; + + if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL) + return -EINVAL; + + if (ipdevice->config_ipv4 == ipconfig) { + ipconfig_list = g_list_remove(ipconfig_list, ipconfig); + + connman_ipaddress_clear(ipdevice->config_ipv4->system); + connman_ipconfig_unref(ipdevice->config_ipv4); + ipdevice->config_ipv4 = NULL; + return 0; + } + + if (ipdevice->config_ipv6 == ipconfig) { + ipconfig_list = g_list_remove(ipconfig_list, ipconfig); + + 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) { switch (method) { case CONNMAN_IPCONFIG_METHOD_UNKNOWN: break; - case CONNMAN_IPCONFIG_METHOD_IGNORE: - return "ignore"; - case CONNMAN_IPCONFIG_METHOD_STATIC: - return "static"; + case CONNMAN_IPCONFIG_METHOD_OFF: + return "off"; + case CONNMAN_IPCONFIG_METHOD_FIXED: + return "fixed"; + case CONNMAN_IPCONFIG_METHOD_MANUAL: + return "manual"; case CONNMAN_IPCONFIG_METHOD_DHCP: return "dhcp"; + case CONNMAN_IPCONFIG_METHOD_AUTO: + return "auto"; } return NULL; @@ -555,122 +1602,495 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method) { - if (g_strcmp0(method, "ignore") == 0) - return CONNMAN_IPCONFIG_METHOD_IGNORE; - else if (g_strcmp0(method, "static") == 0) - return CONNMAN_IPCONFIG_METHOD_STATIC; + if (g_strcmp0(method, "off") == 0) + return CONNMAN_IPCONFIG_METHOD_OFF; + else if (g_strcmp0(method, "fixed") == 0) + return CONNMAN_IPCONFIG_METHOD_FIXED; + else if (g_strcmp0(method, "manual") == 0) + 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 void append_variant(DBusMessageIter *iter, const char *prefix, - const char *key, int type, void *val) +static const char *privacy2string(int privacy) { - char *str; + 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) +{ + const char *str; + + DBG(""); + + if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4) + return; + + str = __connman_ipconfig_method2string(ipconfig->method); + if (str == NULL) + return; + + connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str); + + if (ipconfig->system == NULL) + return; + + if (ipconfig->system->local != NULL) { + in_addr_t addr; + struct in_addr netmask; + char *mask; + + connman_dbus_dict_append_basic(iter, "Address", + DBUS_TYPE_STRING, &ipconfig->system->local); + + addr = 0xffffffff << (32 - ipconfig->system->prefixlen); + netmask.s_addr = htonl(addr); + mask = inet_ntoa(netmask); + connman_dbus_dict_append_basic(iter, "Netmask", + DBUS_TYPE_STRING, &mask); + } + + if (ipconfig->system->gateway != NULL) + connman_dbus_dict_append_basic(iter, "Gateway", + DBUS_TYPE_STRING, &ipconfig->system->gateway); +} - if (prefix == NULL) { - connman_dbus_dict_append_variant(iter, key, type, val); +void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, + DBusMessageIter *iter) +{ + const char *str, *privacy; + + DBG(""); + + if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6) + return; + + str = __connman_ipconfig_method2string(ipconfig->method); + if (str == NULL) + return; + + connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str); + + if (ipconfig->system == NULL) return; + + if (ipconfig->system->local != NULL) { + connman_dbus_dict_append_basic(iter, "Address", + DBUS_TYPE_STRING, &ipconfig->system->local); + connman_dbus_dict_append_basic(iter, "PrefixLength", + DBUS_TYPE_BYTE, + &ipconfig->system->prefixlen); } - str = g_strdup_printf("%s%s", prefix, key); - if (str != NULL) - connman_dbus_dict_append_variant(iter, str, type, val); + if (ipconfig->system->gateway != NULL) + connman_dbus_dict_append_basic(iter, "Gateway", + DBUS_TYPE_STRING, &ipconfig->system->gateway); - g_free(str); + privacy = privacy2string(ipconfig->ipv6_privacy_config); + connman_dbus_dict_append_basic(iter, "Privacy", + DBUS_TYPE_STRING, &privacy); } -void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, - DBusMessageIter *iter, const char *prefix) +void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig, + DBusMessageIter *iter) +{ + const char *str, *privacy; + + DBG(""); + + str = __connman_ipconfig_method2string(ipconfig->method); + if (str == NULL) + return; + + connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str); + + switch (ipconfig->method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_DHCP: + return; + case CONNMAN_IPCONFIG_METHOD_FIXED: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + case CONNMAN_IPCONFIG_METHOD_AUTO: + break; + } + + if (ipconfig->address == NULL) + return; + + if (ipconfig->address->local != NULL) { + connman_dbus_dict_append_basic(iter, "Address", + DBUS_TYPE_STRING, &ipconfig->address->local); + connman_dbus_dict_append_basic(iter, "PrefixLength", + DBUS_TYPE_BYTE, + &ipconfig->address->prefixlen); + } + + 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, + DBusMessageIter *iter) { const char *str; + DBG(""); + str = __connman_ipconfig_method2string(ipconfig->method); if (str == NULL) return; - append_variant(iter, prefix, "Method", DBUS_TYPE_STRING, &str); + connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str); + + 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_MANUAL: + break; + } + + if (ipconfig->address == NULL) + return; + + if (ipconfig->address->local != NULL) { + in_addr_t addr; + struct in_addr netmask; + char *mask; + + connman_dbus_dict_append_basic(iter, "Address", + DBUS_TYPE_STRING, &ipconfig->address->local); + + addr = 0xffffffff << (32 - ipconfig->address->prefixlen); + netmask.s_addr = htonl(addr); + mask = inet_ntoa(netmask); + connman_dbus_dict_append_basic(iter, "Netmask", + DBUS_TYPE_STRING, &mask); + } + + if (ipconfig->address->gateway != NULL) + connman_dbus_dict_append_basic(iter, "Gateway", + DBUS_TYPE_STRING, &ipconfig->address->gateway); } -int __connman_ipconfig_set_ipv4(struct connman_ipconfig *ipconfig, - const char *key, DBusMessageIter *value) +int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig, + DBusMessageIter *array) { - int type = dbus_message_iter_get_arg_type(value); + enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; + const char *address = NULL, *netmask = NULL, *gateway = NULL, + *prefix_length_string = NULL, *privacy_string = NULL; + int prefix_length = 0, privacy = 0; + DBusMessageIter dict; + + DBG("ipconfig %p", ipconfig); - DBG("ipconfig %p key %s type %d", ipconfig, key, type); + if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY) + return -EINVAL; - if (g_strcmp0(key, "Method") == 0) { - const char *method; + dbus_message_iter_recurse(array, &dict); - if (type != DBUS_TYPE_STRING) + while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter entry; + const char *key; + int type; + + dbus_message_iter_recurse(&dict, &entry); + + if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) return -EINVAL; - dbus_message_iter_get_basic(value, &method); + dbus_message_iter_get_basic(&entry, &key); + dbus_message_iter_next(&entry); - ipconfig->method = __connman_ipconfig_string2method(method); - } else + type = dbus_message_iter_get_arg_type(&entry); + + if (g_str_equal(key, "Method") == TRUE) { + const char *str; + + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, &str); + method = __connman_ipconfig_string2method(str); + } else if (g_str_equal(key, "Address") == TRUE) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, &address); + } else if (g_str_equal(key, "PrefixLength") == TRUE) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, + &prefix_length_string); + + prefix_length = atoi(prefix_length_string); + if (prefix_length < 0 || prefix_length > 128) + return -EINVAL; + + } else if (g_str_equal(key, "Netmask") == TRUE) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, &netmask); + } else if (g_str_equal(key, "Gateway") == TRUE) { + if (type != DBUS_TYPE_STRING) + 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 " + "privacy %s", + method, address, netmask, gateway, prefix_length, + privacy_string); + + switch (method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + 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 (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); + break; + + case CONNMAN_IPCONFIG_METHOD_DHCP: + if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) + return -EOPNOTSUPP; + + ipconfig->method = method; + break; + } + return 0; } -int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, - GKeyFile *keyfile, const char *identifier, const char *prefix) +void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig, + DBusMessageIter *iter) { - DBG("ipconfig %p identifier %s", ipconfig, identifier); + struct connman_ipdevice *ipdevice; + const char *method = "auto"; - return 0; + connman_dbus_dict_append_basic(iter, "Method", + DBUS_TYPE_STRING, &method); + + ipdevice = g_hash_table_lookup(ipdevice_hash, + GINT_TO_POINTER(ipconfig->index)); + if (ipdevice == NULL) + return; + + if (ipdevice->ifname != NULL) + connman_dbus_dict_append_basic(iter, "Interface", + DBUS_TYPE_STRING, &ipdevice->ifname); + + if (ipdevice->address != NULL) + connman_dbus_dict_append_basic(iter, "Address", + DBUS_TYPE_STRING, &ipdevice->address); + + if (ipdevice->mtu > 0) + connman_dbus_dict_append_basic(iter, "MTU", + DBUS_TYPE_UINT16, &ipdevice->mtu); } -int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, +int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, GKeyFile *keyfile, const char *identifier, const char *prefix) { + char *method; + char *key; + DBG("ipconfig %p identifier %s", ipconfig, identifier); - return 0; -} + key = g_strdup_printf("%smethod", prefix); + method = g_key_file_get_string(keyfile, identifier, key, NULL); + 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); + } + } -static GSList *driver_list = NULL; + g_free(method); + g_free(key); -static gint compare_priority(gconstpointer a, gconstpointer b) -{ - const struct connman_ipconfig_driver *driver1 = a; - const struct connman_ipconfig_driver *driver2 = b; + key = g_strdup_printf("%snetmask_prefixlen", prefix); + ipconfig->address->prefixlen = g_key_file_get_integer( + keyfile, identifier, key, NULL); + g_free(key); - return driver2->priority - driver1->priority; -} + key = g_strdup_printf("%slocal_address", prefix); + ipconfig->address->local = g_key_file_get_string( + keyfile, identifier, key, NULL); + g_free(key); -/** - * 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); + key = g_strdup_printf("%speer_address", prefix); + ipconfig->address->peer = g_key_file_get_string( + keyfile, identifier, key, NULL); + g_free(key); - driver_list = g_slist_insert_sorted(driver_list, driver, - compare_priority); + key = g_strdup_printf("%sbroadcast_address", prefix); + ipconfig->address->broadcast = g_key_file_get_string( + keyfile, identifier, key, NULL); + g_free(key); + + key = g_strdup_printf("%sgateway", prefix); + ipconfig->address->gateway = g_key_file_get_string( + keyfile, identifier, key, NULL); + g_free(key); 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) +int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, + GKeyFile *keyfile, const char *identifier, const char *prefix) { - DBG("driver %p name %s", driver, driver->name); + const char *method; + char *key; + + DBG("ipconfig %p identifier %s", ipconfig, identifier); + + method = __connman_ipconfig_method2string(ipconfig->method); + + key = g_strdup_printf("%smethod", prefix); + g_key_file_set_string(keyfile, identifier, key, method); + g_free(key); + + switch (ipconfig->method) { + case CONNMAN_IPCONFIG_METHOD_FIXED: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + break; + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_DHCP: + case CONNMAN_IPCONFIG_METHOD_AUTO: + return 0; + } - driver_list = g_slist_remove(driver_list, driver); + key = g_strdup_printf("%snetmask_prefixlen", prefix); + g_key_file_set_integer(keyfile, identifier, + key, ipconfig->address->prefixlen); + g_free(key); + + key = g_strdup_printf("%slocal_address", prefix); + if (ipconfig->address->local != NULL) + g_key_file_set_string(keyfile, identifier, + key, ipconfig->address->local); + g_free(key); + + key = g_strdup_printf("%speer_address", prefix); + if (ipconfig->address->peer != NULL) + g_key_file_set_string(keyfile, identifier, + key, ipconfig->address->peer); + g_free(key); + + key = g_strdup_printf("%sbroadcast_address", prefix); + if (ipconfig->address->broadcast != NULL) + g_key_file_set_string(keyfile, identifier, + key, ipconfig->address->broadcast); + g_free(key); + + key = g_strdup_printf("%sgateway", prefix); + if (ipconfig->address->gateway != NULL) + g_key_file_set_string(keyfile, identifier, + key, ipconfig->address->gateway); + 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); + } + + return 0; } int __connman_ipconfig_init(void)