*
* Connection Manager
*
- * Copyright (C) 2007-2009 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
*
* 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
#endif
#include <errno.h>
+#include <stdlib.h>
#include <gdbus.h>
#include <string.h>
#include <connman/element.h>
#include <connman/device.h>
#include <connman/network.h>
+#include <connman/ipconfig.h>
#include <connman/dbus.h>
#include <connman/inet.h>
+#include <connman/technology.h>
#include <connman/log.h>
+#include "mcc.h"
+
#define OFONO_SERVICE "org.ofono"
#define OFONO_MANAGER_INTERFACE OFONO_SERVICE ".Manager"
#define OFONO_MODEM_INTERFACE OFONO_SERVICE ".Modem"
-#define OFONO_GPRS_INTERFACE OFONO_SERVICE ".DataConnectionManager"
+#define OFONO_GPRS_INTERFACE OFONO_SERVICE ".ConnectionManager"
+#define OFONO_CONTEXT_INTERFACE OFONO_SERVICE ".ConnectionContext"
#define OFONO_SIM_INTERFACE OFONO_SERVICE ".SimManager"
-#define OFONO_PRI_CONTEXT_INTERFACE OFONO_SERVICE ".PrimaryDataContext"
+#define OFONO_REGISTRATION_INTERFACE OFONO_SERVICE ".NetworkRegistration"
#define PROPERTY_CHANGED "PropertyChanged"
#define GET_PROPERTIES "GetProperties"
#define SET_PROPERTY "SetProperty"
+#define CONTEXT_ADDED "ContextAdded"
+#define CONTEXT_REMOVED "ContextRemoved"
+#define ADD_CONTEXT "AddContext"
+#define GET_MODEMS "GetModems"
+#define MODEM_ADDED "ModemAdded"
+#define MODEM_REMOVED "ModemRemoved"
+
-#define TIMEOUT 5000
+#define TIMEOUT 40000
static DBusConnection *connection;
static GHashTable *modem_hash = NULL;
+static GHashTable *network_hash;
+
struct modem_data {
char *path;
struct connman_device *device;
+ gboolean has_sim;
+ gboolean has_reg;
+ gboolean has_gprs;
gboolean available;
+ gboolean pending_online;
+ dbus_bool_t requested_online;
+ dbus_bool_t online;
+
+ /* org.ofono.ConnectionManager properties */
+ dbus_bool_t powered;
+ dbus_bool_t attached;
+ dbus_bool_t roaming_allowed;
+
+ connman_bool_t registered;
+ connman_bool_t roaming;
+ uint8_t strength, has_strength;
+ char *operator;
+};
+
+struct network_info {
+ struct connman_network *network;
+
+ enum connman_ipconfig_method ipv4_method;
+ struct connman_ipaddress ipv4_address;
+
+ enum connman_ipconfig_method ipv6_method;
+ struct connman_ipaddress ipv6_address;
};
static int modem_probe(struct connman_device *device)
DBG("device %p", device);
}
-static void powered_reply(DBusPendingCall *call, void *user_data)
+static int call_ofono(const char *path,
+ const char *interface, const char *method,
+ DBusPendingCallNotifyFunction notify, void *user_data,
+ DBusFreeFunction free_function,
+ int type, ...)
+{
+ DBusMessage *message;
+ DBusPendingCall *call;
+ dbus_bool_t ok;
+ va_list va;
+
+ DBG("path %s %s.%s", path, interface, method);
+
+ if (path == NULL)
+ return -EINVAL;
+
+ message = dbus_message_new_method_call(OFONO_SERVICE, path,
+ interface, method);
+ if (message == NULL)
+ return -ENOMEM;
+
+ dbus_message_set_auto_start(message, FALSE);
+
+ va_start(va, type);
+ ok = dbus_message_append_args_valist(message, type, va);
+ va_end(va);
+
+ if (!ok)
+ return -ENOMEM;
+
+ if (dbus_connection_send_with_reply(connection, message,
+ &call, TIMEOUT) == FALSE) {
+ connman_error("Failed to call %s.%s", interface, method);
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ if (call == NULL) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ dbus_pending_call_set_notify(call, notify, user_data, free_function);
+
+ dbus_message_unref(message);
+
+ return -EINPROGRESS;
+}
+
+static void set_property_reply(DBusPendingCall *call, void *user_data)
{
DBusMessage *reply;
DBusError error;
+ char const *name = user_data;
DBG("");
reply = dbus_pending_call_steal_reply(call);
if (dbus_set_error_from_message(&error, reply)) {
- connman_error("%s", error.message);
+ connman_error("SetProperty(%s) %s %s", name,
+ error.name, error.message);
dbus_error_free(&error);
}
dbus_message_unref(reply);
+
+ dbus_pending_call_unref(call);
}
-static int gprs_change_powered(const char *path, dbus_bool_t powered)
+static int set_property(const char *path, const char *interface,
+ const char *property, int type, void *value,
+ DBusPendingCallNotifyFunction notify, void *user_data,
+ DBusFreeFunction free_function)
{
DBusMessage *message;
DBusMessageIter iter;
DBusPendingCall *call;
- DBG("path %s powered %d", path, powered);
+ DBG("path %s %s.%s", path, interface, property);
+
+ g_assert(notify == NULL ? free_function == NULL : 1);
if (path == NULL)
return -EINVAL;
message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_GPRS_INTERFACE, SET_PROPERTY);
+ interface, SET_PROPERTY);
if (message == NULL)
return -ENOMEM;
dbus_message_set_auto_start(message, FALSE);
dbus_message_iter_init_append(message, &iter);
- connman_dbus_property_append_basic(&iter, "Powered",
- DBUS_TYPE_BOOLEAN, &powered);
+ connman_dbus_property_append_basic(&iter, property, type, value);
if (dbus_connection_send_with_reply(connection, message,
&call, TIMEOUT) == FALSE) {
- connman_error("Failed to change powered property");
+ connman_error("Failed to change \"%s\" property on %s",
+ property, interface);
dbus_message_unref(message);
return -EINVAL;
}
return -EINVAL;
}
- dbus_pending_call_set_notify(call, powered_reply, (void *)path, NULL);
+ if (notify == NULL) {
+ notify = set_property_reply;
+ user_data = (void *)property;
+ free_function = NULL;
+ }
+
+ dbus_pending_call_set_notify(call, notify, user_data, free_function);
dbus_message_unref(message);
return -EINPROGRESS;
}
-static int modem_enable(struct connman_device *device)
+static void update_modem_online(struct modem_data *modem,
+ connman_bool_t online)
{
- const char *path = connman_device_get_string(device, "Path");
+ DBG("modem %p path %s online %d", modem, modem->path, online);
- DBG("device %p, path, %s", device, path);
+ modem->online = online;
+ modem->requested_online = online;
+ modem->pending_online = FALSE;
- return gprs_change_powered(path, TRUE);
+ if (modem->device)
+ connman_device_set_powered(modem->device, online);
}
-static int modem_disable(struct connman_device *device)
+static void set_online_reply(DBusPendingCall *call, void *user_data)
{
- const char *path = connman_device_get_string(device, "Path");
+ struct modem_data *modem;
+ DBusMessage *reply;
+ DBusError error;
+ gboolean result;
- DBG("device %p, path %s", device, path);
+ DBG("path %s", (char *)user_data);
- return gprs_change_powered(path, FALSE);
-}
+ if (modem_hash == NULL)
+ return;
-static struct connman_device_driver modem_driver = {
- .name = "modem",
- .type = CONNMAN_DEVICE_TYPE_CELLULAR,
- .probe = modem_probe,
- .remove = modem_remove,
- .enable = modem_enable,
- .disable = modem_disable,
-};
+ modem = g_hash_table_lookup(modem_hash, user_data);
+ if (modem == NULL)
+ return;
-static char *get_ident(const char *path)
-{
- char *ident, *pos;
+ reply = dbus_pending_call_steal_reply(call);
- if (*path != '/')
- return NULL;
+ dbus_error_init(&error);
+
+ if (dbus_set_error_from_message(&error, reply)) {
+ connman_error("SetProperty(Online) %s %s",
+ error.name, error.message);
+ dbus_error_free(&error);
- ident = g_strdup(path + 1);
+ result = modem->online;
+ } else
+ result = modem->requested_online;
- pos = ident;
+ if (modem->pending_online)
+ update_modem_online(modem, result);
- while ((pos = strchr(pos, '/')) != NULL)
- *pos = '_';
+ dbus_message_unref(reply);
- return ident;
+ dbus_pending_call_unref(call);
}
-static void config_network_reply(DBusPendingCall *call, void *user_data)
+static int modem_change_online(char const *path, dbus_bool_t online)
{
- struct connman_network *network = user_data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
- gboolean internet_type = FALSE;
-
- DBG("network %p", network);
+ struct modem_data *modem = g_hash_table_lookup(modem_hash, path);
- reply = dbus_pending_call_steal_reply(call);
- if (reply == NULL)
- goto done;
+ if (modem == NULL)
+ return -ENODEV;
- if (dbus_message_iter_init(reply, &array) == FALSE)
- goto done;
+ if (modem->online == online)
+ return -EALREADY;
- if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
- goto done;
+ modem->requested_online = online;
- dbus_message_iter_recurse(&array, &dict);
+ return set_property(path, OFONO_MODEM_INTERFACE, "Online",
+ DBUS_TYPE_BOOLEAN, &online,
+ set_online_reply,
+ (void *)g_strdup(path), g_free);
+}
- while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
+static int modem_enable(struct connman_device *device)
+{
+ const char *path = connman_device_get_string(device, "Path");
- dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+ DBG("device %p, path, %s", device, path);
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
+ return modem_change_online(path, TRUE);
+}
- if (g_str_equal(key, "Name") == TRUE) {
- const char *name;
+static int modem_disable(struct connman_device *device)
+{
+ const char *path = connman_device_get_string(device, "Path");
- dbus_message_iter_get_basic(&value, &name);
- connman_network_set_name(network, name);
- } else if (g_str_equal(key, "Type") == TRUE) {
- const char *type;
+ DBG("device %p path %s", device, path);
- dbus_message_iter_get_basic(&value, &type);
- if (g_strcmp0(type, "internet") == 0) {
- internet_type = TRUE;
+ return modem_change_online(path, FALSE);
+}
- connman_network_set_protocol(network,
- CONNMAN_NETWORK_PROTOCOL_IP);
- } else {
- internet_type = FALSE;
+static struct connman_device_driver modem_driver = {
+ .name = "modem",
+ .type = CONNMAN_DEVICE_TYPE_CELLULAR,
+ .probe = modem_probe,
+ .remove = modem_remove,
+ .enable = modem_enable,
+ .disable = modem_disable,
+};
- connman_network_set_protocol(network,
- CONNMAN_NETWORK_PROTOCOL_UNKNOWN);
- }
- }
+static void modem_remove_device(struct modem_data *modem)
+{
+ DBG("modem %p path %s device %p", modem, modem->path, modem->device);
- dbus_message_iter_next(&dict);
- }
+ if (modem->device == NULL)
+ return;
- if (internet_type == TRUE) {
- const char *path;
- char *group;
+ connman_device_remove_all_networks(modem->device);
+ connman_device_unregister(modem->device);
+ connman_device_unref(modem->device);
- path = connman_network_get_string(network, "Path");
+ modem->device = NULL;
+}
- group = get_ident(path);
+static void remove_modem(gpointer data)
+{
+ struct modem_data *modem = data;
- connman_network_set_group(network, group);
+ modem_remove_device(modem);
- g_free(group);
- }
+ g_free(modem->path);
+ g_free(modem->operator);
-done:
- dbus_message_unref(reply);
+ g_free(modem);
}
-static void config_network(struct connman_network *network, const char *path)
+static void remove_network(gpointer data)
{
- DBusMessage *message;
- DBusPendingCall *call;
+ struct network_info *info = data;
- DBG("path %s", path);
-
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_PRI_CONTEXT_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
+ connman_network_unref(info->network);
- dbus_message_set_auto_start(message, FALSE);
+ g_free(info);
+}
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get Primary Context");
- goto done;
- }
+static char *get_ident(const char *path)
+{
+ char *pos;
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
- }
+ if (*path != '/')
+ return NULL;
- dbus_pending_call_set_notify(call, config_network_reply,
- (void *)network, NULL);
+ pos = strrchr(path, '/');
+ if (pos == NULL)
+ return NULL;
-done:
- dbus_message_unref(message);
+ return pos + 1;
}
-static int network_probe(struct connman_network *network)
+static void create_service(struct connman_network *network)
{
const char *path;
+ char *group;
+
+ DBG("");
path = connman_network_get_string(network, "Path");
- DBG("network %p path %s", network, path);
+ group = get_ident(path);
- config_network(network, path);
+ connman_network_set_group(network, group);
+}
+static int network_probe(struct connman_network *network)
+{
return 0;
}
-static struct connman_network *pending_network;
+static gboolean pending_network_is_available(struct connman_network *network)
+{
+ /* Modem or network may be removed */
+ if (network == NULL || connman_network_get_device(network) == NULL) {
+ DBG("Modem or network was removed");
+ return FALSE;
+ }
+
+ return TRUE;
+}
-static gboolean pending_network_is_available(
- struct connman_network *pending_network)
+static void set_connected(struct network_info *info,
+ connman_bool_t connected)
{
- struct connman_device *device;
- struct connman_network *network;
- const char *identifier;
- char *ident;
+ DBG("network %p connected %d", info->network, connected);
- /* Modem may be removed during waiting for active reply */
- device = connman_network_get_device(pending_network);
- if (device == NULL)
- return FALSE;
+ switch (info->ipv4_method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return;
- identifier = connman_network_get_identifier(pending_network);
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ connman_network_set_ipv4_method(info->network,
+ info->ipv4_method);
+ connman_network_set_ipaddress(info->network,
+ &info->ipv4_address);
- ident = g_strdup(identifier);
+ break;
- connman_network_unref(pending_network);
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ connman_network_set_ipv4_method(info->network,
+ info->ipv4_method);
- /* network may be removed during waiting for active reply */
- network = connman_device_get_network(device, ident);
+ break;
+ }
+
+ switch (info->ipv6_method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return;
- g_free(ident);
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ connman_network_set_ipv6_method(info->network,
+ info->ipv6_method);
+ connman_network_set_ipaddress(info->network,
+ &info->ipv6_address);
- if (network == NULL)
- return FALSE;
+ break;
+ }
- return TRUE;
+ connman_network_set_connected(info->network, connected);
}
static void set_active_reply(DBusPendingCall *call, void *user_data)
{
+ char const *path = user_data;
DBusMessage *reply;
DBusError error;
- struct connman_network *network = user_data;
-
- DBG("network %p", network);
+ struct network_info *info;
- if (pending_network_is_available(network) == FALSE)
- return;
+ info = g_hash_table_lookup(network_hash, path);
reply = dbus_pending_call_steal_reply(call);
- if (reply == NULL)
- return;
+
+ if (info == NULL)
+ goto done;
+
+ DBG("path %s network %p", path, info->network);
+
+ if (!pending_network_is_available(info->network))
+ goto done;
dbus_error_init(&error);
- if (dbus_set_error_from_message(&error, reply)) {
- if (connman_network_get_index(network) < 0)
- connman_network_set_error(network,
- CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
- pending_network = NULL;
+ if (dbus_set_error_from_message(&error, reply)) {
+ connman_error("SetProperty(Active) %s %s",
+ error.name, error.message);
- connman_error("%s", error.message);
+ if (connman_network_get_index(info->network) < 0)
+ connman_network_set_error(info->network,
+ CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
dbus_error_free(&error);
- } else
- pending_network = network;
+ } else if (connman_network_get_index(info->network) >= 0)
+ set_connected(info, TRUE);
+done:
dbus_message_unref(reply);
+
+ dbus_pending_call_unref(call);
}
-static int set_network_active(struct connman_network *network,
- dbus_bool_t active)
+static int set_network_active(struct connman_network *network)
{
- DBusMessage *message;
- DBusPendingCall *call;
- DBusMessageIter iter;
-
+ dbus_bool_t value = TRUE;
const char *path = connman_network_get_string(network, "Path");
- DBG("network %p, path %s, active %d", network, path, active);
+ DBG("network %p, path %s", network, path);
- if (path == NULL)
- return -EINVAL;
+ return set_property(path, OFONO_CONTEXT_INTERFACE,
+ "Active", DBUS_TYPE_BOOLEAN, &value,
+ set_active_reply, g_strdup(path), g_free);
+}
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_PRI_CONTEXT_INTERFACE, SET_PROPERTY);
- if (message == NULL)
- return -ENOMEM;
+static int set_network_inactive(struct connman_network *network)
+{
+ int err;
+ dbus_bool_t value = FALSE;
+ const char *path = connman_network_get_string(network, "Path");
- dbus_message_set_auto_start(message, FALSE);
+ DBG("network %p, path %s", network, path);
- dbus_message_iter_init_append(message, &iter);
- connman_dbus_property_append_basic(&iter, "Active",
- DBUS_TYPE_BOOLEAN, &active);
+ err = set_property(path, OFONO_CONTEXT_INTERFACE,
+ "Active", DBUS_TYPE_BOOLEAN, &value,
+ NULL, NULL, NULL);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT * 10) == FALSE) {
- connman_error("Failed to connect service");
- dbus_message_unref(message);
- return -EINVAL;
- }
+ if (err == -EINPROGRESS)
+ err = 0;
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- dbus_message_unref(message);
- return -EINVAL;
- }
+ return err;
+}
- connman_network_ref(network);
+static int network_connect(struct connman_network *network)
+{
+ struct connman_device *device;
+ struct modem_data *modem;
- dbus_pending_call_set_notify(call, set_active_reply, network, NULL);
+ DBG("network %p", network);
- dbus_message_unref(message);
+ device = connman_network_get_device(network);
+ if (device == NULL)
+ return -ENODEV;
+
+ modem = connman_device_get_data(device);
+ if (modem == NULL)
+ return -ENODEV;
- if (active == TRUE)
- return -EINPROGRESS;
+ if (modem->registered == FALSE)
+ return -ENOLINK;
- return 0;
-}
+ if (modem->powered == FALSE)
+ return -ENOLINK;
-static int network_connect(struct connman_network *network)
-{
- if (connman_network_get_index(network) >= 0)
- return -EISCONN;
+ if (modem->roaming_allowed == FALSE && modem->roaming == TRUE)
+ return -ENOLINK;
- return set_network_active(network, TRUE);
+ return set_network_active(network);
}
static int network_disconnect(struct connman_network *network)
{
+ DBG("network %p", network);
+
if (connman_network_get_index(network) < 0)
return -ENOTCONN;
- return set_network_active(network, FALSE);
+ connman_network_set_associating(network, FALSE);
+
+ return set_network_inactive(network);
}
static void network_remove(struct connman_network *network)
{
- DBG("network %p", network);
+ char const *path = connman_network_get_string(network, "Path");
+
+ DBG("network %p path %s", network, path);
+
+ g_hash_table_remove(network_hash, path);
}
static struct connman_network_driver network_driver = {
.disconnect = network_disconnect,
};
-static void add_network(struct connman_device *device, const char *path)
+static void get_dns(DBusMessageIter *array, struct network_info *info)
+{
+ DBusMessageIter entry;
+ gchar *nameservers = NULL, *nameservers_old = NULL;
+
+ DBG("");
+
+
+ dbus_message_iter_recurse(array, &entry);
+
+ while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
+ const char *dns;
+
+ dbus_message_iter_get_basic(&entry, &dns);
+
+ DBG("dns %s", dns);
+
+ if (nameservers == NULL) {
+
+ nameservers = g_strdup(dns);
+ } else {
+
+ nameservers_old = nameservers;
+ nameservers = g_strdup_printf("%s %s",
+ nameservers_old, dns);
+ g_free(nameservers_old);
+ }
+
+ dbus_message_iter_next(&entry);
+ }
+
+ connman_network_set_nameservers(info->network, nameservers);
+
+ g_free(nameservers);
+}
+
+static void update_ipv4_settings(DBusMessageIter *array,
+ struct network_info *info)
+{
+ DBusMessageIter dict;
+ char *address = NULL, *netmask = NULL, *gateway = NULL;
+ const char *interface = NULL;
+
+ DBG("network %p", info->network);
+
+ if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
+ return;
+
+ 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);
+
+ DBG("key %s", key);
+
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &value);
+
+ if (g_str_equal(key, "Interface") == TRUE) {
+ int index;
+
+ dbus_message_iter_get_basic(&value, &interface);
+
+ DBG("interface %s", interface);
+
+ index = connman_inet_ifindex(interface);
+ if (index >= 0) {
+ connman_network_set_index(info->network, index);
+ } else {
+ connman_error("Can not find interface %s",
+ interface);
+ break;
+ }
+ } else if (g_str_equal(key, "Method") == TRUE) {
+ const char *method;
+
+ dbus_message_iter_get_basic(&value, &method);
+
+ if (g_strcmp0(method, "static") == 0) {
+
+ info->ipv4_method =
+ CONNMAN_IPCONFIG_METHOD_FIXED;
+ } else if (g_strcmp0(method, "dhcp") == 0) {
+
+ info->ipv4_method =
+ CONNMAN_IPCONFIG_METHOD_DHCP;
+ break;
+ }
+ } else if (g_str_equal(key, "Address") == TRUE) {
+ dbus_message_iter_get_basic(&value, &val);
+
+ address = g_strdup(val);
+
+ DBG("address %s", address);
+ } else if (g_str_equal(key, "Netmask") == TRUE) {
+ dbus_message_iter_get_basic(&value, &val);
+
+ netmask = g_strdup(val);
+
+ DBG("netmask %s", netmask);
+ } else if (g_str_equal(key, "DomainNameServers") == TRUE) {
+
+ get_dns(&value, info);
+ } else if (g_str_equal(key, "Gateway") == TRUE) {
+ dbus_message_iter_get_basic(&value, &val);
+
+ gateway = g_strdup(val);
+
+ DBG("gateway %s", gateway);
+ }
+
+ dbus_message_iter_next(&dict);
+ }
+
+
+ if (info->ipv4_method == CONNMAN_IPCONFIG_METHOD_FIXED) {
+ connman_ipaddress_set_ipv4(&info->ipv4_address, address,
+ netmask, gateway);
+ }
+
+ /* deactive, oFono send NULL inteface before deactive signal */
+ if (interface == NULL)
+ connman_network_set_index(info->network, -1);
+
+ g_free(address);
+ g_free(netmask);
+ g_free(gateway);
+}
+
+static void update_ipv6_settings(DBusMessageIter *array,
+ struct network_info *info)
+{
+ DBusMessageIter dict;
+ char *address = NULL, *gateway = NULL;
+ unsigned char prefix_length;
+ const char *interface = NULL;
+
+ DBG("network %p", info->network);
+
+ if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
+ return;
+
+ dbus_message_iter_recurse(array, &dict);
+
+ info->ipv6_method = CONNMAN_IPCONFIG_METHOD_FIXED;
+
+ 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);
+
+ DBG("key %s", key);
+
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &value);
+
+ if (g_str_equal(key, "Interface") == TRUE) {
+ int index;
+
+ dbus_message_iter_get_basic(&value, &interface);
+
+ DBG("interface %s", interface);
+
+ index = connman_inet_ifindex(interface);
+ if (index >= 0) {
+ connman_network_set_index(info->network, index);
+ } else {
+ connman_error("Can not find interface %s",
+ interface);
+ break;
+ }
+ } else if (g_str_equal(key, "Address") == TRUE) {
+ dbus_message_iter_get_basic(&value, &val);
+
+ address = g_strdup(val);
+
+ DBG("address %s", address);
+ } else if (g_str_equal(key, "PrefixLength") == TRUE) {
+ dbus_message_iter_get_basic(&value, &prefix_length);
+
+ DBG("prefix length %d", prefix_length);
+ } else if (g_str_equal(key, "DomainNameServers") == TRUE) {
+
+ get_dns(&value, info);
+ } else if (g_str_equal(key, "Gateway") == TRUE) {
+ dbus_message_iter_get_basic(&value, &val);
+
+ gateway = g_strdup(val);
+
+ DBG("gateway %s", gateway);
+ }
+
+ dbus_message_iter_next(&dict);
+ }
+
+ connman_ipaddress_set_ipv6(&info->ipv6_address, address,
+ prefix_length, gateway);
+
+ /* deactive, oFono send NULL inteface before deactive signal */
+ if (interface == NULL)
+ connman_network_set_index(info->network, -1);
+
+ g_free(address);
+ g_free(gateway);
+}
+
+static int add_network(struct connman_device *device,
+ const char *path, DBusMessageIter *dict)
+{
+ struct modem_data *modem = connman_device_get_data(device);
+ struct connman_network *network;
+ struct network_info *info;
+ char *ident;
+ const char *hash_path;
+ dbus_bool_t active = FALSE;
+
+ DBG("modem %p device %p path %s", modem, device, path);
+
+ ident = get_ident(path);
+
+ network = connman_device_get_network(device, ident);
+ if (network != NULL)
+ return -EALREADY;
+
+ info = g_hash_table_lookup(network_hash, path);
+ if (info != NULL) {
+ DBG("path %p already exists with device %p", path,
+ connman_network_get_device(info->network));
+ if (connman_network_get_device(info->network))
+ return -EALREADY;
+ g_hash_table_remove(network_hash, path);
+ }
+
+ network = connman_network_create(ident, CONNMAN_NETWORK_TYPE_CELLULAR);
+ if (network == NULL)
+ return -ENOMEM;
+
+ info = g_try_new0(struct network_info, 1);
+ if (info == NULL) {
+ connman_network_unref(network);
+ return -ENOMEM;
+ }
+
+ connman_ipaddress_clear(&info->ipv4_address);
+ connman_ipaddress_clear(&info->ipv6_address);
+ info->network = network;
+
+ connman_network_set_string(network, "Path", path);
+ hash_path = connman_network_get_string(network, "Path");
+ if (hash_path == NULL) {
+ connman_network_unref(network);
+ g_free(info);
+ return -EIO;
+ }
+
+ create_service(network);
+
+ connman_network_ref(network);
+ g_hash_table_insert(network_hash, (char *) hash_path, info);
+
+ connman_network_set_available(network, TRUE);
+ connman_network_set_index(network, -1);
+
+ if (modem->operator)
+ connman_network_set_name(network, modem->operator);
+
+ if (modem->has_strength)
+ connman_network_set_strength(network, modem->strength);
+
+ connman_network_set_roaming(network, modem->roaming);
+
+ while (dbus_message_iter_get_arg_type(dict) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter entry, value;
+ const char *key;
+
+ dbus_message_iter_recurse(dict, &entry);
+ dbus_message_iter_get_basic(&entry, &key);
+
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &value);
+
+ if (g_str_equal(key, "Type")) {
+ const char *type;
+
+ dbus_message_iter_get_basic(&value, &type);
+ if (g_strcmp0(type, "internet") != 0) {
+ DBG("path %p type %s", path, type);
+ goto error;
+ }
+ } else if (g_str_equal(key, "Settings"))
+ update_ipv4_settings(&value, info);
+ else if (g_str_equal(key, "IPv6.Settings"))
+ update_ipv6_settings(&value, info);
+ else if (g_str_equal(key, "Active") == TRUE)
+ dbus_message_iter_get_basic(&value, &active);
+
+ dbus_message_iter_next(dict);
+ }
+
+ if (connman_device_add_network(device, network) != 0)
+ goto error;
+
+ /* Connect only if requested to do so */
+ if (active && connman_network_get_connecting(network) == TRUE)
+ set_connected(info, active);
+
+ return 0;
+
+error:
+ connman_network_unref(network);
+ g_hash_table_remove(network_hash, hash_path);
+ return -EIO;
+}
+
+static void check_networks_reply(DBusPendingCall *call, void *user_data)
+{
+ char *path = user_data;
+ struct modem_data *modem;
+ DBusMessage *reply;
+ DBusMessageIter array, entry, value, properties;
+
+ DBG("path %s", path);
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem == NULL)
+ return;
+ if (modem->device == NULL)
+ return;
+
+ reply = dbus_pending_call_steal_reply(call);
+
+ if (dbus_message_has_signature(reply, "a(oa{sv})") == FALSE)
+ goto done;
+
+ dbus_message_iter_init(reply, &array);
+
+ dbus_message_iter_recurse(&array, &entry);
+
+ while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRUCT) {
+ char const *network_path;
+
+ dbus_message_iter_recurse(&entry, &value);
+ dbus_message_iter_get_basic(&value, &network_path);
+
+ dbus_message_iter_next(&value);
+ dbus_message_iter_recurse(&value, &properties);
+
+ add_network(modem->device, network_path, &properties);
+
+ dbus_message_iter_next(&entry);
+ }
+
+done:
+ dbus_message_unref(reply);
+
+ dbus_pending_call_unref(call);
+}
+
+static void check_networks(struct modem_data *modem)
+{
+ char const *path = modem->path;
+
+ DBG("modem %p path %s", modem, path);
+
+ call_ofono(path, OFONO_GPRS_INTERFACE, "GetContexts",
+ check_networks_reply, g_strdup(path), g_free,
+ DBUS_TYPE_INVALID);
+}
+
+static void modem_clear_network_errors(struct modem_data *modem)
+{
+ struct connman_device *device = modem->device;
+ GHashTableIter i;
+ gpointer value;
+
+ if (device == NULL)
+ return;
+
+ g_hash_table_iter_init(&i, network_hash);
+
+ while (g_hash_table_iter_next(&i, NULL, &value)) {
+ struct network_info *info = value;
+
+ if (connman_network_get_device(info->network) == device)
+ connman_network_clear_error(info->network);
+ }
+}
+
+static void modem_operator_name_changed(struct modem_data *modem,
+ char const *name)
+{
+ struct connman_device *device = modem->device;
+ GHashTableIter i;
+ gpointer value;
+
+ if (device == NULL)
+ return;
+
+ if (modem->operator != NULL)
+ g_free(modem->operator);
+ modem->operator = g_strdup(name);
+
+ for (g_hash_table_iter_init(&i, network_hash);
+ g_hash_table_iter_next(&i, NULL, &value);) {
+ struct network_info *info = value;
+
+ if (connman_network_get_device(info->network) == device) {
+ connman_network_set_name(info->network, name);
+ connman_network_update(info->network);
+ }
+ }
+}
+
+static void modem_strength_changed(struct modem_data *modem, uint8_t strength)
+{
+ struct connman_device *device = modem->device;
+ GHashTableIter i;
+ gpointer value;
+
+ modem->strength = strength;
+ modem->has_strength = TRUE;
+
+ if (device == NULL)
+ return;
+
+ for (g_hash_table_iter_init(&i, network_hash);
+ g_hash_table_iter_next(&i, NULL, &value);) {
+ struct network_info *info = value;
+
+ if (connman_network_get_device(info->network) == device) {
+ connman_network_set_strength(info->network, strength);
+ connman_network_update(info->network);
+ }
+ }
+}
+
+static void modem_roaming_changed(struct modem_data *modem,
+ char const *status)
+{
+ struct connman_device *device = modem->device;
+ connman_bool_t roaming = FALSE;
+ connman_bool_t registered = FALSE;
+ connman_bool_t was_roaming = modem->roaming;
+ GHashTableIter i;
+ gpointer value;
+
+ if (g_str_equal(status, "roaming"))
+ roaming = TRUE;
+ else if (g_str_equal(status, "registered"))
+ registered = TRUE;
+
+ registered = registered || roaming;
+
+ if (modem->roaming == roaming && modem->registered == registered)
+ return;
+
+ modem->registered = registered;
+ modem->roaming = roaming;
+
+ if (roaming == was_roaming)
+ return;
+
+ if (device == NULL)
+ return;
+
+ g_hash_table_iter_init(&i, network_hash);
+
+ while (g_hash_table_iter_next(&i, NULL, &value)) {
+ struct network_info *info = value;
+
+ if (connman_network_get_device(info->network) == device) {
+ connman_network_set_roaming(info->network, roaming);
+ connman_network_update(info->network);
+ }
+ }
+}
+
+static void modem_registration_removed(struct modem_data *modem)
+{
+ modem->registered = FALSE;
+ modem->roaming = FALSE;
+}
+
+static void modem_registration_changed(struct modem_data *modem,
+ DBusMessageIter *entry)
+{
+ DBusMessageIter iter;
+ const char *key;
+ int type;
+ connman_uint8_t strength;
+ char const *name, *status, *mcc_s;
+
+ dbus_message_iter_get_basic(entry, &key);
+
+ DBG("key %s", key);
+
+ dbus_message_iter_next(entry);
+
+ dbus_message_iter_recurse(entry, &iter);
+
+ type = dbus_message_iter_get_arg_type(&iter);
+ if (type != DBUS_TYPE_BYTE && type != DBUS_TYPE_STRING)
+ return;
+
+ if (g_str_equal(key, "Name") && type == DBUS_TYPE_STRING) {
+ dbus_message_iter_get_basic(&iter, &name);
+ modem_operator_name_changed(modem, name);
+ } else if (g_str_equal(key, "Strength") && type == DBUS_TYPE_BYTE) {
+ dbus_message_iter_get_basic(&iter, &strength);
+ modem_strength_changed(modem, strength);
+ } else if (g_str_equal(key, "Status") && type == DBUS_TYPE_STRING) {
+ dbus_message_iter_get_basic(&iter, &status);
+ modem_roaming_changed(modem, status);
+ } else if (g_str_equal(key, "MobileCountryCode") &&
+ type == DBUS_TYPE_STRING) {
+ int mcc;
+ char *alpha2;
+
+ dbus_message_iter_get_basic(&iter, &mcc_s);
+
+ mcc = atoi(mcc_s);
+ if (mcc > 799)
+ return;
+
+ alpha2 = mcc_country_codes[mcc - 200];
+ connman_technology_set_regdom(alpha2);
+ }
+
+}
+
+static gboolean reg_changed(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
+{
+ const char *path = dbus_message_get_path(message);
+ struct modem_data *modem;
+ DBusMessageIter iter;
+
+ DBG("path %s", path);
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem == NULL)
+ return TRUE;
+
+ if (dbus_message_iter_init(message, &iter))
+ modem_registration_changed(modem, &iter);
+
+ return TRUE;
+}
+
+static void check_registration_reply(DBusPendingCall *call, void *user_data)
+{
+ char const *path = user_data;
+ struct modem_data *modem;
+ DBusMessage *reply;
+ DBusMessageIter array, dict, entry;
+
+ DBG("path %s", path);
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem == NULL)
+ return;
+
+ reply = dbus_pending_call_steal_reply(call);
+
+ if (dbus_message_iter_init(reply, &array) == FALSE)
+ goto done;
+
+ if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
+ goto done;
+
+ dbus_message_iter_recurse(&array, &dict);
+ while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
+ dbus_message_iter_recurse(&dict, &entry);
+ modem_registration_changed(modem, &entry);
+ dbus_message_iter_next(&dict);
+ }
+
+done:
+ dbus_message_unref(reply);
+
+ dbus_pending_call_unref(call);
+}
+
+static void check_registration(struct modem_data *modem)
{
- struct connman_network *network;
- char *ident;
+ char const *path = modem->path;
- DBG("device %p path %s", device, path);
+ DBG("modem %p path %s", modem, path);
- network = connman_device_get_network(device, path);
- if (network != NULL)
- return;
+ call_ofono(path, OFONO_REGISTRATION_INTERFACE, GET_PROPERTIES,
+ check_registration_reply, g_strdup(path), g_free,
+ DBUS_TYPE_INVALID);
+}
- ident = get_ident(path);
+static void modem_gprs_changed(struct modem_data *modem,
+ DBusMessageIter *entry)
+{
+ DBusMessageIter iter;
+ const char *key;
+ int type;
+ dbus_bool_t value;
- network = connman_network_create(ident,
- CONNMAN_NETWORK_TYPE_CELLULAR);
- if (network == NULL)
- return;
+ dbus_message_iter_get_basic(entry, &key);
- g_free(ident);
+ DBG("key %s", key);
- connman_network_set_string(network, "Path", path);
- connman_network_set_available(network, TRUE);
- connman_network_set_index(network, -1);
- connman_device_add_network(device, network);
-}
+ dbus_message_iter_next(entry);
-static void add_networks(struct connman_device *device, DBusMessageIter *array)
-{
- DBusMessageIter entry;
+ dbus_message_iter_recurse(entry, &iter);
- DBG("");
+ type = dbus_message_iter_get_arg_type(&iter);
- dbus_message_iter_recurse(array, &entry);
+ if (type != DBUS_TYPE_BOOLEAN)
+ return;
- while (dbus_message_iter_get_arg_type(&entry) ==
- DBUS_TYPE_OBJECT_PATH) {
- const char *path;
+ dbus_message_iter_get_basic(&iter, &value);
- dbus_message_iter_get_basic(&entry, &path);
+ if (g_str_equal(key, "Attached") == TRUE) {
+ DBG("Attached %d", value);
- add_network(device, path);
+ modem->attached = value;
- dbus_message_iter_next(&entry);
+ if (value)
+ modem_clear_network_errors(modem);
+ } else if (g_str_equal(key, "Powered") == TRUE) {
+ DBG("Powered %d", value);
+
+ modem->powered = value;
+ } else if (g_str_equal(key, "RoamingAllowed") == TRUE) {
+ DBG("RoamingAllowed %d", value);
+
+ modem->roaming_allowed = value;
}
}
-static void check_networks_reply(DBusPendingCall *call, void *user_data)
+static void check_gprs_reply(DBusPendingCall *call, void *user_data)
{
- struct connman_device *device = user_data;
+ char const *path = user_data;
+ struct modem_data *modem;
DBusMessage *reply;
- DBusMessageIter array, dict, contexts;
- dbus_bool_t attached;
+ DBusMessageIter array, dict, entry;
- DBG("device %p", device);
+ DBG("path %s", path);
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem == NULL)
+ return;
reply = dbus_pending_call_steal_reply(call);
- if (reply == NULL)
- goto done;
if (dbus_message_iter_init(reply, &array) == FALSE)
goto done;
goto done;
dbus_message_iter_recurse(&array, &dict);
-
while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
-
dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
-
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
-
- DBG("key %s", key);
-
- if (g_str_equal(key, "Attached") == TRUE) {
- dbus_message_iter_get_basic(&value, &attached);
- DBG("Attached %d", attached);
- } else if (g_str_equal(key, "PrimaryContexts") == TRUE) {
- contexts = value;
- } else if (g_str_equal(key, "Status") == TRUE) {
- const char *status;
-
- dbus_message_iter_get_basic(&value, &status);
- /* FIXME: add roaming support */
- } else if (g_str_equal(key, "Powered") == TRUE) {
- dbus_bool_t powered;
-
- dbus_message_iter_get_basic(&value, &powered);
-
- connman_device_set_powered(device, powered);
- }
-
+ modem_gprs_changed(modem, &entry);
dbus_message_iter_next(&dict);
}
- if (attached == TRUE)
- add_networks(device, &contexts);
-
done:
dbus_message_unref(reply);
-}
-
-static void check_networks(struct modem_data *modem)
-{
- DBusMessage *message;
- DBusPendingCall *call;
- struct connman_device *device;
-
- DBG("modem %p", modem);
-
- if (modem == NULL)
- return;
-
- device = modem->device;
- if (device == NULL)
- return;
-
- message = dbus_message_new_method_call(OFONO_SERVICE, modem->path,
- OFONO_GPRS_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
- dbus_message_set_auto_start(message, FALSE);
+ dbus_pending_call_unref(call);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono GPRS");
- goto done;
- }
+ check_networks(modem);
+}
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
- }
+static void check_gprs(struct modem_data *modem)
+{
+ char const *path = modem->path;
- dbus_pending_call_set_notify(call, check_networks_reply,
- (void *)device, NULL);
+ DBG("modem %p path %s", modem, path);
-done:
- dbus_message_unref(message);
+ call_ofono(path, OFONO_GPRS_INTERFACE, GET_PROPERTIES,
+ check_gprs_reply, g_strdup(path), g_free,
+ DBUS_TYPE_INVALID);
}
static void add_device(const char *path, const char *imsi)
if (modem == NULL)
return;
+ if (modem->device) {
+ if (!g_strcmp0(imsi, connman_device_get_ident(modem->device)))
+ return;
+
+ modem_remove_device(modem);
+ }
+
+ if (strlen(imsi) == 0)
+ return;
+
device = connman_device_create(imsi, CONNMAN_DEVICE_TYPE_CELLULAR);
if (device == NULL)
return;
connman_device_set_ident(device, imsi);
- connman_device_set_mode(device, CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE);
-
connman_device_set_string(device, "Path", path);
+ connman_device_set_data(device, modem);
+
if (connman_device_register(device) < 0) {
connman_device_unref(device);
return;
modem->device = device;
- check_networks(modem);
+ if (modem->has_reg)
+ check_registration(modem);
+
+ if (modem->has_gprs)
+ check_gprs(modem);
}
static void sim_properties_reply(DBusPendingCall *call, void *user_data)
{
const char *path = user_data;
+ const char *imsi = NULL;
DBusMessage *reply;
DBusMessageIter array, dict;
DBG("path %s", path);
reply = dbus_pending_call_steal_reply(call);
- if (reply == NULL)
- return;
if (dbus_message_iter_init(reply, &array) == FALSE)
goto done;
while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
DBusMessageIter entry, value;
- const char *key, *imsi;
+ const char *key;
dbus_message_iter_recurse(&dict, &entry);
dbus_message_iter_get_basic(&entry, &key);
dbus_message_iter_next(&entry);
dbus_message_iter_recurse(&entry, &value);
- if (g_str_equal(key, "SubscriberIdentity") == TRUE) {
+ if (g_str_equal(key, "SubscriberIdentity")) {
dbus_message_iter_get_basic(&value, &imsi);
-
add_device(path, imsi);
}
done:
dbus_message_unref(reply);
+
+ dbus_pending_call_unref(call);
}
static void get_imsi(const char *path)
{
- DBusMessage *message;
- DBusPendingCall *call;
-
DBG("path %s", path);
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_SIM_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
-
- dbus_message_set_auto_start(message, FALSE);
-
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono modem sim");
- goto done;
- }
-
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
- }
-
- dbus_pending_call_set_notify(call, sim_properties_reply,
- (void *)path, NULL);
-
-done:
- dbus_message_unref(message);
+ call_ofono(path, OFONO_SIM_INTERFACE, GET_PROPERTIES,
+ sim_properties_reply, g_strdup(path), g_free,
+ DBUS_TYPE_INVALID);
}
-static int modem_change_powered(const char *path, dbus_bool_t powered)
+static int gprs_change_powered(const char *path, dbus_bool_t powered)
{
- DBusMessage *message;
- DBusMessageIter iter;
- DBusPendingCall *call;
-
DBG("path %s powered %d", path, powered);
- if (path == NULL)
- return -EINVAL;
-
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_MODEM_INTERFACE, SET_PROPERTY);
- if (message == NULL)
- return -ENOMEM;
-
- dbus_message_set_auto_start(message, FALSE);
-
- dbus_message_iter_init_append(message, &iter);
- connman_dbus_property_append_basic(&iter, "Powered",
- DBUS_TYPE_BOOLEAN, &powered);
-
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to change powered property");
- dbus_message_unref(message);
- return -EINVAL;
- }
-
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- dbus_message_unref(message);
- return -EINVAL;
- }
-
- dbus_pending_call_set_notify(call, powered_reply, NULL, NULL);
-
- dbus_message_unref(message);
-
- return -EINPROGRESS;
+ return set_property(path, OFONO_GPRS_INTERFACE, "Powered",
+ DBUS_TYPE_BOOLEAN, &powered,
+ NULL, NULL, NULL);
}
-static struct modem_data *add_modem(const char *path)
+static int modem_change_powered(const char *path, dbus_bool_t powered)
{
- struct modem_data *modem;
-
- if (path == NULL)
- return NULL;
-
- modem = g_hash_table_lookup(modem_hash, path);
- if (modem != NULL) {
- modem->available = TRUE;
-
- return modem;
- }
-
- modem = g_try_new0(struct modem_data, 1);
- if (modem == NULL)
- return NULL;
-
- modem->path = g_strdup(path);
- modem->device = NULL;
- modem->available = TRUE;
-
- g_hash_table_insert(modem_hash, g_strdup(path), modem);
+ DBG("path %s powered %d", path, powered);
- return modem;
+ return set_property(path, OFONO_MODEM_INTERFACE, "Powered",
+ DBUS_TYPE_BOOLEAN, &powered,
+ NULL, NULL, NULL);
}
-static gboolean modem_has_gprs(DBusMessageIter *array)
+
+static gboolean modem_has_interface(DBusMessageIter *array,
+ char const *interface)
{
DBusMessageIter entry;
dbus_message_iter_recurse(array, &entry);
while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
- const char *interface;
+ const char *element;
- dbus_message_iter_get_basic(&entry, &interface);
+ dbus_message_iter_get_basic(&entry, &element);
- if (g_strcmp0(OFONO_GPRS_INTERFACE, interface) == 0)
+ if (g_strcmp0(interface, element) == 0)
return TRUE;
dbus_message_iter_next(&entry);
return FALSE;
}
-static void modem_properties_reply(DBusPendingCall *call, void *user_data)
+static gboolean modem_has_sim(DBusMessageIter *array)
{
- DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *path = user_data;
-
- DBG("path %s", path);
-
- reply = dbus_pending_call_steal_reply(call);
- if (reply == NULL)
- goto done;
-
- if (dbus_message_iter_init(reply, &array) == FALSE)
- goto done;
-
- if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
- goto done;
-
- dbus_message_iter_recurse(&array, &dict);
-
- while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
- dbus_bool_t powered;
-
- dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
-
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
-
- if (g_str_equal(key, "Powered") == TRUE) {
- dbus_message_iter_get_basic(&value, &powered);
-
- if (powered == FALSE) {
- modem_change_powered(path, TRUE);
- break;
- }
- } else if (g_str_equal(key, "Interface") == TRUE) {
- if (modem_has_gprs(&value) == TRUE)
- get_imsi(path);
- }
+ return modem_has_interface(array, OFONO_SIM_INTERFACE);
+}
- dbus_message_iter_next(&dict);
- }
+static gboolean modem_has_reg(DBusMessageIter *array)
+{
+ return modem_has_interface(array, OFONO_REGISTRATION_INTERFACE);
+}
-done:
- dbus_message_unref(reply);
+static gboolean modem_has_gprs(DBusMessageIter *array)
+{
+ return modem_has_interface(array, OFONO_GPRS_INTERFACE);
}
-static void get_modem_properties(struct modem_data *modem)
+static void add_modem(const char *path, DBusMessageIter *prop)
{
- DBusMessage *message;
- DBusPendingCall *call;
+ struct modem_data *modem;
+ dbus_bool_t powered = FALSE;
+ dbus_bool_t online = FALSE;
+ dbus_bool_t locked = FALSE;
+ gboolean has_sim = FALSE;
+ gboolean has_reg = FALSE;
+ gboolean has_gprs = FALSE;
- DBG("path %s", modem->path);
+ modem = g_hash_table_lookup(modem_hash, path);
- if (modem->path == NULL)
+ if (modem != NULL)
return;
- message = dbus_message_new_method_call(OFONO_SERVICE, modem->path,
- OFONO_MODEM_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
+ modem = g_try_new0(struct modem_data, 1);
+ if (modem == NULL)
return;
- dbus_message_set_auto_start(message, FALSE);
-
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono modem");
- goto done;
- }
-
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
- }
-
- dbus_pending_call_set_notify(call, modem_properties_reply,
- (void *)modem->path, NULL);
-
-done:
- dbus_message_unref(message);
-}
-
-static void mask_unavailable(gpointer key, gpointer value, gpointer user_data)
-{
- struct modem_data *modem = value;
-
- modem->available = FALSE;
-}
-
-static void modems_set_unavailable()
-{
- g_hash_table_foreach(modem_hash, mask_unavailable, NULL);
-}
+ modem->path = g_strdup(path);
+ modem->device = NULL;
+ modem->available = TRUE;
-static void cleanup_modem(gpointer key, gpointer value, gpointer user_data)
-{
- struct modem_data *modem = value;
+ g_hash_table_insert(modem_hash, g_strdup(path), modem);
- if (modem->available == FALSE)
- g_hash_table_remove(modem_hash, key);
-}
+ while (dbus_message_iter_get_arg_type(prop) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter entry, value;
+ const char *key;
-static void cleanup_modems()
-{
- g_hash_table_foreach(modem_hash, cleanup_modem, NULL);
-}
+ dbus_message_iter_recurse(prop, &entry);
+ dbus_message_iter_get_basic(&entry, &key);
-static void update_modems(DBusMessageIter *array)
-{
- DBusMessageIter entry;
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &value);
- dbus_message_iter_recurse(array, &entry);
+ if (g_str_equal(key, "Powered") == TRUE)
+ dbus_message_iter_get_basic(&value, &powered);
+ else if (g_str_equal(key, "Lockdown") == TRUE)
+ dbus_message_iter_get_basic(&value, &locked);
+ else if (g_str_equal(key, "Interfaces") == TRUE) {
+ has_sim = modem_has_sim(&value);
+ has_reg = modem_has_reg(&value);
+ has_gprs = modem_has_gprs(&value);
+ }
- modems_set_unavailable();
+ dbus_message_iter_next(prop);
+ }
- while (dbus_message_iter_get_arg_type(&entry) ==
- DBUS_TYPE_OBJECT_PATH) {
- const char *path;
- struct modem_data *modem;
+ if (locked)
+ return;
- dbus_message_iter_get_basic(&entry, &path);
+ if (!powered)
+ modem_change_powered(path, TRUE);
- modem = add_modem(path);
- if (modem != NULL)
- get_modem_properties(modem);
+ modem->has_sim = has_sim;
+ modem->has_reg = has_reg;
+ modem->has_gprs = has_gprs;
- dbus_message_iter_next(&entry);
- }
+ update_modem_online(modem, online);
- cleanup_modems();
+ if (has_sim)
+ get_imsi(path);
}
-static void manager_properties_reply(DBusPendingCall *call, void *user_data)
+static void manager_modems_reply(DBusPendingCall *call, void *user_data)
{
DBusMessage *reply;
+ DBusError error;
DBusMessageIter array, dict;
DBG("");
reply = dbus_pending_call_steal_reply(call);
- if (reply == NULL)
+
+ if (dbus_message_has_signature(reply, "a(oa{sv})") == FALSE)
goto done;
- if (dbus_message_iter_init(reply, &array) == FALSE)
+ dbus_error_init(&error);
+
+ if (dbus_set_error_from_message(&error, reply)) {
+ connman_error("ModemManager.GetModems() %s %s",
+ error.name, error.message);
+ dbus_error_free(&error);
goto done;
+ }
- if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
+ if (dbus_message_iter_init(reply, &array) == FALSE)
goto done;
dbus_message_iter_recurse(&array, &dict);
- while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
+ while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_STRUCT) {
+ DBusMessageIter value, properties;
+ const char *modem_path;
- dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+ dbus_message_iter_recurse(&dict, &value);
+ dbus_message_iter_get_basic(&value, &modem_path);
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
+ dbus_message_iter_next(&value);
+ dbus_message_iter_recurse(&value, &properties);
- if (g_str_equal(key, "Modems") == TRUE) {
- update_modems(&value);
- break;
- }
+ /* Add modem */
+ add_modem(modem_path, &properties);
dbus_message_iter_next(&dict);
}
done:
dbus_message_unref(reply);
-}
-
-static void modem_remove_device(struct modem_data *modem)
-{
- if (modem->device == NULL)
- return;
-
- connman_device_unregister(modem->device);
- connman_device_unref(modem->device);
-
- modem->device = NULL;
-}
-
-static void remove_modem(gpointer data)
-{
- struct modem_data *modem = data;
-
- g_free(modem->path);
- modem_remove_device(modem);
-
- g_free(modem);
+ dbus_pending_call_unref(call);
}
static void ofono_connect(DBusConnection *connection, void *user_data)
{
- DBusMessage *message;
- DBusPendingCall *call;
-
DBG("connection %p", connection);
modem_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
g_free, remove_modem);
- message = dbus_message_new_method_call(OFONO_SERVICE, "/",
- OFONO_MANAGER_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
-
- dbus_message_set_auto_start(message, FALSE);
-
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono modems");
- goto done;
- }
-
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
- }
-
- dbus_pending_call_set_notify(call, manager_properties_reply,
- NULL, NULL);
-
-done:
- dbus_message_unref(message);
+ network_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+ NULL, remove_network);
+ call_ofono("/", OFONO_MANAGER_INTERFACE, GET_MODEMS,
+ manager_modems_reply, NULL, NULL,
+ DBUS_TYPE_INVALID);
}
static void ofono_disconnect(DBusConnection *connection, void *user_data)
modem_hash = NULL;
}
-static void modem_changed(DBusConnection *connection, DBusMessage *message)
+static gboolean modem_changed(DBusConnection *connection, DBusMessage *message,
+ void *user_data)
{
const char *path = dbus_message_get_path(message);
struct modem_data *modem;
modem = g_hash_table_lookup(modem_hash, path);
if (modem == NULL)
- return;
+ return TRUE;
if (dbus_message_iter_init(message, &iter) == FALSE)
- return;
+ return TRUE;
dbus_message_iter_get_basic(&iter, &key);
dbus_message_iter_get_basic(&value, &powered);
if (powered == TRUE)
- return;
+ return TRUE;
+
+ modem->has_sim = FALSE;
+ modem->has_reg = FALSE;
+ modem->has_gprs = FALSE;
modem_remove_device(modem);
+ } else if (g_str_equal(key, "Online") == TRUE) {
+ dbus_bool_t online;
+
+ dbus_message_iter_get_basic(&value, &online);
+
+ update_modem_online(modem, online);
+ } else if (g_str_equal(key, "Lockdown") == TRUE) {
+ dbus_bool_t locked;
+
+ dbus_message_iter_get_basic(&value, &locked);
+
+ if (!locked)
+ modem_change_powered(path, TRUE);
+
} else if (g_str_equal(key, "Interfaces") == TRUE) {
- if (modem_has_gprs(&value) == TRUE) {
- if (modem->device == NULL)
+ gboolean has_sim = modem_has_sim(&value);
+ gboolean has_reg = modem_has_reg(&value);
+ gboolean had_reg = modem->has_reg;
+ gboolean has_gprs = modem_has_gprs(&value);
+ gboolean had_gprs = modem->has_gprs;
+
+ modem->has_sim = has_sim;
+ modem->has_reg = has_reg;
+ modem->has_gprs = has_gprs;
+
+ if (modem->device == NULL) {
+ if (has_sim)
get_imsi(modem->path);
- } else if (modem->device != NULL)
+ } else if (!has_sim) {
modem_remove_device(modem);
+ } else {
+ if (has_reg && !had_reg)
+ check_registration(modem);
+ else if (had_reg && !has_reg)
+ modem_registration_removed(modem);
+
+ if (has_gprs && !had_gprs) {
+ gprs_change_powered(modem->path, TRUE);
+ check_gprs(modem);
+ }
+ }
}
+
+ return TRUE;
}
-static void gprs_changed(DBusConnection *connection, DBusMessage *message)
+static gboolean sim_changed(DBusConnection *connection, DBusMessage *message,
+ void *user_data)
{
const char *path = dbus_message_get_path(message);
struct modem_data *modem;
modem = g_hash_table_lookup(modem_hash, path);
if (modem == NULL)
- return;
+ return TRUE;
if (dbus_message_iter_init(message, &iter) == FALSE)
- return;
+ return TRUE;
dbus_message_iter_get_basic(&iter, &key);
dbus_message_iter_next(&iter);
dbus_message_iter_recurse(&iter, &value);
- if (g_str_equal(key, "Attached") == TRUE) {
- dbus_bool_t attached;
-
- dbus_message_iter_get_basic(&value, &attached);
-
- DBG("Attached %d", attached);
+ if (g_str_equal(key, "SubscriberIdentity") == TRUE) {
+ char *imsi;
- if (attached == TRUE)
- check_networks(modem);
- else if (modem->device != NULL)
- connman_device_remove_all_networks(modem->device);
+ dbus_message_iter_get_basic(&value, &imsi);
- } else if (g_str_equal(key, "Status") == TRUE) {
- const char *status;
- dbus_message_iter_get_basic(&value, &status);
+ add_device(path, imsi);
+ } else if (g_str_equal(key, "Present") == TRUE) {
+ dbus_bool_t present;
- DBG("status %s", status);
+ dbus_message_iter_get_basic(&value, &present);
- /* FIXME: add roaming support */
- } else if (g_str_equal(key, "PrimaryContexts") == TRUE) {
- check_networks(modem);
- } else if (g_str_equal(key, "Powered") == TRUE) {
- dbus_bool_t powered;
+ if (present)
+ return TRUE;
- if (modem->device == NULL)
- return;
+ if (modem->device != NULL)
+ modem_remove_device(modem);
- dbus_message_iter_get_basic(&value, &powered);
- connman_device_set_powered(modem->device, powered);
+ modem->has_gprs = FALSE;
+ modem->has_reg = FALSE;
}
+
+ return TRUE;
}
-static void manager_changed(DBusConnection *connection, DBusMessage *message)
+static gboolean gprs_changed(DBusConnection *connection, DBusMessage *message,
+ void *user_data)
{
const char *path = dbus_message_get_path(message);
- DBusMessageIter iter, value;
- const char *key;
+ struct modem_data *modem;
+ DBusMessageIter iter;
DBG("path %s", path);
- if (dbus_message_iter_init(message, &iter) == FALSE)
- return;
-
- dbus_message_iter_get_basic(&iter, &key);
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem == NULL)
+ return TRUE;
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
+ if (dbus_message_iter_init(message, &iter))
+ modem_gprs_changed(modem, &iter);
- if (g_str_equal(key, "Modems") == TRUE)
- update_modems(&value);
+ return TRUE;
}
-static void get_dns(DBusMessageIter *array, struct connman_element *parent)
+static gboolean context_added(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
{
- DBusMessageIter entry;
- gchar *nameserver = NULL, *nameserver_old = NULL;
-
- DBG("");
-
- dbus_message_iter_recurse(array, &entry);
-
- while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
- const char *dns;
+ const char *path = dbus_message_get_path(message);
+ const char *network_path;
+ struct modem_data *modem;
+ DBusMessageIter iter, properties;
- dbus_message_iter_get_basic(&entry, &dns);
+ DBG("path %s", path);
- DBG("dns %s", dns);
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem == NULL || modem->device == NULL)
+ return TRUE;
- if (nameserver == NULL) {
+ if (dbus_message_iter_init(message, &iter) == FALSE)
+ return TRUE;
- nameserver = g_strdup(dns);
- } else {
+ dbus_message_iter_get_basic(&iter, &network_path);
- nameserver_old = nameserver;
- nameserver = g_strdup_printf("%s %s",
- nameserver_old, dns);
- g_free(nameserver_old);
- }
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &properties);
- dbus_message_iter_next(&entry);
- }
+ add_network(modem->device, network_path, &properties);
- parent->ipv4.nameserver = nameserver;
+ return TRUE;
}
-static void update_settings(DBusMessageIter *array,
- struct connman_element *parent)
+static gboolean context_removed(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
{
- DBusMessageIter dict;
- const char *interface = NULL;
-
- DBG("");
-
- if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
- return;
-
- dbus_message_iter_recurse(array, &dict);
-
- while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
-
- dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
-
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
-
- if (g_str_equal(key, "Interface") == TRUE) {
- int index;
-
- dbus_message_iter_get_basic(&value, &interface);
-
- DBG("interface %s", interface);
-
- index = connman_inet_ifindex(interface);
- if (index >= 0) {
- connman_network_set_index(
- pending_network, index);
- } else {
- connman_error("Can not find interface %s",
- interface);
- break;
- }
- } else if (g_str_equal(key, "Method") == TRUE) {
- const char *method;
-
- dbus_message_iter_get_basic(&value, &method);
- if (g_strcmp0(method, "static") == 0) {
-
- parent->ipv4.method =
- CONNMAN_IPCONFIG_METHOD_STATIC;
- } else if (g_strcmp0(method, "dhcp") == 0) {
-
- parent->ipv4.method =
- CONNMAN_IPCONFIG_METHOD_DHCP;
- break;
- }
- } else if (g_str_equal(key, "Address") == TRUE) {
- const char *address;
-
- dbus_message_iter_get_basic(&value, &address);
-
- DBG("address %s", address);
-
- parent->ipv4.address = g_strdup(address);
- } else if (g_str_equal(key, "Netmask") == TRUE) {
- const char *netmask;
-
- dbus_message_iter_get_basic(&value, &netmask);
-
- DBG("netmask %s", netmask);
+ const char *path = dbus_message_get_path(message);
+ const char *network_path, *identifier;
+ struct modem_data *modem;
+ struct network_info *info;
+ DBusMessageIter iter;
- parent->ipv4.netmask = g_strdup(netmask);
- } else if (g_str_equal(key, "DomainNameServers") == TRUE) {
+ DBG("path %s", path);
- get_dns(&value, parent);
- } else if (g_str_equal(key, "Gateway") == TRUE) {
- const char *gateway;
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem == NULL || modem->device == NULL)
+ return TRUE;
- dbus_message_iter_get_basic(&value, &gateway);
+ if (dbus_message_iter_init(message, &iter) == FALSE)
+ return TRUE;
- DBG("gateway %s", gateway);
+ dbus_message_iter_get_basic(&iter, &network_path);
- parent->ipv4.gateway = g_strdup(gateway);
- }
+ info = g_hash_table_lookup(network_hash, network_path);
+ if (info == NULL)
+ return TRUE;
- dbus_message_iter_next(&dict);
- }
+ identifier = connman_network_get_identifier(info->network);
+ connman_device_remove_network(modem->device, identifier);
- /* deactive, oFono send NULL inteface before deactive signal */
- if (interface == NULL)
- connman_network_set_index(pending_network, -1);
+ return TRUE;
}
-static void cleanup_ipconfig(struct connman_element *parent)
+static gboolean modem_added(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
{
- g_free(parent->ipv4.address);
- parent->ipv4.address = NULL;
-
- g_free(parent->ipv4.netmask);
- parent->ipv4.netmask = NULL;
+ DBusMessageIter iter, properties;
+ const char *modem_path;
- g_free(parent->ipv4.nameserver);
- parent->ipv4.nameserver = NULL;
-
- g_free(parent->ipv4.gateway);
- parent->ipv4.gateway = NULL;
-
- parent->ipv4.method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
-}
+ DBG("");
-static int static_network_set_connected(
- struct connman_network *pending_network,
- struct connman_element *parent,
- connman_bool_t connected)
-{
- if (connected == TRUE) {
- struct connman_element *element;
+ if (dbus_message_iter_init(message, &iter) == FALSE)
+ return TRUE;
- if (parent->ipv4.address == NULL)
- goto error;
+ dbus_message_iter_get_basic(&iter, &modem_path);
- if (parent->ipv4.netmask == NULL)
- goto error;
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &properties);
- element = connman_element_create(NULL);
- if (element == NULL) {
- connman_error("Can not create connman_element");
- return -ENOMEM;
- }
+ add_modem(modem_path, &properties);
- element->type = CONNMAN_ELEMENT_TYPE_IPV4;
- element->index = parent->index;
+ return TRUE;
+}
- if (connman_element_register(element, parent) < 0) {
- connman_element_unref(element);
- goto error;
- }
- } else
- cleanup_ipconfig(parent);
+static gboolean modem_removed(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
+{
+ DBusMessageIter iter;
+ const char *modem_path;
- connman_network_set_connected(pending_network, connected);
+ DBG("");
- return 0;
+ if (dbus_message_iter_init(message, &iter) == FALSE)
+ return TRUE;
-error:
- connman_network_set_error(pending_network,
- CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
+ dbus_message_iter_get_basic(&iter, &modem_path);
- cleanup_ipconfig(parent);
+ g_hash_table_remove(modem_hash, modem_path);
- return -EINVAL;
+ return TRUE;
}
-static void pri_context_changed(DBusConnection *connection,
- DBusMessage *message)
+static gboolean context_changed(DBusConnection *connection,
+ DBusMessage *message, void *user_data)
{
const char *path = dbus_message_get_path(message);
- struct connman_element *parent;
- const char *pending_path;
+ struct network_info *info;
DBusMessageIter iter, value;
const char *key;
- DBG("pending_network %p, path %s", pending_network, path);
-
- if (pending_network == NULL)
- return;
+ DBG("path %s", path);
- pending_path = connman_network_get_string(pending_network, "Path");
- if (g_strcmp0(pending_path, path) != 0)
- return;
+ info = g_hash_table_lookup(network_hash, path);
+ if (info == NULL)
+ return TRUE;
- parent = connman_network_get_element(pending_network);
+ if (!pending_network_is_available(info->network)) {
+ g_hash_table_remove(network_hash, path);
+ return TRUE;
+ }
if (dbus_message_iter_init(message, &iter) == FALSE)
- return;
+ return TRUE;
dbus_message_iter_get_basic(&iter, &key);
dbus_message_iter_next(&iter);
dbus_message_iter_recurse(&iter, &value);
- if (g_str_equal(key, "Settings") == TRUE) {
+ DBG("key %s", key);
- update_settings(&value, parent);
- } else if (g_str_equal(key, "Active") == TRUE) {
+ if (g_str_equal(key, "Settings") == TRUE)
+ update_ipv4_settings(&value, info);
+ else if (g_str_equal(key, "IPv6.Settings"))
+ update_ipv6_settings(&value, info);
+ else if (g_str_equal(key, "Active") == TRUE) {
dbus_bool_t active;
dbus_message_iter_get_basic(&value, &active);
- switch (parent->ipv4.method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_IGNORE:
- break;
- case CONNMAN_IPCONFIG_METHOD_STATIC:
- if (static_network_set_connected(
- pending_network, parent, active) < 0)
- set_network_active(pending_network, FALSE);
- break;
- case CONNMAN_IPCONFIG_METHOD_DHCP:
- connman_network_set_connected(pending_network, active);
- break;
- }
-
- pending_network = NULL;
- }
-}
+ if (active == FALSE)
+ set_connected(info, active);
-static DBusHandlerResult ofono_signal(DBusConnection *connection,
- DBusMessage *message, void *user_data)
-{
- if (dbus_message_is_signal(message, OFONO_MODEM_INTERFACE,
- PROPERTY_CHANGED) == TRUE) {
- modem_changed(connection, message);
- } else if (dbus_message_is_signal(message, OFONO_GPRS_INTERFACE,
- PROPERTY_CHANGED) == TRUE) {
- gprs_changed(connection, message);
- } else if (dbus_message_is_signal(message, OFONO_MANAGER_INTERFACE,
- PROPERTY_CHANGED) == TRUE) {
- manager_changed(connection, message);
- } else if (dbus_message_is_signal(message, OFONO_PRI_CONTEXT_INTERFACE,
- PROPERTY_CHANGED) == TRUE) {
- pri_context_changed(connection, message);
+ /* Connect only if requested to do so */
+ if (active == TRUE &&
+ connman_network_get_connecting(info->network) == TRUE)
+ set_connected(info, active);
}
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ return TRUE;
}
-static const char *gprs_rule = "type=signal, member=" PROPERTY_CHANGED
- ",interface=" OFONO_GPRS_INTERFACE;
-static const char *modem_rule = "type=signal,member=" PROPERTY_CHANGED
- ",interface=" OFONO_MODEM_INTERFACE;
-static const char *manager_rule = "type=signal,member=" PROPERTY_CHANGED
- ",interface=" OFONO_MANAGER_INTERFACE;
-static const char *pri_context_rule = "type=signal,member=" PROPERTY_CHANGED
- ", interface=" OFONO_PRI_CONTEXT_INTERFACE;
-
static guint watch;
+static guint reg_watch;
+static guint sim_watch;
+static guint gprs_watch;
+static guint context_added_watch;
+static guint context_removed_watch;
+static guint modem_watch;
+static guint modem_added_watch;
+static guint modem_removed_watch;
+static guint context_watch;
static int ofono_init(void)
{
if (connection == NULL)
return -EIO;
- if (dbus_connection_add_filter(connection, ofono_signal,
- NULL, NULL) == FALSE) {
+ watch = g_dbus_add_service_watch(connection, OFONO_SERVICE,
+ ofono_connect, ofono_disconnect, NULL, NULL);
+
+ reg_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_REGISTRATION_INTERFACE,
+ PROPERTY_CHANGED,
+ reg_changed,
+ NULL, NULL);
+
+ gprs_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_GPRS_INTERFACE,
+ PROPERTY_CHANGED,
+ gprs_changed,
+ NULL, NULL);
+
+ context_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_GPRS_INTERFACE,
+ CONTEXT_ADDED,
+ context_added,
+ NULL, NULL);
+
+ context_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_GPRS_INTERFACE,
+ CONTEXT_REMOVED,
+ context_removed,
+ NULL, NULL);
+
+ modem_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_MODEM_INTERFACE,
+ PROPERTY_CHANGED,
+ modem_changed,
+ NULL, NULL);
+
+ sim_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_SIM_INTERFACE,
+ PROPERTY_CHANGED,
+ sim_changed,
+ NULL, NULL);
+
+ modem_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_MANAGER_INTERFACE,
+ MODEM_ADDED,
+ modem_added,
+ NULL, NULL);
+
+ modem_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_MANAGER_INTERFACE,
+ MODEM_REMOVED,
+ modem_removed,
+ NULL, NULL);
+
+ context_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ OFONO_CONTEXT_INTERFACE,
+ PROPERTY_CHANGED,
+ context_changed,
+ NULL, NULL);
+
+ if (watch == 0 || gprs_watch == 0 || context_added_watch == 0 ||
+ context_removed_watch == 0 || modem_watch == 0 ||
+ reg_watch == 0 || sim_watch == 0 ||
+ modem_added_watch == 0 || modem_removed_watch == 0 ||
+ context_watch == 0) {
err = -EIO;
- goto unref;
+ goto remove;
}
err = connman_network_driver_register(&network_driver);
goto remove;
}
- watch = g_dbus_add_service_watch(connection, OFONO_SERVICE,
- ofono_connect, ofono_disconnect, NULL, NULL);
- if (watch == 0) {
- err = -EIO;
- goto remove;
- }
-
- dbus_bus_add_match(connection, modem_rule, NULL);
- dbus_bus_add_match(connection, gprs_rule, NULL);
- dbus_bus_add_match(connection, manager_rule, NULL);
- dbus_bus_add_match(connection, pri_context_rule, NULL);
-
return 0;
remove:
- dbus_connection_remove_filter(connection, ofono_signal, NULL);
+ g_dbus_remove_watch(connection, watch);
+ g_dbus_remove_watch(connection, sim_watch);
+ g_dbus_remove_watch(connection, reg_watch);
+ g_dbus_remove_watch(connection, gprs_watch);
+ g_dbus_remove_watch(connection, context_added_watch);
+ g_dbus_remove_watch(connection, context_removed_watch);
+ g_dbus_remove_watch(connection, modem_watch);
+ g_dbus_remove_watch(connection, modem_added_watch);
+ g_dbus_remove_watch(connection, modem_removed_watch);
+ g_dbus_remove_watch(connection, context_watch);
-unref:
dbus_connection_unref(connection);
return err;
static void ofono_exit(void)
{
- dbus_bus_remove_match(connection, modem_rule, NULL);
- dbus_bus_remove_match(connection, gprs_rule, NULL);
- dbus_bus_remove_match(connection, manager_rule, NULL);
- dbus_bus_remove_match(connection, pri_context_rule, NULL);
-
g_dbus_remove_watch(connection, watch);
+ g_dbus_remove_watch(connection, sim_watch);
+ g_dbus_remove_watch(connection, reg_watch);
+ g_dbus_remove_watch(connection, gprs_watch);
+ g_dbus_remove_watch(connection, context_added_watch);
+ g_dbus_remove_watch(connection, context_removed_watch);
+ g_dbus_remove_watch(connection, modem_watch);
+ g_dbus_remove_watch(connection, modem_added_watch);
+ g_dbus_remove_watch(connection, modem_removed_watch);
+ g_dbus_remove_watch(connection, context_watch);
ofono_disconnect(connection, NULL);
connman_device_driver_unregister(&modem_driver);
connman_network_driver_unregister(&network_driver);
- dbus_connection_remove_filter(connection, ofono_signal, NULL);
-
dbus_connection_unref(connection);
}
projects / framework / connectivity / connman.git / blobdiff