From: Daniel Wagner <daniel.wag...@bmw-carit.de>
WIP
---
src/connman.h | 9 ++
src/dhcp.c | 303 +++++++++++++++++++++++++++++---------------------------
src/element.c | 2 -
src/main.c | 2 +
src/network.c | 99 +++++++++----------
5 files changed, 217 insertions(+), 198 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index a717946..07f6768 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -302,6 +302,15 @@ void __connman_timeserver_cleanup(void);
int __connman_dhcp_init(void);
void __connman_dhcp_cleanup(void);
+struct connman_dhcp_notify {
+ void (* valid) (struct connman_network *network);
+ void (* invalid) (struct connman_network *network);
+};
+
+int __connman_dhcp_start(struct connman_network *network,
+ struct connman_dhcp_notify *notify);
+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..bc6b929 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;
+ struct connman_dhcp_notify *notify;
- 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)
{
- 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->notify != NULL && dhcp->notify->invalid != NULL)
+ dhcp->notify->invalid(dhcp->network);
- 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->notify->valid != NULL)
+ dhcp->notify->valid(dhcp->network);
}
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);
}
static void lease_lost_cb(GDHCPClient *dhcp_client, gpointer user_data)
{
+ struct connman_dhcp *dhcp = user_data;
+
DBG("Lease lost");
+
+ dhcp_invalid(dhcp);
}
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);
}
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,63 @@ 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,
+ struct connman_dhcp_notify *notify)
{
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->notify = notify;
- 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..fbefc94 100644
--- a/src/element.c
+++ b/src/element.c
@@ -1399,7 +1399,6 @@ void __connman_element_start(void)
__connman_rtnl_start();
__connman_ipv4_init();
- __connman_dhcp_init();
__connman_wpad_init();
__connman_wispr_init();
@@ -1414,7 +1413,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 fc21403..38c433a 100644
--- a/src/network.c
+++ b/src/network.c
@@ -445,6 +445,43 @@ connman_bool_t __connman_network_get_connecting(struct
connman_network *network)
return network->connecting;
}
+static void dhcp_valid_cb(struct connman_network *network)
+{
+ struct connman_service *service;
+
+ DBG("");
+
+ 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);
+
+ return;
+
+err:
+ connman_network_set_error(network,
+ CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+}
+
+static void dhcp_invalid_cb(struct connman_network *network)
+{
+ DBG("");
+
+ __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE);
+}
+
+static struct connman_dhcp_notify dhcp_notify = {
+ .valid = dhcp_valid_cb,
+ .invalid = dhcp_invalid_cb,
+};
+
/**
* connman_network_set_available:
* @network: network structure
@@ -700,26 +737,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_notify);
+ if (err < 0) {
+ connman_error("Can not request DHCP lease");
+ return err;
}
- set_configuration(network);
-
return 0;
}
@@ -806,13 +835,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;
@@ -973,37 +1003,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)
{
@@ -1048,7 +1047,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;
}
@@ -1099,7 +1098,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_notify);
}
}
--
1.7.4
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
