From: Daniel Wagner <daniel.wag...@bmw-carit.de> --- include/element.h | 2 - src/connman.h | 12 ++ src/dhcp.c | 302 +++++++++++++++++++++++++++-------------------------- src/element.c | 9 -- src/main.c | 2 + src/network.c | 110 ++++++++++--------- 6 files changed, 227 insertions(+), 210 deletions(-)
diff --git a/include/element.h b/include/element.h index f38ecfa..ef9f96f 100644 --- a/include/element.h +++ b/include/element.h @@ -48,7 +48,6 @@ enum connman_element_type { CONNMAN_ELEMENT_TYPE_SERVICE = 5, CONNMAN_ELEMENT_TYPE_IPV4 = 7, CONNMAN_ELEMENT_TYPE_IPV6 = 8, - CONNMAN_ELEMENT_TYPE_DHCP = 9, CONNMAN_ELEMENT_TYPE_BOOTP = 10, CONNMAN_ELEMENT_TYPE_ZEROCONF = 11, CONNMAN_ELEMENT_TYPE_VENDOR = 10000, @@ -64,7 +63,6 @@ enum connman_element_state { enum connman_element_error { CONNMAN_ELEMENT_ERROR_UNKNOWN = 0, CONNMAN_ELEMENT_ERROR_FAILED = 1, - CONNMAN_ELEMENT_ERROR_DHCP_FAILED = 2, CONNMAN_ELEMENT_ERROR_CONNECT_FAILED = 3, }; diff --git a/src/connman.h b/src/connman.h index ee025f5..45c0717 100644 --- a/src/connman.h +++ b/src/connman.h @@ -302,6 +302,18 @@ void __connman_timeserver_cleanup(void); int __connman_dhcp_init(void); void __connman_dhcp_cleanup(void); +enum connman_dhcp_state { + CONNMAN_DHCP_STATE_VALID, + CONNMAN_DHCP_STATE_NO_LEASE, + CONNMAN_DHCP_STATE_LEASE_LOST, +}; + +typedef void (* dhcp_cb) (struct connman_network *network, + enum connman_dhcp_state state); + +int __connman_dhcp_start(struct connman_network *network, dhcp_cb callback); +void __connman_dhcp_stop(struct connman_network *network); + int __connman_ipv4_init(void); void __connman_ipv4_cleanup(void); diff --git a/src/dhcp.c b/src/dhcp.c index 163b0b7..4977f8a 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -27,100 +27,73 @@ #include <string.h> #include <stdlib.h> +#include <connman/ipconfig.h> + #include <gdhcp/gdhcp.h> #include <glib.h> #include "connman.h" -enum connman_dhcp_state { - CONNMAN_DHCP_STATE_UNKNOWN = 0, - CONNMAN_DHCP_STATE_IDLE = 1, - CONNMAN_DHCP_STATE_BOUND = 2, - CONNMAN_DHCP_STATE_RENEW = 3, - CONNMAN_DHCP_STATE_FAIL = 4, -}; - struct connman_dhcp { - GDHCPClient *dhcp_client; + struct connman_network *network; + dhcp_cb callback; - int index; - enum connman_dhcp_state state; + char **nameservers; + char *timeserver; + char *pac; - struct connman_element *element; + GDHCPClient *dhcp_client; }; -static void dhcp_set_value(struct connman_dhcp *dhcp, - const char *key, const char *value) +static GHashTable *network_table; + +static void dhcp_free(struct connman_dhcp *dhcp) { - char **nameservers; + g_strfreev(dhcp->nameservers); + g_free(dhcp->timeserver); + g_free(dhcp->pac); - if (g_strcmp0(key, "Address") == 0) { - g_free(dhcp->element->ipv4.address); - dhcp->element->ipv4.address = g_strdup(value); - } else if (g_strcmp0(key, "Netmask") == 0) { - g_free(dhcp->element->ipv4.netmask); - dhcp->element->ipv4.netmask = g_strdup(value); - } else if (g_strcmp0(key, "Gateway") == 0) { - g_free(dhcp->element->ipv4.gateway); - dhcp->element->ipv4.gateway = g_strdup(value); - } else if (g_strcmp0(key, "Network") == 0) { - g_free(dhcp->element->ipv4.network); - dhcp->element->ipv4.network = g_strdup(value); - } else if (g_strcmp0(key, "Broadcast") == 0) { - g_free(dhcp->element->ipv4.broadcast); - dhcp->element->ipv4.broadcast = g_strdup(value); - } else if (g_strcmp0(key, "Nameserver") == 0) { - g_free(dhcp->element->ipv4.nameserver); - nameservers = g_strsplit_set(value, " ", 0); - /* FIXME: The ipv4 structure can only hold one nameserver, so - * we are only able to pass along the first nameserver sent by - * the DHCP server. If this situation changes, we should - * retain all of them. - */ - dhcp->element->ipv4.nameserver = g_strdup(nameservers[0]); - g_strfreev(nameservers); - } else if (g_strcmp0(key, "Domainname") == 0) { - g_free(dhcp->element->domainname); - dhcp->element->domainname = g_strdup(value); - - __connman_utsname_set_domainname(value); - } else if (g_strcmp0(key, "Hostname") == 0) { - g_free(dhcp->element->hostname); - dhcp->element->hostname = g_strdup(value); - - __connman_utsname_set_hostname(value); - } else if (g_strcmp0(key, "Timeserver") == 0) { - connman_info("Timeserver %s", value); - - g_free(dhcp->element->ipv4.timeserver); - dhcp->element->ipv4.timeserver = g_strdup(value); - } else if (g_strcmp0(key, "MTU") == 0) { - } else if (g_strcmp0(key, "PAC") == 0) { - connman_info("PAC configuration %s", value); - - g_free(dhcp->element->ipv4.pac); - dhcp->element->ipv4.pac = g_strdup(value); - } + dhcp->nameservers = NULL; + dhcp->timeserver = NULL; + dhcp->pac = NULL; } -static void dhcp_bound(struct connman_dhcp *dhcp) +static void dhcp_invalid(struct connman_dhcp *dhcp, enum connman_dhcp_state state) { - struct connman_element *element; + struct connman_service *service; + struct connman_ipconfig *ipconfig; + int i; - DBG("dhcp %p", dhcp); + service = __connman_service_lookup_from_network(dhcp->network); + if (service == NULL) + return; - element = connman_element_create(NULL); - if (element == NULL) + ipconfig = __connman_service_get_ip4config(service); + if (ipconfig == NULL) return; - element->type = CONNMAN_ELEMENT_TYPE_IPV4; - element->index = dhcp->index; + __connman_service_set_domainname(service, NULL); + __connman_service_pac_remove(service, dhcp->pac); + __connman_service_timeserver_remove(service, dhcp->timeserver); + + for (i = 0; dhcp->nameservers[i] != NULL; i++) { + __connman_service_nameserver_remove(service, + dhcp->nameservers[i]); + } + + __connman_ipconfig_set_ipv4(ipconfig, NULL, NULL, NULL); - connman_element_update(dhcp->element); + if (dhcp->callback != NULL) + dhcp->callback(dhcp->network, state); - if (connman_element_register(element, dhcp->element) < 0) - connman_element_unref(element); + dhcp_free(dhcp); +} + +static void dhcp_valid(struct connman_dhcp *dhcp) +{ + if (dhcp->callback != NULL) + dhcp->callback(dhcp->network, CONNMAN_DHCP_STATE_VALID); } static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data) @@ -129,13 +102,16 @@ static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data) DBG("No lease available"); - connman_element_set_error(dhcp->element, - CONNMAN_ELEMENT_ERROR_FAILED); + dhcp_invalid(dhcp, CONNMAN_DHCP_STATE_NO_LEASE); } static void lease_lost_cb(GDHCPClient *dhcp_client, gpointer user_data) { + struct connman_dhcp *dhcp = user_data; + DBG("Lease lost"); + + dhcp_invalid(dhcp, CONNMAN_DHCP_STATE_LEASE_LOST); } static void ipv4ll_lost_cb(GDHCPClient *dhcp_client, gpointer user_data) @@ -144,85 +120,123 @@ static void ipv4ll_lost_cb(GDHCPClient *dhcp_client, gpointer user_data) DBG("Lease lost"); - connman_element_unregister_children(dhcp->element); + dhcp_invalid(dhcp, CONNMAN_DHCP_STATE_LEASE_LOST); } static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) { struct connman_dhcp *dhcp = user_data; GList *list, *option = NULL; - char *address, *nameservers; - size_t ns_strlen = 0; + char *address, *netmask = NULL, *gateway = NULL, *net = NULL; + char *domainname = NULL, *hostname = NULL; + int ns_entries; + struct connman_ipconfig *ipconfig; + struct connman_service *service; + int i; DBG("Lease available"); + service = __connman_service_lookup_from_network(dhcp->network); + if (service == NULL) { + connman_error("Can not lookup service"); + return; + } + + ipconfig = __connman_service_get_ip4config(service); + if (ipconfig == NULL) { + connman_error("Could not lookup ipconfig"); + return; + } + address = g_dhcp_client_get_address(dhcp_client); - if (address != NULL) - dhcp_set_value(dhcp, "Address", address); - g_free(address); option = g_dhcp_client_get_option(dhcp_client, G_DHCP_SUBNET); if (option != NULL) - dhcp_set_value(dhcp, "Netmask", option->data); + netmask = g_strdup(option->data); + + option = g_dhcp_client_get_option(dhcp_client, G_DHCP_ROUTER); + if (option != NULL) + gateway = g_strdup(option->data); option = g_dhcp_client_get_option(dhcp_client, G_DHCP_DNS_SERVER); - for (list = option; list; list = list->next) - ns_strlen += strlen((char *) list->data) + 2; - nameservers = g_try_malloc0(ns_strlen); - if (nameservers) { - char *ns_index = nameservers; - - for (list = option; list; list = list->next) { - sprintf(ns_index, "%s ", (char *) list->data); - ns_index += strlen((char *) list->data) + 1; - } - - dhcp_set_value(dhcp, "Nameserver", nameservers); + for (ns_entries = 0, list = option; list; list = list->next) + ns_entries += 1; + dhcp->nameservers = g_try_new0(char *, ns_entries + 1); + if (dhcp->nameservers) { + for (i = 0, list = option; list; list = list->next) + dhcp->nameservers[i] = g_strdup(list->data); + dhcp->nameservers[ns_entries] = NULL; } - g_free(nameservers); option = g_dhcp_client_get_option(dhcp_client, G_DHCP_DOMAIN_NAME); if (option != NULL) - dhcp_set_value(dhcp, "Domainname", option->data); - - option = g_dhcp_client_get_option(dhcp_client, G_DHCP_ROUTER); - if (option != NULL) - dhcp_set_value(dhcp, "Gateway", option->data); + domainname = g_strdup(option->data); option = g_dhcp_client_get_option(dhcp_client, G_DHCP_HOST_NAME); if (option != NULL) - dhcp_set_value(dhcp, "Hostname", option->data); + hostname = g_strdup(option->data); option = g_dhcp_client_get_option(dhcp_client, G_DHCP_NTP_SERVER); if (option != NULL) - dhcp_set_value(dhcp, "Timeserver", option->data); + dhcp->timeserver = g_strdup(option->data); option = g_dhcp_client_get_option(dhcp_client, 252); if (option != NULL) - dhcp_set_value(dhcp, "PAC", option->data); + dhcp->pac = g_strdup(option->data); + + connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); + __connman_ipconfig_set_ipv4(ipconfig, address, netmask, gateway); + for (i = 0; dhcp->nameservers[i] != NULL; i++) { + __connman_service_nameserver_append(service, + dhcp->nameservers[i]); + } + __connman_service_timeserver_append(service, dhcp->timeserver); + __connman_service_pac_append(service, dhcp->pac); + __connman_service_set_domainname(service, domainname); + + if (domainname != NULL) + __connman_utsname_set_domainname(domainname); - dhcp_bound(dhcp); + if (hostname != NULL) + __connman_utsname_set_hostname(hostname); + + dhcp_valid(dhcp); + + g_free(address); + g_free(netmask); + g_free(gateway); + g_free(net); + g_free(domainname); + g_free(hostname); } static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data) { struct connman_dhcp *dhcp = user_data; char *address, *netmask; + struct connman_service *service; + struct connman_ipconfig *ipconfig; DBG("IPV4LL available"); - address = g_dhcp_client_get_address(dhcp_client); - if (address != NULL) - dhcp_set_value(dhcp, "Address", address); + service = __connman_service_lookup_from_network(dhcp->network); + if (service == NULL) + return; + + ipconfig = __connman_service_get_ip4config(service); + if (ipconfig == NULL) + return; + address = g_dhcp_client_get_address(dhcp_client); netmask = g_dhcp_client_get_netmask(dhcp_client); - if (netmask != NULL) - dhcp_set_value(dhcp, "Netmask", netmask); + + connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); + __connman_ipconfig_set_ipv4(ipconfig, address, netmask, NULL); + + dhcp_valid(dhcp); g_free(address); g_free(netmask); - - dhcp_bound(dhcp); } static void dhcp_debug(const char *str, void *data) @@ -239,7 +253,7 @@ static int dhcp_request(struct connman_dhcp *dhcp) DBG("dhcp %p", dhcp); - index = dhcp->index; + index = connman_network_get_index(dhcp->network); dhcp_client = g_dhcp_client_new(G_DHCP_IPV4, index, &error); if (error != G_DHCP_CLIENT_ERROR_NONE) @@ -292,66 +306,62 @@ static int dhcp_release(struct connman_dhcp *dhcp) return 0; } -static int dhcp_probe(struct connman_element *element) +static void remove_network(gpointer user_data) +{ + struct connman_dhcp *dhcp = user_data; + + DBG("dhcp %p", dhcp); + + dhcp_free(dhcp); + g_free(dhcp); +} + +int __connman_dhcp_start(struct connman_network *network, dhcp_cb callback) { struct connman_dhcp *dhcp; - DBG("element %p name %s", element, element->name); + DBG(""); dhcp = g_try_new0(struct connman_dhcp, 1); if (dhcp == NULL) return -ENOMEM; - dhcp->index = element->index; - dhcp->state = CONNMAN_DHCP_STATE_IDLE; - - dhcp->element = element; - - connman_element_set_data(element, dhcp); + dhcp->network = network; + dhcp->callback = callback; - dhcp_request(dhcp); + g_hash_table_replace(network_table, network, dhcp); - return 0; + return dhcp_request(dhcp); } -static void dhcp_remove(struct connman_element *element) +void __connman_dhcp_stop(struct connman_network *network) { - struct connman_dhcp *dhcp = connman_element_get_data(element); + struct connman_dhcp *dhcp; - DBG("element %p name %s", element, element->name); + DBG(""); - connman_element_set_data(element, NULL); + dhcp = g_hash_table_lookup(network_table, network); + if (dhcp == NULL) + return; dhcp_release(dhcp); - g_free(dhcp); - connman_element_unref(element); + g_hash_table_remove(network_table, network); } -static void dhcp_change(struct connman_element *element) +int __connman_dhcp_init(void) { - DBG("element %p name %s", element, element->name); + DBG(""); - if (element->state == CONNMAN_ELEMENT_STATE_ERROR) - connman_element_set_error(element->parent, - CONNMAN_ELEMENT_ERROR_DHCP_FAILED); -} - -static struct connman_driver dhcp_driver = { - .name = "dhcp", - .type = CONNMAN_ELEMENT_TYPE_DHCP, - .priority = CONNMAN_DRIVER_PRIORITY_LOW, - .probe = dhcp_probe, - .remove = dhcp_remove, - .change = dhcp_change, -}; + network_table = g_hash_table_new_full(g_direct_hash, g_direct_equal, + NULL, remove_network); -int __connman_dhcp_init(void) -{ - return connman_driver_register(&dhcp_driver); + return 0; } void __connman_dhcp_cleanup(void) { - connman_driver_unregister(&dhcp_driver); + DBG(""); + + g_hash_table_destroy(network_table); } diff --git a/src/element.c b/src/element.c index e3ec3b7..bc10bc1 100644 --- a/src/element.c +++ b/src/element.c @@ -60,8 +60,6 @@ static const char *type2string(enum connman_element_type type) return "ipv4"; case CONNMAN_ELEMENT_TYPE_IPV6: return "ipv6"; - case CONNMAN_ELEMENT_TYPE_DHCP: - return "dhcp"; case CONNMAN_ELEMENT_TYPE_BOOTP: return "bootp"; case CONNMAN_ELEMENT_TYPE_ZEROCONF: @@ -1114,9 +1112,6 @@ setup: } } - if (element->type == CONNMAN_ELEMENT_TYPE_DHCP) - element->ipv4.method = CONNMAN_IPCONFIG_METHOD_DHCP; - element->parent = parent; register_element(element, NULL); @@ -1276,8 +1271,6 @@ static enum connman_service_error convert_error(enum connman_element_error error case CONNMAN_ELEMENT_ERROR_UNKNOWN: case CONNMAN_ELEMENT_ERROR_FAILED: break; - case CONNMAN_ELEMENT_ERROR_DHCP_FAILED: - return CONNMAN_SERVICE_ERROR_DHCP_FAILED; case CONNMAN_ELEMENT_ERROR_CONNECT_FAILED: return CONNMAN_SERVICE_ERROR_CONNECT_FAILED; } @@ -1399,7 +1392,6 @@ void __connman_element_start(void) __connman_rtnl_start(); __connman_ipv4_init(); - __connman_dhcp_init(); __connman_wpad_init(); __connman_wispr_init(); @@ -1414,7 +1406,6 @@ void __connman_element_stop(void) __connman_wispr_cleanup(); __connman_wpad_cleanup(); - __connman_dhcp_cleanup(); __connman_ipv4_cleanup(); __connman_provider_cleanup(); } diff --git a/src/main.c b/src/main.c index ac90b5e..5b37d8b 100644 --- a/src/main.c +++ b/src/main.c @@ -229,6 +229,7 @@ int main(int argc, char *argv[]) __connman_session_init(); __connman_timeserver_init(); __connman_connection_init(); + __connman_dhcp_init(); __connman_plugin_init(option_plugin, option_noplugin); @@ -250,6 +251,7 @@ int main(int argc, char *argv[]) __connman_plugin_cleanup(); + __connman_dhcp_cleanup(); __connman_connection_cleanup(); __connman_timeserver_cleanup(); __connman_session_cleanup(); diff --git a/src/network.c b/src/network.c index faf74bc..f08ea58 100644 --- a/src/network.c +++ b/src/network.c @@ -445,6 +445,51 @@ connman_bool_t __connman_network_get_connecting(struct connman_network *network) return network->connecting; } +static void dhcp_success(struct connman_network *network) +{ + struct connman_service *service; + + service = __connman_service_lookup_from_network(network); + if (service == NULL) + goto err; + + connman_network_set_associating(network, FALSE); + + network->connecting = FALSE; + + connman_network_set_associating(network, FALSE); + + __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY, + CONNMAN_IPCONFIG_TYPE_IPV4); + + return; + +err: + connman_network_set_error(network, + CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL); +} + +static void dhcp_failure(struct connman_network *network) +{ + __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE, + CONNMAN_IPCONFIG_TYPE_IPV4); +} + +static void dhcp_update(struct connman_network *network, enum connman_dhcp_state state) +{ + DBG("state %d", state); + + switch (state) { + case CONNMAN_DHCP_STATE_VALID: + dhcp_success(network); + break; + case CONNMAN_DHCP_STATE_NO_LEASE: + case CONNMAN_DHCP_STATE_LEASE_LOST: + dhcp_failure(network); + break; + } +} + /** * connman_network_set_available: * @network: network structure @@ -724,26 +769,18 @@ static void set_connected_manual(struct connman_network *network) static int set_connected_dhcp(struct connman_network *network) { - struct connman_element *element; - int error; - - DBG("network %p", network); + int err; - element = connman_element_create(NULL); - if (element == NULL) - return -ENOMEM; + DBG(""); - element->type = CONNMAN_ELEMENT_TYPE_DHCP; - element->index = network->element.index; + set_configuration(network); - error = connman_element_register(element, &network->element); - if (error < 0) { - connman_element_unref(element); - return error; + err = __connman_dhcp_start(network, dhcp_update); + if (err < 0) { + connman_error("Can not request DHCP lease"); + return err; } - set_configuration(network); - return 0; } @@ -863,13 +900,14 @@ static gboolean set_connected(gpointer user_data) set_connected_manual(network); return TRUE; case CONNMAN_IPCONFIG_METHOD_DHCP: - if (set_connected_dhcp(network) < 0) { + ret = set_connected_dhcp(network); + if (ret != 0) { connman_network_set_error(network, CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL); return FALSE; } + return TRUE;; } - } else { struct connman_service *service; @@ -1035,37 +1073,6 @@ int __connman_network_disconnect(struct connman_network *network) return err; } -static int dhcp_start(struct connman_network *network) -{ - struct connman_element *element; - int error; - - element = connman_element_create(NULL); - if (element == NULL) - return -ENOMEM; - - element->type = CONNMAN_ELEMENT_TYPE_DHCP; - element->index = network->element.index; - - error = connman_element_register(element, &network->element); - if (error < 0) { - connman_element_unref(element); - return error; - } - - return 0; -} - -static int dhcp_stop(struct connman_network *network) -{ - connman_element_unregister_children_type(&network->element, - CONNMAN_ELEMENT_TYPE_IPV4); - connman_element_unregister_children_type(&network->element, - CONNMAN_ELEMENT_TYPE_DHCP); - - return 0; -} - static int manual_ipv4_set(struct connman_network *network, struct connman_ipconfig *ipconfig) { @@ -1119,7 +1126,7 @@ int __connman_network_clear_ipconfig(struct connman_network *network, __connman_ipconfig_clear_address(ipconfig); break; case CONNMAN_IPCONFIG_METHOD_DHCP: - dhcp_stop(network); + __connman_dhcp_stop(network); break; } @@ -1178,7 +1185,7 @@ int __connman_network_set_ipconfig(struct connman_network *network, case CONNMAN_IPCONFIG_METHOD_MANUAL: return manual_ipv4_set(network, ipconfig_ipv4); case CONNMAN_IPCONFIG_METHOD_DHCP: - return dhcp_start(network); + return __connman_dhcp_start(network, dhcp_update); } } @@ -1722,9 +1729,6 @@ static void network_change(struct connman_element *element) if (element->state != CONNMAN_ELEMENT_STATE_ERROR) return; - if (element->error != CONNMAN_ELEMENT_ERROR_DHCP_FAILED) - return; - if (network->connected == FALSE) return; -- 1.7.4 _______________________________________________ connman mailing list connman@connman.net http://lists.connman.net/listinfo/connman