*
* Connection Manager
*
- * Copyright (C) 2007 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2008 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
}
}
+gboolean __connman_iface_is_connected(void)
+{
+ GSList *list;
+ gboolean connected = FALSE;
+
+ DBG("");
+
+ for (list = interfaces; list; list = list->next) {
+ struct connman_iface *iface = list->data;
+
+ if (iface->state == CONNMAN_IFACE_STATE_READY) {
+ connected = TRUE;
+ break;
+ }
+ }
+
+ return connected;
+}
+
static void append_entry(DBusMessageIter *dict,
const char *key, int type, void *val)
{
switch (iface->state) {
case CONNMAN_IFACE_STATE_OFF:
- __connman_dhcp_release(iface);
+ __connman_iface_stop(iface);
break;
case CONNMAN_IFACE_STATE_ENABLED:
- __connman_dhcp_release(iface);
- connman_iface_clear_ipv4(iface);
- if (iface->driver->disconnect)
- iface->driver->disconnect(iface);
+ __connman_iface_start(iface);
if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING)
state = CONNMAN_IFACE_STATE_SCANNING;
break;
break;
case CONNMAN_IFACE_STATE_SHUTDOWN:
- __connman_dhcp_release(iface);
- if (iface->driver->disconnect)
- iface->driver->disconnect(iface);
+ __connman_iface_stop(iface);
if (iface->policy != CONNMAN_IFACE_POLICY_AUTO)
state = CONNMAN_IFACE_STATE_OFF;
break;
static void switch_policy(struct connman_iface *iface)
{
- DBG("iface %p", iface);
+ DBG("iface %p policy %d", iface, iface->policy);
switch (iface->policy) {
case CONNMAN_IFACE_POLICY_OFF:
- iface->state = CONNMAN_IFACE_STATE_SHUTDOWN;
- state_changed(iface);
- connman_iface_clear_ipv4(iface);
- if (iface->driver->stop)
- iface->driver->stop(iface);
- else
- __connman_iface_down(iface);
+ __connman_iface_stop(iface);
break;
case CONNMAN_IFACE_POLICY_IGNORE:
break;
case CONNMAN_IFACE_POLICY_AUTO:
- if (iface->driver->start)
- iface->driver->start(iface);
- else
- __connman_iface_up(iface);
- state_changed(iface);
+ case CONNMAN_IFACE_POLICY_ASK:
+ __connman_iface_start(iface);
break;
default:
}
}
-void connman_iface_indicate_enabled(struct connman_iface *iface)
+void connman_iface_indicate_ifup(struct connman_iface *iface)
{
DBG("iface %p state %d", iface, iface->state);
switch (iface->state) {
case CONNMAN_IFACE_STATE_OFF:
- case CONNMAN_IFACE_STATE_CARRIER:
iface->state = CONNMAN_IFACE_STATE_ENABLED;
state_changed(iface);
break;
}
}
-void connman_iface_indicate_disabled(struct connman_iface *iface)
+void connman_iface_indicate_ifdown(struct connman_iface *iface)
{
DBG("iface %p state %d", iface, iface->state);
- if (iface->policy == CONNMAN_IFACE_POLICY_AUTO) {
+ if (iface->policy == CONNMAN_IFACE_POLICY_AUTO)
iface->state = CONNMAN_IFACE_STATE_ENABLED;
- if (iface->driver->start)
- iface->driver->start(iface);
- else
- __connman_iface_up(iface);
- } else
+ else
iface->state = CONNMAN_IFACE_STATE_SHUTDOWN;
state_changed(iface);
case CONNMAN_IFACE_STATE_CARRIER:
case CONNMAN_IFACE_STATE_CONFIGURE:
case CONNMAN_IFACE_STATE_READY:
-#if 0
- if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING) {
- if (iface->driver->disconnect)
- iface->driver->disconnect(iface);
+ __connman_iface_disconnect(iface);
+ if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING)
iface->state = CONNMAN_IFACE_STATE_SCANNING;
- } else
-#endif
+ else
iface->state = CONNMAN_IFACE_STATE_ENABLED;
state_changed(iface);
break;
case CONNMAN_IFACE_STATE_CONFIGURE:
iface->state = CONNMAN_IFACE_STATE_READY;
state_changed(iface);
+ __connman_iface_store_current_network(iface);
break;
default:
break;
const char *name, int strength, int security)
{
DBusMessage *signal;
- char *passphrase;
+ char *ssid, *passphrase;
+ int len;
DBG("iface %p security %d name %s", iface, security, name);
dbus_connection_send(connection, signal, NULL);
dbus_message_unref(signal);
- if (iface->state != CONNMAN_IFACE_STATE_SCANNING)
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_CONNECT:
+ case CONNMAN_IFACE_STATE_CONNECTED:
+ case CONNMAN_IFACE_STATE_CARRIER:
+ case CONNMAN_IFACE_STATE_CONFIGURE:
+ case CONNMAN_IFACE_STATE_READY:
return;
+ default:
+ break;
+ }
+
+ len = strlen(name);
+ ssid = strdup(name);
+ if (ssid == NULL)
+ return;
+
+ /* The D-Link access points return a 0x05 at the end of the SSID */
+ if (ssid[len - 1] == '\05')
+ ssid[len - 1] = '\0';
- passphrase = __connman_iface_find_passphrase(iface, name);
+ passphrase = __connman_iface_find_passphrase(iface, ssid);
if (passphrase != NULL) {
+ DBG("network %s passphrase %s", ssid, passphrase);
+
g_free(iface->network.identifier);
- iface->network.identifier = g_strdup(name);
+ iface->network.identifier = g_strdup(ssid);
g_free(iface->network.passphrase);
iface->network.passphrase = passphrase;
- if (iface->driver->connect) {
- iface->driver->connect(iface, &iface->network);
- iface->state = CONNMAN_IFACE_STATE_CONNECT;
- state_changed(iface);
- }
+ __connman_iface_connect(iface, &iface->network);
+
+ iface->state = CONNMAN_IFACE_STATE_CONNECT;
+ state_changed(iface);
}
+
+ free(ssid);
}
int connman_iface_get_ipv4(struct connman_iface *iface,
struct ifreq ifr;
struct rtentry rt;
struct sockaddr_in *addr;
- char cmd[128];
int sk, err;
if ((iface->flags & CONNMAN_IFACE_FLAG_RTNL) == 0)
return -1;
}
- sprintf(cmd, "echo \"nameserver %s\" | resolvconf -a %s",
- inet_ntoa(ipv4->nameserver), ifr.ifr_name);
-
- DBG("%s", cmd);
-
- err = system(cmd);
+ __connman_resolver_append(iface, inet_ntoa(ipv4->nameserver));
return 0;
}
{
struct ifreq ifr;
struct sockaddr_in *addr;
- char cmd[128];
int sk, err;
if ((iface->flags & CONNMAN_IFACE_FLAG_RTNL) == 0)
return -1;
}
- sprintf(cmd, "resolvconf -d %s", ifr.ifr_name);
-
- DBG("%s", cmd);
-
- err = system(cmd);
+ __connman_resolver_remove(iface);
return 0;
}
if (reply == NULL)
return NULL;
+ dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_CONNECT:
+ case CONNMAN_IFACE_STATE_CONFIGURE:
+ return reply;
+ default:
+ break;
+ }
+
if (driver->scan)
driver->scan(iface);
- dbus_message_append_args(reply, DBUS_TYPE_INVALID);
-
return reply;
}
dbus_message_unref(signal);
}
- if (iface->driver->disconnect)
- iface->driver->disconnect(iface);
+ __connman_iface_connect(iface, &iface->network);
+ }
+
+ return reply;
+}
+
+static DBusMessage *list_networks(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ DBusMessageIter array, iter;
+
+ DBG("conn %p", conn);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ dbus_message_iter_init_append(reply, &array);
+
+ dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+
+ __connman_iface_network_list(iface, &iter);
+
+ dbus_message_iter_close_container(&array, &iter);
+
+ return reply;
+}
+
+static DBusMessage *create_network(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ DBusMessageIter array, dict;
+ const char *path, *identifier = NULL, *passphrase = NULL;
+
+ DBG("conn %p", conn);
+
+ dbus_message_iter_init(msg, &array);
+
+ dbus_message_iter_recurse(&array, &dict);
- if (iface->driver->connect)
- iface->driver->connect(iface, &iface->network);
+ while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter entry, value;
+ const char *key, *val;
+
+ dbus_message_iter_recurse(&dict, &entry);
+ dbus_message_iter_get_basic(&entry, &key);
+
+ dbus_message_iter_next(&entry);
+
+ dbus_message_iter_recurse(&entry, &value);
+
+ //type = dbus_message_iter_get_arg_type(&value);
+ dbus_message_iter_get_basic(&value, &val);
+
+ if (g_strcasecmp(key, "Identifier") == 0)
+ identifier = val;
+
+ if (g_strcasecmp(key, "Passphrase") == 0)
+ passphrase = val;
+
+ dbus_message_iter_next(&dict);
}
+ DBG("identifier %s passphrase %s", identifier, passphrase);
+
+ path = __connman_iface_add_network(iface, identifier, passphrase);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &path,
+ DBUS_TYPE_INVALID);
+
+ return reply;
+}
+
+static DBusMessage *remove_network(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ const char *path;
+
+ DBG("conn %p", conn);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+ DBUS_TYPE_INVALID);
+
+ __connman_iface_remove_network(iface, path);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
return reply;
}
DBusMessage *msg, void *data)
{
struct connman_iface *iface = data;
+ struct connman_network *network;
DBusMessage *reply;
- const char *network;
+ const char *path;
DBG("conn %p", conn);
- dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &network,
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID);
- g_free(iface->network.identifier);
- iface->network.identifier = g_strdup(network);
+ network = __connman_iface_find_network(iface, path);
+ if (network == NULL)
+ goto done;
- if (iface->driver->disconnect)
- iface->driver->disconnect(iface);
+ g_free(iface->network.identifier);
+ iface->network.identifier = g_strdup(network->identifier);
+ g_free(iface->network.passphrase);
+ iface->network.passphrase = g_strdup(network->passphrase);
- if (iface->driver->connect)
- iface->driver->connect(iface, &iface->network);
+ __connman_iface_connect(iface, &iface->network);
+done:
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- str = __connman_ipv4_method2string(iface->ipv4.method);
+ str = __connman_ipv4_method2string(CONNMAN_IPV4_METHOD_DHCP);
append_entry(&dict, "Method", DBUS_TYPE_STRING, &str);
if (iface->ipv4.address.s_addr != INADDR_ANY) {
DBG("conn %p", conn);
+ switch (iface->policy) {
+ case CONNMAN_IFACE_POLICY_OFF:
+ case CONNMAN_IFACE_POLICY_IGNORE:
+ return dbus_message_new_error(msg, CONNMAN_ERROR_INTERFACE
+ ".NotAvailable", "");
+ default:
+ break;
+ }
+
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
DBG("conn %p", conn);
+ return dbus_message_new_error(msg, CONNMAN_ERROR_INTERFACE
+ ".NotImplemented", "");
+
dbus_message_iter_init(msg, &array);
dbus_message_iter_recurse(&array, &dict);
{ "SetPolicy", "s", "", set_policy },
{ "GetNetwork", "", "a{sv}", get_network },
{ "SetNetwork", "a{sv}", "", set_network },
- { "SelectNetwork", "s", "", select_network },
+ { "ListNetworks", "", "ao", list_networks },
+ { "CreateNetwork", "a{av}", "o", create_network },
+ { "RemoveNetwork", "o", "", remove_network },
+ { "SelectNetwork", "o", "", select_network },
{ "GetIPv4", "", "a{sv}", get_ipv4 },
{ "SetIPv4", "a{sv}", "", set_ipv4 },
{ },
ifname = libhal_device_get_property_string(ctx, udi,
"net.interface", NULL);
if (ifname != NULL && ifname_filter != NULL &&
- *ifname_filter != '\0' &&
g_str_equal(ifname, ifname_filter) == FALSE) {
device_free(iface);
return -1;
iface->driver = driver;
+ iface->policy = CONNMAN_IFACE_POLICY_AUTO;
+
__connman_iface_load(iface);
DBG("iface %p network %s secret %s", iface,
conn = libhal_ctx_get_dbus_connection(ctx);
- g_dbus_register_object(conn, iface->path, iface, device_free);
-
interfaces = g_slist_append(interfaces, iface);
if (iface->flags & CONNMAN_IFACE_FLAG_IPV4) {
g_dbus_register_interface(conn, iface->path,
CONNMAN_IFACE_INTERFACE,
- iface_methods, iface_signals, NULL);
+ iface_methods, iface_signals, NULL,
+ iface, device_free);
DBG("iface %p identifier %s", iface, iface->identifier);
DBUS_TYPE_OBJECT_PATH, &iface->path,
DBUS_TYPE_INVALID);
+ __connman_iface_load_networks(iface);
+
switch_policy(iface);
+ state_changed(iface);
+
return 0;
}
interfaces = g_slist_remove(interfaces, iface);
g_dbus_unregister_interface(conn, iface->path,
CONNMAN_IFACE_INTERFACE);
- g_dbus_unregister_object(conn, iface->path);
break;
}
}
g_dbus_unregister_interface(conn, iface->path,
CONNMAN_IFACE_INTERFACE);
-
- g_dbus_unregister_object(conn, iface->path);
}
g_slist_free(interfaces);
hal_init(connection);
- hal_watch = g_dbus_add_watch(connection, "org.freedesktop.Hal",
+ hal_watch = g_dbus_add_service_watch(connection, "org.freedesktop.Hal",
hal_init, hal_cleanup, connection, NULL);
return 0;
projects / connman / blobdiff