static DBusConnection *connection = NULL;
+static gchar *ifname_filter = NULL;
+
static GSList *drivers = NULL;
int connman_iface_register(struct connman_iface_driver *driver)
}
}
+static void append_entry(DBusMessageIter *dict,
+ const char *key, int type, void *val)
+{
+ DBusMessageIter entry, value;
+ const char *signature;
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ switch (type) {
+ case DBUS_TYPE_STRING:
+ signature = DBUS_TYPE_STRING_AS_STRING;
+ break;
+ case DBUS_TYPE_UINT16:
+ signature = DBUS_TYPE_UINT16_AS_STRING;
+ break;
+ default:
+ signature = DBUS_TYPE_VARIANT_AS_STRING;
+ break;
+ }
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ signature, &value);
+ dbus_message_iter_append_basic(&value, type, val);
+ dbus_message_iter_close_container(&entry, &value);
+
+ dbus_message_iter_close_container(dict, &entry);
+}
+
+static gboolean scan_timeout(gpointer user_data)
+{
+ struct connman_iface *iface = user_data;
+
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_SCANNING:
+ if (iface->driver->scan)
+ iface->driver->scan(iface);
+ return TRUE;
+ default:
+ break;
+ }
+
+ return FALSE;
+}
+
static void state_changed(struct connman_iface *iface)
{
const char *str = __connman_iface_state2string(iface->state);
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->type == CONNMAN_IFACE_TYPE_80211) {
+ __connman_iface_start(iface);
+ if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING)
state = CONNMAN_IFACE_STATE_SCANNING;
- if (iface->driver->connect) {
- iface->driver->connect(iface, NULL);
- state = CONNMAN_IFACE_STATE_CONNECT;
- }
- }
+ break;
+
+ case CONNMAN_IFACE_STATE_SCANNING:
+ if (iface->driver->scan)
+ iface->driver->scan(iface);
+ g_timeout_add(8000, scan_timeout, iface);
break;
case CONNMAN_IFACE_STATE_CARRIER:
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;
+ case CONNMAN_IFACE_STATE_READY:
+ break;
+
default:
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);
- __connman_iface_down(iface);
+ __connman_iface_stop(iface);
break;
case CONNMAN_IFACE_POLICY_IGNORE:
break;
case CONNMAN_IFACE_POLICY_AUTO:
- __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);
- iface->state = CONNMAN_IFACE_STATE_SHUTDOWN;
+ if (iface->policy == CONNMAN_IFACE_POLICY_AUTO)
+ iface->state = CONNMAN_IFACE_STATE_ENABLED;
+ 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:
- iface->state = CONNMAN_IFACE_STATE_ENABLED;
+ __connman_iface_disconnect(iface);
+ if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING)
+ iface->state = CONNMAN_IFACE_STATE_SCANNING;
+ else
+ iface->state = CONNMAN_IFACE_STATE_ENABLED;
state_changed(iface);
break;
default:
case CONNMAN_IFACE_STATE_CONFIGURE:
iface->state = CONNMAN_IFACE_STATE_READY;
state_changed(iface);
+ __connman_iface_store_current_network(iface);
break;
default:
break;
}
}
+static void append_station(DBusMessage *reply, const char *name,
+ int signal, int security)
+{
+ DBusMessageIter array, dict;
+ const char *wpa = "WPA";
+
+ dbus_message_iter_init_append(reply, &array);
+
+ dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
+ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+ append_entry(&dict, "ESSID", DBUS_TYPE_STRING, &name);
+ append_entry(&dict, "Signal", DBUS_TYPE_UINT16, &signal);
+
+ if (security > 0)
+ append_entry(&dict, "Security", DBUS_TYPE_STRING, &wpa);
+
+ dbus_message_iter_close_container(&array, &dict);
+}
+
+void connman_iface_indicate_station(struct connman_iface *iface,
+ const char *name, int strength, int security)
+{
+ DBusMessage *signal;
+ char *ssid, *passphrase;
+ int len;
+
+ DBG("iface %p security %d name %s", iface, security, name);
+
+ if (name == NULL || strlen(name) == 0)
+ return;
+
+ signal = dbus_message_new_signal(iface->path,
+ CONNMAN_IFACE_INTERFACE, "NetworkFound");
+ if (signal == NULL)
+ return;
+
+ append_station(signal, name, strength, security);
+
+ dbus_connection_send(connection, signal, NULL);
+ dbus_message_unref(signal);
+
+ 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, ssid);
+ if (passphrase != NULL) {
+ DBG("network %s passphrase %s", ssid, passphrase);
+
+ g_free(iface->network.identifier);
+ iface->network.identifier = g_strdup(ssid);
+ g_free(iface->network.passphrase);
+ iface->network.passphrase = passphrase;
+
+ __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 connman_ipv4 *ipv4)
{
+#if 0
struct {
struct nlmsghdr hdr;
struct rtgenmsg msg;
req.msg.rtgen_family = AF_INET;
__connman_rtnl_send(&req, sizeof(req));
+#endif
return 0;
}
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;
- if (driver->scan)
- driver->scan(iface);
-
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
- return reply;
-}
-
-static void append_entry(DBusMessageIter *dict,
- const char *key, int type, void *val)
-{
- DBusMessageIter entry, value;
- const char *signature;
-
- dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
-
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
- switch (type) {
- case DBUS_TYPE_STRING:
- signature = DBUS_TYPE_STRING_AS_STRING;
- break;
- case DBUS_TYPE_UINT16:
- signature = DBUS_TYPE_UINT16_AS_STRING;
- break;
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_CONNECT:
+ case CONNMAN_IFACE_STATE_CONFIGURE:
+ return reply;
default:
- signature = DBUS_TYPE_VARIANT_AS_STRING;
break;
}
- dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
- signature, &value);
- dbus_message_iter_append_basic(&value, type, val);
- dbus_message_iter_close_container(&entry, &value);
+ if (driver->scan)
+ driver->scan(iface);
- dbus_message_iter_close_container(dict, &entry);
+ return reply;
}
static DBusMessage *get_properties(DBusConnection *conn,
switch (iface->type) {
case CONNMAN_IFACE_TYPE_80211:
- if (iface->network.essid != NULL)
+ if (iface->network.identifier != NULL)
append_entry(&dict, "ESSID",
- DBUS_TYPE_STRING, &iface->network.essid);
- if (secrets == TRUE && iface->network.psk != NULL)
+ DBUS_TYPE_STRING, &iface->network.identifier);
+ if (secrets == TRUE && iface->network.passphrase != NULL)
append_entry(&dict, "PSK",
- DBUS_TYPE_STRING, &iface->network.psk);
+ DBUS_TYPE_STRING, &iface->network.passphrase);
break;
default:
break;
dbus_message_iter_get_basic(&value, &val);
if (g_strcasecmp(key, "ESSID") == 0) {
- g_free(iface->network.essid);
- iface->network.essid = g_strdup(val);
- if (iface->driver->set_network)
- iface->driver->set_network(iface, val);
+ g_free(iface->network.identifier);
+ iface->network.identifier = g_strdup(val);
changed = TRUE;
}
if (g_strcasecmp(key, "PSK") == 0) {
- g_free(iface->network.psk);
- iface->network.psk = g_strdup(val);
- if (iface->driver->set_network)
- iface->driver->set_passphrase(iface, val);
+ g_free(iface->network.passphrase);
+ iface->network.passphrase = g_strdup(val);
changed = TRUE;
}
dbus_connection_send(conn, signal, NULL);
dbus_message_unref(signal);
}
+
+ __connman_iface_connect(iface, &iface->network);
}
return reply;
}
+static DBusMessage *select_network(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ const char *network;
+ gchar *passphrase;
+
+ DBG("conn %p", conn);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &network,
+ DBUS_TYPE_INVALID);
+
+ passphrase = __connman_iface_find_passphrase(iface, network);
+ if (passphrase == NULL)
+ goto done;
+
+ g_free(iface->network.identifier);
+ iface->network.identifier = g_strdup(network);
+ g_free(iface->network.passphrase);
+ iface->network.passphrase = passphrase;
+
+ __connman_iface_connect(iface, &iface->network);
+
+done:
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+ return reply;
+}
+
static void append_ipv4(DBusMessage *reply, struct connman_iface *iface)
{
DBusMessageIter array, dict;
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 },
{ "GetIPv4", "", "a{sv}", get_ipv4 },
{ "SetIPv4", "a{sv}", "", set_ipv4 },
{ },
{ "StateChanged", "s" },
{ "SignalChanged", "q" },
{ "PolicyChanged", "s" },
+ { "NetworkFound", "a{sv}" },
{ "NetworkChanged", "a{sv}" },
{ "IPv4Changed", "a{sv}" },
{ },
g_free(iface->udi);
g_free(iface->sysfs);
g_free(iface->identifier);
- g_free(iface->network.essid);
+ g_free(iface->network.identifier);
+ g_free(iface->network.passphrase);
g_free(iface->device.driver);
g_free(iface->device.vendor);
g_free(iface->device.product);
{
DBusConnection *conn;
struct connman_iface *iface;
- char *temp, *sysfs;
+ char *temp, *sysfs, *ifname;
int err;
DBG("ctx %p driver %p udi %s", ctx, driver, udi);
iface->index = -1;
- if (g_str_has_prefix(driver->capability, "net") == TRUE)
+ if (g_str_has_prefix(driver->capability, "net") == TRUE) {
iface->index = libhal_device_get_property_int(ctx, udi,
"net.linux.ifindex", NULL);
+ 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->type = CONNMAN_IFACE_TYPE_UNKNOWN;
iface->flags = 0;
iface->state = CONNMAN_IFACE_STATE_UNKNOWN;
iface->driver = driver;
+ iface->policy = CONNMAN_IFACE_POLICY_AUTO;
+
__connman_iface_load(iface);
+ DBG("iface %p network %s secret %s", iface,
+ iface->network.identifier,
+ iface->network.passphrase);
+
conn = libhal_ctx_get_dbus_connection(ctx);
g_dbus_register_object(conn, iface->path, iface, device_free);
switch_policy(iface);
+ state_changed(iface);
+
return 0;
}
static guint hal_watch = 0;
-int __connman_iface_init(DBusConnection *conn)
+int __connman_iface_init(DBusConnection *conn, const char *interface)
{
DBG("conn %p", conn);
if (connection == NULL)
return -1;
+ if (interface != NULL)
+ ifname_filter = g_strdup(interface);
+
hal_init(connection);
hal_watch = g_dbus_add_watch(connection, "org.freedesktop.Hal",
hal_cleanup(connection);
+ g_free(ifname_filter);
+
dbus_connection_unref(connection);
}
projects / connman / blobdiff