#include "connman.h"
+static DBusConnection *connection = NULL;
+
+static gchar *ifname_filter = NULL;
+
static GSList *drivers = NULL;
int connman_iface_register(struct connman_iface_driver *driver)
}
}
-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)
{
- switch (state) {
- case CONNMAN_IFACE_STATE_ACTIVE:
- if (iface->type == CONNMAN_IFACE_TYPE_80211) {
- if (iface->driver->connect)
- iface->driver->connect(iface, NULL);
- }
+ 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;
+ }
- case CONNMAN_IFACE_STATE_CONNECTED:
+ 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:
+ case CONNMAN_IFACE_STATE_READY:
+ 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);
+ enum connman_iface_state state = iface->state;
+
+ DBG("iface %p state %s", iface, str);
+
+ 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:
+ __connman_dhcp_release(iface);
+ break;
+
+ case CONNMAN_IFACE_STATE_ENABLED:
+ __connman_dhcp_release(iface);
+ connman_iface_clear_ipv4(iface);
+ if (iface->driver->disconnect)
+ iface->driver->disconnect(iface);
+ if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING)
+ state = CONNMAN_IFACE_STATE_SCANNING;
+ 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:
+ if (iface->policy == CONNMAN_IFACE_POLICY_AUTO)
+ state = CONNMAN_IFACE_STATE_CONFIGURE;
+ break;
+
+ case CONNMAN_IFACE_STATE_CONFIGURE:
__connman_dhcp_request(iface);
break;
+ case CONNMAN_IFACE_STATE_SHUTDOWN:
+ __connman_dhcp_release(iface);
+ if (iface->driver->disconnect)
+ iface->driver->disconnect(iface);
+ if (iface->policy != CONNMAN_IFACE_POLICY_AUTO)
+ state = CONNMAN_IFACE_STATE_OFF;
+ break;
+
+ case CONNMAN_IFACE_STATE_READY:
+ if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING)
+ g_timeout_add(20000, scan_timeout, iface);
+ break;
+
default:
break;
}
- iface->state = state;
+ if (iface->state != state) {
+ iface->state = state;
+ state_changed(iface);
+ }
+}
- return 0;
+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);
+ if (iface->driver->stop)
+ iface->driver->stop(iface);
+ else
+ __connman_iface_down(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);
+ break;
+
+ default:
+ break;
+ }
+}
+
+void connman_iface_indicate_enabled(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;
+ default:
+ break;
+ }
+}
+
+void connman_iface_indicate_disabled(struct connman_iface *iface)
+{
+ DBG("iface %p state %d", iface, iface->state);
+
+ 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
+ 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:
+#if 0
+ if (iface->flags & CONNMAN_IFACE_FLAG_SCANNING) {
+ if (iface->driver->disconnect)
+ iface->driver->disconnect(iface);
+ iface->state = CONNMAN_IFACE_STATE_SCANNING;
+ } else
+#endif
+ 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;
+ }
+}
+
+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_carrier(struct connman_iface *iface, int carrier)
+void connman_iface_indicate_station(struct connman_iface *iface,
+ const char *name, int strength, int security)
{
- DBG("iface %p carrier %d", iface, carrier);
+ 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);
+
+ if (g_str_equal(name, iface->network.essid) == TRUE &&
+ iface->state == CONNMAN_IFACE_STATE_SCANNING) {
+ if (iface->driver->set_network)
+ iface->driver->set_network(iface, name);
+ if (iface->driver->set_passphrase)
+ iface->driver->set_passphrase(iface,
+ iface->network.psk);
+
+ if (iface->driver->connect) {
+ iface->driver->connect(iface, NULL);
+ iface->state = CONNMAN_IFACE_STATE_CONNECT;
+ state_changed(iface);
+ }
+ }
}
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;
}
DBG("%s", cmd);
- system(cmd);
+ err = system(cmd);
return 0;
}
DBG("%s", cmd);
- system(cmd);
+ err = system(cmd);
return 0;
}
-static DBusMessage *enable_iface(DBusConnection *conn,
+static DBusMessage *scan_iface(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_iface *iface = data;
if (reply == NULL)
return NULL;
- if (driver->activate)
- driver->activate(iface);
+ if (driver->scan) {
+ //driver->scan(iface);
+ }
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
return reply;
}
-static DBusMessage *scan_iface(DBusConnection *conn,
+static DBusMessage *get_properties(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ DBusMessageIter array, dict;
+ const char *str;
+
+ 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_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+ str = __connman_iface_type2string(iface->type);
+ append_entry(&dict, "Type", DBUS_TYPE_STRING, &str);
+
+ str = __connman_iface_state2string(iface->state);
+ append_entry(&dict, "State", DBUS_TYPE_STRING, &str);
+
+ if (iface->type == CONNMAN_IFACE_TYPE_80211) {
+ dbus_uint16_t signal = 75;
+ append_entry(&dict, "Signal", DBUS_TYPE_UINT16, &signal);
+ }
+
+ str = __connman_iface_policy2string(iface->policy);
+ append_entry(&dict, "Policy", DBUS_TYPE_STRING, &str);
+
+ if (iface->device.driver != NULL)
+ append_entry(&dict, "Driver",
+ DBUS_TYPE_STRING, &iface->device.driver);
+
+ if (iface->device.vendor != NULL)
+ append_entry(&dict, "Vendor",
+ DBUS_TYPE_STRING, &iface->device.vendor);
+
+ if (iface->device.product != NULL)
+ append_entry(&dict, "Product",
+ DBUS_TYPE_STRING, &iface->device.product);
+
+ dbus_message_iter_close_container(&array, &dict);
+
+ return reply;
+}
+
+static DBusMessage *get_state(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ const char *state;
+
+ DBG("conn %p", conn);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ state = __connman_iface_state2string(iface->state);
+
+ dbus_message_append_args(reply, DBUS_TYPE_STRING, &state,
+ DBUS_TYPE_INVALID);
+
+ return reply;
+}
+
+static DBusMessage *get_signal(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_iface *iface = data;
- struct connman_iface_driver *driver = iface->driver;
DBusMessage *reply;
+ dbus_uint16_t signal;
DBG("conn %p", conn);
if (reply == NULL)
return NULL;
- if (driver->scan)
- driver->scan(iface);
+ if (iface->type == CONNMAN_IFACE_TYPE_80211)
+ signal = 75;
+ else
+ signal = 0;
+
+ dbus_message_append_args(reply, DBUS_TYPE_UINT16, &signal,
+ DBUS_TYPE_INVALID);
+
+ return reply;
+}
+
+static DBusMessage *get_policy(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ const char *policy;
+
+ DBG("conn %p", conn);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ policy = __connman_iface_policy2string(iface->policy);
+
+ dbus_message_append_args(reply, DBUS_TYPE_STRING, &policy,
+ DBUS_TYPE_INVALID);
+
+ return reply;
+}
+
+static DBusMessage *set_policy(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+ enum connman_iface_policy new_policy;
+ const char *policy;
+
+ DBG("conn %p", conn);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &policy,
+ DBUS_TYPE_INVALID);
+
+ new_policy = __connman_iface_string2policy(policy);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ if (iface->policy != new_policy) {
+ iface->policy = new_policy;
+ __connman_iface_store(iface);
+
+ switch_policy(iface);
+ policy = __connman_iface_policy2string(new_policy);
+
+ g_dbus_emit_signal(conn, iface->path, CONNMAN_IFACE_INTERFACE,
+ "PolicyChanged", DBUS_TYPE_STRING, &policy,
+ DBUS_TYPE_INVALID);
+ }
+
+ return reply;
+}
+
+static void append_network(DBusMessage *reply,
+ struct connman_iface *iface, gboolean secrets)
+{
+ DBusMessageIter array, dict;
+
+ 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);
+
+ 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",
+ DBUS_TYPE_STRING, &iface->network.psk);
+ break;
+ default:
+ break;
+ }
+
+ dbus_message_iter_close_container(&array, &dict);
+}
+
+static DBusMessage *get_network(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply;
+
+ DBG("conn %p", conn);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ append_network(reply, iface, TRUE);
+
return reply;
}
DBusMessage *msg, void *data)
{
struct connman_iface *iface = data;
- struct connman_iface_driver *driver = iface->driver;
+ DBusMessage *reply, *signal;
+ DBusMessageIter array, dict;
+ gboolean changed = FALSE;
+
+ DBG("conn %p", conn);
+
+ dbus_message_iter_init(msg, &array);
+
+ dbus_message_iter_recurse(&array, &dict);
+
+ 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, "ESSID") == 0) {
+ g_free(iface->network.essid);
+ iface->network.essid = g_strdup(val);
+ if (iface->driver->set_network)
+ iface->driver->set_network(iface, val);
+ changed = TRUE;
+ }
+
+ if (g_strcasecmp(key, "PSK") == 0) {
+ g_free(iface->network.psk);
+ iface->network.psk = g_strdup(val);
+ if (iface->driver->set_passphrase)
+ iface->driver->set_passphrase(iface, val);
+ changed = TRUE;
+ }
+
+ dbus_message_iter_next(&dict);
+ }
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+ if (changed == TRUE) {
+ __connman_iface_store(iface);
+
+ signal = dbus_message_new_signal(iface->path,
+ CONNMAN_IFACE_INTERFACE, "NetworkChanged");
+ if (signal != NULL) {
+ append_network(signal, iface, FALSE);
+ dbus_connection_send(conn, signal, NULL);
+ dbus_message_unref(signal);
+ }
+ }
+
+ return reply;
+}
+
+static DBusMessage *select_network(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
DBusMessage *reply;
const char *network;
dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &network,
DBUS_TYPE_INVALID);
+ g_free(iface->network.essid);
+ iface->network.essid = g_strdup(network);
+
+ if (iface->driver->set_network)
+ iface->driver->set_network(iface, network);
+
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
- if (driver->set_network)
- driver->set_network(iface, network);
-
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
return reply;
}
-static DBusMessage *set_passphrase(DBusConnection *conn,
+static void append_ipv4(DBusMessage *reply, struct connman_iface *iface)
+{
+ DBusMessageIter array, dict;
+ const char *str;
+
+ 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);
+
+ str = __connman_ipv4_method2string(iface->ipv4.method);
+ append_entry(&dict, "Method", DBUS_TYPE_STRING, &str);
+
+ if (iface->ipv4.address.s_addr != INADDR_ANY) {
+ str = inet_ntoa(iface->ipv4.address);
+ append_entry(&dict, "Address", DBUS_TYPE_STRING, &str);
+ }
+
+ if (iface->ipv4.netmask.s_addr != INADDR_ANY) {
+ str = inet_ntoa(iface->ipv4.netmask);
+ append_entry(&dict, "Netmask", DBUS_TYPE_STRING, &str);
+ }
+
+ if (iface->ipv4.gateway.s_addr != INADDR_ANY) {
+ str = inet_ntoa(iface->ipv4.gateway);
+ append_entry(&dict, "Gateway", DBUS_TYPE_STRING, &str);
+ }
+
+ dbus_message_iter_close_container(&array, &dict);
+}
+
+static DBusMessage *get_ipv4(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_iface *iface = data;
- struct connman_iface_driver *driver = iface->driver;
DBusMessage *reply;
- const char *passphrase;
DBG("conn %p", conn);
- dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &passphrase,
- DBUS_TYPE_INVALID);
-
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
- if (driver->set_passphrase)
- driver->set_passphrase(iface, passphrase);
+ append_ipv4(reply, iface);
+
+ return reply;
+}
+
+static DBusMessage *set_ipv4(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_iface *iface = data;
+ DBusMessage *reply, *signal;
+ DBusMessageIter array, dict;
+ gboolean changed = FALSE;
+
+ DBG("conn %p", conn);
+
+ dbus_message_iter_init(msg, &array);
+
+ dbus_message_iter_recurse(&array, &dict);
+
+ while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter entry, value;
+ const char *key, *val;
+ enum connman_ipv4_method method;
+ in_addr_t addr;
+
+ 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, "Method") == 0) {
+ method = __connman_ipv4_string2method(val);
+ if (iface->ipv4.method != method) {
+ iface->ipv4.method = method;
+ changed = TRUE;
+ }
+ }
+
+ if (g_strcasecmp(key, "Address") == 0) {
+ addr = inet_addr(val);
+ if (iface->ipv4.address.s_addr != addr) {
+ iface->ipv4.address.s_addr = addr;
+ changed = TRUE;
+ }
+ }
+
+ if (g_strcasecmp(key, "Netmask") == 0) {
+ addr = inet_addr(val);
+ if (iface->ipv4.netmask.s_addr != addr) {
+ iface->ipv4.netmask.s_addr = addr;
+ changed = TRUE;
+ }
+ }
+
+ if (g_strcasecmp(key, "Gateway") == 0) {
+ addr = inet_addr(val);
+ if (iface->ipv4.gateway.s_addr != addr) {
+ iface->ipv4.gateway.s_addr = addr;
+ changed = TRUE;
+ }
+ }
+
+ dbus_message_iter_next(&dict);
+ }
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ if (changed == TRUE) {
+ __connman_iface_store(iface);
+
+ signal = dbus_message_new_signal(iface->path,
+ CONNMAN_IFACE_INTERFACE, "IPv4Changed");
+ if (signal != NULL) {
+ append_ipv4(signal, iface);
+ dbus_connection_send(conn, signal, NULL);
+ dbus_message_unref(signal);
+ }
+ }
+
return reply;
}
static GDBusMethodTable iface_methods[] = {
- { "Enable", "", "", enable_iface },
- { "Scan", "", "", scan_iface },
- { "SetNetwork", "s", "", set_network },
- { "SetPassphrase", "s", "", set_passphrase },
+ { "Scan", "", "", scan_iface },
+ { "GetProperties", "", "a{sv}", get_properties },
+ { "GetState", "", "s", get_state },
+ { "GetSignal", "", "q", get_signal },
+ { "GetPolicy", "", "s", get_policy },
+ { "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 },
+ { },
+};
+
+static GDBusSignalTable iface_signals[] = {
+ { "StateChanged", "s" },
+ { "SignalChanged", "q" },
+ { "PolicyChanged", "s" },
+ { "NetworkFound", "a{sv}" },
+ { "NetworkChanged", "a{sv}" },
+ { "IPv4Changed", "a{sv}" },
{ },
};
g_free(iface->path);
g_free(iface->udi);
g_free(iface->sysfs);
+ g_free(iface->identifier);
+ g_free(iface->network.essid);
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->udi = g_strdup(udi);
- DBG("path %s", iface->path);
+ DBG("iface %p path %s", iface, iface->path);
sysfs = libhal_device_get_property_string(ctx, udi,
"linux.sysfs_path", NULL);
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;
-
- DBG("iface %p", iface);
+ iface->policy = CONNMAN_IFACE_POLICY_UNKNOWN;
err = driver->probe(iface);
if (err < 0) {
return -1;
}
+ __connman_iface_create_identifier(iface);
+
+ __connman_iface_init_via_inet(iface);
+
iface->driver = driver;
+ __connman_iface_load(iface);
+
+ DBG("iface %p network %s secret %s", iface,
+ iface->network.essid, iface->network.psk);
+
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) {
- 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));
}
g_dbus_register_interface(conn, iface->path,
CONNMAN_IFACE_INTERFACE,
- iface_methods, NULL, NULL);
+ iface_methods, iface_signals, NULL);
+
+ DBG("iface %p identifier %s", iface, iface->identifier);
g_dbus_emit_signal(conn, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE,
DBUS_TYPE_OBJECT_PATH, &iface->path,
DBUS_TYPE_INVALID);
+ switch_policy(iface);
+
return 0;
}
hal_ctx = NULL;
}
-static DBusConnection *connection = NULL;
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