}
}
-int connman_iface_update(struct connman_iface *iface,
- enum connman_iface_state state)
+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 void state_changed(struct connman_iface *iface)
{
- const char *str = NULL;
+ const char *str = __connman_iface_state2string(iface->state);
+ enum connman_iface_state state = iface->state;
+
+ DBG("iface %p state %s", iface, str);
- switch (state) {
+ g_dbus_emit_signal(connection, iface->path,
+ CONNMAN_IFACE_INTERFACE, "StateChanged",
+ DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID);
+
+ switch (iface->state) {
case CONNMAN_IFACE_STATE_OFF:
- str = "off";
+ __connman_dhcp_release(iface);
break;
case CONNMAN_IFACE_STATE_ENABLED:
- str = "enabled";
+ __connman_dhcp_release(iface);
+ connman_iface_clear_ipv4(iface);
if (iface->type == CONNMAN_IFACE_TYPE_80211) {
- if (iface->driver->connect)
+ state = CONNMAN_IFACE_STATE_SCANNING;
+ if (iface->driver->connect) {
iface->driver->connect(iface, NULL);
+ state = CONNMAN_IFACE_STATE_CONNECT;
+ }
}
break;
case CONNMAN_IFACE_STATE_CARRIER:
- str = "carrier";
- __connman_dhcp_request(iface);
+ if (iface->policy == CONNMAN_IFACE_POLICY_AUTO)
+ state = CONNMAN_IFACE_STATE_CONFIGURE;
break;
- case CONNMAN_IFACE_STATE_READY:
- str = "ready";
+ case CONNMAN_IFACE_STATE_CONFIGURE:
+ __connman_dhcp_request(iface);
break;
case CONNMAN_IFACE_STATE_SHUTDOWN:
- str = "shutdown";
__connman_dhcp_release(iface);
- if (iface->driver->shutdown)
- iface->driver->shutdown(iface);
+ if (iface->driver->disconnect)
+ iface->driver->disconnect(iface);
+ if (iface->policy != CONNMAN_IFACE_POLICY_AUTO)
+ state = CONNMAN_IFACE_STATE_OFF;
+ break;
+
+ default:
+ break;
+ }
+
+ if (iface->state != state) {
+ iface->state = state;
+ state_changed(iface);
+ }
+}
+
+static void switch_policy(struct connman_iface *iface)
+{
+ DBG("iface %p", iface);
+
+ 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);
+ break;
+
+ case CONNMAN_IFACE_POLICY_IGNORE:
+ break;
+
+ case CONNMAN_IFACE_POLICY_AUTO:
+ __connman_iface_up(iface);
+ state_changed(iface);
break;
default:
break;
}
+}
- iface->state = state;
+void connman_iface_indicate_enabled(struct connman_iface *iface)
+{
+ DBG("iface %p state %d", iface, iface->state);
- if (str != NULL) {
- g_dbus_emit_signal(connection, iface->path,
- CONNMAN_IFACE_INTERFACE, "StateChanged",
- DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID);
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_OFF:
+ case CONNMAN_IFACE_STATE_CARRIER:
+ iface->state = CONNMAN_IFACE_STATE_ENABLED;
+ state_changed(iface);
+ break;
+ default:
+ break;
}
+}
- return 0;
+void connman_iface_indicate_disabled(struct connman_iface *iface)
+{
+ DBG("iface %p state %d", iface, iface->state);
+
+ iface->state = CONNMAN_IFACE_STATE_SHUTDOWN;
+ state_changed(iface);
+}
+
+void connman_iface_indicate_connected(struct connman_iface *iface)
+{
+ DBG("iface %p state %d", iface, iface->state);
+
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_CONNECT:
+ iface->state = CONNMAN_IFACE_STATE_CONNECTED;
+ state_changed(iface);
+ break;
+ default:
+ break;
+ }
+}
+
+void connman_iface_indicate_carrier_on(struct connman_iface *iface)
+{
+ DBG("iface %p state %d", iface, iface->state);
+
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_ENABLED:
+ case CONNMAN_IFACE_STATE_CONNECT:
+ case CONNMAN_IFACE_STATE_CONNECTED:
+ iface->state = CONNMAN_IFACE_STATE_CARRIER;
+ state_changed(iface);
+ break;
+ default:
+ break;
+ }
+}
+
+void connman_iface_indicate_carrier_off(struct connman_iface *iface)
+{
+ DBG("iface %p state %d", iface, iface->state);
+
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_CARRIER:
+ case CONNMAN_IFACE_STATE_CONFIGURE:
+ case CONNMAN_IFACE_STATE_READY:
+ iface->state = CONNMAN_IFACE_STATE_ENABLED;
+ state_changed(iface);
+ break;
+ default:
+ break;
+ }
+}
+
+void connman_iface_indicate_configured(struct connman_iface *iface)
+{
+ DBG("iface %p state %d", iface, iface->state);
+
+ switch (iface->state) {
+ case CONNMAN_IFACE_STATE_CONFIGURE:
+ iface->state = CONNMAN_IFACE_STATE_READY;
+ state_changed(iface);
+ break;
+ default:
+ break;
+ }
}
-void connman_iface_indicate_carrier(struct connman_iface *iface, int carrier)
+static void append_station(DBusMessage *reply, const char *name,
+ int signal, int security)
{
- DBG("iface %p carrier %d", iface, carrier);
+ 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;
+
+ 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);
}
int connman_iface_get_ipv4(struct connman_iface *iface,
DBG("%s", cmd);
- system(cmd);
+ err = system(cmd);
return 0;
}
DBG("%s", cmd);
- system(cmd);
+ err = system(cmd);
return 0;
}
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;
- 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 DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_iface *iface = data;
DBusMessage *reply;
enum connman_iface_policy new_policy;
- const char *path, *policy;
+ const char *policy;
DBG("conn %p", conn);
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
if (iface->policy != new_policy) {
- path = dbus_message_get_path(msg);
-
iface->policy = new_policy;
__connman_iface_store(iface);
- if (new_policy == CONNMAN_IFACE_POLICY_AUTO) {
- if (iface->driver->activate)
- iface->driver->activate(iface);
- } else
- connman_iface_update(iface,
- CONNMAN_IFACE_STATE_SHUTDOWN);
+ switch_policy(iface);
+ policy = __connman_iface_policy2string(new_policy);
- g_dbus_emit_signal(conn, path, CONNMAN_IFACE_INTERFACE,
+ g_dbus_emit_signal(conn, iface->path, CONNMAN_IFACE_INTERFACE,
"PolicyChanged", DBUS_TYPE_STRING, &policy,
DBUS_TYPE_INVALID);
}
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- if (iface->network.essid != NULL)
- append_entry(&dict, "ESSID",
+ switch (iface->type) {
+ case CONNMAN_IFACE_TYPE_80211:
+ if (iface->network.essid != NULL)
+ append_entry(&dict, "ESSID",
DBUS_TYPE_STRING, &iface->network.essid);
-
- if (secrets == TRUE && iface->network.psk != NULL)
- append_entry(&dict, "PSK",
+ if (secrets == TRUE && iface->network.psk != NULL)
+ append_entry(&dict, "PSK",
DBUS_TYPE_STRING, &iface->network.psk);
+ break;
+ default:
+ break;
+ }
dbus_message_iter_close_container(&array, &dict);
}
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
if (changed == TRUE) {
- const char *path = dbus_message_get_path(msg);
-
__connman_iface_store(iface);
- signal = dbus_message_new_signal(path,
+ signal = dbus_message_new_signal(iface->path,
CONNMAN_IFACE_INTERFACE, "NetworkChanged");
if (signal != NULL) {
append_network(signal, iface, FALSE);
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
if (changed == TRUE) {
- const char *path = dbus_message_get_path(msg);
-
__connman_iface_store(iface);
- signal = dbus_message_new_signal(path,
+ signal = dbus_message_new_signal(iface->path,
CONNMAN_IFACE_INTERFACE, "IPv4Changed");
if (signal != NULL) {
append_ipv4(signal, iface);
{ "StateChanged", "s" },
{ "SignalChanged", "q" },
{ "PolicyChanged", "s" },
+ { "NetworkFound", "a{sv}" },
{ "NetworkChanged", "a{sv}" },
{ "IPv4Changed", "a{sv}" },
{ },
interfaces = g_slist_append(interfaces, iface);
if (iface->flags & CONNMAN_IFACE_FLAG_IPV4) {
- if (driver->get_ipv4)
- driver->get_ipv4(iface, &iface->ipv4);
- else
- connman_iface_get_ipv4(iface, &iface->ipv4);
+ connman_iface_get_ipv4(iface, &iface->ipv4);
DBG("address %s", inet_ntoa(iface->ipv4.address));
}
DBUS_TYPE_OBJECT_PATH, &iface->path,
DBUS_TYPE_INVALID);
- if (iface->policy == CONNMAN_IFACE_POLICY_AUTO) {
- if (driver->activate)
- driver->activate(iface);
- }
+ switch_policy(iface);
return 0;
}
projects / connman / blobdiff