X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fipconfig.c;h=ac26203c6c0742d831ac2ead43df2a810e4c7344;hb=679bb7a005c773149de0760a10c1935aab0fa24f;hp=335a93e38479edc0ca5725b01f72bb24bc116e4f;hpb=859dd0f44e310d8c98e7e0370b488923ee3971f4;p=platform%2Fupstream%2Fconnman.git diff --git a/src/ipconfig.c b/src/ipconfig.c index 335a93e..ac26203 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 @@ -25,6 +25,7 @@ #include #include +#include #ifndef IFF_LOWER_UP #define IFF_LOWER_UP 0x10000 @@ -46,9 +47,6 @@ struct connman_ipconfig { enum connman_ipconfig_method method; struct connman_ipaddress *address; struct connman_ipaddress *system; - - char *eth; - uint16_t mtu; }; struct connman_ipdevice { @@ -56,6 +54,10 @@ struct connman_ipdevice { char *ifname; unsigned short type; unsigned int flags; + char *address; + uint16_t mtu; + uint32_t tx_bytes; + uint32_t rx_bytes; GSList *address_list; char *gateway; @@ -88,6 +90,7 @@ void connman_ipaddress_free(struct connman_ipaddress *ipaddress) g_free(ipaddress->broadcast); g_free(ipaddress->peer); g_free(ipaddress->local); + g_free(ipaddress->gateway); g_free(ipaddress); } @@ -108,7 +111,7 @@ static unsigned char netmask2prefixlen(const char *netmask) } void connman_ipaddress_set(struct connman_ipaddress *ipaddress, - const char *address, const char *netmask) + const char *address, const char *netmask, const char *gateway) { if (ipaddress == NULL) return; @@ -120,6 +123,9 @@ void connman_ipaddress_set(struct connman_ipaddress *ipaddress, 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) @@ -137,6 +143,9 @@ void connman_ipaddress_clear(struct connman_ipaddress *ipaddress) g_free(ipaddress->broadcast); ipaddress->broadcast = NULL; + + g_free(ipaddress->gateway); + ipaddress->gateway = NULL; } void connman_ipaddress_copy(struct connman_ipaddress *ipaddress, @@ -155,6 +164,9 @@ void connman_ipaddress_copy(struct connman_ipaddress *ipaddress, 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) @@ -231,6 +243,7 @@ static void free_ipdevice(gpointer data) free_address_list(ipdevice); g_free(ipdevice->gateway); + g_free(ipdevice->address); g_free(ipdevice->ifname); g_free(ipdevice); } @@ -337,16 +350,37 @@ static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice) connman_inet_clear_address(ipdevice->index); } +static void update_stats(struct connman_ipdevice *ipdevice, + struct rtnl_link_stats *stats) +{ + 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 == NULL) + return; + + ipdevice->rx_bytes = stats->rx_bytes; + ipdevice->tx_bytes = stats->tx_bytes; + + __connman_counter_notify(ipdevice->ifname, + ipdevice->rx_bytes, ipdevice->tx_bytes); +} + void __connman_ipconfig_newlink(int index, unsigned short type, unsigned int flags, const char *address, - unsigned short mtu) + unsigned short mtu, + struct rtnl_link_stats *stats) { struct connman_ipdevice *ipdevice; GList *list; GString *str; gboolean up = FALSE, down = FALSE; gboolean lower_up = FALSE, lower_down = FALSE; - char *ifname; DBG("index %d", index); @@ -357,35 +391,25 @@ void __connman_ipconfig_newlink(int index, unsigned short type, if (ipdevice != NULL) goto update; - ifname = connman_inet_ifname(index); - - if (__connman_element_device_isfiltered(ifname) == TRUE) { - connman_info("Ignoring interface %s (filtered)", ifname); - g_free(ifname); - return; - } - ipdevice = g_try_new0(struct connman_ipdevice, 1); - if (ipdevice == NULL) { - g_free(ifname); + if (ipdevice == NULL) return; - } ipdevice->index = index; - ipdevice->ifname = ifname; + ipdevice->ifname = connman_inet_ifname(index); ipdevice->type = type; + 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: - if (ipdevice->config != NULL) { - g_free(ipdevice->config->eth); - ipdevice->config->eth = g_strdup(address); - ipdevice->config->mtu = mtu; - } + ipdevice->mtu = mtu; + + update_stats(ipdevice, stats); if (flags == ipdevice->flags) return; @@ -455,7 +479,7 @@ update: __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; @@ -466,6 +490,8 @@ void __connman_ipconfig_dellink(int 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; @@ -597,8 +623,23 @@ void __connman_ipconfig_newroute(int index, unsigned char scope, return; if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 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); + } + + for (list = ipdevice->address_list; list; list = list->next) { + struct connman_ipaddress *ipaddress = list->data; + + g_free(ipaddress->gateway); + ipaddress->gateway = g_strdup(gateway); + } } connman_info("%s {add} route %s gw %s scope %u <%s>", @@ -618,8 +659,23 @@ void __connman_ipconfig_delroute(int index, unsigned char scope, return; if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 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; + } + + for (list = ipdevice->address_list; list; list = list->next) { + struct connman_ipaddress *ipaddress = list->data; + + g_free(ipaddress->gateway); + ipaddress->gateway = NULL; + } } connman_info("%s {del} route %s gw %s scope %u <%s>", @@ -678,6 +734,11 @@ const char *__connman_ipconfig_get_gateway(int index) return ipdevice->gateway; } +void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index) +{ + ipconfig->index = index; +} + /** * connman_ipconfig_create: * @@ -771,7 +832,6 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig) connman_ipaddress_free(ipconfig->system); connman_ipaddress_free(ipconfig->address); - g_free(ipconfig->eth); g_free(ipconfig); } } @@ -807,6 +867,9 @@ 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; @@ -823,6 +886,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; @@ -862,6 +928,14 @@ 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 @@ -881,6 +955,65 @@ void connman_ipconfig_bind(struct connman_ipconfig *ipconfig, connman_inet_set_address(origin->index, origin->address); } +/* FIXME: The element soulution should be removed in the future */ +int __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig, + struct connman_element *parent) +{ + struct connman_element *connection; + + connection = connman_element_create(NULL); + + connection->type = CONNMAN_ELEMENT_TYPE_CONNECTION; + connection->index = ipconfig->index; + connection->ipv4.gateway = ipconfig->address->gateway; + + if (connman_element_register(connection, parent) < 0) + connman_element_unref(connection); + + return 0; +} + +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: + break; + case CONNMAN_IPCONFIG_METHOD_MANUAL: + return connman_inet_set_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: + break; + case CONNMAN_IPCONFIG_METHOD_MANUAL: + return connman_inet_clear_address(ipconfig->index); + } + + return 0; + +} + int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) { struct connman_ipdevice *ipdevice; @@ -895,6 +1028,9 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) if (ipdevice == NULL) return -ENXIO; + if (ipdevice->config == ipconfig) + return -EALREADY; + if (ipdevice->config != NULL) { ipconfig_list = g_list_remove(ipconfig_list, ipconfig); @@ -997,6 +1133,10 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, 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); } void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, @@ -1037,13 +1177,17 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, 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_ipv4config(struct connman_ipconfig *ipconfig, DBusMessageIter *array) { enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; - const char *address = NULL, *netmask = NULL; + const char *address = NULL, *netmask = NULL, *gateway = NULL; DBusMessageIter dict; DBG("ipconfig %p", ipconfig); @@ -1086,12 +1230,17 @@ int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig, 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); + } dbus_message_iter_next(&dict); } - DBG("method %d address %s netmask %s", method, address, netmask); + DBG("method %d address %s netmask %s gateway %s", + method, address, netmask, gateway); switch (method) { case CONNMAN_IPCONFIG_METHOD_UNKNOWN: @@ -1104,7 +1253,8 @@ int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig, return -EINVAL; ipconfig->method = method; - connman_ipaddress_set(ipconfig->address, address, netmask); + connman_ipaddress_set(ipconfig->address, + address, netmask, gateway); break; case CONNMAN_IPCONFIG_METHOD_DHCP: @@ -1118,38 +1268,129 @@ int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig, return 0; } -int __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig, +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) +{ + struct connman_ipdevice *ipdevice; const char *method = "auto"; connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &method); - if (ipconfig->eth != NULL) + 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, &ipconfig->eth); + DBUS_TYPE_STRING, &ipdevice->address); - if (ipconfig->mtu > 0) + if (ipdevice->mtu > 0) connman_dbus_dict_append_basic(iter, "MTU", - DBUS_TYPE_UINT16, &ipconfig->mtu); - - return 0; + DBUS_TYPE_UINT16, &ipdevice->mtu); } int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, GKeyFile *keyfile, const char *identifier, const char *prefix) { + const char *method; + char *key; + 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 + ipconfig->method = __connman_ipconfig_string2method(method); + g_free(key); + + key = g_strdup_printf("%snetmask_prefixlen", prefix); + ipconfig->address->prefixlen = g_key_file_get_integer( + keyfile, identifier, key, NULL); + g_free(key); + + key = g_strdup_printf("%slocal_address", prefix); + ipconfig->address->local = g_key_file_get_string( + keyfile, identifier, key, NULL); + g_free(key); + + key = g_strdup_printf("%speer_address", prefix); + ipconfig->address->peer = g_key_file_get_string( + keyfile, identifier, key, NULL); + g_free(key); + + 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; } int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, GKeyFile *keyfile, const char *identifier, const char *prefix) { + 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); + + 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); + return 0; }