*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2011-2014 BMW Car IT GmbH.
*
* 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 <stdint.h>
#define CONNMAN_API_SUBJECT_TO_CHANGE
#include <connman/plugin.h>
-#include <connman/element.h>
#include <connman/device.h>
#include <connman/network.h>
-#include <connman/dbus.h>
#include <connman/inet.h>
+#include <connman/dbus.h>
#include <connman/log.h>
+#include <connman/technology.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_SIM_INTERFACE OFONO_SERVICE ".SimManager"
-#define OFONO_PRI_CONTEXT_INTERFACE OFONO_SERVICE ".PrimaryDataContext"
-#define OFONO_REGISTRATION_INTERFACE OFONO_SERVICE ".NetworkRegistration"
-
+#define OFONO_NETREG_INTERFACE OFONO_SERVICE ".NetworkRegistration"
+#define OFONO_CM_INTERFACE OFONO_SERVICE ".ConnectionManager"
+#define OFONO_CONTEXT_INTERFACE OFONO_SERVICE ".ConnectionContext"
+#define OFONO_CDMA_CM_INTERFACE OFONO_SERVICE ".cdma.ConnectionManager"
+#define OFONO_CDMA_NETREG_INTERFACE OFONO_SERVICE ".cdma.NetworkRegistration"
+
+#define MODEM_ADDED "ModemAdded"
+#define MODEM_REMOVED "ModemRemoved"
#define PROPERTY_CHANGED "PropertyChanged"
+#define CONTEXT_ADDED "ContextAdded"
+#define CONTEXT_REMOVED "ContextRemoved"
+
#define GET_PROPERTIES "GetProperties"
#define SET_PROPERTY "SetProperty"
-#define CREATE_CONTEXT "CreateContext"
+#define GET_MODEMS "GetModems"
+#define GET_CONTEXTS "GetContexts"
+
+#define TIMEOUT 40000
-#define TIMEOUT 5000
+enum ofono_api {
+ OFONO_API_SIM = 0x1,
+ OFONO_API_NETREG = 0x2,
+ OFONO_API_CM = 0x4,
+ OFONO_API_CDMA_NETREG = 0x8,
+ OFONO_API_CDMA_CM = 0x10,
+};
-#define CONTEXT_NAME "3G Connection"
-#define CONTEXT_TYPE "internet"
+/*
+ * The way this plugin works is following:
+ *
+ * powered -> SubscriberIdentity or Online = True -> gprs, context ->
+ * attached -> netreg -> ready
+ *
+ * Depending on the modem type, this plugin will behave differently.
+ *
+ * GSM working flow:
+ *
+ * When a new modem appears, the plugin always powers it up. This
+ * allows the plugin to create a connman_device. The core will call
+ * modem_enable() if the technology is enabled. modem_enable() will
+ * then set the modem online. If the technology is disabled then
+ * modem_disable() will just set the modem offline. The modem is
+ * always kept powered all the time.
+ *
+ * After setting the modem online the plugin waits for the
+ * ConnectionManager and ConnectionContext to appear. When the context
+ * signals that it is attached and the NetworkRegistration interface
+ * appears, a new Service will be created and registered at the core.
+ *
+ * When asked to connect to the network (network_connect()) the plugin
+ * will set the Active property on the context. If this operation is
+ * successful the modem is connected to the network. oFono will inform
+ * the plugin about IP configuration through the updating the context's
+ * properties.
+ *
+ * CDMA working flow:
+ *
+ * When a new modem appears, the plugin always powers it up. This
+ * allows the plugin to create connman_device either using IMSI either
+ * using modem Serial if the modem got a SIM interface or not.
+ *
+ * As for GSM, the core will call modem_enable() if the technology
+ * is enabled. modem_enable() will then set the modem online.
+ * If the technology is disabled then modem_disable() will just set the
+ * modem offline. The modem is always kept powered all the time.
+ *
+ * After setting the modem online the plugin waits for CdmaConnectionManager
+ * interface to appear. Then, once CdmaNetworkRegistration appears, a new
+ * Service will be created and registered at the core.
+ *
+ * When asked to connect to the network (network_connect()) the plugin
+ * will power up the CdmaConnectionManager interface.
+ * If the operation is successful the modem is connected to the network.
+ * oFono will inform the plugin about IP configuration through the
+ * updating CdmaConnectionManager settings properties.
+ */
static DBusConnection *connection;
-static GHashTable *modem_hash = NULL;
+static GHashTable *modem_hash;
+static GHashTable *context_hash;
+
+struct network_context {
+ char *path;
+ int index;
+ struct connman_network *network;
+
+ enum connman_ipconfig_method ipv4_method;
+ struct connman_ipaddress *ipv4_address;
+ char *ipv4_nameservers;
+
+ enum connman_ipconfig_method ipv6_method;
+ struct connman_ipaddress *ipv6_address;
+ char *ipv6_nameservers;
+
+ int refcount;
+
+ bool active;
+ bool valid_apn; /* APN is 'valid' if length > 0 */
+};
struct modem_data {
char *path;
+
struct connman_device *device;
- gboolean available;
+
+ GSList *context_list;
+
+ /* Modem Interface */
+ char *serial;
+ bool powered;
+ bool online;
+ uint8_t interfaces;
+ bool ignore;
+
+ bool set_powered;
+
+ /* CDMA ConnectionManager Interface */
+ bool cdma_cm_powered;
+
+ /* ConnectionManager Interface */
+ bool attached;
+ bool cm_powered;
+
+ /* SimManager Interface */
+ char *imsi;
+
+ /* Netreg Interface */
+ char *name;
+ uint8_t strength;
+ uint8_t data_strength; /* 1xEVDO signal strength */
+ bool registered;
+ bool roaming;
+
+ /* pending calls */
+ DBusPendingCall *call_set_property;
+ DBusPendingCall *call_get_properties;
+ DBusPendingCall *call_get_contexts;
};
-static int modem_probe(struct connman_device *device)
+static const char *api2string(enum ofono_api api)
{
- DBG("device %p", device);
+ switch (api) {
+ case OFONO_API_SIM:
+ return "sim";
+ case OFONO_API_NETREG:
+ return "netreg";
+ case OFONO_API_CM:
+ return "cm";
+ case OFONO_API_CDMA_NETREG:
+ return "cdma-netreg";
+ case OFONO_API_CDMA_CM:
+ return "cmda-cm";
+ }
- return 0;
+ return "unknown";
}
-static void modem_remove(struct connman_device *device)
+static char *get_ident(const char *path)
{
- DBG("device %p", device);
+ char *pos;
+
+ if (*path != '/')
+ return NULL;
+
+ pos = strrchr(path, '/');
+ if (!pos)
+ return NULL;
+
+ return pos + 1;
}
-static void powered_reply(DBusPendingCall *call, void *user_data)
+static struct network_context *get_context_with_path(GSList *context_list,
+ const gchar *path)
{
- DBusMessage *reply;
- DBusError error;
+ GSList *list;
- DBG("");
-
- dbus_error_init(&error);
+ DBG("path %s", path);
- reply = dbus_pending_call_steal_reply(call);
+ for (list = context_list; list; list = list->next) {
+ struct network_context *context = list->data;
- if (dbus_set_error_from_message(&error, reply)) {
- connman_error("%s", error.message);
- dbus_error_free(&error);
+ if (g_strcmp0(context->path, path) == 0)
+ return context;
}
- dbus_message_unref(reply);
-
- dbus_pending_call_unref(call);
+ return NULL;
}
-static int gprs_change_powered(const char *path, dbus_bool_t powered)
+static struct network_context *get_context_with_network(GSList *context_list,
+ const struct connman_network *network)
{
- DBusMessage *message;
- DBusMessageIter iter;
- DBusPendingCall *call;
+ GSList *list;
- DBG("path %s powered %d", path, powered);
+ DBG("network %p", network);
- if (path == NULL)
- return -EINVAL;
+ for (list = context_list; list; list = list->next) {
+ struct network_context *context = list->data;
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_GPRS_INTERFACE, SET_PROPERTY);
- if (message == NULL)
- return -ENOMEM;
+ if (context->network == network)
+ return context;
+ }
- dbus_message_set_auto_start(message, FALSE);
+ return NULL;
+}
- dbus_message_iter_init_append(message, &iter);
- connman_dbus_property_append_basic(&iter, "Powered",
- DBUS_TYPE_BOOLEAN, &powered);
+static struct network_context *network_context_alloc(const char *path)
+{
+ struct network_context *context;
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to change powered property");
- dbus_message_unref(message);
- return -EINVAL;
- }
+ context = g_try_new0(struct network_context, 1);
+ if (!context)
+ return NULL;
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- dbus_message_unref(message);
- return -EINVAL;
- }
+ context->path = g_strdup(path);
+ context->index = -1;
- dbus_pending_call_set_notify(call, powered_reply, (void *)path, NULL);
+ context->ipv4_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+ context->ipv4_address = NULL;
+ context->ipv4_nameservers = NULL;
- dbus_message_unref(message);
+ context->ipv6_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+ context->ipv6_address = NULL;
+ context->ipv6_nameservers = NULL;
- return -EINPROGRESS;
+ context->refcount = 1;
+
+ return context;
}
-static int modem_enable(struct connman_device *device)
+static void network_context_ref(struct network_context *context)
{
- const char *path = connman_device_get_string(device, "Path");
+ DBG("%p ref %d", context, context->refcount + 1);
- DBG("device %p, path, %s", device, path);
-
- return gprs_change_powered(path, TRUE);
+ __sync_fetch_and_add(&context->refcount, 1);
}
-static int modem_disable(struct connman_device *device)
+static void network_context_unref(struct network_context *context)
{
- const char *path = connman_device_get_string(device, "Path");
+ DBG("%p ref %d", context, context->refcount - 1);
- DBG("device %p, path %s", device, path);
+ if (__sync_fetch_and_sub(&context->refcount, 1) != 1)
+ return;
- return gprs_change_powered(path, FALSE);
-}
+ g_free(context->path);
-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_ipaddress_free(context->ipv4_address);
+ g_free(context->ipv4_nameservers);
-static char *get_ident(const char *path)
+ connman_ipaddress_free(context->ipv6_address);
+ g_free(context->ipv6_nameservers);
+
+ g_free(context);
+}
+
+static void set_connected(struct modem_data *modem,
+ struct network_context *context)
{
- char *ident, *pos;
+ struct connman_service *service;
+ bool setip = false;
+ enum connman_ipconfig_method method;
+ char *nameservers;
+ int index;
- if (*path != '/')
- return NULL;
+ DBG("%s", modem->path);
- ident = g_strdup(path + 1);
+ index = context->index;
- pos = ident;
+ method = context->ipv4_method;
+ if (index < 0 || (!context->ipv4_address &&
+ method == CONNMAN_IPCONFIG_METHOD_FIXED)) {
+ connman_error("Invalid index and/or address");
+ return;
+ }
- while ((pos = strchr(pos, '/')) != NULL)
- *pos = '_';
+ service = connman_service_lookup_from_network(context->network);
+ if (!service)
+ return;
- return ident;
-}
+ connman_service_create_ip4config(service, index);
+ connman_network_set_ipv4_method(context->network, method);
-static void create_service(struct connman_network *network)
-{
- const char *path;
- char *group;
+ if (method == CONNMAN_IPCONFIG_METHOD_FIXED ||
+ method == CONNMAN_IPCONFIG_METHOD_DHCP) {
+ setip = true;
+ }
- DBG("");
+ if (method == CONNMAN_IPCONFIG_METHOD_FIXED) {
+ connman_network_set_ipaddress(context->network,
+ context->ipv4_address);
+ }
- path = connman_network_get_string(network, "Path");
+ method = context->ipv6_method;
+ connman_service_create_ip6config(service, index);
+ connman_network_set_ipv6_method(context->network, method);
- group = get_ident(path);
+ if (method == CONNMAN_IPCONFIG_METHOD_AUTO) {
+ setip = true;
+ }
- connman_network_set_group(network, group);
+ /* Set the nameservers */
+ if (context->ipv4_nameservers &&
+ context->ipv6_nameservers) {
+ nameservers = g_strdup_printf("%s %s",
+ context->ipv4_nameservers,
+ context->ipv6_nameservers);
+ connman_network_set_nameservers(context->network, nameservers);
+ g_free(nameservers);
+ } else if (context->ipv4_nameservers) {
+ connman_network_set_nameservers(context->network,
+ context->ipv4_nameservers);
+ } else if (context->ipv6_nameservers) {
+ connman_network_set_nameservers(context->network,
+ context->ipv6_nameservers);
+ }
- g_free(group);
+ if (setip) {
+ connman_network_set_index(context->network, index);
+ connman_network_set_connected(context->network, true);
+ }
}
-static void set_network_name_reply(DBusPendingCall *call, void *user_data)
+static void set_disconnected(struct network_context *context)
{
- struct connman_network *network = user_data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
+ DBG("%s", context->path);
+
+ if (context->network)
+ connman_network_set_connected(context->network, false);
+
+ g_free(context->ipv4_nameservers);
+ context->ipv4_nameservers = NULL;
+ if (context->ipv4_method != CONNMAN_IPCONFIG_METHOD_OFF)
+ context->ipv4_method =
+ CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+
+ g_free(context->ipv6_nameservers);
+ context->ipv6_nameservers = NULL;
+ if (context->ipv6_method != CONNMAN_IPCONFIG_METHOD_OFF)
+ context->ipv6_method =
+ CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+}
- DBG("network %p", network);
+typedef void (*set_property_cb)(struct modem_data *data,
+ struct network_context *context, bool success);
+typedef void (*get_properties_cb)(struct modem_data *data,
+ DBusMessageIter *dict);
- reply = dbus_pending_call_steal_reply(call);
+struct property_info {
+ struct modem_data *modem;
+ struct network_context *context;
+ const char *path;
+ const char *interface;
+ const char *property;
+ set_property_cb set_property_cb;
+ get_properties_cb get_properties_cb;
+};
- if (dbus_message_iter_init(reply, &array) == FALSE)
- goto done;
+static void free_property_info(void * memory)
+{
+ struct property_info * info = memory;
- if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
- goto done;
+ if (info->context)
+ network_context_unref(info->context);
- dbus_message_iter_recurse(&array, &dict);
+ g_free(info);
+}
- while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
+static void set_property_reply(DBusPendingCall *call, void *user_data)
+{
+ struct property_info *info = user_data;
+ DBusMessage *reply;
+ DBusError error;
+ bool success = true;
- dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+ DBG("%s path %s %s.%s", info->modem->path,
+ info->path, info->interface, info->property);
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
+ info->modem->call_set_property = NULL;
- if (g_str_equal(key, "Operator") == TRUE) {
- const char *name;
+ dbus_error_init(&error);
- dbus_message_iter_get_basic(&value, &name);
- connman_network_set_name(network, name);
- create_service(network);
- }
+ reply = dbus_pending_call_steal_reply(call);
- dbus_message_iter_next(&dict);
+ if (dbus_set_error_from_message(&error, reply)) {
+ connman_error("Failed to change property: %s %s.%s: %s %s",
+ info->path, info->interface, info->property,
+ error.name, error.message);
+ dbus_error_free(&error);
+ success = false;
}
-done:
+
+ if (info->set_property_cb)
+ (*info->set_property_cb)(info->modem, info->context,
+ success);
+
dbus_message_unref(reply);
dbus_pending_call_unref(call);
}
-static void set_network_name(struct connman_network *network)
+static int set_property(struct modem_data *modem,
+ struct network_context *context,
+ const char *path, const char *interface,
+ const char *property, int type, void *value,
+ set_property_cb notify)
{
- struct connman_device *device;
DBusMessage *message;
- DBusPendingCall *call;
- const char *path;
-
- device = connman_network_get_device(network);
+ DBusMessageIter iter;
+ struct property_info *info;
- path = connman_device_get_string(device, "Path");
- if (path == NULL)
- return;
+ DBG("%s path %s %s.%s", modem->path, path, interface, property);
- DBG("path %s", path);
+ if (modem->call_set_property) {
+ DBG("Cancel pending SetProperty");
+ dbus_pending_call_cancel(modem->call_set_property);
+ dbus_pending_call_unref(modem->call_set_property);
+ modem->call_set_property = NULL;
+ }
message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_REGISTRATION_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
+ interface, SET_PROPERTY);
+ if (!message)
+ return -ENOMEM;
- dbus_message_set_auto_start(message, FALSE);
+ dbus_message_iter_init_append(message, &iter);
+ connman_dbus_property_append_basic(&iter, property, type, value);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get operator");
- goto done;
+ if (!dbus_connection_send_with_reply(connection, message,
+ &modem->call_set_property, TIMEOUT)) {
+ connman_error("Failed to change property: %s %s.%s",
+ path, interface, property);
+ dbus_message_unref(message);
+ return -EINVAL;
}
- if (call == NULL) {
+ if (!modem->call_set_property) {
connman_error("D-Bus connection not available");
- goto done;
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ info = g_try_new0(struct property_info, 1);
+ if (!info) {
+ dbus_message_unref(message);
+ return -ENOMEM;
}
- dbus_pending_call_set_notify(call, set_network_name_reply,
- (void *)network, NULL);
+ info->modem = modem;
+ info->context = context;
+ info->path = path;
+ info->interface = interface;
+ info->property = property;
+ info->set_property_cb = notify;
+
+ if (info->context)
+ network_context_ref(info->context);
+
+ dbus_pending_call_set_notify(modem->call_set_property,
+ set_property_reply, info, free_property_info);
-done:
dbus_message_unref(message);
+
+ return -EINPROGRESS;
}
-static void config_network_reply(DBusPendingCall *call, void *user_data)
+static void get_properties_reply(DBusPendingCall *call, void *user_data)
{
- struct connman_network *network = user_data;
- DBusMessage *reply;
+ struct property_info *info = user_data;
DBusMessageIter array, dict;
- gboolean internet_type = FALSE;
+ DBusMessage *reply;
+ DBusError error;
- DBG("network %p", network);
+ DBG("%s path %s %s", info->modem->path, info->path, info->interface);
+
+ info->modem->call_get_properties = NULL;
+
+ dbus_error_init(&error);
reply = dbus_pending_call_steal_reply(call);
- if (dbus_message_iter_init(reply, &array) == FALSE)
+ if (dbus_set_error_from_message(&error, reply)) {
+ connman_error("Failed to get properties: %s %s: %s %s",
+ info->path, info->interface,
+ error.name, error.message);
+ dbus_error_free(&error);
+
+ goto done;
+ }
+
+ if (!dbus_message_iter_init(reply, &array))
goto done;
if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_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;
-
- 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") == TRUE) {
- const char *type;
-
- dbus_message_iter_get_basic(&value, &type);
- if (g_strcmp0(type, "internet") == 0) {
- internet_type = TRUE;
-
- connman_network_set_protocol(network,
- CONNMAN_NETWORK_PROTOCOL_IP);
- set_network_name(network);
- } else {
- internet_type = FALSE;
-
- connman_network_set_protocol(network,
- CONNMAN_NETWORK_PROTOCOL_UNKNOWN);
- }
- }
-
- dbus_message_iter_next(&dict);
- }
+ if (info->get_properties_cb)
+ (*info->get_properties_cb)(info->modem, &dict);
done:
+
dbus_message_unref(reply);
dbus_pending_call_unref(call);
}
-static void config_network(struct connman_network *network, const char *path)
+static int get_properties(const char *path, const char *interface,
+ get_properties_cb notify,
+ struct modem_data *modem)
{
DBusMessage *message;
- DBusPendingCall *call;
+ struct property_info *info;
- DBG("path %s", path);
+ DBG("%s path %s %s", modem->path, path, interface);
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_PRI_CONTEXT_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
+ if (modem->call_get_properties) {
+ connman_error("Pending GetProperties");
+ return -EBUSY;
+ }
- dbus_message_set_auto_start(message, FALSE);
+ message = dbus_message_new_method_call(OFONO_SERVICE, path,
+ interface, GET_PROPERTIES);
+ if (!message)
+ return -ENOMEM;
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get Primary Context");
- goto done;
+ if (!dbus_connection_send_with_reply(connection, message,
+ &modem->call_get_properties, TIMEOUT)) {
+ connman_error("Failed to call %s.GetProperties()", interface);
+ dbus_message_unref(message);
+ return -EINVAL;
}
- if (call == NULL) {
+ if (!modem->call_get_properties) {
connman_error("D-Bus connection not available");
- goto done;
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
+
+ info = g_try_new0(struct property_info, 1);
+ if (!info) {
+ dbus_message_unref(message);
+ return -ENOMEM;
}
- dbus_pending_call_set_notify(call, config_network_reply,
- (void *)network, NULL);
+ info->modem = modem;
+ info->path = path;
+ info->interface = interface;
+ info->get_properties_cb = notify;
+
+ dbus_pending_call_set_notify(modem->call_get_properties,
+ get_properties_reply, info, g_free);
-done:
dbus_message_unref(message);
+
+ return -EINPROGRESS;
}
-static int network_probe(struct connman_network *network)
+static void context_set_active_reply(struct modem_data *modem,
+ struct network_context *context, bool success)
{
- const char *path;
-
- path = connman_network_get_string(network, "Path");
+ DBG("%s", context->path);
- DBG("network %p path %s", network, path);
+ if (success) {
+ /*
+ * Don't handle do anything on success here. oFono will send
+ * the change via PropertyChanged signal.
+ */
+ return;
+ }
- config_network(network, path);
+ /*
+ * Active = True might fail due a timeout. That means oFono
+ * still tries to go online. If we retry to set Active = True,
+ * we just get a InProgress error message. Should we power
+ * cycle the modem in such cases?
+ */
+
+ if (!context->network) {
+ /*
+ * In the case where we power down the device
+ * we don't wait for the reply, therefore the network
+ * might already be gone.
+ */
+ return;
+ }
- return 0;
+ connman_network_set_error(context->network,
+ CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
}
-static struct connman_network *pending_network;
-
-static gboolean pending_network_is_available(
- struct connman_network *pending_network)
+static int context_set_active(struct modem_data *modem,
+ struct network_context *context,
+ dbus_bool_t active)
{
- struct connman_device *device;
- struct connman_network *network;
- const char *identifier;
- char *ident;
+ int err;
- /* Modem may be removed during waiting for active reply */
- device = connman_network_get_device(pending_network);
- if (device == NULL)
- return FALSE;
+ DBG("%s active %d", modem->path, active);
- identifier = connman_network_get_identifier(pending_network);
+ err = set_property(modem, context, context->path,
+ OFONO_CONTEXT_INTERFACE,
+ "Active", DBUS_TYPE_BOOLEAN,
+ &active,
+ context_set_active_reply);
- ident = g_strdup(identifier);
+ if (!active && err == -EINPROGRESS)
+ return 0;
- connman_network_unref(pending_network);
+ return err;
+}
- /* network may be removed during waiting for active reply */
- network = connman_device_get_network(device, ident);
+static void cdma_cm_set_powered_reply(struct modem_data *modem,
+ struct network_context *context, bool success)
+{
+ DBG("%s", context->path);
- g_free(ident);
+ if (success) {
+ /*
+ * Don't handle do anything on success here. oFono will send
+ * the change via PropertyChanged signal.
+ */
+ return;
+ }
- if (network == NULL)
- return FALSE;
+ /*
+ * Powered = True might fail due a timeout. That means oFono
+ * still tries to go online. If we retry to set Powered = True,
+ * we just get a InProgress error message. Should we power
+ * cycle the modem in such cases?
+ */
+
+ if (!context->network) {
+ /*
+ * In the case where we power down the device
+ * we don't wait for the reply, therefore the network
+ * might already be gone.
+ */
+ return;
+ }
- return TRUE;
+ connman_network_set_error(context->network,
+ CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
}
-static void set_active_reply(DBusPendingCall *call, void *user_data)
+static int cdma_cm_set_powered(struct modem_data *modem, dbus_bool_t powered)
{
- DBusMessage *reply;
- DBusError error;
- struct connman_network *network = user_data;
+ int err;
+ struct network_context *context = NULL;
- DBG("network %p", network);
+ if (!modem->context_list)
+ return -1;
- reply = dbus_pending_call_steal_reply(call);
-
- if (pending_network_is_available(network) == FALSE)
- 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;
+ DBG("%s powered %d", modem->path, powered);
- connman_error("%s", error.message);
-
- dbus_error_free(&error);
- } else
- pending_network = network;
+ /* In case of CDMA, there is only one context */
+ context = modem->context_list->data;
+ err = set_property(modem, context, modem->path,
+ OFONO_CDMA_CM_INTERFACE,
+ "Powered", DBUS_TYPE_BOOLEAN,
+ &powered,
+ cdma_cm_set_powered_reply);
-done:
- dbus_message_unref(reply);
+ if (!powered && err == -EINPROGRESS)
+ return 0;
- dbus_pending_call_unref(call);
+ return err;
}
-static int set_network_active(struct connman_network *network,
- dbus_bool_t active)
+static int modem_set_online(struct modem_data *modem, dbus_bool_t online)
{
- DBusMessage *message;
- DBusPendingCall *call;
- DBusMessageIter iter;
-
- const char *path = connman_network_get_string(network, "Path");
-
- DBG("network %p, path %s, active %d", network, path, active);
-
- if (path == NULL)
- return -EINVAL;
-
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_PRI_CONTEXT_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, "Active",
- DBUS_TYPE_BOOLEAN, &active);
-
- 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 (call == NULL) {
- connman_error("D-Bus connection not available");
- dbus_message_unref(message);
- return -EINVAL;
- }
-
- connman_network_ref(network);
-
- dbus_pending_call_set_notify(call, set_active_reply, network, NULL);
+ DBG("%s online %d", modem->path, online);
- dbus_message_unref(message);
-
- if (active == TRUE)
- return -EINPROGRESS;
-
- return 0;
+ return set_property(modem, NULL, modem->path,
+ OFONO_MODEM_INTERFACE,
+ "Online", DBUS_TYPE_BOOLEAN,
+ &online,
+ NULL);
}
-static void set_apn_reply(DBusPendingCall *call, void *user_data)
+static int cm_set_powered(struct modem_data *modem, dbus_bool_t powered)
{
- DBusMessage *reply;
- DBusError error;
-
- reply = dbus_pending_call_steal_reply(call);
+ int err;
- dbus_error_init(&error);
- if (dbus_set_error_from_message(&error, reply)) {
- connman_error("%s", error.message);
+ DBG("%s powered %d", modem->path, powered);
- dbus_error_free(&error);
- }
+ err = set_property(modem, NULL, modem->path,
+ OFONO_CM_INTERFACE,
+ "Powered", DBUS_TYPE_BOOLEAN,
+ &powered,
+ NULL);
- dbus_message_unref(reply);
+ if (!powered && err == -EINPROGRESS)
+ return 0;
- dbus_pending_call_unref(call);
+ return err;
}
-static void set_apn(struct connman_network *network)
+static int modem_set_powered(struct modem_data *modem, dbus_bool_t powered)
{
- DBusMessage *message;
- DBusPendingCall *call;
- DBusMessageIter iter;
- const char *apn, *path;
-
- apn = connman_network_get_string(network, "Cellular.APN");
- if (apn == NULL)
- return;
-
- path = connman_network_get_string(network, "Path");
- if (path == NULL)
- return;
-
- DBG("path %s, apn %s", path, apn);
-
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_PRI_CONTEXT_INTERFACE, SET_PROPERTY);
- if (message == NULL)
- return;
-
- dbus_message_set_auto_start(message, FALSE);
+ int err;
- dbus_message_iter_init_append(message, &iter);
- connman_dbus_property_append_basic(&iter, "AccessPointName",
- DBUS_TYPE_STRING, &apn);
+ DBG("%s powered %d", modem->path, powered);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- dbus_message_unref(message);
- return;
- }
+ modem->set_powered = powered;
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- dbus_message_unref(message);
- return;
- }
+ err = set_property(modem, NULL, modem->path,
+ OFONO_MODEM_INTERFACE,
+ "Powered", DBUS_TYPE_BOOLEAN,
+ &powered,
+ NULL);
- dbus_pending_call_set_notify(call, set_apn_reply, NULL, NULL);
+ if (!powered && err == -EINPROGRESS)
+ return 0;
- dbus_message_unref(message);
+ return err;
}
-static int network_connect(struct connman_network *network)
+static bool has_interface(uint8_t interfaces,
+ enum ofono_api api)
{
- if (connman_network_get_index(network) >= 0)
- return -EISCONN;
+ if ((interfaces & api) == api)
+ return true;
- return set_network_active(network, TRUE);
+ return false;
}
-static int network_disconnect(struct connman_network *network)
+static uint8_t extract_interfaces(DBusMessageIter *array)
{
- if (connman_network_get_index(network) < 0)
- return -ENOTCONN;
+ DBusMessageIter entry;
+ uint8_t interfaces = 0;
- return set_network_active(network, FALSE);
-}
+ dbus_message_iter_recurse(array, &entry);
-static void network_remove(struct connman_network *network)
-{
- DBG("network %p", network);
-}
+ while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
+ const char *name;
-static int network_setup(struct connman_network *network, const char *key)
-{
- DBG("");
+ dbus_message_iter_get_basic(&entry, &name);
- if (g_strcmp0(key, "Cellular.APN") == 0)
- set_apn(network);
+ if (g_str_equal(name, OFONO_SIM_INTERFACE))
+ interfaces |= OFONO_API_SIM;
+ else if (g_str_equal(name, OFONO_NETREG_INTERFACE))
+ interfaces |= OFONO_API_NETREG;
+ else if (g_str_equal(name, OFONO_CM_INTERFACE))
+ interfaces |= OFONO_API_CM;
+ else if (g_str_equal(name, OFONO_CDMA_CM_INTERFACE))
+ interfaces |= OFONO_API_CDMA_CM;
+ else if (g_str_equal(name, OFONO_CDMA_NETREG_INTERFACE))
+ interfaces |= OFONO_API_CDMA_NETREG;
- return 0;
-}
+ dbus_message_iter_next(&entry);
+ }
-static struct connman_network_driver network_driver = {
- .name = "network",
- .type = CONNMAN_NETWORK_TYPE_CELLULAR,
- .probe = network_probe,
- .remove = network_remove,
- .connect = network_connect,
- .disconnect = network_disconnect,
- .setup = network_setup,
-};
+ return interfaces;
+}
-static void add_network(struct connman_device *device, const char *path)
+static char *extract_nameservers(DBusMessageIter *array)
{
- struct connman_network *network;
- char *ident;
+ DBusMessageIter entry;
+ char *nameservers = NULL;
+ char *tmp;
- DBG("device %p path %s", device, path);
+ dbus_message_iter_recurse(array, &entry);
- network = connman_device_get_network(device, path);
- if (network != NULL)
- return;
+ while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
+ const char *nameserver;
- ident = get_ident(path);
+ dbus_message_iter_get_basic(&entry, &nameserver);
- network = connman_network_create(ident,
- CONNMAN_NETWORK_TYPE_CELLULAR);
- if (network == NULL)
- return;
+ if (!nameservers) {
+ nameservers = g_strdup(nameserver);
+ } else {
+ tmp = nameservers;
+ nameservers = g_strdup_printf("%s %s", tmp, nameserver);
+ g_free(tmp);
+ }
- g_free(ident);
+ dbus_message_iter_next(&entry);
+ }
- 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);
+ return nameservers;
}
-static void add_networks(struct connman_device *device, DBusMessageIter *array)
+static void extract_ipv4_settings(DBusMessageIter *array,
+ struct network_context *context)
{
- DBusMessageIter entry;
+ DBusMessageIter dict;
+ char *address = NULL, *netmask = NULL, *gateway = NULL;
+ char *nameservers = NULL;
+ const char *interface = NULL;
+ int index = -1;
- DBG("");
+ connman_ipaddress_free(context->ipv4_address);
+ context->ipv4_address = NULL;
- dbus_message_iter_recurse(array, &entry);
+ if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
+ return;
- while (dbus_message_iter_get_arg_type(&entry) ==
- DBUS_TYPE_OBJECT_PATH) {
- const char *path;
+ dbus_message_iter_recurse(array, &dict);
- dbus_message_iter_get_basic(&entry, &path);
+ while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter entry, value;
+ const char *key, *val;
- add_network(device, path);
+ dbus_message_iter_recurse(&dict, &entry);
+ dbus_message_iter_get_basic(&entry, &key);
dbus_message_iter_next(&entry);
- }
-}
+ dbus_message_iter_recurse(&entry, &value);
-static void create_context_reply(DBusPendingCall *call, void *user_data)
-{
- DBusMessage *reply;
- DBusError error;
+ if (g_str_equal(key, "Interface")) {
+ dbus_message_iter_get_basic(&value, &interface);
- DBG("");
+ DBG("Interface %s", interface);
- dbus_error_init(&error);
+ index = connman_inet_ifindex(interface);
- reply = dbus_pending_call_steal_reply(call);
+ DBG("index %d", index);
+ } else if (g_str_equal(key, "Method")) {
+ dbus_message_iter_get_basic(&value, &val);
- if (dbus_set_error_from_message(&error, reply)) {
- connman_error("%s", error.message);
- dbus_error_free(&error);
- }
+ DBG("Method %s", val);
- dbus_message_unref(reply);
+ if (g_strcmp0(val, "static") == 0)
+ context->ipv4_method = CONNMAN_IPCONFIG_METHOD_FIXED;
+ else if (g_strcmp0(val, "dhcp") == 0)
+ context->ipv4_method = CONNMAN_IPCONFIG_METHOD_DHCP;
- dbus_pending_call_unref(call);
-}
+ } else if (g_str_equal(key, "Address")) {
+ dbus_message_iter_get_basic(&value, &val);
-static void add_default_context(DBusMessageIter *array,
- const char *path, const char *name, const char *type)
-{
- DBusMessageIter entry;
- DBusMessage *message;
- DBusPendingCall *call;
+ address = g_strdup(val);
- if (path == NULL)
- return;
+ DBG("Address %s", address);
+ } else if (g_str_equal(key, "Netmask")) {
+ dbus_message_iter_get_basic(&value, &val);
- DBG("");
+ netmask = g_strdup(val);
- dbus_message_iter_recurse(array, &entry);
+ DBG("Netmask %s", netmask);
+ } else if (g_str_equal(key, "DomainNameServers")) {
+ nameservers = extract_nameservers(&value);
- if (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_OBJECT_PATH)
- return;
+ DBG("Nameservers %s", nameservers);
+ } else if (g_str_equal(key, "Gateway")) {
+ dbus_message_iter_get_basic(&value, &val);
- DBG("path %s, name %s, type %s", path, name, type);
+ gateway = g_strdup(val);
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_GPRS_INTERFACE, CREATE_CONTEXT);
- if (message == NULL)
- return;
+ DBG("Gateway %s", gateway);
+ }
+
+ dbus_message_iter_next(&dict);
+ }
- dbus_message_set_auto_start(message, FALSE);
+ if (index < 0)
+ goto out;
- dbus_message_append_args(message, DBUS_TYPE_STRING,
- &name, DBUS_TYPE_STRING,
- &type, DBUS_TYPE_INVALID);
+ context->index = index;
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to create default context");
- dbus_message_unref(message);
- return;
- }
+ if (context->ipv4_method != CONNMAN_IPCONFIG_METHOD_FIXED)
+ goto out;
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- dbus_message_unref(message);
- return;
+ context->ipv4_address = connman_ipaddress_alloc(CONNMAN_IPCONFIG_TYPE_IPV4);
+ if (!context->ipv4_address) {
+ context->index = -1;
+ goto out;
}
- dbus_pending_call_set_notify(call, create_context_reply, NULL, NULL);
+ connman_ipaddress_set_ipv4(context->ipv4_address, address,
+ netmask, gateway);
- dbus_message_unref(message);
-}
+ g_free(context->ipv4_nameservers);
+ context->ipv4_nameservers = nameservers;
-static void check_networks_reply(DBusPendingCall *call, void *user_data)
-{
- struct connman_device *device = user_data;
- DBusMessage *reply;
- DBusMessageIter array, dict, contexts;
- dbus_bool_t attached;
+out:
+ if (context->ipv4_nameservers != nameservers)
+ g_free(nameservers);
- DBG("device %p", device);
+ g_free(address);
+ g_free(netmask);
+ g_free(gateway);
+}
- reply = dbus_pending_call_steal_reply(call);
+static void extract_ipv6_settings(DBusMessageIter *array,
+ struct network_context *context)
+{
+ DBusMessageIter dict;
+ char *address = NULL, *gateway = NULL;
+ unsigned char prefix_length = 0;
+ char *nameservers = NULL;
+ const char *interface = NULL;
+ int index = -1;
- if (dbus_message_iter_init(reply, &array) == FALSE)
- goto done;
+ connman_ipaddress_free(context->ipv6_address);
+ context->ipv6_address = NULL;
- if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
- goto done;
+ if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
+ return;
- dbus_message_iter_recurse(&array, &dict);
+ dbus_message_iter_recurse(array, &dict);
while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
DBusMessageIter entry, value;
- const char *key;
+ 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);
- 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) {
- const char *path;
+ if (g_str_equal(key, "Interface")) {
+ dbus_message_iter_get_basic(&value, &interface);
- path = connman_device_get_string(device, "Path");
- contexts = value;
- add_default_context(&contexts, path,
- CONTEXT_NAME, CONTEXT_TYPE);
- } else if (g_str_equal(key, "Status") == TRUE) {
- const char *status;
+ DBG("Interface %s", interface);
- dbus_message_iter_get_basic(&value, &status);
- /* FIXME: add roaming support */
- } else if (g_str_equal(key, "Powered") == TRUE) {
- dbus_bool_t powered;
+ index = connman_inet_ifindex(interface);
- dbus_message_iter_get_basic(&value, &powered);
+ DBG("index %d", index);
+ } else if (g_str_equal(key, "Address")) {
+ dbus_message_iter_get_basic(&value, &val);
- connman_device_set_powered(device, powered);
- }
+ address = g_strdup(val);
- dbus_message_iter_next(&dict);
- }
+ DBG("Address %s", address);
+ } else if (g_str_equal(key, "PrefixLength")) {
+ dbus_message_iter_get_basic(&value, &prefix_length);
- if (attached == TRUE)
- add_networks(device, &contexts);
+ DBG("prefix length %d", prefix_length);
+ } else if (g_str_equal(key, "DomainNameServers")) {
+ nameservers = extract_nameservers(&value);
-done:
- dbus_message_unref(reply);
+ DBG("Nameservers %s", nameservers);
+ } else if (g_str_equal(key, "Gateway")) {
+ dbus_message_iter_get_basic(&value, &val);
- dbus_pending_call_unref(call);
-}
+ gateway = g_strdup(val);
-static void check_networks(struct modem_data *modem)
-{
- DBusMessage *message;
- DBusPendingCall *call;
- struct connman_device *device;
+ DBG("Gateway %s", gateway);
+ }
- DBG("modem %p", modem);
+ dbus_message_iter_next(&dict);
+ }
- if (modem == NULL)
- return;
+ if (index < 0)
+ goto out;
- device = modem->device;
- if (device == NULL)
- return;
+ context->ipv6_method = CONNMAN_IPCONFIG_METHOD_AUTO;
- message = dbus_message_new_method_call(OFONO_SERVICE, modem->path,
- OFONO_GPRS_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
+ context->ipv6_address =
+ connman_ipaddress_alloc(CONNMAN_IPCONFIG_TYPE_IPV6);
+ if (!context->ipv6_address)
+ goto out;
- dbus_message_set_auto_start(message, FALSE);
+ context->index = index;
+ connman_ipaddress_set_ipv6(context->ipv6_address, address,
+ prefix_length, gateway);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono GPRS");
- goto done;
- }
+ g_free(context->ipv6_nameservers);
+ context->ipv6_nameservers = nameservers;
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
- }
+out:
+ if (context->ipv6_nameservers != nameservers)
+ g_free(nameservers);
- dbus_pending_call_set_notify(call, check_networks_reply,
- (void *)device, NULL);
+ g_free(address);
+ g_free(gateway);
+}
-done:
- dbus_message_unref(message);
+static bool ready_to_create_device(struct modem_data *modem)
+{
+ /*
+ * There are three different modem types which behave slightly
+ * different:
+ * - GSM modems will expose the SIM interface then the
+ * CM interface.
+ * - CDMA modems will expose CM first and sometime later
+ * a unique serial number.
+ *
+ * This functions tests if we have the necessary information gathered
+ * before we are able to create a device.
+ */
+
+ if (modem->device)
+ return false;
+
+ if (modem->imsi || modem->serial)
+ return true;
+
+ return false;
}
-static void add_device(const char *path, const char *imsi)
+static void create_device(struct modem_data *modem)
{
- struct modem_data *modem;
struct connman_device *device;
+ char *ident = NULL;
- DBG("path %s imsi %s", path, imsi);
+ DBG("%s", modem->path);
- if (path == NULL)
- return;
+ if (modem->imsi)
+ ident = modem->imsi;
+ else if (modem->serial)
+ ident = modem->serial;
- if (imsi == NULL)
- return;
+ if (!connman_dbus_validate_ident(ident))
+ ident = connman_dbus_encode_string(ident);
+ else
+ ident = g_strdup(ident);
- modem = g_hash_table_lookup(modem_hash, path);
- if (modem == NULL)
- return;
+ device = connman_device_create("ofono", CONNMAN_DEVICE_TYPE_CELLULAR);
+ if (!device)
+ goto out;
- device = connman_device_create(imsi, CONNMAN_DEVICE_TYPE_CELLULAR);
- if (device == NULL)
- return;
+ DBG("device %p", device);
- connman_device_set_ident(device, imsi);
+ connman_device_set_ident(device, ident);
- connman_device_set_mode(device, CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE);
+ connman_device_set_string(device, "Path", modem->path);
- connman_device_set_string(device, "Path", path);
+ connman_device_set_data(device, modem);
if (connman_device_register(device) < 0) {
+ connman_error("Failed to register cellular device");
connman_device_unref(device);
- return;
+ goto out;
}
modem->device = device;
- check_networks(modem);
+ connman_device_set_powered(modem->device, modem->online);
+out:
+ g_free(ident);
}
-static void sim_properties_reply(DBusPendingCall *call, void *user_data)
+static void destroy_device(struct modem_data *modem)
{
- const char *path = user_data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
+ DBG("%s", modem->path);
- DBG("path %s", path);
+ connman_device_set_powered(modem->device, false);
- reply = dbus_pending_call_steal_reply(call);
+ connman_device_unregister(modem->device);
+ connman_device_unref(modem->device);
- if (dbus_message_iter_init(reply, &array) == FALSE)
- goto done;
+ modem->device = NULL;
+}
- if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
- goto done;
+static void add_network(struct modem_data *modem,
+ struct network_context *context)
+{
+ const char *group;
- dbus_message_iter_recurse(&array, &dict);
+ DBG("%s", modem->path);
- while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key, *imsi;
+ if (context->network)
+ return;
- dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+ context->network = connman_network_create(context->path,
+ CONNMAN_NETWORK_TYPE_CELLULAR);
+ if (!context->network)
+ return;
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
+ DBG("network %p", context->network);
- if (g_str_equal(key, "SubscriberIdentity") == TRUE) {
- dbus_message_iter_get_basic(&value, &imsi);
+ connman_network_set_data(context->network, modem);
- add_device(path, imsi);
- }
+ connman_network_set_string(context->network, "Path",
+ context->path);
- dbus_message_iter_next(&dict);
- }
+ if (modem->name)
+ connman_network_set_name(context->network, modem->name);
+ else
+ connman_network_set_name(context->network, "");
-done:
- dbus_message_unref(reply);
+ connman_network_set_strength(context->network, modem->strength);
- dbus_pending_call_unref(call);
-}
+ group = get_ident(context->path);
+ connman_network_set_group(context->network, group);
-static void get_imsi(const char *path)
-{
- DBusMessage *message;
- DBusPendingCall *call;
+ connman_network_set_bool(context->network, "Roaming",
+ modem->roaming);
- DBG("path %s", path);
+ if (connman_device_add_network(modem->device, context->network) < 0) {
+ connman_network_unref(context->network);
+ context->network = NULL;
+ return;
+ }
+}
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_SIM_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
+static void remove_network(struct modem_data *modem,
+ struct network_context *context)
+{
+ DBG("%s", modem->path);
+
+ if (!context || !context->network)
return;
- dbus_message_set_auto_start(message, FALSE);
+ DBG("network %p", context->network);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono modem sim");
- goto done;
- }
+ if (modem->device)
+ connman_device_remove_network(modem->device, context->network);
+ connman_network_unref(context->network);
+ context->network = NULL;
+}
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
+static int set_context_ipconfig(struct network_context *context,
+ const char *protocol)
+{
+ DBG("context %p protocol %s", context, protocol);
+
+ if (!context || !protocol)
+ return -EINVAL;
+
+ if (g_str_equal(protocol, "ip")) {
+ if (context->ipv4_method == CONNMAN_IPCONFIG_METHOD_OFF)
+ context->ipv4_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+
+ context->ipv6_method = CONNMAN_IPCONFIG_METHOD_OFF;
+
+ connman_ipaddress_free(context->ipv6_address);
+ context->ipv6_address = NULL;
+
+ } else if (g_str_equal(protocol, "ipv6")) {
+ if (context->ipv6_method == CONNMAN_IPCONFIG_METHOD_OFF)
+ context->ipv6_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+
+ context->ipv4_method = CONNMAN_IPCONFIG_METHOD_OFF;
+
+ connman_ipaddress_free(context->ipv4_address);
+ context->ipv4_address = NULL;
+
+ } else if (g_str_equal(protocol, "dual")) {
+ if (context->ipv4_method == CONNMAN_IPCONFIG_METHOD_OFF)
+ context->ipv4_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+
+ if (context->ipv6_method == CONNMAN_IPCONFIG_METHOD_OFF)
+ context->ipv6_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
}
- dbus_pending_call_set_notify(call, sim_properties_reply,
- (void *)path, NULL);
+ DBG("ipv4 method %d ipv6 method %d", context->ipv4_method,
+ context->ipv6_method);
-done:
- dbus_message_unref(message);
+ return 0;
}
-static int modem_change_powered(const char *path, dbus_bool_t powered)
+static int add_cm_context(struct modem_data *modem, const char *context_path,
+ DBusMessageIter *dict)
{
- DBusMessage *message;
- DBusMessageIter iter;
- DBusPendingCall *call;
+ const char *context_type = NULL;
+ struct network_context *context = NULL;
+ dbus_bool_t active = FALSE;
+ const char *ip_protocol = NULL;
- DBG("path %s powered %d", path, powered);
+ DBG("%s context path %s", modem->path, context_path);
- if (path == NULL)
- return -EINVAL;
-
- message = dbus_message_new_method_call(OFONO_SERVICE, path,
- OFONO_MODEM_INTERFACE, SET_PROPERTY);
- if (message == NULL)
+ context = network_context_alloc(context_path);
+ if (!context)
return -ENOMEM;
- dbus_message_set_auto_start(message, FALSE);
+ while (dbus_message_iter_get_arg_type(dict) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter entry, value;
+ const char *key;
- dbus_message_iter_init_append(message, &iter);
- connman_dbus_property_append_basic(&iter, "Powered",
- DBUS_TYPE_BOOLEAN, &powered);
+ dbus_message_iter_recurse(dict, &entry);
+ dbus_message_iter_get_basic(&entry, &key);
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to change powered property");
- dbus_message_unref(message);
- return -EINVAL;
+ dbus_message_iter_next(&entry);
+ dbus_message_iter_recurse(&entry, &value);
+
+ if (g_str_equal(key, "Type")) {
+ dbus_message_iter_get_basic(&value, &context_type);
+
+ DBG("%s context %s type %s", modem->path,
+ context_path, context_type);
+ } else if (g_str_equal(key, "Settings")) {
+ DBG("%s Settings", modem->path);
+
+ extract_ipv4_settings(&value, context);
+ } else if (g_str_equal(key, "IPv6.Settings")) {
+ DBG("%s IPv6.Settings", modem->path);
+
+ extract_ipv6_settings(&value, context);
+ } else if (g_str_equal(key, "Active")) {
+ dbus_message_iter_get_basic(&value, &active);
+
+ DBG("%s Active %d", modem->path, active);
+ } else if (g_str_equal(key, "AccessPointName")) {
+ const char *apn;
+
+ dbus_message_iter_get_basic(&value, &apn);
+ if (apn && strlen(apn) > 0)
+ context->valid_apn = true;
+ else
+ context->valid_apn = false;
+
+ DBG("%s AccessPointName '%s'", modem->path, apn);
+ } else if (g_str_equal(key, "Protocol") &&
+ dbus_message_iter_get_arg_type(&value) == DBUS_TYPE_STRING ) {
+
+ dbus_message_iter_get_basic(&value, &ip_protocol);
+
+ DBG("%s Protocol %s", modem->path, ip_protocol);
+ }
+
+ dbus_message_iter_next(dict);
}
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- dbus_message_unref(message);
+ if (g_strcmp0(context_type, "internet") != 0) {
+ network_context_unref(context);
return -EINVAL;
}
- dbus_pending_call_set_notify(call, powered_reply, NULL, NULL);
+ if (ip_protocol)
+ set_context_ipconfig(context, ip_protocol);
- dbus_message_unref(message);
+ context->active = active;
- return -EINPROGRESS;
+ modem->context_list = g_slist_prepend(modem->context_list, context);
+ g_hash_table_replace(context_hash, g_strdup(context_path), modem);
+
+ if (context->valid_apn && modem->attached &&
+ has_interface(modem->interfaces, OFONO_API_NETREG))
+ add_network(modem, context);
+
+ return 0;
}
-static struct modem_data *add_modem(const char *path)
+static void remove_cm_context(struct modem_data *modem,
+ struct network_context *context)
{
- struct modem_data *modem;
+ if (!modem->context_list)
+ return;
+ if (!context)
+ return;
- if (path == NULL)
- return NULL;
+ g_hash_table_remove(context_hash, context->path);
- modem = g_hash_table_lookup(modem_hash, path);
- if (modem != NULL) {
- modem->available = TRUE;
+ if (context->network)
+ remove_network(modem, context);
+ modem->context_list = g_slist_remove(modem->context_list, context);
- return modem;
- }
+ network_context_unref(context);
+ context = NULL;
+}
- modem = g_try_new0(struct modem_data, 1);
- if (modem == NULL)
- return NULL;
+static void remove_all_contexts(struct modem_data *modem)
+{
+ GSList *list = NULL;
- modem->path = g_strdup(path);
- modem->device = NULL;
- modem->available = TRUE;
+ DBG("");
- g_hash_table_insert(modem_hash, g_strdup(path), modem);
+ if (modem->context_list == NULL)
+ return;
- return modem;
+ list = modem->context_list;
+ while (list) {
+ struct network_context *context = list->data;
+
+ remove_cm_context(modem, context);
+
+ list = modem->context_list;
+ }
+ g_slist_free(modem->context_list);
+ modem->context_list = NULL;
}
-static gboolean modem_has_gprs(DBusMessageIter *array)
+static void remove_all_networks(struct modem_data *modem)
{
- DBusMessageIter entry;
+ GSList *list;
- dbus_message_iter_recurse(array, &entry);
+ for (list = modem->context_list; list; list = list->next) {
+ struct network_context *context = list->data;
- while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
- const char *interface;
+ remove_network(modem, context);
+ }
+}
+
+static gboolean context_changed(DBusConnection *conn,
+ DBusMessage *message,
+ void *user_data)
+{
+ struct network_context *context = NULL;
+ const char *context_path = dbus_message_get_path(message);
+ struct modem_data *modem = NULL;
+ DBusMessageIter iter, value;
+ const char *key;
- dbus_message_iter_get_basic(&entry, &interface);
+ DBG("context_path %s", context_path);
- if (g_strcmp0(OFONO_GPRS_INTERFACE, interface) == 0)
- return TRUE;
+ modem = g_hash_table_lookup(context_hash, context_path);
+ if (!modem)
+ return TRUE;
- dbus_message_iter_next(&entry);
+ context = get_context_with_path(modem->context_list, context_path);
+ if (!context)
+ return TRUE;
+
+ if (!dbus_message_iter_init(message, &iter))
+ return TRUE;
+
+ dbus_message_iter_get_basic(&iter, &key);
+
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &value);
+
+ /*
+ * oFono guarantees the ordering of Settings and
+ * Active. Settings will always be send before Active = True.
+ * That means we don't have to order here.
+ */
+ if (g_str_equal(key, "Settings")) {
+ DBG("%s Settings", modem->path);
+
+ extract_ipv4_settings(&value, context);
+ } else if (g_str_equal(key, "IPv6.Settings")) {
+ DBG("%s IPv6.Settings", modem->path);
+
+ extract_ipv6_settings(&value, context);
+ } else if (g_str_equal(key, "Active")) {
+ dbus_bool_t active;
+
+ dbus_message_iter_get_basic(&value, &active);
+ context->active = active;
+
+ DBG("%s Active %d", modem->path, context->active);
+
+ if (context->active)
+ set_connected(modem, context);
+ else
+ set_disconnected(context);
+ } else if (g_str_equal(key, "AccessPointName")) {
+ const char *apn;
+
+ dbus_message_iter_get_basic(&value, &apn);
+
+ DBG("%s AccessPointName %s", modem->path, apn);
+
+ if (apn && strlen(apn) > 0) {
+ context->valid_apn = true;
+
+ if (context->network)
+ return TRUE;
+
+ if (!modem->attached)
+ return TRUE;
+
+ if (!has_interface(modem->interfaces,
+ OFONO_API_NETREG))
+ return TRUE;
+
+ add_network(modem, context);
+
+ if (context->active)
+ set_connected(modem, context);
+ } else {
+ context->valid_apn = false;
+
+ if (!context->network)
+ return TRUE;
+
+ remove_network(modem, context);
+ }
+
+ } else if (g_str_equal(key, "Protocol") &&
+ dbus_message_iter_get_arg_type(&value) == DBUS_TYPE_STRING ) {
+ const char *ip_protocol;
+
+ dbus_message_iter_get_basic(&value, &ip_protocol);
+
+ set_context_ipconfig(context, ip_protocol);
}
- return FALSE;
+ return TRUE;
}
-static void modem_properties_reply(DBusPendingCall *call, void *user_data)
+static void cm_get_contexts_reply(DBusPendingCall *call, void *user_data)
{
+ struct modem_data *modem = user_data;
+ DBusMessageIter array, dict, entry, value;
DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *path = user_data;
+ DBusError error;
- DBG("path %s", path);
+ DBG("%s", modem->path);
+
+ modem->call_get_contexts = NULL;
reply = dbus_pending_call_steal_reply(call);
- if (dbus_message_iter_init(reply, &array) == FALSE)
+ dbus_error_init(&error);
+
+ if (dbus_set_error_from_message(&error, reply)) {
+ connman_error("%s", error.message);
+ dbus_error_free(&error);
+ goto done;
+ }
+
+ if (!dbus_message_iter_init(reply, &array))
goto done;
if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_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;
- dbus_bool_t powered;
+ while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_STRUCT) {
+ const char *context_path;
dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+ dbus_message_iter_get_basic(&entry, &context_path);
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);
- }
+ if (add_cm_context(modem, context_path, &value))
+ break;
dbus_message_iter_next(&dict);
}
dbus_pending_call_unref(call);
}
-static void get_modem_properties(struct modem_data *modem)
+static int cm_get_contexts(struct modem_data *modem)
{
DBusMessage *message;
- DBusPendingCall *call;
- DBG("path %s", modem->path);
+ DBG("%s", modem->path);
- if (modem->path == NULL)
- return;
+ if (modem->call_get_contexts)
+ return -EBUSY;
message = dbus_message_new_method_call(OFONO_SERVICE, modem->path,
- OFONO_MODEM_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
- return;
-
- dbus_message_set_auto_start(message, FALSE);
+ OFONO_CM_INTERFACE, GET_CONTEXTS);
+ if (!message)
+ return -ENOMEM;
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono modem");
- goto done;
+ if (!dbus_connection_send_with_reply(connection, message,
+ &modem->call_get_contexts, TIMEOUT)) {
+ connman_error("Failed to call GetContexts()");
+ dbus_message_unref(message);
+ return -EINVAL;
}
- if (call == NULL) {
+ if (!modem->call_get_contexts) {
connman_error("D-Bus connection not available");
- goto done;
+ dbus_message_unref(message);
+ return -EINVAL;
}
- dbus_pending_call_set_notify(call, modem_properties_reply,
- (void *)modem->path, NULL);
+ dbus_pending_call_set_notify(modem->call_get_contexts,
+ cm_get_contexts_reply,
+ modem, NULL);
-done:
dbus_message_unref(message);
+
+ return -EINPROGRESS;
}
-static void mask_unavailable(gpointer key, gpointer value, gpointer user_data)
+static gboolean cm_context_added(DBusConnection *conn,
+ DBusMessage *message,
+ void *user_data)
{
- struct modem_data *modem = value;
+ const char *path = dbus_message_get_path(message);
+ char *context_path;
+ struct modem_data *modem;
+ DBusMessageIter iter, properties, dict;
- modem->available = FALSE;
-}
+ DBG("%s", path);
-static void modems_set_unavailable()
-{
- g_hash_table_foreach(modem_hash, mask_unavailable, NULL);
-}
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (!modem)
+ return TRUE;
-static void cleanup_modem(gpointer key, gpointer value, gpointer user_data)
-{
- struct modem_data *modem = value;
+ if (!dbus_message_iter_init(message, &iter))
+ return TRUE;
- if (modem->available == FALSE)
- g_hash_table_remove(modem_hash, key);
-}
+ dbus_message_iter_get_basic(&iter, &context_path);
-static void cleanup_modems()
-{
- g_hash_table_foreach(modem_hash, cleanup_modem, NULL);
+ dbus_message_iter_next(&iter);
+ dbus_message_iter_recurse(&iter, &properties);
+
+ /* Sometimes, we get an array instead of dict */
+ if (dbus_message_iter_get_arg_type(&properties) == DBUS_TYPE_ARRAY) {
+ /* Must recurse again */
+ dbus_message_iter_recurse(&properties, &dict);
+ if (add_cm_context(modem, context_path, &dict) != 0)
+ return TRUE;
+ }
+ if (add_cm_context(modem, context_path, &properties) != 0)
+ return TRUE;
+
+ return TRUE;
}
-static void update_modems(DBusMessageIter *array)
+static gboolean cm_context_removed(DBusConnection *conn,
+ DBusMessage *message,
+ void *user_data)
{
- DBusMessageIter entry;
-
- dbus_message_iter_recurse(array, &entry);
+ const char *path = dbus_message_get_path(message);
+ const char *context_path;
+ struct modem_data *modem;
+ struct network_context *context;
+ DBusMessageIter iter;
- modems_set_unavailable();
+ DBG("context path %s", path);
- while (dbus_message_iter_get_arg_type(&entry) ==
- DBUS_TYPE_OBJECT_PATH) {
- const char *path;
- struct modem_data *modem;
+ if (!dbus_message_iter_init(message, &iter))
+ return TRUE;
- dbus_message_iter_get_basic(&entry, &path);
+ dbus_message_iter_get_basic(&iter, &context_path);
- modem = add_modem(path);
- if (modem != NULL)
- get_modem_properties(modem);
+ modem = g_hash_table_lookup(context_hash, context_path);
+ if (!modem)
+ return TRUE;
- dbus_message_iter_next(&entry);
- }
+ context = get_context_with_path(modem->context_list, context_path);
+ remove_cm_context(modem, context);
- cleanup_modems();
+ return TRUE;
}
-static void manager_properties_reply(DBusPendingCall *call, void *user_data)
+static void netreg_update_name(struct modem_data *modem,
+ DBusMessageIter* value)
{
- DBusMessage *reply;
- DBusMessageIter array, dict;
+ char *name;
+ GSList *list;
- DBG("");
+ dbus_message_iter_get_basic(value, &name);
- reply = dbus_pending_call_steal_reply(call);
+ DBG("%s Name %s", modem->path, name);
- if (dbus_message_iter_init(reply, &array) == FALSE)
- goto done;
+ g_free(modem->name);
+ modem->name = g_strdup(name);
- if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY)
- goto done;
+ if (!modem->context_list)
+ return;
- dbus_message_iter_recurse(&array, &dict);
+ /* For all the context */
+ for (list = modem->context_list; list; list = list->next) {
+ struct network_context *context = list->data;
- while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
+ if (context->network) {
+ connman_network_set_name(context->network, modem->name);
+ connman_network_update(context->network);
+ }
+ }
+}
- dbus_message_iter_recurse(&dict, &entry);
- dbus_message_iter_get_basic(&entry, &key);
+static void netreg_update_strength(struct modem_data *modem,
+ DBusMessageIter *value)
+{
+ GSList *list;
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
+ dbus_message_iter_get_basic(value, &modem->strength);
- if (g_str_equal(key, "Modems") == TRUE) {
- update_modems(&value);
- break;
- }
+ DBG("%s Strength %d", modem->path, modem->strength);
- dbus_message_iter_next(&dict);
- }
+ if (!modem->context_list)
+ return;
-done:
- dbus_message_unref(reply);
+ /*
+ * GSM:
+ * We don't have 2 signal notifications we always report the strength
+ * signal. data_strength is always equal to 0.
+ *
+ * CDMA:
+ * In the case we have a data_strength signal (from 1xEVDO network)
+ * we don't need to update the value with strength signal (from 1xCDMA)
+ * because the modem is registered to 1xEVDO network for data call.
+ * In case we have no data_strength signal (not registered to 1xEVDO
+ * network), we must report the strength signal (registered to 1xCDMA
+ * network e.g slow mode).
+ */
+ if (modem->data_strength != 0)
+ return;
- dbus_pending_call_unref(call);
+ /* For all the context */
+ for (list = modem->context_list; list; list = list->next) {
+ struct network_context *context = list->data;
+
+ if (context->network) {
+ connman_network_set_strength(context->network,
+ modem->strength);
+ connman_network_update(context->network);
+ }
+ }
}
-static void modem_remove_device(struct modem_data *modem)
+/* Retrieve 1xEVDO Data Strength signal */
+static void netreg_update_datastrength(struct modem_data *modem,
+ DBusMessageIter *value)
{
- if (modem->device == NULL)
- return;
+ GSList *list;
- connman_device_unregister(modem->device);
- connman_device_unref(modem->device);
+ dbus_message_iter_get_basic(value, &modem->data_strength);
- modem->device = NULL;
-}
+ DBG("%s Data Strength %d", modem->path, modem->data_strength);
-static void remove_modem(gpointer data)
-{
- struct modem_data *modem = data;
+ if (!modem->context_list)
+ return;
- g_free(modem->path);
+ /*
+ * CDMA modem is not registered to 1xEVDO network, let
+ * update_signal_strength() reporting the value on the Strength signal
+ * notification.
+ */
+ if (modem->data_strength == 0)
+ return;
- modem_remove_device(modem);
+ /* For all the context */
+ for (list = modem->context_list; list; list = list->next) {
+ struct network_context *context = list->data;
- g_free(modem);
+ if (context->network) {
+ connman_network_set_strength(context->network,
+ modem->data_strength);
+ connman_network_update(context->network);
+ }
+ }
}
-static void ofono_connect(DBusConnection *connection, void *user_data)
+static void netreg_update_status(struct modem_data *modem,
+ DBusMessageIter *value)
{
- DBusMessage *message;
- DBusPendingCall *call;
+ char *status;
+ bool roaming;
+ GSList *list;
- DBG("connection %p", connection);
+ dbus_message_iter_get_basic(value, &status);
- modem_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
- g_free, remove_modem);
+ roaming = g_str_equal(status, "roaming");
+ modem->registered = roaming || g_str_equal(status, "registered");
- message = dbus_message_new_method_call(OFONO_SERVICE, "/",
- OFONO_MANAGER_INTERFACE, GET_PROPERTIES);
- if (message == NULL)
+ if (roaming == modem->roaming)
return;
- dbus_message_set_auto_start(message, FALSE);
+ modem->roaming = roaming;
- if (dbus_connection_send_with_reply(connection, message,
- &call, TIMEOUT) == FALSE) {
- connman_error("Failed to get ofono modems");
- goto done;
- }
+ if (!modem->context_list)
+ return;
- if (call == NULL) {
- connman_error("D-Bus connection not available");
- goto done;
+ /* For all the context */
+ for (list = modem->context_list; list; list = list->next) {
+ struct network_context *context = list->data;
+
+ if (context->network) {
+ connman_network_set_bool(context->network,
+ "Roaming", modem->roaming);
+ connman_network_update(context->network);
+ }
}
+}
+
+static void netreg_update_regdom(struct modem_data *modem,
+ DBusMessageIter *value)
+{
+ char *mobile_country_code;
+ char *alpha2;
+ int mcc;
- dbus_pending_call_set_notify(call, manager_properties_reply,
- NULL, NULL);
+ dbus_message_iter_get_basic(value, &mobile_country_code);
-done:
- dbus_message_unref(message);
+ DBG("%s MobileContryCode %s", modem->path, mobile_country_code);
+
+
+ mcc = atoi(mobile_country_code);
+ if (mcc > 799 || mcc < 200)
+ return;
+
+ alpha2 = mcc_country_codes[mcc - 200];
+ if (alpha2)
+ connman_technology_set_regdom(alpha2);
+}
+
+static gboolean netreg_changed(DBusConnection *conn, DBusMessage *message,
+ void *user_data)
+{
+ const char *path = dbus_message_get_path(message);
+ struct modem_data *modem;
+ DBusMessageIter iter, value;
+ const char *key;
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (!modem)
+ return TRUE;
+
+ if (modem->ignore)
+ return TRUE;
+
+ if (!dbus_message_iter_init(message, &iter))
+ 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, "Name"))
+ netreg_update_name(modem, &value);
+ else if (g_str_equal(key, "Strength"))
+ netreg_update_strength(modem, &value);
+ else if (g_str_equal(key, "Status"))
+ netreg_update_status(modem, &value);
+ else if (g_str_equal(key, "MobileCountryCode"))
+ netreg_update_regdom(modem, &value);
+
+ return TRUE;
+}
+
+static void netreg_properties_reply(struct modem_data *modem,
+ DBusMessageIter *dict)
+{
+ GSList *list = NULL;
+
+ DBG("%s", modem->path);
+
+ 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, "Name"))
+ netreg_update_name(modem, &value);
+ else if (g_str_equal(key, "Strength"))
+ netreg_update_strength(modem, &value);
+ else if (g_str_equal(key, "Status"))
+ netreg_update_status(modem, &value);
+ else if (g_str_equal(key, "MobileCountryCode"))
+ netreg_update_regdom(modem, &value);
+
+ dbus_message_iter_next(dict);
+ }
+
+ if (!modem->context_list) {
+ /*
+ * netgreg_get_properties() was issued after we got
+ * cm_get_contexts_reply() where we create the
+ * context. Though before we got the
+ * netreg_properties_reply the context was removed
+ * again. Therefore we have to skip the network
+ * creation.
+ */
+ return;
+ }
+ /* Check for all contexts if they are valids and/or actives */
+ for (list = modem->context_list; list; list = list->next) {
+ struct network_context *context = list->data;
+
+ if (context->valid_apn)
+ add_network(modem, context);
+ if (context->active)
+ set_connected(modem, context);
+ }
+}
+
+static int netreg_get_properties(struct modem_data *modem)
+{
+ return get_properties(modem->path, OFONO_NETREG_INTERFACE,
+ netreg_properties_reply, modem);
+}
+
+static void add_cdma_network(struct modem_data *modem)
+{
+ struct network_context *context = NULL;
+ /* Be sure that device is created before adding CDMA network */
+ if (!modem->device)
+ return;
+
+ /*
+ * CDMA modems don't need contexts for data call, however the current
+ * add_network() logic needs one, so we create one to proceed.
+ */
+ if (!modem->context_list) {
+ context = network_context_alloc(modem->path);
+ modem->context_list = g_slist_prepend(modem->context_list,
+ context);
+ } else
+ context = modem->context_list->data;
+
+ if (!modem->name)
+ modem->name = g_strdup("CDMA Network");
+
+ add_network(modem, context);
+
+ if (modem->cdma_cm_powered)
+ set_connected(modem, context);
+}
+
+static gboolean cdma_netreg_changed(DBusConnection *conn,
+ DBusMessage *message,
+ void *user_data)
+{
+ const char *path = dbus_message_get_path(message);
+ struct modem_data *modem;
+ DBusMessageIter iter, value;
+ const char *key;
+
+ DBG("");
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (!modem)
+ return TRUE;
+
+ if (modem->ignore)
+ return TRUE;
+
+ if (!dbus_message_iter_init(message, &iter))
+ 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, "Name"))
+ netreg_update_name(modem, &value);
+ else if (g_str_equal(key, "Strength"))
+ netreg_update_strength(modem, &value);
+ else if (g_str_equal(key, "DataStrength"))
+ netreg_update_datastrength(modem, &value);
+ else if (g_str_equal(key, "Status"))
+ netreg_update_status(modem, &value);
+
+ if (modem->registered)
+ add_cdma_network(modem);
+ else
+ remove_all_networks(modem);
+
+ return TRUE;
+}
+
+static void cdma_netreg_properties_reply(struct modem_data *modem,
+ DBusMessageIter *dict)
+{
+ DBG("%s", modem->path);
+
+ 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, "Name"))
+ netreg_update_name(modem, &value);
+ else if (g_str_equal(key, "Strength"))
+ netreg_update_strength(modem, &value);
+ else if (g_str_equal(key, "DataStrength"))
+ netreg_update_datastrength(modem, &value);
+ else if (g_str_equal(key, "Status"))
+ netreg_update_status(modem, &value);
+
+ dbus_message_iter_next(dict);
+ }
+
+ if (modem->registered)
+ add_cdma_network(modem);
+ else
+ remove_all_networks(modem);
+}
+
+static int cdma_netreg_get_properties(struct modem_data *modem)
+{
+ return get_properties(modem->path, OFONO_CDMA_NETREG_INTERFACE,
+ cdma_netreg_properties_reply, modem);
+}
+
+static void cm_update_attached(struct modem_data *modem,
+ DBusMessageIter *value)
+{
+ dbus_bool_t attached;
+
+ dbus_message_iter_get_basic(value, &attached);
+ modem->attached = attached;
+
+ DBG("%s Attached %d", modem->path, modem->attached);
+
+ if (!modem->attached) {
+ remove_all_networks(modem);
+ return;
+ }
+
+ if (!has_interface(modem->interfaces, OFONO_API_NETREG))
+ return;
+
+ netreg_get_properties(modem);
+}
+
+static void cm_update_powered(struct modem_data *modem,
+ DBusMessageIter *value)
+{
+ dbus_bool_t cm_powered;
+
+ dbus_message_iter_get_basic(value, &cm_powered);
+ modem->cm_powered = cm_powered;
+
+ DBG("%s ConnnectionManager Powered %d", modem->path,
+ modem->cm_powered);
+
+ if (modem->cm_powered)
+ return;
+
+ cm_set_powered(modem, TRUE);
+}
+
+static gboolean cm_changed(DBusConnection *conn, DBusMessage *message,
+ void *user_data)
+{
+ const char *path = dbus_message_get_path(message);
+ struct modem_data *modem;
+ DBusMessageIter iter, value;
+ const char *key;
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (!modem)
+ return TRUE;
+
+ if (modem->ignore)
+ return TRUE;
+
+ if (!dbus_message_iter_init(message, &iter))
+ 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"))
+ cm_update_attached(modem, &value);
+ else if (g_str_equal(key, "Powered"))
+ cm_update_powered(modem, &value);
+
+ return TRUE;
+}
+
+static void cdma_cm_update_powered(struct modem_data *modem,
+ DBusMessageIter *value)
+{
+ struct network_context *context = NULL;
+ dbus_bool_t cdma_cm_powered;
+
+ dbus_message_iter_get_basic(value, &cdma_cm_powered);
+ modem->cdma_cm_powered = cdma_cm_powered;
+
+ DBG("%s CDMA cm Powered %d", modem->path, modem->cdma_cm_powered);
+
+ if (!modem->context_list)
+ return;
+
+ /* In case of CDMA, there is only one context */
+ context = modem->context_list->data;
+ if (modem->cdma_cm_powered)
+ set_connected(modem, context);
+ else
+ set_disconnected(context);
+}
+
+static void cdma_cm_update_settings(struct modem_data *modem,
+ DBusMessageIter *value)
+{
+ DBG("%s Settings", modem->path);
+
+ extract_ipv4_settings(value, modem->context_list->data);
+}
+
+static gboolean cdma_cm_changed(DBusConnection *conn,
+ DBusMessage *message, void *user_data)
+{
+ const char *path = dbus_message_get_path(message);
+ struct modem_data *modem;
+ DBusMessageIter iter, value;
+ const char *key;
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (!modem)
+ return TRUE;
+
+ if (modem->online && !modem->context_list)
+ cdma_netreg_get_properties(modem);
+
+ if (!dbus_message_iter_init(message, &iter))
+ 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, "Powered"))
+ cdma_cm_update_powered(modem, &value);
+ if (g_str_equal(key, "Settings"))
+ cdma_cm_update_settings(modem, &value);
+
+ return TRUE;
+}
+
+static void cm_properties_reply(struct modem_data *modem, DBusMessageIter *dict)
+{
+ DBG("%s", modem->path);
+
+ 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, "Attached"))
+ cm_update_attached(modem, &value);
+ else if (g_str_equal(key, "Powered"))
+ cm_update_powered(modem, &value);
+
+ dbus_message_iter_next(dict);
+ }
+}
+
+static int cm_get_properties(struct modem_data *modem)
+{
+ return get_properties(modem->path, OFONO_CM_INTERFACE,
+ cm_properties_reply, modem);
+}
+
+static void cdma_cm_properties_reply(struct modem_data *modem,
+ DBusMessageIter *dict)
+{
+ DBG("%s", modem->path);
+
+ if (modem->online)
+ cdma_netreg_get_properties(modem);
+
+ 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, "Powered"))
+ cdma_cm_update_powered(modem, &value);
+ if (g_str_equal(key, "Settings"))
+ cdma_cm_update_settings(modem, &value);
+
+ dbus_message_iter_next(dict);
+ }
+}
+
+static int cdma_cm_get_properties(struct modem_data *modem)
+{
+ return get_properties(modem->path, OFONO_CDMA_CM_INTERFACE,
+ cdma_cm_properties_reply, modem);
+}
+
+static void sim_update_imsi(struct modem_data *modem,
+ DBusMessageIter *value)
+{
+ char *imsi;
+
+ dbus_message_iter_get_basic(value, &imsi);
+
+ DBG("%s imsi %s", modem->path, imsi);
+
+ g_free(modem->imsi);
+ modem->imsi = g_strdup(imsi);
+}
+
+static gboolean sim_changed(DBusConnection *conn, DBusMessage *message,
+ void *user_data)
+{
+ const char *path = dbus_message_get_path(message);
+ struct modem_data *modem;
+ DBusMessageIter iter, value;
+ const char *key;
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (!modem)
+ return TRUE;
+
+ if (modem->ignore)
+ return TRUE;
+
+ if (!dbus_message_iter_init(message, &iter))
+ 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, "SubscriberIdentity")) {
+ sim_update_imsi(modem, &value);
+
+ if (!ready_to_create_device(modem))
+ return TRUE;
+
+ /*
+ * This is a GSM modem. Create the device and
+ * register it at the core. Enabling (setting
+ * it online is done through the
+ * modem_enable() callback.
+ */
+ create_device(modem);
+ }
+
+ return TRUE;
+}
+
+static void sim_properties_reply(struct modem_data *modem,
+ DBusMessageIter *dict)
+{
+ DBG("%s", modem->path);
+
+ 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, "SubscriberIdentity")) {
+ sim_update_imsi(modem, &value);
+
+ if (!ready_to_create_device(modem))
+ return;
+
+ /*
+ * This is a GSM modem. Create the device and
+ * register it at the core. Enabling (setting
+ * it online is done through the
+ * modem_enable() callback.
+ */
+ create_device(modem);
+
+ if (!modem->online)
+ return;
+
+ /*
+ * The modem is already online and we have the CM interface.
+ * There will be no interface update and therefore our
+ * state machine will not go to next step. We have to
+ * trigger it from here.
+ */
+ if (has_interface(modem->interfaces, OFONO_API_CM)) {
+ cm_get_properties(modem);
+ cm_get_contexts(modem);
+ }
+ return;
+ }
+
+ dbus_message_iter_next(dict);
+ }
+}
+
+static int sim_get_properties(struct modem_data *modem)
+{
+ return get_properties(modem->path, OFONO_SIM_INTERFACE,
+ sim_properties_reply, modem);
+}
+
+static bool api_added(uint8_t old_iface, uint8_t new_iface,
+ enum ofono_api api)
+{
+ if (!has_interface(old_iface, api) &&
+ has_interface(new_iface, api)) {
+ DBG("%s added", api2string(api));
+ return true;
+ }
+
+ return false;
+}
+
+static bool api_removed(uint8_t old_iface, uint8_t new_iface,
+ enum ofono_api api)
+{
+ if (has_interface(old_iface, api) &&
+ !has_interface(new_iface, api)) {
+ DBG("%s removed", api2string(api));
+ return true;
+ }
+
+ return false;
+}
+
+static void modem_update_interfaces(struct modem_data *modem,
+ uint8_t old_ifaces,
+ uint8_t new_ifaces)
+{
+ DBG("%s", modem->path);
+
+ if (api_added(old_ifaces, new_ifaces, OFONO_API_SIM)) {
+ if (!modem->imsi &&
+ !modem->set_powered) {
+ /*
+ * Only use do GetProperties() when
+ * device has not been powered up.
+ */
+ sim_get_properties(modem);
+ }
+ }
+
+ if (api_added(old_ifaces, new_ifaces, OFONO_API_CM)) {
+ if (modem->device) {
+ cm_get_properties(modem);
+ cm_get_contexts(modem);
+ }
+ }
+
+ if (api_added(old_ifaces, new_ifaces, OFONO_API_CDMA_CM)) {
+ if (ready_to_create_device(modem)) {
+ create_device(modem);
+ if (modem->registered)
+ add_cdma_network(modem);
+ }
+
+ if (modem->device)
+ cdma_cm_get_properties(modem);
+ }
+
+ if (api_added(old_ifaces, new_ifaces, OFONO_API_NETREG)) {
+ if (modem->attached)
+ netreg_get_properties(modem);
+ }
+
+ if (api_added(old_ifaces, new_ifaces, OFONO_API_CDMA_NETREG))
+ cdma_netreg_get_properties(modem);
+
+ if (api_removed(old_ifaces, new_ifaces, OFONO_API_CM)) {
+ if (modem->call_get_contexts) {
+ DBG("cancelling pending GetContexts call");
+ dbus_pending_call_cancel(modem->call_get_contexts);
+ dbus_pending_call_unref(modem->call_get_contexts);
+ modem->call_get_contexts = NULL;
+ }
+ remove_all_contexts(modem);
+ }
+
+ if (api_removed(old_ifaces, new_ifaces, OFONO_API_CDMA_CM))
+ remove_all_contexts(modem);
+
+ if (api_removed(old_ifaces, new_ifaces, OFONO_API_NETREG))
+ remove_all_networks(modem);
+
+ if (api_removed(old_ifaces, new_ifaces, OFONO_API_CDMA_NETREG))
+ remove_all_networks(modem);
+}
+
+static gboolean modem_changed(DBusConnection *conn, DBusMessage *message,
+ void *user_data)
+{
+ const char *path = dbus_message_get_path(message);
+ struct modem_data *modem;
+ DBusMessageIter iter, value;
+ const char *key;
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (!modem)
+ return TRUE;
+
+ if (modem->ignore)
+ return TRUE;
+
+ if (!dbus_message_iter_init(message, &iter))
+ 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, "Powered")) {
+ dbus_bool_t powered;
+
+ dbus_message_iter_get_basic(&value, &powered);
+ modem->powered = powered;
+
+ DBG("%s Powered %d", modem->path, modem->powered);
+
+ /* Set the powered according to the value */
+ modem_set_powered(modem, powered);
+ } else if (g_str_equal(key, "Online")) {
+ dbus_bool_t online;
+
+ dbus_message_iter_get_basic(&value, &online);
+ modem->online = online;
+
+ DBG("%s Online %d", modem->path, modem->online);
+
+ if (!modem->device)
+ return TRUE;
+
+ connman_device_set_powered(modem->device, modem->online);
+ } else if (g_str_equal(key, "Interfaces")) {
+ uint8_t interfaces;
+
+ interfaces = extract_interfaces(&value);
+
+ if (interfaces == modem->interfaces)
+ return TRUE;
+
+ DBG("%s Interfaces 0x%02x", modem->path, interfaces);
+
+ modem_update_interfaces(modem, modem->interfaces, interfaces);
+
+ modem->interfaces = interfaces;
+ } else if (g_str_equal(key, "Serial")) {
+ char *serial;
+
+ dbus_message_iter_get_basic(&value, &serial);
+
+ g_free(modem->serial);
+ modem->serial = g_strdup(serial);
+
+ DBG("%s Serial %s", modem->path, modem->serial);
+
+ if (has_interface(modem->interfaces,
+ OFONO_API_CDMA_CM)) {
+ if (ready_to_create_device(modem)) {
+ create_device(modem);
+ if (modem->registered)
+ add_cdma_network(modem);
+ }
+ }
+ }
+
+ return TRUE;
+}
+
+static void add_modem(const char *path, DBusMessageIter *prop)
+{
+ struct modem_data *modem;
+
+ DBG("%s", path);
+
+ modem = g_hash_table_lookup(modem_hash, path);
+ if (modem) {
+ /*
+ * When oFono powers up we ask for the modems and oFono is
+ * reporting with modem_added signal the modems. Only
+ * handle them once.
+ */
+ return;
+ }
+
+ modem = g_try_new0(struct modem_data, 1);
+ if (!modem)
+ return;
+
+ modem->path = g_strdup(path);
+
+ g_hash_table_insert(modem_hash, g_strdup(path), modem);
+
+ while (dbus_message_iter_get_arg_type(prop) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter entry, value;
+ const char *key;
+
+ dbus_message_iter_recurse(prop, &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")) {
+ dbus_bool_t powered;
+
+ dbus_message_iter_get_basic(&value, &powered);
+ modem->powered = powered;
+
+ DBG("%s Powered %d", modem->path, modem->powered);
+ } else if (g_str_equal(key, "Online")) {
+ dbus_bool_t online;
+
+ dbus_message_iter_get_basic(&value, &online);
+ modem->online = online;
+
+ DBG("%s Online %d", modem->path, modem->online);
+ } else if (g_str_equal(key, "Interfaces")) {
+ modem->interfaces = extract_interfaces(&value);
+
+ DBG("%s Interfaces 0x%02x", modem->path,
+ modem->interfaces);
+ } else if (g_str_equal(key, "Serial")) {
+ char *serial;
+
+ dbus_message_iter_get_basic(&value, &serial);
+ modem->serial = g_strdup(serial);
+
+ DBG("%s Serial %s", modem->path, modem->serial);
+ } else if (g_str_equal(key, "Type")) {
+ char *type;
+
+ dbus_message_iter_get_basic(&value, &type);
+
+ DBG("%s Type %s", modem->path, type);
+ if (g_strcmp0(type, "hardware") != 0) {
+ DBG("%s Ignore this modem", modem->path);
+ modem->ignore = true;
+ }
+ }
+
+ dbus_message_iter_next(prop);
+ }
+
+ if (modem->ignore)
+ return;
+
+ if (!modem->powered) {
+ modem_set_powered(modem, TRUE);
+ return;
+ }
+ modem_update_interfaces(modem, 0, modem->interfaces);
}
-static void ofono_disconnect(DBusConnection *connection, void *user_data)
+static void modem_power_down(gpointer key, gpointer value, gpointer user_data)
{
- DBG("connection %p", connection);
+ struct modem_data *modem = value;
- if (modem_hash == NULL)
- return;
+ DBG("%s", modem->path);
- g_hash_table_destroy(modem_hash);
+ if (modem->ignore)
+ return;
- modem_hash = NULL;
+ modem_set_powered(modem, FALSE);
}
-static gboolean modem_changed(DBusConnection *connection, DBusMessage *message,
- void *user_data)
+static void remove_modem(gpointer data)
{
- const char *path = dbus_message_get_path(message);
- struct modem_data *modem;
- DBusMessageIter iter, value;
- const char *key;
-
- DBG("path %s", path);
+ struct modem_data *modem = data;
- modem = g_hash_table_lookup(modem_hash, path);
- if (modem == NULL)
- return TRUE;
+ DBG("%s", modem->path);
- if (dbus_message_iter_init(message, &iter) == FALSE)
- return TRUE;
+ if (modem->call_set_property) {
+ dbus_pending_call_cancel(modem->call_set_property);
+ dbus_pending_call_unref(modem->call_set_property);
+ modem->call_set_property = NULL;
+ }
- dbus_message_iter_get_basic(&iter, &key);
+ if (modem->call_get_properties) {
+ dbus_pending_call_cancel(modem->call_get_properties);
+ dbus_pending_call_unref(modem->call_get_properties);
+ modem->call_get_properties = NULL;
+ }
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
+ if (modem->call_get_contexts) {
+ dbus_pending_call_cancel(modem->call_get_contexts);
+ dbus_pending_call_unref(modem->call_get_contexts);
+ modem->call_get_contexts = NULL;
+ }
- if (g_str_equal(key, "Powered") == TRUE) {
- dbus_bool_t powered;
+ /* Must remove the contexts before the device */
+ if (modem->context_list)
+ remove_all_contexts(modem);
- dbus_message_iter_get_basic(&value, &powered);
- if (powered == TRUE)
- return TRUE;
+ if (modem->device)
+ destroy_device(modem);
- modem_remove_device(modem);
- } else if (g_str_equal(key, "Interfaces") == TRUE) {
- if (modem_has_gprs(&value) == TRUE) {
- if (modem->device == NULL)
- get_imsi(modem->path);
- } else if (modem->device != NULL)
- modem_remove_device(modem);
- }
+ g_free(modem->serial);
+ g_free(modem->name);
+ g_free(modem->imsi);
+ g_free(modem->path);
- return TRUE;
+ g_free(modem);
}
-static gboolean gprs_changed(DBusConnection *connection, DBusMessage *message,
- void *user_data)
+static gboolean modem_added(DBusConnection *conn,
+ DBusMessage *message, void *user_data)
{
- const char *path = dbus_message_get_path(message);
- struct modem_data *modem;
- DBusMessageIter iter, value;
- const char *key;
-
- DBG("path %s", path);
+ DBusMessageIter iter, properties;
+ const char *path;
- modem = g_hash_table_lookup(modem_hash, path);
- if (modem == NULL)
- return TRUE;
+ DBG("");
- if (dbus_message_iter_init(message, &iter) == FALSE)
+ if (!dbus_message_iter_init(message, &iter))
return TRUE;
- dbus_message_iter_get_basic(&iter, &key);
+ dbus_message_iter_get_basic(&iter, &path);
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);
+ dbus_message_iter_recurse(&iter, &properties);
- if (attached == TRUE)
- check_networks(modem);
- else if (modem->device != NULL)
- connman_device_remove_all_networks(modem->device);
-
- } else if (g_str_equal(key, "Status") == TRUE) {
- const char *status;
- dbus_message_iter_get_basic(&value, &status);
-
- DBG("status %s", status);
-
- /* 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 (modem->device == NULL)
- return TRUE;
-
- dbus_message_iter_get_basic(&value, &powered);
- connman_device_set_powered(modem->device, powered);
- }
+ add_modem(path, &properties);
return TRUE;
}
-static gboolean manager_changed(DBusConnection *connection,
+static gboolean modem_removed(DBusConnection *conn,
DBusMessage *message, void *user_data)
{
- const char *path = dbus_message_get_path(message);
- DBusMessageIter iter, value;
- const char *key;
+ DBusMessageIter iter;
+ const char *path;
- DBG("path %s", path);
+ DBG("");
- if (dbus_message_iter_init(message, &iter) == FALSE)
+ if (!dbus_message_iter_init(message, &iter))
return TRUE;
- dbus_message_iter_get_basic(&iter, &key);
-
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
+ dbus_message_iter_get_basic(&iter, &path);
- if (g_str_equal(key, "Modems") == TRUE)
- update_modems(&value);
+ g_hash_table_remove(modem_hash, path);
return TRUE;
}
-static void get_dns(DBusMessageIter *array, struct connman_element *parent)
+static void manager_get_modems_reply(DBusPendingCall *call, void *user_data)
{
- DBusMessageIter entry;
- gchar *nameserver = NULL, *nameserver_old = NULL;
+ DBusMessage *reply;
+ DBusError error;
+ DBusMessageIter array, dict;
DBG("");
- dbus_message_iter_recurse(array, &entry);
+ reply = dbus_pending_call_steal_reply(call);
- while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
- const char *dns;
+ dbus_error_init(&error);
+
+ if (dbus_set_error_from_message(&error, reply)) {
+ connman_error("%s", error.message);
+ dbus_error_free(&error);
+ goto done;
+ }
- dbus_message_iter_get_basic(&entry, &dns);
+ if (!dbus_message_iter_init(reply, &array))
+ goto done;
- DBG("dns %s", dns);
+ dbus_message_iter_recurse(&array, &dict);
- if (nameserver == NULL) {
+ while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_STRUCT) {
+ DBusMessageIter value, properties;
+ const char *path;
- nameserver = g_strdup(dns);
- } else {
+ dbus_message_iter_recurse(&dict, &value);
+ dbus_message_iter_get_basic(&value, &path);
- nameserver_old = nameserver;
- nameserver = g_strdup_printf("%s %s",
- nameserver_old, dns);
- g_free(nameserver_old);
- }
+ dbus_message_iter_next(&value);
+ dbus_message_iter_recurse(&value, &properties);
- dbus_message_iter_next(&entry);
+ add_modem(path, &properties);
+
+ dbus_message_iter_next(&dict);
}
- parent->ipv4.nameserver = nameserver;
+done:
+ dbus_message_unref(reply);
+
+ dbus_pending_call_unref(call);
}
-static void update_settings(DBusMessageIter *array,
- struct connman_element *parent)
+static int manager_get_modems(void)
{
- DBusMessageIter dict;
- const char *interface = NULL;
+ DBusMessage *message;
+ DBusPendingCall *call;
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;
+ message = dbus_message_new_method_call(OFONO_SERVICE, "/",
+ OFONO_MANAGER_INTERFACE, GET_MODEMS);
+ if (!message)
+ return -ENOMEM;
- dbus_message_iter_get_basic(&value, &interface);
+ if (!dbus_connection_send_with_reply(connection, message,
+ &call, TIMEOUT)) {
+ connman_error("Failed to call GetModems()");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
- DBG("interface %s", interface);
+ if (!call) {
+ connman_error("D-Bus connection not available");
+ dbus_message_unref(message);
+ return -EINVAL;
+ }
- 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_pending_call_set_notify(call, manager_get_modems_reply,
+ NULL, NULL);
- dbus_message_iter_get_basic(&value, &method);
- if (g_strcmp0(method, "static") == 0) {
+ dbus_message_unref(message);
- parent->ipv4.method =
- CONNMAN_IPCONFIG_METHOD_FIXED;
- } else if (g_strcmp0(method, "dhcp") == 0) {
+ return -EINPROGRESS;
+}
- parent->ipv4.method =
- CONNMAN_IPCONFIG_METHOD_DHCP;
- break;
- }
- } else if (g_str_equal(key, "Address") == TRUE) {
- const char *address;
+static void ofono_connect(DBusConnection *conn, void *user_data)
+{
+ DBG("");
- dbus_message_iter_get_basic(&value, &address);
+ modem_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, remove_modem);
+ if (!modem_hash)
+ return;
- DBG("address %s", address);
+ context_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
+ if (!context_hash) {
+ g_hash_table_destroy(modem_hash);
+ return;
+ }
- parent->ipv4.address = g_strdup(address);
- } else if (g_str_equal(key, "Netmask") == TRUE) {
- const char *netmask;
+ manager_get_modems();
+}
- dbus_message_iter_get_basic(&value, &netmask);
+static void ofono_disconnect(DBusConnection *conn, void *user_data)
+{
+ DBG("");
- DBG("netmask %s", netmask);
+ if (!modem_hash || !context_hash)
+ return;
- parent->ipv4.netmask = g_strdup(netmask);
- } else if (g_str_equal(key, "DomainNameServers") == TRUE) {
+ g_hash_table_destroy(modem_hash);
+ modem_hash = NULL;
- get_dns(&value, parent);
- } else if (g_str_equal(key, "Gateway") == TRUE) {
- const char *gateway;
+ g_hash_table_destroy(context_hash);
+ context_hash = NULL;
+}
- dbus_message_iter_get_basic(&value, &gateway);
+static int network_probe(struct connman_network *network)
+{
+ struct modem_data *modem = connman_network_get_data(network);
- DBG("gateway %s", gateway);
+ DBG("%s network %p", modem->path, network);
- parent->ipv4.gateway = g_strdup(gateway);
- }
+ return 0;
+}
- dbus_message_iter_next(&dict);
- }
+static void network_remove(struct connman_network *network)
+{
+ struct modem_data *modem = connman_network_get_data(network);
- /* deactive, oFono send NULL inteface before deactive signal */
- if (interface == NULL)
- connman_network_set_index(pending_network, -1);
+ DBG("%s network %p", modem->path, network);
}
-static void cleanup_ipconfig(struct connman_element *parent)
+static int network_connect(struct connman_network *network)
{
- g_free(parent->ipv4.address);
- parent->ipv4.address = NULL;
+ struct network_context *context;
+ struct modem_data *modem = connman_network_get_data(network);
+
+ DBG("%s network %p", modem->path, network);
- g_free(parent->ipv4.netmask);
- parent->ipv4.netmask = NULL;
+ if (!g_hash_table_lookup(modem_hash, modem->path))
+ return -ENODEV;
- g_free(parent->ipv4.nameserver);
- parent->ipv4.nameserver = NULL;
+ context = get_context_with_network(modem->context_list, network);
+ if (!context)
+ return -ENODEV;
- g_free(parent->ipv4.gateway);
- parent->ipv4.gateway = NULL;
+ if (has_interface(modem->interfaces, OFONO_API_CM))
+ return context_set_active(modem, context, TRUE);
+ else if (has_interface(modem->interfaces, OFONO_API_CDMA_CM))
+ return cdma_cm_set_powered(modem, TRUE);
- parent->ipv4.method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+ connman_error("Connection manager interface not available");
+
+ return -ENOSYS;
}
-static int static_network_set_connected(
- struct connman_network *pending_network,
- struct connman_element *parent,
- connman_bool_t connected)
+static int network_disconnect(struct connman_network *network)
{
- if (connected == TRUE) {
- struct connman_element *element;
+ struct network_context *context;
+ struct modem_data *modem = connman_network_get_data(network);
- if (parent->ipv4.address == NULL)
- goto failed;
+ DBG("%s network %p", modem->path, network);
- if (parent->ipv4.netmask == NULL)
- goto failed;
+ if (!g_hash_table_lookup(modem_hash, modem->path))
+ return -ENODEV;
- element = connman_element_create(NULL);
- if (element == NULL) {
- connman_error("Can not create connman_element");
- return -ENOMEM;
- }
+ context = get_context_with_network(modem->context_list, network);
+ if (!context)
+ return -ENODEV;
- element->type = CONNMAN_ELEMENT_TYPE_IPV4;
- element->index = parent->index;
+ if (has_interface(modem->interfaces, OFONO_API_CM))
+ return context_set_active(modem, context, FALSE);
+ else if (has_interface(modem->interfaces, OFONO_API_CDMA_CM))
+ return cdma_cm_set_powered(modem, FALSE);
- if (connman_element_register(element, parent) < 0) {
- connman_element_unref(element);
- goto failed;
- }
- } else
- cleanup_ipconfig(parent);
+ connman_error("Connection manager interface not available");
- connman_network_set_connected(pending_network, connected);
+ return -ENOSYS;
+}
- return 0;
+static struct connman_network_driver network_driver = {
+ .name = "cellular",
+ .type = CONNMAN_NETWORK_TYPE_CELLULAR,
+ .probe = network_probe,
+ .remove = network_remove,
+ .connect = network_connect,
+ .disconnect = network_disconnect,
+};
-failed:
- connman_network_set_error(pending_network,
- CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
+static int modem_probe(struct connman_device *device)
+{
+ struct modem_data *modem = connman_device_get_data(device);
- cleanup_ipconfig(parent);
+ DBG("%s device %p", modem->path, device);
- return -EINVAL;
+ return 0;
}
-static gboolean pri_context_changed(DBusConnection *connection,
- DBusMessage *message, void *user_data)
+static void modem_remove(struct connman_device *device)
{
- const char *path = dbus_message_get_path(message);
- struct connman_element *parent;
- const char *pending_path;
- DBusMessageIter iter, value;
- const char *key;
-
- DBG("pending_network %p, path %s", pending_network, path);
+ struct modem_data *modem = connman_device_get_data(device);
- if (pending_network == NULL)
- return TRUE;
+ DBG("%s device %p", modem->path, device);
+}
- pending_path = connman_network_get_string(pending_network, "Path");
- if (g_strcmp0(pending_path, path) != 0)
- return TRUE;
+static int modem_enable(struct connman_device *device)
+{
+ struct modem_data *modem = connman_device_get_data(device);
- parent = connman_network_get_element(pending_network);
+ DBG("%s device %p", modem->path, device);
- if (dbus_message_iter_init(message, &iter) == FALSE)
- return TRUE;
+ if (modem->online)
+ return 0;
- dbus_message_iter_get_basic(&iter, &key);
+ return modem_set_online(modem, TRUE);
+}
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
+static int modem_disable(struct connman_device *device)
+{
+ struct modem_data *modem = connman_device_get_data(device);
- if (g_str_equal(key, "Settings") == TRUE) {
+ DBG("%s device %p", modem->path, device);
- update_settings(&value, parent);
- } else if (g_str_equal(key, "Active") == TRUE) {
- dbus_bool_t active;
+ if (!modem->online)
+ return 0;
- dbus_message_iter_get_basic(&value, &active);
+ return modem_set_online(modem, FALSE);
+}
- switch (parent->ipv4.method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
- case CONNMAN_IPCONFIG_METHOD_MANUAL:
- break;
- case CONNMAN_IPCONFIG_METHOD_FIXED:
- 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_method(pending_network,
- CONNMAN_IPCONFIG_METHOD_DHCP);
- connman_network_set_connected(pending_network, active);
- break;
- }
+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,
+};
- pending_network = NULL;
- }
+static int tech_probe(struct connman_technology *technology)
+{
+ return 0;
+}
- return TRUE;
+static void tech_remove(struct connman_technology *technology)
+{
}
+static struct connman_technology_driver tech_driver = {
+ .name = "cellular",
+ .type = CONNMAN_SERVICE_TYPE_CELLULAR,
+ .probe = tech_probe,
+ .remove = tech_remove,
+};
+
static guint watch;
-static guint gprs_watch;
+static guint modem_added_watch;
+static guint modem_removed_watch;
static guint modem_watch;
-static guint manager_watch;
+static guint cm_watch;
+static guint sim_watch;
+static guint context_added_watch;
+static guint context_removed_watch;
+static guint netreg_watch;
static guint context_watch;
+static guint cdma_cm_watch;
+static guint cdma_netreg_watch;
static int ofono_init(void)
{
int err;
+ DBG("");
+
connection = connman_dbus_get_connection();
- if (connection == NULL)
+ if (!connection)
return -EIO;
- watch = g_dbus_add_service_watch(connection, OFONO_SERVICE,
- ofono_connect, ofono_disconnect, NULL, NULL);
+ watch = g_dbus_add_service_watch(connection,
+ OFONO_SERVICE, ofono_connect,
+ ofono_disconnect, NULL, NULL);
- gprs_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
- OFONO_GPRS_INTERFACE,
- PROPERTY_CHANGED,
- gprs_changed,
+ modem_added_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE,
+ NULL, OFONO_MANAGER_INTERFACE,
+ MODEM_ADDED,
+ modem_added,
+ NULL, NULL);
+
+ modem_removed_watch = g_dbus_add_signal_watch(connection,
+ OFONO_SERVICE, NULL,
+ OFONO_MANAGER_INTERFACE,
+ MODEM_REMOVED,
+ modem_removed,
NULL, NULL);
- modem_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ modem_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE, NULL,
OFONO_MODEM_INTERFACE,
PROPERTY_CHANGED,
modem_changed,
NULL, NULL);
- manager_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
- OFONO_MANAGER_INTERFACE,
+ cm_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE, NULL,
+ OFONO_CM_INTERFACE,
+ PROPERTY_CHANGED,
+ cm_changed,
+ NULL, NULL);
+
+ sim_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE, NULL,
+ OFONO_SIM_INTERFACE,
+ PROPERTY_CHANGED,
+ sim_changed,
+ NULL, NULL);
+
+ context_added_watch = g_dbus_add_signal_watch(connection,
+ OFONO_SERVICE, NULL,
+ OFONO_CM_INTERFACE,
+ CONTEXT_ADDED,
+ cm_context_added,
+ NULL, NULL);
+
+ context_removed_watch = g_dbus_add_signal_watch(connection,
+ OFONO_SERVICE, NULL,
+ OFONO_CM_INTERFACE,
+ CONTEXT_REMOVED,
+ cm_context_removed,
+ NULL, NULL);
+
+ context_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE,
+ NULL, OFONO_CONTEXT_INTERFACE,
+ PROPERTY_CHANGED,
+ context_changed,
+ NULL, NULL);
+
+ netreg_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE, NULL,
+ OFONO_NETREG_INTERFACE,
+ PROPERTY_CHANGED,
+ netreg_changed,
+ NULL, NULL);
+
+ cdma_cm_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE,
+ NULL, OFONO_CDMA_CM_INTERFACE,
PROPERTY_CHANGED,
- manager_changed,
+ cdma_cm_changed,
NULL, NULL);
- context_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
- OFONO_PRI_CONTEXT_INTERFACE,
+ cdma_netreg_watch = g_dbus_add_signal_watch(connection, OFONO_SERVICE,
+ NULL, OFONO_CDMA_NETREG_INTERFACE,
PROPERTY_CHANGED,
- pri_context_changed,
+ cdma_netreg_changed,
NULL, NULL);
- if (watch == 0 || gprs_watch == 0 || modem_watch == 0 ||
- manager_watch == 0 || context_watch == 0) {
+
+ if (watch == 0 || modem_added_watch == 0 || modem_removed_watch == 0 ||
+ modem_watch == 0 || cm_watch == 0 || sim_watch == 0 ||
+ context_added_watch == 0 ||
+ context_removed_watch == 0 ||
+ context_watch == 0 || netreg_watch == 0 ||
+ cdma_cm_watch == 0 || cdma_netreg_watch == 0) {
err = -EIO;
goto remove;
}
goto remove;
}
+ err = connman_technology_driver_register(&tech_driver);
+ if (err < 0) {
+ connman_device_driver_unregister(&modem_driver);
+ connman_network_driver_unregister(&network_driver);
+ goto remove;
+ }
+
return 0;
remove:
- g_dbus_remove_watch(connection, watch);
- g_dbus_remove_watch(connection, gprs_watch);
- g_dbus_remove_watch(connection, modem_watch);
- g_dbus_remove_watch(connection, manager_watch);
+ g_dbus_remove_watch(connection, cdma_netreg_watch);
+ g_dbus_remove_watch(connection, cdma_cm_watch);
+ g_dbus_remove_watch(connection, netreg_watch);
g_dbus_remove_watch(connection, context_watch);
-
+ g_dbus_remove_watch(connection, context_removed_watch);
+ g_dbus_remove_watch(connection, context_added_watch);
+ g_dbus_remove_watch(connection, sim_watch);
+ g_dbus_remove_watch(connection, cm_watch);
+ g_dbus_remove_watch(connection, modem_watch);
+ g_dbus_remove_watch(connection, modem_removed_watch);
+ g_dbus_remove_watch(connection, modem_added_watch);
+ g_dbus_remove_watch(connection, watch);
dbus_connection_unref(connection);
return err;
static void ofono_exit(void)
{
- g_dbus_remove_watch(connection, watch);
- g_dbus_remove_watch(connection, gprs_watch);
- g_dbus_remove_watch(connection, modem_watch);
- g_dbus_remove_watch(connection, manager_watch);
- g_dbus_remove_watch(connection, context_watch);
+ DBG("");
+
+ if (modem_hash) {
+ /*
+ * We should probably wait for the SetProperty() reply
+ * message, because ...
+ */
+ g_hash_table_foreach(modem_hash, modem_power_down, NULL);
+
+ /*
+ * ... here we will cancel the call.
+ */
+ g_hash_table_destroy(modem_hash);
+ modem_hash = NULL;
+ }
- ofono_disconnect(connection, NULL);
+ if (context_hash) {
+ g_hash_table_destroy(context_hash);
+ context_hash = NULL;
+ }
+ connman_technology_driver_unregister(&tech_driver);
connman_device_driver_unregister(&modem_driver);
connman_network_driver_unregister(&network_driver);
+ g_dbus_remove_watch(connection, cdma_netreg_watch);
+ g_dbus_remove_watch(connection, cdma_cm_watch);
+ g_dbus_remove_watch(connection, netreg_watch);
+ g_dbus_remove_watch(connection, context_watch);
+ g_dbus_remove_watch(connection, context_removed_watch);
+ g_dbus_remove_watch(connection, context_added_watch);
+ g_dbus_remove_watch(connection, sim_watch);
+ g_dbus_remove_watch(connection, cm_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, watch);
+
dbus_connection_unref(connection);
}
projects / platform / upstream / connman.git / blobdiff