X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fofono.c;h=ae419be4e15bcab1c93af6b9968a5b9dae0db49a;hb=af22afbaf54aaadb85d6df5d60c5b43f37ea5fc0;hp=c24165e6a9bd4d36e16cb3385cbfc62abd219ac5;hpb=aefaadcf4fc8c9a5da8b4b6f843d4cf93ab4190c;p=framework%2Fconnectivity%2Fconnman.git diff --git a/plugins/ofono.c b/plugins/ofono.c index c24165e..ae419be 100644 --- a/plugins/ofono.c +++ b/plugins/ofono.c @@ -2,8 +2,9 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2011 BWM Car IT GmbH. All rights reserved. * * 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 @@ -29,16 +30,16 @@ #include #include +#include #define CONNMAN_API_SUBJECT_TO_CHANGE #include #include #include -#include -#include #include -#include +#include #include +#include #include "mcc.h" @@ -46,592 +47,699 @@ #define OFONO_MANAGER_INTERFACE OFONO_SERVICE ".Manager" #define OFONO_MODEM_INTERFACE OFONO_SERVICE ".Modem" -#define OFONO_GPRS_INTERFACE OFONO_SERVICE ".ConnectionManager" -#define OFONO_CONTEXT_INTERFACE OFONO_SERVICE ".ConnectionContext" #define OFONO_SIM_INTERFACE OFONO_SERVICE ".SimManager" -#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 GET_PROPERTIES "GetProperties" -#define SET_PROPERTY "SetProperty" #define CONTEXT_ADDED "ContextAdded" #define CONTEXT_REMOVED "ContextRemoved" -#define ADD_CONTEXT "AddContext" -#define GET_MODEMS "GetModems" -#define MODEM_ADDED "ModemAdded" -#define MODEM_REMOVED "ModemRemoved" +#define GET_PROPERTIES "GetProperties" +#define SET_PROPERTY "SetProperty" +#define GET_MODEMS "GetModems" +#define GET_CONTEXTS "GetContexts" #define TIMEOUT 40000 +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, +}; + +/* + * 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; -static GHashTable *network_hash; +struct network_context { + char *path; + int index; + + 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; +}; struct modem_data { char *path; - struct connman_device *device; - gboolean has_sim; - gboolean has_reg; - gboolean has_gprs; - gboolean available; - gboolean pending_online; - dbus_bool_t requested_online; - dbus_bool_t online; - - /* org.ofono.ConnectionManager properties */ - dbus_bool_t powered; - dbus_bool_t attached; - dbus_bool_t roaming_allowed; - - connman_bool_t registered; - connman_bool_t roaming; - uint8_t strength, has_strength; - char *operator; -}; -struct network_info { + struct connman_device *device; struct connman_network *network; - enum connman_ipconfig_method ipv4_method; - struct connman_ipaddress ipv4_address; + struct network_context *context; - enum connman_ipconfig_method ipv6_method; - struct connman_ipaddress ipv6_address; + /* Modem Interface */ + char *serial; + connman_bool_t powered; + connman_bool_t online; + uint8_t interfaces; + connman_bool_t ignore; + + connman_bool_t set_powered; + + /* CDMA ConnectionManager Interface */ + connman_bool_t cdma_cm_powered; + + /* ConnectionManager Interface */ + connman_bool_t attached; + connman_bool_t cm_powered; + + /* ConnectionContext Interface */ + connman_bool_t active; + connman_bool_t set_active; + connman_bool_t valid_apn; /* APN is 'valid' if length > 0 */ + + /* SimManager Interface */ + char *imsi; + + /* Netreg Interface */ + char *name; + uint8_t strength; + uint8_t data_strength; /* 1xEVDO signal strength */ + connman_bool_t 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) +{ + 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 "unknown"; +} + +static char *get_ident(const char *path) { - DBG("device %p", device); + char *pos; - return 0; + if (*path != '/') + return NULL; + + pos = strrchr(path, '/'); + if (pos == NULL) + return NULL; + + return pos + 1; } -static void modem_remove(struct connman_device *device) +static struct network_context *network_context_alloc(const char *path) { - DBG("device %p", device); + struct network_context *context; + + context = g_try_new0(struct network_context, 1); + if (context == NULL) + return NULL; + + context->path = g_strdup(path); + context->index = -1; + + context->ipv4_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; + context->ipv4_address = NULL; + context->ipv4_nameservers = NULL; + + context->ipv6_method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; + context->ipv6_address = NULL; + context->ipv6_nameservers = NULL; + + return context; } -static int call_ofono(const char *path, - const char *interface, const char *method, - DBusPendingCallNotifyFunction notify, void *user_data, - DBusFreeFunction free_function, - int type, ...) +static void network_context_free(struct network_context *context) { - DBusMessage *message; - DBusPendingCall *call; - dbus_bool_t ok; - va_list va; + g_free(context->path); - DBG("path %s %s.%s", path, interface, method); + connman_ipaddress_free(context->ipv4_address); + g_free(context->ipv4_nameservers); - if (path == NULL) - return -EINVAL; + connman_ipaddress_free(context->ipv6_address); + g_free(context->ipv6_nameservers); - message = dbus_message_new_method_call(OFONO_SERVICE, path, - interface, method); - if (message == NULL) - return -ENOMEM; + free(context); +} - dbus_message_set_auto_start(message, FALSE); +static void set_connected(struct modem_data *modem) +{ + connman_bool_t setip = FALSE; - va_start(va, type); - ok = dbus_message_append_args_valist(message, type, va); - va_end(va); + DBG("%s", modem->path); - if (!ok) - return -ENOMEM; + connman_network_set_index(modem->network, modem->context->index); - if (dbus_connection_send_with_reply(connection, message, - &call, TIMEOUT) == FALSE) { - connman_error("Failed to call %s.%s", interface, method); - dbus_message_unref(message); - return -EINVAL; + switch (modem->context->ipv4_method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + case CONNMAN_IPCONFIG_METHOD_AUTO: + break; + + case CONNMAN_IPCONFIG_METHOD_FIXED: + connman_network_set_ipv4_method(modem->network, + modem->context->ipv4_method); + connman_network_set_ipaddress(modem->network, + modem->context->ipv4_address); + connman_network_set_nameservers(modem->network, + modem->context->ipv4_nameservers); + setip = TRUE; + break; + + case CONNMAN_IPCONFIG_METHOD_DHCP: + connman_network_set_ipv4_method(modem->network, + modem->context->ipv4_method); + setip = TRUE; + break; } - if (call == NULL) { - connman_error("D-Bus connection not available"); - dbus_message_unref(message); - return -EINVAL; + switch (modem->context->ipv6_method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + case CONNMAN_IPCONFIG_METHOD_DHCP: + case CONNMAN_IPCONFIG_METHOD_AUTO: + break; + + case CONNMAN_IPCONFIG_METHOD_FIXED: + connman_network_set_ipv6_method(modem->network, + modem->context->ipv6_method); + connman_network_set_ipaddress(modem->network, + modem->context->ipv6_address); + setip = TRUE; + break; } - dbus_pending_call_set_notify(call, notify, user_data, free_function); + if (setip == TRUE) + connman_network_set_connected(modem->network, TRUE); +} - dbus_message_unref(message); +static void set_disconnected(struct modem_data *modem) +{ + DBG("%s", modem->path); - return -EINPROGRESS; + if (modem->network == NULL) + return; + + connman_network_set_connected(modem->network, FALSE); } +typedef void (*set_property_cb)(struct modem_data *data, + connman_bool_t success); +typedef void (*get_properties_cb)(struct modem_data *data, + DBusMessageIter *dict); + +struct property_info { + struct modem_data *modem; + const char *path; + const char *interface; + const char *property; + set_property_cb set_property_cb; + get_properties_cb get_properties_cb; +}; + static void set_property_reply(DBusPendingCall *call, void *user_data) { + struct property_info *info = user_data; DBusMessage *reply; DBusError error; - char const *name = user_data; + connman_bool_t success = TRUE; - DBG(""); + DBG("%s path %s %s.%s", info->modem->path, + info->path, info->interface, info->property); + + info->modem->call_set_property = NULL; dbus_error_init(&error); reply = dbus_pending_call_steal_reply(call); if (dbus_set_error_from_message(&error, reply)) { - connman_error("SetProperty(%s) %s %s", name, + 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; } + if (info->set_property_cb != NULL) + (*info->set_property_cb)(info->modem, success); + dbus_message_unref(reply); dbus_pending_call_unref(call); } -static int set_property(const char *path, const char *interface, +static int set_property(struct modem_data *modem, + const char *path, const char *interface, const char *property, int type, void *value, - DBusPendingCallNotifyFunction notify, void *user_data, - DBusFreeFunction free_function) + set_property_cb notify) { DBusMessage *message; DBusMessageIter iter; - DBusPendingCall *call; + struct property_info *info; - DBG("path %s %s.%s", path, interface, property); + DBG("%s path %s %s.%s", modem->path, path, interface, property); - g_assert(notify == NULL ? free_function == NULL : 1); + if (modem->call_set_property != NULL) { + DBG("Cancel pending SetProperty"); - if (path == NULL) - return -EINVAL; + dbus_pending_call_cancel(modem->call_set_property); + modem->call_set_property = NULL; + } message = dbus_message_new_method_call(OFONO_SERVICE, path, 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, property, type, value); if (dbus_connection_send_with_reply(connection, message, - &call, TIMEOUT) == FALSE) { - connman_error("Failed to change \"%s\" property on %s", - property, interface); + &modem->call_set_property, TIMEOUT) == FALSE) { + 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 == NULL) { connman_error("D-Bus connection not available"); dbus_message_unref(message); return -EINVAL; } - if (notify == NULL) { - notify = set_property_reply; - user_data = (void *)property; - free_function = NULL; + info = g_try_new0(struct property_info, 1); + if (info == NULL) { + dbus_message_unref(message); + return -ENOMEM; } - dbus_pending_call_set_notify(call, notify, user_data, free_function); + info->modem = modem; + info->path = path; + info->interface = interface; + info->property = property; + info->set_property_cb = notify; + + dbus_pending_call_set_notify(modem->call_set_property, + set_property_reply, info, g_free); dbus_message_unref(message); return -EINPROGRESS; } -static void update_modem_online(struct modem_data *modem, - connman_bool_t online) +static void get_properties_reply(DBusPendingCall *call, void *user_data) { - DBG("modem %p path %s online %d", modem, modem->path, online); - - modem->online = online; - modem->requested_online = online; - modem->pending_online = FALSE; - - if (modem->device) - connman_device_set_powered(modem->device, online); -} - -static void set_online_reply(DBusPendingCall *call, void *user_data) -{ - struct modem_data *modem; + struct property_info *info = user_data; + DBusMessageIter array, dict; DBusMessage *reply; DBusError error; - gboolean result; - DBG("path %s", (char *)user_data); + DBG("%s path %s %s", info->modem->path, info->path, info->interface); - if (modem_hash == NULL) - return; + info->modem->call_get_properties = NULL; - modem = g_hash_table_lookup(modem_hash, user_data); - if (modem == NULL) - return; + dbus_error_init(&error); reply = dbus_pending_call_steal_reply(call); - dbus_error_init(&error); - if (dbus_set_error_from_message(&error, reply)) { - connman_error("SetProperty(Online) %s %s", + connman_error("Failed to get properties: %s %s: %s %s", + info->path, info->interface, error.name, error.message); dbus_error_free(&error); - result = modem->online; - } else - result = modem->requested_online; + goto done; + } + + if (dbus_message_iter_init(reply, &array) == FALSE) + goto done; + + if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY) + goto done; + + dbus_message_iter_recurse(&array, &dict); + + if (info->get_properties_cb != NULL) + (*info->get_properties_cb)(info->modem, &dict); - if (modem->pending_online) - update_modem_online(modem, result); +done: dbus_message_unref(reply); dbus_pending_call_unref(call); } -static int modem_change_online(char const *path, dbus_bool_t online) +static int get_properties(const char *path, const char *interface, + get_properties_cb notify, + struct modem_data *modem) { - struct modem_data *modem = g_hash_table_lookup(modem_hash, path); + DBusMessage *message; + struct property_info *info; - if (modem == NULL) - return -ENODEV; + DBG("%s path %s %s", modem->path, path, interface); - if (modem->online == online) - return -EALREADY; + if (modem->call_get_properties != NULL) { + connman_error("Pending GetProperties"); + return -EBUSY; + } + + message = dbus_message_new_method_call(OFONO_SERVICE, path, + interface, GET_PROPERTIES); + if (message == NULL) + return -ENOMEM; + + if (dbus_connection_send_with_reply(connection, message, + &modem->call_get_properties, TIMEOUT) == FALSE) { + connman_error("Failed to call %s.GetProperties()", interface); + dbus_message_unref(message); + return -EINVAL; + } + + if (modem->call_get_properties == NULL) { + connman_error("D-Bus connection not available"); + dbus_message_unref(message); + return -EINVAL; + } + + info = g_try_new0(struct property_info, 1); + if (info == NULL) { + dbus_message_unref(message); + return -ENOMEM; + } + + info->modem = modem; + info->path = path; + info->interface = interface; + info->get_properties_cb = notify; - modem->requested_online = online; + dbus_pending_call_set_notify(modem->call_get_properties, + get_properties_reply, info, g_free); + + dbus_message_unref(message); - return set_property(path, OFONO_MODEM_INTERFACE, "Online", - DBUS_TYPE_BOOLEAN, &online, - set_online_reply, - (void *)g_strdup(path), g_free); + return -EINPROGRESS; } -static int modem_enable(struct connman_device *device) +static void context_set_active_reply(struct modem_data *modem, + connman_bool_t success) { - const char *path = connman_device_get_string(device, "Path"); + DBG("%s", modem->path); + + if (success == TRUE) { + /* + * Don't handle do anything on success here. oFono will send + * the change via PropertyChanged singal. + */ + return; + } - DBG("device %p, path, %s", device, 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 (modem->network == NULL) { + /* + * 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 modem_change_online(path, TRUE); + connman_network_set_error(modem->network, + CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL); } -static int modem_disable(struct connman_device *device) +static int context_set_active(struct modem_data *modem, + connman_bool_t active) { - const char *path = connman_device_get_string(device, "Path"); + int err; - DBG("device %p path %s", device, path); + DBG("%s active %d", modem->path, active); - return modem_change_online(path, FALSE); -} + err = set_property(modem, modem->context->path, + OFONO_CONTEXT_INTERFACE, + "Active", DBUS_TYPE_BOOLEAN, + &active, + context_set_active_reply); -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, -}; + if (active == FALSE && err == -EINPROGRESS) + return 0; + + return err; +} -static void modem_remove_device(struct modem_data *modem) +static void cdma_cm_set_powered_reply(struct modem_data *modem, + connman_bool_t success) { - DBG("modem %p path %s device %p", modem, modem->path, modem->device); + DBG("%s", modem->path); - if (modem->device == NULL) + if (success == TRUE) { + /* + * Don't handle do anything on success here. oFono will send + * the change via PropertyChanged singal. + */ return; + } - connman_device_remove_all_networks(modem->device); - connman_device_unregister(modem->device); - connman_device_unref(modem->device); + /* + * 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 (modem->network == NULL) { + /* + * In the case where we power down the device + * we don't wait for the reply, therefore the network + * might already be gone. + */ + return; + } - modem->device = NULL; + connman_network_set_error(modem->network, + CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL); } -static void remove_modem(gpointer data) +static int cdma_cm_set_powered(struct modem_data *modem, connman_bool_t powered) { - struct modem_data *modem = data; + int err; - modem_remove_device(modem); + DBG("%s powered %d", modem->path, powered); - g_free(modem->path); - g_free(modem->operator); + err = set_property(modem, modem->path, OFONO_CDMA_CM_INTERFACE, + "Powered", DBUS_TYPE_BOOLEAN, + &powered, + cdma_cm_set_powered_reply); - g_free(modem); + if (powered == FALSE && err == -EINPROGRESS) + return 0; + + return err; } -static void remove_network(gpointer data) +static int modem_set_online(struct modem_data *modem, connman_bool_t online) { - struct network_info *info = data; - - connman_network_unregister(info->network); - connman_network_unref(info->network); + DBG("%s online %d", modem->path, online); - g_free(info); + return set_property(modem, modem->path, + OFONO_MODEM_INTERFACE, + "Online", DBUS_TYPE_BOOLEAN, + &online, + NULL); } -static char *get_ident(const char *path) +static int cm_set_powered(struct modem_data *modem, connman_bool_t powered) { - char *pos; + int err; - if (*path != '/') - return NULL; + DBG("%s powered %d", modem->path, powered); - pos = strrchr(path, '/'); - if (pos == NULL) - return NULL; + err = set_property(modem, modem->path, + OFONO_CM_INTERFACE, + "Powered", DBUS_TYPE_BOOLEAN, + &powered, + NULL); - return pos + 1; + if (powered == FALSE && err == -EINPROGRESS) + return 0; + + return err; } -static void create_service(struct connman_network *network) +static int modem_set_powered(struct modem_data *modem, connman_bool_t powered) { - const char *path; - char *group; + int err; - DBG(""); + DBG("%s powered %d", modem->path, powered); - path = connman_network_get_string(network, "Path"); + modem->set_powered = powered; - group = get_ident(path); + err = set_property(modem, modem->path, + OFONO_MODEM_INTERFACE, + "Powered", DBUS_TYPE_BOOLEAN, + &powered, + NULL); - connman_network_set_group(network, group); -} + if (powered == FALSE && err == -EINPROGRESS) + return 0; -static int network_probe(struct connman_network *network) -{ - return 0; + return err; } -static gboolean pending_network_is_available(struct connman_network *network) +static connman_bool_t has_interface(uint8_t interfaces, + enum ofono_api api) { - /* Modem or network may be removed */ - if (network == NULL || connman_network_get_device(network) == NULL) { - DBG("Modem or network was removed"); - return FALSE; - } + if ((interfaces & api) == api) + return TRUE; - return TRUE; + return FALSE; } -static void set_connected(struct network_info *info, - connman_bool_t connected) +static uint8_t extract_interfaces(DBusMessageIter *array) { - DBG("network %p connected %d", info->network, connected); + DBusMessageIter entry; + uint8_t interfaces = 0; - switch (info->ipv4_method) { - case CONNMAN_IPCONFIG_METHOD_UNKNOWN: - case CONNMAN_IPCONFIG_METHOD_OFF: - case CONNMAN_IPCONFIG_METHOD_MANUAL: - case CONNMAN_IPCONFIG_METHOD_AUTO: - return; - - case CONNMAN_IPCONFIG_METHOD_FIXED: - connman_network_set_ipv4_method(info->network, - info->ipv4_method); - connman_network_set_ipaddress(info->network, - &info->ipv4_address); - - break; - - case CONNMAN_IPCONFIG_METHOD_DHCP: - connman_network_set_ipv4_method(info->network, - info->ipv4_method); + dbus_message_iter_recurse(array, &entry); - break; - } + while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) { + const char *name; - switch (info->ipv6_method) { - case CONNMAN_IPCONFIG_METHOD_UNKNOWN: - case CONNMAN_IPCONFIG_METHOD_OFF: - case CONNMAN_IPCONFIG_METHOD_MANUAL: - case CONNMAN_IPCONFIG_METHOD_DHCP: - case CONNMAN_IPCONFIG_METHOD_AUTO: - return; + dbus_message_iter_get_basic(&entry, &name); - case CONNMAN_IPCONFIG_METHOD_FIXED: - connman_network_set_ipv6_method(info->network, - info->ipv6_method); - connman_network_set_ipaddress(info->network, - &info->ipv6_address); + if (g_str_equal(name, OFONO_SIM_INTERFACE) == TRUE) + interfaces |= OFONO_API_SIM; + else if (g_str_equal(name, OFONO_NETREG_INTERFACE) == TRUE) + interfaces |= OFONO_API_NETREG; + else if (g_str_equal(name, OFONO_CM_INTERFACE) == TRUE) + interfaces |= OFONO_API_CM; + else if (g_str_equal(name, OFONO_CDMA_CM_INTERFACE) == TRUE) + interfaces |= OFONO_API_CDMA_CM; + else if (g_str_equal(name, OFONO_CDMA_NETREG_INTERFACE) == TRUE) + interfaces |= OFONO_API_CDMA_NETREG; - break; + dbus_message_iter_next(&entry); } - connman_network_set_connected(info->network, connected); -} - -static void set_active_reply(DBusPendingCall *call, void *user_data) -{ - char const *path = user_data; - DBusMessage *reply; - DBusError error; - struct network_info *info; - - info = g_hash_table_lookup(network_hash, path); - - reply = dbus_pending_call_steal_reply(call); - - if (info == NULL) - goto done; - - DBG("path %s network %p", path, info->network); - - if (!pending_network_is_available(info->network)) - goto done; - - dbus_error_init(&error); - - if (dbus_set_error_from_message(&error, reply)) { - connman_error("SetProperty(Active) %s %s", - error.name, error.message); - - if (connman_network_get_index(info->network) < 0) - connman_network_set_error(info->network, - CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL); - - dbus_error_free(&error); - } else if (connman_network_get_index(info->network) >= 0) - set_connected(info, TRUE); - -done: - dbus_message_unref(reply); - - dbus_pending_call_unref(call); -} - -static int set_network_active(struct connman_network *network) -{ - dbus_bool_t value = TRUE; - const char *path = connman_network_get_string(network, "Path"); - - DBG("network %p, path %s", network, path); - - return set_property(path, OFONO_CONTEXT_INTERFACE, - "Active", DBUS_TYPE_BOOLEAN, &value, - set_active_reply, g_strdup(path), g_free); -} - -static int set_network_inactive(struct connman_network *network) -{ - int err; - dbus_bool_t value = FALSE; - const char *path = connman_network_get_string(network, "Path"); - - DBG("network %p, path %s", network, path); - - err = set_property(path, OFONO_CONTEXT_INTERFACE, - "Active", DBUS_TYPE_BOOLEAN, &value, - NULL, NULL, NULL); - - if (err == -EINPROGRESS) - err = 0; - - return err; -} - -static int network_connect(struct connman_network *network) -{ - struct connman_device *device; - struct modem_data *modem; - - DBG("network %p", network); - - device = connman_network_get_device(network); - if (device == NULL) - return -ENODEV; - - modem = connman_device_get_data(device); - if (modem == NULL) - return -ENODEV; - - if (modem->registered == FALSE) - return -ENOLINK; - - if (modem->powered == FALSE) - return -ENOLINK; - - if (modem->roaming_allowed == FALSE && modem->roaming == TRUE) - return -ENOLINK; - - return set_network_active(network); -} - -static int network_disconnect(struct connman_network *network) -{ - DBG("network %p", network); - - if (connman_network_get_index(network) < 0) - return -ENOTCONN; - - connman_network_set_associating(network, FALSE); - - return set_network_inactive(network); -} - -static void network_remove(struct connman_network *network) -{ - char const *path = connman_network_get_string(network, "Path"); - - DBG("network %p path %s", network, path); - - g_hash_table_remove(network_hash, path); + return interfaces; } -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, -}; - -static void get_dns(DBusMessageIter *array, struct network_info *info) +static char *extract_nameservers(DBusMessageIter *array) { DBusMessageIter entry; - gchar *nameservers = NULL, *nameservers_old = NULL; - - DBG(""); - + char *nameservers = NULL; + char *tmp; dbus_message_iter_recurse(array, &entry); while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) { - const char *dns; - - dbus_message_iter_get_basic(&entry, &dns); + const char *nameserver; - DBG("dns %s", dns); + dbus_message_iter_get_basic(&entry, &nameserver); if (nameservers == NULL) { - - nameservers = g_strdup(dns); + nameservers = g_strdup(nameserver); } else { - - nameservers_old = nameservers; - nameservers = g_strdup_printf("%s %s", - nameservers_old, dns); - g_free(nameservers_old); + tmp = nameservers; + nameservers = g_strdup_printf("%s %s", tmp, nameserver); + g_free(tmp); } dbus_message_iter_next(&entry); } - connman_network_set_nameservers(info->network, nameservers); - - g_free(nameservers); + return nameservers; } -static void update_ipv4_settings(DBusMessageIter *array, - struct network_info *info) +static void extract_ipv4_settings(DBusMessageIter *array, + struct network_context *context) { DBusMessageIter dict; char *address = NULL, *netmask = NULL, *gateway = NULL; + char *nameservers = NULL; const char *interface = NULL; - - DBG("network %p", info->network); + int index = -1; if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY) return; @@ -645,39 +753,26 @@ static void update_ipv4_settings(DBusMessageIter *array, dbus_message_iter_recurse(&dict, &entry); dbus_message_iter_get_basic(&entry, &key); - DBG("key %s", key); - dbus_message_iter_next(&entry); dbus_message_iter_recurse(&entry, &value); if (g_str_equal(key, "Interface") == TRUE) { - int index; - dbus_message_iter_get_basic(&value, &interface); - DBG("interface %s", interface); + DBG("Interface %s", interface); index = connman_inet_ifindex(interface); - if (index >= 0) { - connman_network_set_index(info->network, index); - } else { - connman_error("Can not find interface %s", - interface); - break; - } - } else if (g_str_equal(key, "Method") == TRUE) { - const char *method; - - dbus_message_iter_get_basic(&value, &method); - if (g_strcmp0(method, "static") == 0) { + DBG("index %d", index); + } else if (g_str_equal(key, "Method") == TRUE) { + dbus_message_iter_get_basic(&value, &val); - info->ipv4_method = - CONNMAN_IPCONFIG_METHOD_FIXED; - } else if (g_strcmp0(method, "dhcp") == 0) { + DBG("Method %s", val); - info->ipv4_method = - CONNMAN_IPCONFIG_METHOD_DHCP; + 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; break; } } else if (g_str_equal(key, "Address") == TRUE) { @@ -685,59 +780,68 @@ static void update_ipv4_settings(DBusMessageIter *array, address = g_strdup(val); - DBG("address %s", address); + DBG("Address %s", address); } else if (g_str_equal(key, "Netmask") == TRUE) { dbus_message_iter_get_basic(&value, &val); netmask = g_strdup(val); - DBG("netmask %s", netmask); + DBG("Netmask %s", netmask); } else if (g_str_equal(key, "DomainNameServers") == TRUE) { + nameservers = extract_nameservers(&value); - get_dns(&value, info); + DBG("Nameservers %s", nameservers); } else if (g_str_equal(key, "Gateway") == TRUE) { dbus_message_iter_get_basic(&value, &val); gateway = g_strdup(val); - DBG("gateway %s", gateway); + DBG("Gateway %s", gateway); } dbus_message_iter_next(&dict); } + if (index < 0) + goto out; - if (info->ipv4_method == CONNMAN_IPCONFIG_METHOD_FIXED) { - connman_ipaddress_set_ipv4(&info->ipv4_address, address, - netmask, gateway); - } + if (context->ipv4_method != CONNMAN_IPCONFIG_METHOD_FIXED) + goto out; + + context->ipv4_address = connman_ipaddress_alloc(CONNMAN_IPCONFIG_TYPE_IPV4); + if (context->ipv4_address == NULL) + goto out; + + context->index = index; + connman_ipaddress_set_ipv4(context->ipv4_address, address, + netmask, gateway); + + context->ipv4_nameservers = nameservers; - /* deactive, oFono send NULL inteface before deactive signal */ - if (interface == NULL) - connman_network_set_index(info->network, -1); +out: + if (context->ipv4_nameservers != nameservers) + g_free(nameservers); g_free(address); g_free(netmask); g_free(gateway); } -static void update_ipv6_settings(DBusMessageIter *array, - struct network_info *info) +static void extract_ipv6_settings(DBusMessageIter *array, + struct network_context *context) { DBusMessageIter dict; char *address = NULL, *gateway = NULL; - unsigned char prefix_length; + unsigned char prefix_length = 0; + char *nameservers = NULL; const char *interface = NULL; - - DBG("network %p", info->network); + int index = -1; if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY) return; dbus_message_iter_recurse(array, &dict); - info->ipv6_method = CONNMAN_IPCONFIG_METHOD_FIXED; - while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { DBusMessageIter entry, value; const char *key, *val; @@ -745,409 +849,419 @@ static void update_ipv6_settings(DBusMessageIter *array, dbus_message_iter_recurse(&dict, &entry); dbus_message_iter_get_basic(&entry, &key); - DBG("key %s", key); - dbus_message_iter_next(&entry); dbus_message_iter_recurse(&entry, &value); if (g_str_equal(key, "Interface") == TRUE) { - int index; - dbus_message_iter_get_basic(&value, &interface); - DBG("interface %s", interface); + DBG("Interface %s", interface); index = connman_inet_ifindex(interface); - if (index >= 0) { - connman_network_set_index(info->network, index); - } else { - connman_error("Can not find interface %s", - interface); - break; - } + + DBG("index %d", index); } else if (g_str_equal(key, "Address") == TRUE) { dbus_message_iter_get_basic(&value, &val); address = g_strdup(val); - DBG("address %s", address); + DBG("Address %s", address); } else if (g_str_equal(key, "PrefixLength") == TRUE) { dbus_message_iter_get_basic(&value, &prefix_length); DBG("prefix length %d", prefix_length); } else if (g_str_equal(key, "DomainNameServers") == TRUE) { + nameservers = extract_nameservers(&value); - get_dns(&value, info); + DBG("Nameservers %s", nameservers); } else if (g_str_equal(key, "Gateway") == TRUE) { dbus_message_iter_get_basic(&value, &val); gateway = g_strdup(val); - DBG("gateway %s", gateway); + DBG("Gateway %s", gateway); } dbus_message_iter_next(&dict); } - connman_ipaddress_set_ipv6(&info->ipv6_address, address, - prefix_length, gateway); + if (index < 0) + goto out; + + context->ipv6_method = CONNMAN_IPCONFIG_METHOD_FIXED; - /* deactive, oFono send NULL inteface before deactive signal */ - if (interface == NULL) - connman_network_set_index(info->network, -1); + context->ipv6_address = + connman_ipaddress_alloc(CONNMAN_IPCONFIG_TYPE_IPV6); + if (context->ipv6_address == NULL) + goto out; + + context->index = index; + connman_ipaddress_set_ipv6(context->ipv6_address, address, + prefix_length, gateway); + + context->ipv6_nameservers = nameservers; + +out: + if (context->ipv6_nameservers != nameservers) + g_free(nameservers); g_free(address); g_free(gateway); } -static int add_network(struct connman_device *device, - const char *path, DBusMessageIter *dict) +static connman_bool_t ready_to_create_device(struct modem_data *modem) { - struct modem_data *modem = connman_device_get_data(device); - struct connman_network *network; - struct network_info *info; - char *ident; - dbus_bool_t active = FALSE; - - DBG("modem %p device %p path %s", modem, device, path); - - ident = get_ident(path); - - network = connman_device_get_network(device, ident); - if (network != NULL) - return -EALREADY; + /* + * 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. + */ - info = g_hash_table_lookup(network_hash, path); - if (info != NULL) { - DBG("path %p already exists with device %p", path, - connman_network_get_device(info->network)); - if (connman_network_get_device(info->network)) - return -EALREADY; - g_hash_table_remove(network_hash, path); - } + if (modem->device != NULL) + return FALSE; - network = connman_network_create(ident, CONNMAN_NETWORK_TYPE_CELLULAR); - if (network == NULL) - return -ENOMEM; + if (modem->imsi != NULL || modem->serial != NULL) + return TRUE; - connman_network_register(network); + return FALSE; +} - info = g_try_new0(struct network_info, 1); - if (info == NULL) { - connman_network_unregister(network); - connman_network_unref(network); - return -ENOMEM; - } +static void create_device(struct modem_data *modem) +{ + struct connman_device *device; + char *ident = NULL; - connman_ipaddress_clear(&info->ipv4_address); - connman_ipaddress_clear(&info->ipv6_address); - info->network = network; + DBG("%s", modem->path); - connman_network_set_string(network, "Path", path); + if (modem->imsi != NULL) + ident = modem->imsi; + else if (modem->serial != NULL) + ident = modem->serial; - create_service(network); + if (connman_dbus_validate_ident(ident) == FALSE) + ident = connman_dbus_encode_string(ident); + else + ident = g_strdup(ident); - g_hash_table_insert(network_hash, (char *) path, info); + device = connman_device_create(ident, CONNMAN_DEVICE_TYPE_CELLULAR); + if (device == NULL) + goto out; - connman_network_set_available(network, TRUE); - connman_network_set_index(network, -1); + DBG("device %p", device); - if (modem->operator) - connman_network_set_name(network, modem->operator); + connman_device_set_ident(device, ident); - if (modem->has_strength) - connman_network_set_strength(network, modem->strength); + connman_device_set_string(device, "Path", modem->path); - connman_network_set_roaming(network, modem->roaming); + connman_device_set_data(device, modem); - while (dbus_message_iter_get_arg_type(dict) == DBUS_TYPE_DICT_ENTRY) { - DBusMessageIter entry, value; - const char *key; + if (connman_device_register(device) < 0) { + connman_error("Failed to register cellular device"); + connman_device_unref(device); + goto out; + } - dbus_message_iter_recurse(dict, &entry); - dbus_message_iter_get_basic(&entry, &key); + modem->device = device; - dbus_message_iter_next(&entry); - dbus_message_iter_recurse(&entry, &value); + connman_device_set_powered(modem->device, modem->online); +out: + g_free(ident); +} - if (g_str_equal(key, "Type")) { - const char *type; +static void destroy_device(struct modem_data *modem) +{ + DBG("%s", modem->path); - dbus_message_iter_get_basic(&value, &type); - if (g_strcmp0(type, "internet") != 0) { - DBG("path %p type %s", path, type); - return -EIO; - } - } else if (g_str_equal(key, "Settings")) - update_ipv4_settings(&value, info); - else if (g_str_equal(key, "IPv6.Settings")) - update_ipv6_settings(&value, info); - else if (g_str_equal(key, "Active") == TRUE) - dbus_message_iter_get_basic(&value, &active); + connman_device_set_powered(modem->device, FALSE); - dbus_message_iter_next(dict); + if (modem->network != NULL) { + connman_device_remove_network(modem->device, modem->network); + connman_network_unref(modem->network); + modem->network = NULL; } - if (connman_device_add_network(device, network) != 0) - return -EIO; - - /* Connect only if requested to do so */ - if (active && connman_network_get_connecting(network) == TRUE) - set_connected(info, active); + connman_device_unregister(modem->device); + connman_device_unref(modem->device); - return 0; + modem->device = NULL; } -static void check_networks_reply(DBusPendingCall *call, void *user_data) +static void add_network(struct modem_data *modem) { - char *path = user_data; - struct modem_data *modem; - DBusMessage *reply; - DBusMessageIter array, entry, value, properties; + const char *group; - DBG("path %s", path); + DBG("%s", modem->path); - modem = g_hash_table_lookup(modem_hash, path); - if (modem == NULL) + if (modem->network != NULL) return; - if (modem->device == NULL) + + modem->network = connman_network_create(modem->context->path, + CONNMAN_NETWORK_TYPE_CELLULAR); + if (modem->network == NULL) return; - reply = dbus_pending_call_steal_reply(call); + DBG("network %p", modem->network); - if (dbus_message_has_signature(reply, "a(oa{sv})") == FALSE) - goto done; + connman_network_set_data(modem->network, modem); - dbus_message_iter_init(reply, &array); + connman_network_set_string(modem->network, "Path", + modem->context->path); - dbus_message_iter_recurse(&array, &entry); + connman_network_set_index(modem->network, modem->context->index); - while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRUCT) { - char const *network_path; + if (modem->name != NULL) + connman_network_set_name(modem->network, modem->name); + else + connman_network_set_name(modem->network, ""); - dbus_message_iter_recurse(&entry, &value); - dbus_message_iter_get_basic(&value, &network_path); + connman_network_set_strength(modem->network, modem->strength); - dbus_message_iter_next(&value); - dbus_message_iter_recurse(&value, &properties); + group = get_ident(modem->context->path); + connman_network_set_group(modem->network, group); - add_network(modem->device, network_path, &properties); + connman_network_set_available(modem->network, TRUE); - dbus_message_iter_next(&entry); - } + connman_network_set_bool(modem->network, "Roaming", + modem->roaming); -done: - dbus_message_unref(reply); + if (connman_device_add_network(modem->device, modem->network) < 0) { + connman_network_unref(modem->network); + modem->network = NULL; + return; + } - dbus_pending_call_unref(call); + /* + * Create the ipconfig layer before trying to connect. Withouth + * the ipconfig layer the core is not ready to process errors. + */ + connman_network_set_index(modem->network, -1); } -static void check_networks(struct modem_data *modem) +static void remove_network(struct modem_data *modem) { - char const *path = modem->path; + DBG("%s", modem->path); - DBG("modem %p path %s", modem, path); + if (modem->network == NULL) + return; + + DBG("network %p", modem->network); - call_ofono(path, OFONO_GPRS_INTERFACE, "GetContexts", - check_networks_reply, g_strdup(path), g_free, - DBUS_TYPE_INVALID); + connman_device_remove_network(modem->device, modem->network); + connman_network_unref(modem->network); + modem->network = NULL; } -static void modem_clear_network_errors(struct modem_data *modem) +static int add_cm_context(struct modem_data *modem, const char *context_path, + DBusMessageIter *dict) { - struct connman_device *device = modem->device; - GHashTableIter i; - gpointer value; - - if (device == NULL) - return; - - g_hash_table_iter_init(&i, network_hash); + const char *context_type = NULL; + struct network_context *context = NULL; + connman_bool_t active = FALSE; - while (g_hash_table_iter_next(&i, NULL, &value)) { - struct network_info *info = value; + DBG("%s context path %s", modem->path, context_path); - if (connman_network_get_device(info->network) == device) - connman_network_clear_error(info->network); + if (modem->context != NULL) { + /* + * We have already assigned a context to this modem + * and we do only support one Internet context. + */ + return -EALREADY; } -} -static void modem_operator_name_changed(struct modem_data *modem, - char const *name) -{ - struct connman_device *device = modem->device; - GHashTableIter i; - gpointer value; + context = network_context_alloc(context_path); + if (context == NULL) + return -ENOMEM; - if (device == NULL) - return; + while (dbus_message_iter_get_arg_type(dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter entry, value; + const char *key; - if (modem->operator != NULL) - g_free(modem->operator); - modem->operator = g_strdup(name); + dbus_message_iter_recurse(dict, &entry); + dbus_message_iter_get_basic(&entry, &key); - for (g_hash_table_iter_init(&i, network_hash); - g_hash_table_iter_next(&i, NULL, &value);) { - struct network_info *info = value; + dbus_message_iter_next(&entry); + dbus_message_iter_recurse(&entry, &value); - if (connman_network_get_device(info->network) == device) { - connman_network_set_name(info->network, name); - connman_network_update(info->network); - } - } -} + if (g_str_equal(key, "Type") == TRUE) { + dbus_message_iter_get_basic(&value, &context_type); -static void modem_strength_changed(struct modem_data *modem, uint8_t strength) -{ - struct connman_device *device = modem->device; - GHashTableIter i; - gpointer value; + DBG("%s context %s type %s", modem->path, + context_path, context_type); + } else if (g_str_equal(key, "Settings") == TRUE) { + DBG("%s Settings", modem->path); - modem->strength = strength; - modem->has_strength = TRUE; + extract_ipv4_settings(&value, context); + } else if (g_str_equal(key, "IPv6.Settings") == TRUE) { + DBG("%s IPv6.Settings", modem->path); - if (device == NULL) - return; + extract_ipv6_settings(&value, context); + } else if (g_str_equal(key, "Active") == TRUE) { + dbus_message_iter_get_basic(&value, &active); - for (g_hash_table_iter_init(&i, network_hash); - g_hash_table_iter_next(&i, NULL, &value);) { - struct network_info *info = value; + DBG("%s Active %d", modem->path, active); + } else if (g_str_equal(key, "AccessPointName") == TRUE) { + const char *apn; - if (connman_network_get_device(info->network) == device) { - connman_network_set_strength(info->network, strength); - connman_network_update(info->network); + dbus_message_iter_get_basic(&value, &apn); + if (apn != NULL && strlen(apn) > 0) + modem->valid_apn = TRUE; + else + modem->valid_apn = FALSE; + + DBG("%s AccessPointName '%s'", modem->path, apn); } + dbus_message_iter_next(dict); } -} -static void modem_roaming_changed(struct modem_data *modem, - char const *status) -{ - struct connman_device *device = modem->device; - connman_bool_t roaming = FALSE; - connman_bool_t registered = FALSE; - connman_bool_t was_roaming = modem->roaming; - GHashTableIter i; - gpointer value; + if (g_strcmp0(context_type, "internet") != 0) { + network_context_free(context); + return -EINVAL; + } - if (g_str_equal(status, "roaming")) - roaming = TRUE; - else if (g_str_equal(status, "registered")) - registered = TRUE; + modem->context = context; + modem->active = active; - registered = registered || roaming; + g_hash_table_replace(context_hash, g_strdup(context_path), modem); - if (modem->roaming == roaming && modem->registered == registered) - return; + if (modem->valid_apn == TRUE && modem->attached == TRUE && + has_interface(modem->interfaces, + OFONO_API_NETREG) == TRUE) { + add_network(modem); + } - modem->registered = registered; - modem->roaming = roaming; + return 0; +} - if (roaming == was_roaming) +static void remove_cm_context(struct modem_data *modem, + const char *context_path) +{ + if (modem->context == NULL) return; - if (device == NULL) - return; + if (modem->network != NULL) + remove_network(modem); - g_hash_table_iter_init(&i, network_hash); + g_hash_table_remove(context_hash, context_path); - while (g_hash_table_iter_next(&i, NULL, &value)) { - struct network_info *info = value; + network_context_free(modem->context); + modem->context = NULL; - if (connman_network_get_device(info->network) == device) { - connman_network_set_roaming(info->network, roaming); - connman_network_update(info->network); - } - } -} + modem->valid_apn = FALSE; -static void modem_registration_removed(struct modem_data *modem) -{ - modem->registered = FALSE; - modem->roaming = FALSE; + if (modem->network != NULL) + remove_network(modem); } -static void modem_registration_changed(struct modem_data *modem, - DBusMessageIter *entry) +static gboolean context_changed(DBusConnection *connection, + DBusMessage *message, + void *user_data) { - DBusMessageIter iter; + const char *context_path = dbus_message_get_path(message); + struct modem_data *modem = NULL; + DBusMessageIter iter, value; const char *key; - int type; - connman_uint8_t strength; - char const *name, *status, *mcc_s; - dbus_message_iter_get_basic(entry, &key); + DBG("context_path %s", context_path); - DBG("key %s", key); + modem = g_hash_table_lookup(context_hash, context_path); + if (modem == NULL) + return TRUE; - dbus_message_iter_next(entry); + if (dbus_message_iter_init(message, &iter) == FALSE) + return TRUE; - dbus_message_iter_recurse(entry, &iter); + dbus_message_iter_get_basic(&iter, &key); - type = dbus_message_iter_get_arg_type(&iter); - if (type != DBUS_TYPE_BYTE && type != DBUS_TYPE_STRING) - return; + dbus_message_iter_next(&iter); + dbus_message_iter_recurse(&iter, &value); - if (g_str_equal(key, "Name") && type == DBUS_TYPE_STRING) { - dbus_message_iter_get_basic(&iter, &name); - modem_operator_name_changed(modem, name); - } else if (g_str_equal(key, "Strength") && type == DBUS_TYPE_BYTE) { - dbus_message_iter_get_basic(&iter, &strength); - modem_strength_changed(modem, strength); - } else if (g_str_equal(key, "Status") && type == DBUS_TYPE_STRING) { - dbus_message_iter_get_basic(&iter, &status); - modem_roaming_changed(modem, status); - } else if (g_str_equal(key, "MobileCountryCode") && - type == DBUS_TYPE_STRING) { - int mcc; - char *alpha2; - - dbus_message_iter_get_basic(&iter, &mcc_s); - - mcc = atoi(mcc_s); - if (mcc > 799) - return; + /* + * 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") == TRUE) { + DBG("%s Settings", modem->path); - alpha2 = mcc_country_codes[mcc - 200]; - connman_technology_set_regdom(alpha2); - } + extract_ipv4_settings(&value, modem->context); + } else if (g_str_equal(key, "IPv6.Settings") == TRUE) { + DBG("%s IPv6.Settings", modem->path); -} + extract_ipv6_settings(&value, modem->context); + } else if (g_str_equal(key, "Active") == TRUE) { + dbus_message_iter_get_basic(&value, &modem->active); -static gboolean reg_changed(DBusConnection *connection, - DBusMessage *message, void *user_data) -{ - const char *path = dbus_message_get_path(message); - struct modem_data *modem; - DBusMessageIter iter; + DBG("%s Active %d", modem->path, modem->active); - DBG("path %s", path); + if (modem->active == TRUE) + set_connected(modem); + else + set_disconnected(modem); + } else if (g_str_equal(key, "AccessPointName") == TRUE) { + const char *apn; - modem = g_hash_table_lookup(modem_hash, path); - if (modem == NULL) - return TRUE; + dbus_message_iter_get_basic(&value, &apn); + + DBG("%s AccessPointName %s", modem->path, apn); + + if (apn != NULL && strlen(apn) > 0) { + modem->valid_apn = TRUE; + + if (modem->network != NULL) + return TRUE; + + if (modem->attached == FALSE) + return TRUE; + + if (has_interface(modem->interfaces, + OFONO_API_NETREG) == FALSE) { + return TRUE; + } + + add_network(modem); - if (dbus_message_iter_init(message, &iter)) - modem_registration_changed(modem, &iter); + if (modem->active == TRUE) + set_connected(modem); + } else { + modem->valid_apn = FALSE; + + if (modem->network == NULL) + return TRUE; + + remove_network(modem); + } + } return TRUE; } -static void check_registration_reply(DBusPendingCall *call, void *user_data) +static void cm_get_contexts_reply(DBusPendingCall *call, void *user_data) { - char const *path = user_data; - struct modem_data *modem; + struct modem_data *modem = user_data; + DBusMessageIter array, dict, entry, value; DBusMessage *reply; - DBusMessageIter array, dict, entry; + DBusError error; - DBG("path %s", path); + DBG("%s", modem->path); - modem = g_hash_table_lookup(modem_hash, path); - if (modem == NULL) - return; + modem->call_get_contexts = NULL; reply = dbus_pending_call_steal_reply(call); + dbus_error_init(&error); + + if (dbus_set_error_from_message(&error, reply) == TRUE) { + connman_error("%s", error.message); + dbus_error_free(&error); + goto done; + } + if (dbus_message_iter_init(reply, &array) == FALSE) goto done; @@ -1155,9 +1269,19 @@ static void check_registration_reply(DBusPendingCall *call, void *user_data) goto done; dbus_message_iter_recurse(&array, &dict); - while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + + while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_STRUCT) { + const char *context_path; + dbus_message_iter_recurse(&dict, &entry); - modem_registration_changed(modem, &entry); + dbus_message_iter_get_basic(&entry, &context_path); + + dbus_message_iter_next(&entry); + dbus_message_iter_recurse(&entry, &value); + + if (add_cm_context(modem, context_path, &value) == 0) + break; + dbus_message_iter_next(&dict); } @@ -1167,417 +1291,502 @@ done: dbus_pending_call_unref(call); } -static void check_registration(struct modem_data *modem) +static int cm_get_contexts(struct modem_data *modem) { - char const *path = modem->path; + DBusMessage *message; - DBG("modem %p path %s", modem, path); + DBG("%s", modem->path); - call_ofono(path, OFONO_REGISTRATION_INTERFACE, GET_PROPERTIES, - check_registration_reply, g_strdup(path), g_free, - DBUS_TYPE_INVALID); -} + if (modem->call_get_contexts != NULL) + return -EBUSY; -static void modem_gprs_changed(struct modem_data *modem, - DBusMessageIter *entry) -{ - DBusMessageIter iter; - const char *key; - int type; - dbus_bool_t value; + message = dbus_message_new_method_call(OFONO_SERVICE, modem->path, + OFONO_CM_INTERFACE, GET_CONTEXTS); + if (message == NULL) + return -ENOMEM; - dbus_message_iter_get_basic(entry, &key); + if (dbus_connection_send_with_reply(connection, message, + &modem->call_get_contexts, TIMEOUT) == FALSE) { + connman_error("Failed to call GetContexts()"); + dbus_message_unref(message); + return -EINVAL; + } - DBG("key %s", key); + if (modem->call_get_contexts == NULL) { + connman_error("D-Bus connection not available"); + dbus_message_unref(message); + return -EINVAL; + } - dbus_message_iter_next(entry); + dbus_pending_call_set_notify(modem->call_get_contexts, + cm_get_contexts_reply, + modem, NULL); - dbus_message_iter_recurse(entry, &iter); + dbus_message_unref(message); - type = dbus_message_iter_get_arg_type(&iter); + return -EINPROGRESS; +} - if (type != DBUS_TYPE_BOOLEAN) - return; +static gboolean cm_context_added(DBusConnection *connection, + DBusMessage *message, + void *user_data) +{ + const char *path = dbus_message_get_path(message); + char *context_path; + struct modem_data *modem; + DBusMessageIter iter, properties; - dbus_message_iter_get_basic(&iter, &value); + DBG("%s", path); - if (g_str_equal(key, "Attached") == TRUE) { - DBG("Attached %d", value); + modem = g_hash_table_lookup(modem_hash, path); + if (modem == NULL) + return TRUE; - modem->attached = value; + if (dbus_message_iter_init(message, &iter) == FALSE) + return TRUE; - if (value) - modem_clear_network_errors(modem); - } else if (g_str_equal(key, "Powered") == TRUE) { - DBG("Powered %d", value); + dbus_message_iter_get_basic(&iter, &context_path); - modem->powered = value; - } else if (g_str_equal(key, "RoamingAllowed") == TRUE) { - DBG("RoamingAllowed %d", value); + dbus_message_iter_next(&iter); + dbus_message_iter_recurse(&iter, &properties); - modem->roaming_allowed = value; - } + if (add_cm_context(modem, context_path, &properties) != 0) + return TRUE; + + return TRUE; } -static void check_gprs_reply(DBusPendingCall *call, void *user_data) +static gboolean cm_context_removed(DBusConnection *connection, + DBusMessage *message, + void *user_data) { - char const *path = user_data; + const char *path = dbus_message_get_path(message); + const char *context_path; struct modem_data *modem; - DBusMessage *reply; - DBusMessageIter array, dict, entry; + DBusMessageIter iter; - DBG("path %s", path); + DBG("context path %s", path); - modem = g_hash_table_lookup(modem_hash, path); + if (dbus_message_iter_init(message, &iter) == FALSE) + return TRUE; + + dbus_message_iter_get_basic(&iter, &context_path); + + modem = g_hash_table_lookup(context_hash, context_path); if (modem == NULL) - return; + return TRUE; - reply = dbus_pending_call_steal_reply(call); + remove_cm_context(modem, context_path); - if (dbus_message_iter_init(reply, &array) == FALSE) - goto done; + return TRUE; +} - if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY) - goto done; +static void netreg_update_name(struct modem_data *modem, + DBusMessageIter* value) +{ + char *name; - dbus_message_iter_recurse(&array, &dict); - while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { - dbus_message_iter_recurse(&dict, &entry); - modem_gprs_changed(modem, &entry); - dbus_message_iter_next(&dict); - } + dbus_message_iter_get_basic(value, &name); -done: - dbus_message_unref(reply); + DBG("%s Name %s", modem->path, name); - dbus_pending_call_unref(call); + g_free(modem->name); + modem->name = g_strdup(name); + + if (modem->network == NULL) + return; - check_networks(modem); + connman_network_set_name(modem->network, modem->name); + connman_network_update(modem->network); } -static void check_gprs(struct modem_data *modem) +static void netreg_update_strength(struct modem_data *modem, + DBusMessageIter *value) { - char const *path = modem->path; + dbus_message_iter_get_basic(value, &modem->strength); + + DBG("%s Strength %d", modem->path, modem->strength); - DBG("modem %p path %s", modem, path); + if (modem->network == NULL) + return; + + /* + * 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; - call_ofono(path, OFONO_GPRS_INTERFACE, GET_PROPERTIES, - check_gprs_reply, g_strdup(path), g_free, - DBUS_TYPE_INVALID); + connman_network_set_strength(modem->network, modem->strength); + connman_network_update(modem->network); } -static void add_device(const char *path, const char *imsi) +/* Retrieve 1xEVDO Data Strength signal */ +static void netreg_update_datastrength(struct modem_data *modem, + DBusMessageIter *value) { - struct modem_data *modem; - struct connman_device *device; + dbus_message_iter_get_basic(value, &modem->data_strength); - DBG("path %s imsi %s", path, imsi); + DBG("%s Data Strength %d", modem->path, modem->data_strength); - if (path == NULL) + if (modem->network == NULL) return; - if (imsi == NULL) + /* + * 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 = g_hash_table_lookup(modem_hash, path); - if (modem == NULL) - return; + connman_network_set_strength(modem->network, modem->data_strength); + connman_network_update(modem->network); +} - if (modem->device) { - if (!g_strcmp0(imsi, connman_device_get_ident(modem->device))) - return; +static void netreg_update_roaming(struct modem_data *modem, + DBusMessageIter *value) +{ + char *status; + connman_bool_t roaming; - modem_remove_device(modem); - } + dbus_message_iter_get_basic(value, &status); + + if (g_str_equal(status, "roaming") == TRUE) + roaming = TRUE; + else + roaming = FALSE; - if (strlen(imsi) == 0) + if (roaming == modem->roaming) return; - device = connman_device_create(imsi, CONNMAN_DEVICE_TYPE_CELLULAR); - if (device == NULL) + modem->roaming = roaming; + + if (modem->network == NULL) return; - connman_device_set_ident(device, imsi); + connman_network_set_bool(modem->network, + "Roaming", modem->roaming); + connman_network_update(modem->network); +} - connman_device_set_string(device, "Path", path); +static void netreg_update_regdom(struct modem_data *modem, + DBusMessageIter *value) +{ + char *mobile_country_code; + char *alpha2; + int mcc; - connman_device_set_data(device, modem); + dbus_message_iter_get_basic(value, &mobile_country_code); - if (connman_device_register(device) < 0) { - connman_device_unref(device); - return; - } + DBG("%s MobileContryCode %s", modem->path, mobile_country_code); - modem->device = device; - if (modem->has_reg) - check_registration(modem); + mcc = atoi(mobile_country_code); + if (mcc > 799 || mcc < 200) + return; - if (modem->has_gprs) - check_gprs(modem); + alpha2 = mcc_country_codes[mcc - 200]; + if (alpha2 != NULL) + connman_technology_set_regdom(alpha2); } -static void sim_properties_reply(DBusPendingCall *call, void *user_data) +static gboolean netreg_changed(DBusConnection *connection, DBusMessage *message, + void *user_data) { - const char *path = user_data; - const char *imsi = NULL; - DBusMessage *reply; - DBusMessageIter array, dict; + const char *path = dbus_message_get_path(message); + struct modem_data *modem; + DBusMessageIter iter, value; + const char *key; - DBG("path %s", path); + modem = g_hash_table_lookup(modem_hash, path); + if (modem == NULL) + return TRUE; - reply = dbus_pending_call_steal_reply(call); + if (modem->ignore == TRUE) + return TRUE; - if (dbus_message_iter_init(reply, &array) == FALSE) - goto done; + if (dbus_message_iter_init(message, &iter) == FALSE) + return TRUE; - if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY) - goto done; + dbus_message_iter_get_basic(&iter, &key); - dbus_message_iter_recurse(&array, &dict); + dbus_message_iter_next(&iter); + dbus_message_iter_recurse(&iter, &value); - while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + if (g_str_equal(key, "Name") == TRUE) + netreg_update_name(modem, &value); + else if (g_str_equal(key, "Strength") == TRUE) + netreg_update_strength(modem, &value); + else if (g_str_equal(key, "Status") == TRUE) + netreg_update_roaming(modem, &value); + else if (g_str_equal(key, "MobileCountryCode") == TRUE) + netreg_update_regdom(modem, &value); + + return TRUE; +} + +static void 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_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")) { - dbus_message_iter_get_basic(&value, &imsi); - add_device(path, imsi); - } + if (g_str_equal(key, "Name") == TRUE) + netreg_update_name(modem, &value); + else if (g_str_equal(key, "Strength") == TRUE) + netreg_update_strength(modem, &value); + else if (g_str_equal(key, "Status") == TRUE) + netreg_update_roaming(modem, &value); + else if (g_str_equal(key, "MobileCountryCode") == TRUE) + netreg_update_regdom(modem, &value); - dbus_message_iter_next(&dict); + dbus_message_iter_next(dict); } -done: - dbus_message_unref(reply); + if (modem->context == NULL) { + /* + * 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; + } - dbus_pending_call_unref(call); + if (modem->valid_apn == TRUE) + add_network(modem); + + if (modem->active == TRUE) + set_connected(modem); } -static void get_imsi(const char *path) +static int netreg_get_properties(struct modem_data *modem) { - DBG("path %s", path); - - call_ofono(path, OFONO_SIM_INTERFACE, GET_PROPERTIES, - sim_properties_reply, g_strdup(path), g_free, - DBUS_TYPE_INVALID); + return get_properties(modem->path, OFONO_NETREG_INTERFACE, + netreg_properties_reply, modem); } -static int gprs_change_powered(const char *path, dbus_bool_t powered) +static void add_cdma_network(struct modem_data *modem) { - DBG("path %s powered %d", path, powered); + /* Be sure that device is created before adding CDMA network */ + if (modem->device == NULL) + return; - return set_property(path, OFONO_GPRS_INTERFACE, "Powered", - DBUS_TYPE_BOOLEAN, &powered, - NULL, NULL, NULL); -} + /* + * 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 == NULL) + modem->context = network_context_alloc(modem->path); -static int modem_change_powered(const char *path, dbus_bool_t powered) -{ - DBG("path %s powered %d", path, powered); + if (modem->name == NULL) + modem->name = g_strdup("CDMA Network"); - return set_property(path, OFONO_MODEM_INTERFACE, "Powered", - DBUS_TYPE_BOOLEAN, &powered, - NULL, NULL, NULL); -} + add_network(modem); + if (modem->cdma_cm_powered == TRUE) + set_connected(modem); +} -static gboolean modem_has_interface(DBusMessageIter *array, - char const *interface) +static gboolean cdma_netreg_changed(DBusConnection *connection, + DBusMessage *message, + void *user_data) { - DBusMessageIter entry; + const char *path = dbus_message_get_path(message); + struct modem_data *modem; + DBusMessageIter iter, value; + const char *key; - dbus_message_iter_recurse(array, &entry); + DBG(""); - while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) { - const char *element; + modem = g_hash_table_lookup(modem_hash, path); + if (modem == NULL) + return TRUE; - dbus_message_iter_get_basic(&entry, &element); + if (modem->ignore == TRUE) + return TRUE; - if (g_strcmp0(interface, element) == 0) - return TRUE; + if (dbus_message_iter_init(message, &iter) == FALSE) + return TRUE; - dbus_message_iter_next(&entry); - } + dbus_message_iter_get_basic(&iter, &key); - return FALSE; -} + dbus_message_iter_next(&iter); + dbus_message_iter_recurse(&iter, &value); -static gboolean modem_has_sim(DBusMessageIter *array) -{ - return modem_has_interface(array, OFONO_SIM_INTERFACE); -} + if (g_str_equal(key, "Name") == TRUE) + netreg_update_name(modem, &value); + else if (g_str_equal(key, "Strength") == TRUE) + netreg_update_strength(modem, &value); + else if (g_str_equal(key, "DataStrength") == TRUE) + netreg_update_datastrength(modem, &value); + else if (g_str_equal(key, "Status") == TRUE) + netreg_update_roaming(modem, &value); -static gboolean modem_has_reg(DBusMessageIter *array) -{ - return modem_has_interface(array, OFONO_REGISTRATION_INTERFACE); -} + add_cdma_network(modem); -static gboolean modem_has_gprs(DBusMessageIter *array) -{ - return modem_has_interface(array, OFONO_GPRS_INTERFACE); + return TRUE; } -static void add_modem(const char *path, DBusMessageIter *prop) +static void cdma_netreg_properties_reply(struct modem_data *modem, + DBusMessageIter *dict) { - struct modem_data *modem; - dbus_bool_t powered = FALSE; - dbus_bool_t online = FALSE; - dbus_bool_t locked = FALSE; - gboolean has_sim = FALSE; - gboolean has_reg = FALSE; - gboolean has_gprs = FALSE; - - modem = g_hash_table_lookup(modem_hash, path); - - if (modem != NULL) - return; - - modem = g_try_new0(struct modem_data, 1); - if (modem == NULL) - return; - - modem->path = g_strdup(path); - modem->device = NULL; - modem->available = TRUE; - - g_hash_table_insert(modem_hash, g_strdup(path), modem); + DBG("%s", modem->path); - while (dbus_message_iter_get_arg_type(prop) == DBUS_TYPE_DICT_ENTRY) { + while (dbus_message_iter_get_arg_type(dict) == DBUS_TYPE_DICT_ENTRY) { DBusMessageIter entry, value; const char *key; - dbus_message_iter_recurse(prop, &entry); + dbus_message_iter_recurse(dict, &entry); dbus_message_iter_get_basic(&entry, &key); dbus_message_iter_next(&entry); dbus_message_iter_recurse(&entry, &value); - if (g_str_equal(key, "Powered") == TRUE) - dbus_message_iter_get_basic(&value, &powered); - else if (g_str_equal(key, "Lockdown") == TRUE) - dbus_message_iter_get_basic(&value, &locked); - else if (g_str_equal(key, "Interfaces") == TRUE) { - has_sim = modem_has_sim(&value); - has_reg = modem_has_reg(&value); - has_gprs = modem_has_gprs(&value); - } + if (g_str_equal(key, "Name") == TRUE) + netreg_update_name(modem, &value); + else if (g_str_equal(key, "Strength") == TRUE) + netreg_update_strength(modem, &value); + else if (g_str_equal(key, "DataStrength") == TRUE) + netreg_update_datastrength(modem, &value); + else if (g_str_equal(key, "Status") == TRUE) + netreg_update_roaming(modem, &value); - dbus_message_iter_next(prop); + dbus_message_iter_next(dict); } - if (locked) - return; - - if (!powered) - modem_change_powered(path, TRUE); - - modem->has_sim = has_sim; - modem->has_reg = has_reg; - modem->has_gprs = has_gprs; - - update_modem_online(modem, online); - - if (has_sim) - get_imsi(path); + add_cdma_network(modem); } -static void manager_modems_reply(DBusPendingCall *call, void *user_data) +static int cdma_netreg_get_properties(struct modem_data *modem) { - DBusMessage *reply; - DBusError error; - DBusMessageIter array, dict; - - DBG(""); + return get_properties(modem->path, OFONO_CDMA_NETREG_INTERFACE, + cdma_netreg_properties_reply, modem); +} - reply = dbus_pending_call_steal_reply(call); +static void cm_update_attached(struct modem_data *modem, + DBusMessageIter *value) +{ + dbus_message_iter_get_basic(value, &modem->attached); - if (dbus_message_has_signature(reply, "a(oa{sv})") == FALSE) - goto done; + DBG("%s Attached %d", modem->path, modem->attached); - dbus_error_init(&error); + if (modem->attached == FALSE) + return; - if (dbus_set_error_from_message(&error, reply)) { - connman_error("ModemManager.GetModems() %s %s", - error.name, error.message); - dbus_error_free(&error); - goto done; + if (has_interface(modem->interfaces, + OFONO_API_NETREG) == FALSE) { + return; } - if (dbus_message_iter_init(reply, &array) == FALSE) - goto done; + netreg_get_properties(modem); +} - dbus_message_iter_recurse(&array, &dict); +static void cm_update_powered(struct modem_data *modem, + DBusMessageIter *value) +{ + dbus_message_iter_get_basic(value, &modem->cm_powered); - while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_STRUCT) { - DBusMessageIter value, properties; - const char *modem_path; + DBG("%s ConnnectionManager Powered %d", modem->path, + modem->cm_powered); - dbus_message_iter_recurse(&dict, &value); - dbus_message_iter_get_basic(&value, &modem_path); + if (modem->cm_powered == TRUE) + return; - dbus_message_iter_next(&value); - dbus_message_iter_recurse(&value, &properties); + cm_set_powered(modem, TRUE); +} - /* Add modem */ - add_modem(modem_path, &properties); +static gboolean cm_changed(DBusConnection *connection, DBusMessage *message, + void *user_data) +{ + const char *path = dbus_message_get_path(message); + struct modem_data *modem; + DBusMessageIter iter, value; + const char *key; - dbus_message_iter_next(&dict); - } + modem = g_hash_table_lookup(modem_hash, path); + if (modem == NULL) + return TRUE; -done: - dbus_message_unref(reply); + if (modem->ignore == TRUE) + return TRUE; - dbus_pending_call_unref(call); -} + if (dbus_message_iter_init(message, &iter) == FALSE) + return TRUE; -static void ofono_connect(DBusConnection *connection, void *user_data) -{ - DBG("connection %p", connection); + dbus_message_iter_get_basic(&iter, &key); - modem_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, remove_modem); + dbus_message_iter_next(&iter); + dbus_message_iter_recurse(&iter, &value); - network_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - NULL, remove_network); + if (g_str_equal(key, "Attached") == TRUE) + cm_update_attached(modem, &value); + else if (g_str_equal(key, "Powered") == TRUE) + cm_update_powered(modem, &value); - call_ofono("/", OFONO_MANAGER_INTERFACE, GET_MODEMS, - manager_modems_reply, NULL, NULL, - DBUS_TYPE_INVALID); + return TRUE; } -static void ofono_disconnect(DBusConnection *connection, void *user_data) +static void cdma_cm_update_powered(struct modem_data *modem, + DBusMessageIter *value) { - DBG("connection %p", connection); + dbus_message_iter_get_basic(value, &modem->cdma_cm_powered); - if (modem_hash == NULL) + DBG("%s CDMA cm Powered %d", modem->path, modem->cdma_cm_powered); + + if (modem->network == NULL) return; - g_hash_table_destroy(modem_hash); + if (modem->cdma_cm_powered == TRUE) + set_connected(modem); + else + set_disconnected(modem); +} - modem_hash = NULL; +static void cdma_cm_update_settings(struct modem_data *modem, + DBusMessageIter *value) +{ + DBG("%s Settings", modem->path); + + extract_ipv4_settings(value, modem->context); } -static gboolean modem_changed(DBusConnection *connection, DBusMessage *message, - void *user_data) +static gboolean cdma_cm_changed(DBusConnection *connection, + 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); - modem = g_hash_table_lookup(modem_hash, path); if (modem == NULL) return TRUE; + if (modem->online == TRUE && modem->network == NULL) + cdma_netreg_get_properties(modem); + if (dbus_message_iter_init(message, &iter) == FALSE) return TRUE; @@ -1586,62 +1795,87 @@ static gboolean modem_changed(DBusConnection *connection, DBusMessage *message, dbus_message_iter_next(&iter); dbus_message_iter_recurse(&iter, &value); - if (g_str_equal(key, "Powered") == TRUE) { - dbus_bool_t powered; + if (g_str_equal(key, "Powered") == TRUE) + cdma_cm_update_powered(modem, &value); + if (g_str_equal(key, "Settings") == TRUE) + cdma_cm_update_settings(modem, &value); - dbus_message_iter_get_basic(&value, &powered); - if (powered == TRUE) - return TRUE; + return TRUE; +} - modem->has_sim = FALSE; - modem->has_reg = FALSE; - modem->has_gprs = FALSE; +static void cm_properties_reply(struct modem_data *modem, DBusMessageIter *dict) +{ + DBG("%s", modem->path); - modem_remove_device(modem); - } else if (g_str_equal(key, "Online") == TRUE) { - dbus_bool_t online; + 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") == TRUE) + cm_update_attached(modem, &value); + else if (g_str_equal(key, "Powered") == TRUE) + cm_update_powered(modem, &value); - dbus_message_iter_get_basic(&value, &online); + dbus_message_iter_next(dict); + } +} - update_modem_online(modem, online); - } else if (g_str_equal(key, "Lockdown") == TRUE) { - dbus_bool_t locked; +static int cm_get_properties(struct modem_data *modem) +{ + return get_properties(modem->path, OFONO_CM_INTERFACE, + cm_properties_reply, modem); +} - dbus_message_iter_get_basic(&value, &locked); +static void cdma_cm_properties_reply(struct modem_data *modem, + DBusMessageIter *dict) +{ + DBG("%s", modem->path); - if (!locked) - modem_change_powered(path, TRUE); + if (modem->online == TRUE) + cdma_netreg_get_properties(modem); - } else if (g_str_equal(key, "Interfaces") == TRUE) { - gboolean has_sim = modem_has_sim(&value); - gboolean has_reg = modem_has_reg(&value); - gboolean had_reg = modem->has_reg; - gboolean has_gprs = modem_has_gprs(&value); - gboolean had_gprs = modem->has_gprs; - - modem->has_sim = has_sim; - modem->has_reg = has_reg; - modem->has_gprs = has_gprs; - - if (modem->device == NULL) { - if (has_sim) - get_imsi(modem->path); - } else if (!has_sim) { - modem_remove_device(modem); - } else { - if (has_reg && !had_reg) - check_registration(modem); - else if (had_reg && !has_reg) - modem_registration_removed(modem); - - if (has_gprs && !had_gprs) { - gprs_change_powered(modem->path, TRUE); - check_gprs(modem); - } - } + 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") == TRUE) + cdma_cm_update_powered(modem, &value); + if (g_str_equal(key, "Settings") == TRUE) + cdma_cm_update_settings(modem, &value); + + dbus_message_iter_next(dict); } +} - return TRUE; +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 *connection, DBusMessage *message, @@ -1652,12 +1886,13 @@ static gboolean sim_changed(DBusConnection *connection, DBusMessage *message, DBusMessageIter iter, value; const char *key; - DBG("path %s", path); - modem = g_hash_table_lookup(modem_hash, path); if (modem == NULL) return TRUE; + if (modem->ignore == TRUE) + return TRUE; + if (dbus_message_iter_init(message, &iter) == FALSE) return TRUE; @@ -1667,122 +1902,370 @@ static gboolean sim_changed(DBusConnection *connection, DBusMessage *message, dbus_message_iter_recurse(&iter, &value); if (g_str_equal(key, "SubscriberIdentity") == TRUE) { - char *imsi; + sim_update_imsi(modem, &value); - dbus_message_iter_get_basic(&value, &imsi); + if (ready_to_create_device(modem) == FALSE) + return TRUE; - add_device(path, imsi); - } else if (g_str_equal(key, "Present") == TRUE) { - dbus_bool_t present; + /* + * 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); + } - dbus_message_iter_get_basic(&value, &present); + return TRUE; +} - if (present) - return TRUE; +static void sim_properties_reply(struct modem_data *modem, + DBusMessageIter *dict) +{ + DBG("%s", modem->path); - if (modem->device != NULL) - modem_remove_device(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, "SubscriberIdentity") == TRUE) { + sim_update_imsi(modem, &value); + + if (ready_to_create_device(modem) == FALSE) + 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 == FALSE) + 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) == TRUE) { + cm_get_properties(modem); + cm_get_contexts(modem); + } + return; + } - modem->has_gprs = FALSE; - modem->has_reg = FALSE; + dbus_message_iter_next(dict); } +} - return TRUE; +static int sim_get_properties(struct modem_data *modem) +{ + return get_properties(modem->path, OFONO_SIM_INTERFACE, + sim_properties_reply, modem); } -static gboolean gprs_changed(DBusConnection *connection, DBusMessage *message, - void *user_data) +static connman_bool_t api_added(uint8_t old_iface, uint8_t new_iface, + enum ofono_api api) { - const char *path = dbus_message_get_path(message); - struct modem_data *modem; - DBusMessageIter iter; + if (has_interface(old_iface, api) == FALSE && + has_interface(new_iface, api) == TRUE) { + DBG("%s added", api2string(api)); + return TRUE; + } - DBG("path %s", path); + return FALSE; +} - modem = g_hash_table_lookup(modem_hash, path); - if (modem == NULL) +static connman_bool_t api_removed(uint8_t old_iface, uint8_t new_iface, + enum ofono_api api) +{ + if (has_interface(old_iface, api) == TRUE && + has_interface(new_iface, api) == FALSE) { + DBG("%s removed", api2string(api)); return TRUE; + } + + return FALSE; +} - if (dbus_message_iter_init(message, &iter)) - modem_gprs_changed(modem, &iter); +static void modem_update_interfaces(struct modem_data *modem, + uint8_t old_ifaces, + uint8_t new_ifaces) +{ + DBG("%s", modem->path); - return TRUE; + if (api_added(old_ifaces, new_ifaces, OFONO_API_SIM) == TRUE) { + if (modem->imsi == NULL && + modem->set_powered == FALSE) { + /* + * 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) == TRUE) { + if (modem->device != NULL) { + cm_get_properties(modem); + cm_get_contexts(modem); + } + } + + if (api_added(old_ifaces, new_ifaces, OFONO_API_CDMA_CM) == TRUE) { + if (ready_to_create_device(modem) == TRUE) + create_device(modem); + + if (modem->device != NULL) + cdma_cm_get_properties(modem); + } + + if (api_added(old_ifaces, new_ifaces, OFONO_API_NETREG) == TRUE) { + if (modem->attached == TRUE) + netreg_get_properties(modem); + } + + if (api_added(old_ifaces, new_ifaces, OFONO_API_CDMA_NETREG) == TRUE) { + cdma_netreg_get_properties(modem); + } + + if (api_removed(old_ifaces, new_ifaces, OFONO_API_CM) == TRUE) { + remove_cm_context(modem, modem->context->path); + } + + if (api_removed(old_ifaces, new_ifaces, OFONO_API_CDMA_CM) == TRUE) { + remove_cm_context(modem, modem->context->path); + } + + if (api_removed(old_ifaces, new_ifaces, OFONO_API_NETREG) == TRUE) { + remove_network(modem); + } + + if (api_removed(old_ifaces, new_ifaces, OFONO_API_CDMA_NETREG == TRUE)) { + remove_network(modem); + } } -static gboolean context_added(DBusConnection *connection, - DBusMessage *message, void *user_data) +static gboolean modem_changed(DBusConnection *connection, DBusMessage *message, + void *user_data) { const char *path = dbus_message_get_path(message); - const char *network_path; struct modem_data *modem; - DBusMessageIter iter, properties; - - DBG("path %s", path); + DBusMessageIter iter, value; + const char *key; modem = g_hash_table_lookup(modem_hash, path); - if (modem == NULL || modem->device == NULL) + if (modem == NULL) + return TRUE; + + if (modem->ignore == TRUE) return TRUE; if (dbus_message_iter_init(message, &iter) == FALSE) return TRUE; - dbus_message_iter_get_basic(&iter, &network_path); + dbus_message_iter_get_basic(&iter, &key); dbus_message_iter_next(&iter); - dbus_message_iter_recurse(&iter, &properties); + dbus_message_iter_recurse(&iter, &value); + + if (g_str_equal(key, "Powered") == TRUE) { + dbus_message_iter_get_basic(&value, &modem->powered); + + DBG("%s Powered %d", modem->path, modem->powered); + + if (modem->powered == FALSE) + modem_set_powered(modem, TRUE); + } else if (g_str_equal(key, "Online") == TRUE) { + dbus_message_iter_get_basic(&value, &modem->online); + + DBG("%s Online %d", modem->path, modem->online); + + if (modem->device == NULL) + return TRUE; + + connman_device_set_powered(modem->device, modem->online); + } else if (g_str_equal(key, "Interfaces") == TRUE) { + uint8_t interfaces; + + interfaces = extract_interfaces(&value); - add_network(modem->device, network_path, &properties); + 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") == TRUE) { + 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) == TRUE) { + if (ready_to_create_device(modem) == TRUE) + create_device(modem); + } + } return TRUE; } -static gboolean context_removed(DBusConnection *connection, - DBusMessage *message, void *user_data) +static void add_modem(const char *path, DBusMessageIter *prop) { - const char *path = dbus_message_get_path(message); - const char *network_path, *identifier; struct modem_data *modem; - struct network_info *info; - DBusMessageIter iter; - DBG("path %s", path); + DBG("%s", path); modem = g_hash_table_lookup(modem_hash, path); - if (modem == NULL || modem->device == NULL) - return TRUE; + if (modem != NULL) { + /* + * When oFono powers up we ask for the modems and oFono is + * reporting with modem_added signal the modems. Only + * handle them once. + */ + return; + } - if (dbus_message_iter_init(message, &iter) == FALSE) - return TRUE; + modem = g_try_new0(struct modem_data, 1); + if (modem == NULL) + return; - dbus_message_iter_get_basic(&iter, &network_path); + modem->path = g_strdup(path); - info = g_hash_table_lookup(network_hash, network_path); - if (info == NULL) - return TRUE; + 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; - identifier = connman_network_get_identifier(info->network); - connman_device_remove_network(modem->device, identifier); + dbus_message_iter_recurse(prop, &entry); + dbus_message_iter_get_basic(&entry, &key); - return TRUE; + dbus_message_iter_next(&entry); + dbus_message_iter_recurse(&entry, &value); + + if (g_str_equal(key, "Powered") == TRUE) { + dbus_message_iter_get_basic(&value, &modem->powered); + + DBG("%s Powered %d", modem->path, modem->powered); + } else if (g_str_equal(key, "Online") == TRUE) { + dbus_message_iter_get_basic(&value, &modem->online); + + DBG("%s Online %d", modem->path, modem->online); + } else if (g_str_equal(key, "Interfaces") == TRUE) { + modem->interfaces = extract_interfaces(&value); + + DBG("%s Interfaces 0x%02x", modem->path, + modem->interfaces); + } else if (g_str_equal(key, "Serial") == TRUE) { + 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") == TRUE) { + 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 == TRUE) + return; + + if (modem->powered == FALSE) { + modem_set_powered(modem, TRUE); + return; + } + + modem_update_interfaces(modem, 0, modem->interfaces); +} + +static void modem_power_down(gpointer key, gpointer value, gpointer user_data) +{ + struct modem_data *modem = value; + + DBG("%s", modem->path); + + if (modem->ignore == TRUE) + return; + + modem_set_powered(modem, FALSE); +} + +static void remove_modem(gpointer data) +{ + struct modem_data *modem = data; + + DBG("%s", modem->path); + + if (modem->call_set_property != NULL) + dbus_pending_call_cancel(modem->call_set_property); + + if (modem->call_get_properties != NULL) + dbus_pending_call_cancel(modem->call_get_properties); + + if (modem->call_get_contexts != NULL) + dbus_pending_call_cancel(modem->call_get_contexts); + + if (modem->device != NULL) + destroy_device(modem); + + if (modem->context != NULL) + remove_cm_context(modem, modem->context->path); + + g_free(modem->serial); + g_free(modem->name); + g_free(modem->imsi); + g_free(modem->path); + + g_free(modem); } static gboolean modem_added(DBusConnection *connection, DBusMessage *message, void *user_data) { DBusMessageIter iter, properties; - const char *modem_path; + const char *path; DBG(""); if (dbus_message_iter_init(message, &iter) == FALSE) return TRUE; - dbus_message_iter_get_basic(&iter, &modem_path); + dbus_message_iter_get_basic(&iter, &path); dbus_message_iter_next(&iter); dbus_message_iter_recurse(&iter, &properties); - add_modem(modem_path, &properties); + add_modem(path, &properties); return TRUE; } @@ -1791,114 +2274,289 @@ static gboolean modem_removed(DBusConnection *connection, DBusMessage *message, void *user_data) { DBusMessageIter iter; - const char *modem_path; + const char *path; DBG(""); if (dbus_message_iter_init(message, &iter) == FALSE) return TRUE; - dbus_message_iter_get_basic(&iter, &modem_path); + dbus_message_iter_get_basic(&iter, &path); - g_hash_table_remove(modem_hash, modem_path); + g_hash_table_remove(modem_hash, path); return TRUE; } -static gboolean context_changed(DBusConnection *connection, - DBusMessage *message, void *user_data) +static void manager_get_modems_reply(DBusPendingCall *call, void *user_data) { - const char *path = dbus_message_get_path(message); - struct network_info *info; - DBusMessageIter iter, value; - const char *key; + DBusMessage *reply; + DBusError error; + DBusMessageIter array, dict; - DBG("path %s", path); + DBG(""); - info = g_hash_table_lookup(network_hash, path); - if (info == NULL) - return TRUE; + reply = dbus_pending_call_steal_reply(call); - if (!pending_network_is_available(info->network)) { - g_hash_table_remove(network_hash, path); - return TRUE; + dbus_error_init(&error); + + if (dbus_set_error_from_message(&error, reply) == TRUE) { + connman_error("%s", error.message); + dbus_error_free(&error); + goto done; } - if (dbus_message_iter_init(message, &iter) == FALSE) - return TRUE; + if (dbus_message_iter_init(reply, &array) == FALSE) + goto done; - dbus_message_iter_get_basic(&iter, &key); + dbus_message_iter_recurse(&array, &dict); - dbus_message_iter_next(&iter); - dbus_message_iter_recurse(&iter, &value); + while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_STRUCT) { + DBusMessageIter value, properties; + const char *path; - DBG("key %s", key); + dbus_message_iter_recurse(&dict, &value); + dbus_message_iter_get_basic(&value, &path); - if (g_str_equal(key, "Settings") == TRUE) - update_ipv4_settings(&value, info); - else if (g_str_equal(key, "IPv6.Settings")) - update_ipv6_settings(&value, info); - else if (g_str_equal(key, "Active") == TRUE) { - dbus_bool_t active; + dbus_message_iter_next(&value); + dbus_message_iter_recurse(&value, &properties); + + add_modem(path, &properties); + + dbus_message_iter_next(&dict); + } - dbus_message_iter_get_basic(&value, &active); +done: + dbus_message_unref(reply); + + dbus_pending_call_unref(call); +} + +static int manager_get_modems(void) +{ + DBusMessage *message; + DBusPendingCall *call; + + DBG(""); + + message = dbus_message_new_method_call(OFONO_SERVICE, "/", + OFONO_MANAGER_INTERFACE, GET_MODEMS); + if (message == NULL) + return -ENOMEM; - if (active == FALSE) - set_connected(info, active); + if (dbus_connection_send_with_reply(connection, message, + &call, TIMEOUT) == FALSE) { + connman_error("Failed to call GetModems()"); + dbus_message_unref(message); + return -EINVAL; + } - /* Connect only if requested to do so */ - if (active == TRUE && - connman_network_get_connecting(info->network) == TRUE) - set_connected(info, active); + if (call == NULL) { + connman_error("D-Bus connection not available"); + dbus_message_unref(message); + return -EINVAL; } - return TRUE; + dbus_pending_call_set_notify(call, manager_get_modems_reply, + NULL, NULL); + + dbus_message_unref(message); + + return -EINPROGRESS; +} + +static void ofono_connect(DBusConnection *conn, void *user_data) +{ + DBG(""); + + modem_hash = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, remove_modem); + if (modem_hash == NULL) + return; + + context_hash = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, NULL); + if (context_hash == NULL) { + g_hash_table_destroy(modem_hash); + return; + } + + manager_get_modems(); +} + +static void ofono_disconnect(DBusConnection *conn, void *user_data) +{ + DBG(""); + + if (modem_hash == NULL || context_hash == NULL) + return; + + g_hash_table_destroy(modem_hash); + modem_hash = NULL; + + g_hash_table_destroy(context_hash); + context_hash = NULL; +} + +static int network_probe(struct connman_network *network) +{ + struct modem_data *modem = connman_network_get_data(network); + + DBG("%s network %p", modem->path, network); + + return 0; +} + +static void network_remove(struct connman_network *network) +{ + struct modem_data *modem = connman_network_get_data(network); + + DBG("%s network %p", modem->path, network); +} + +static int network_connect(struct connman_network *network) +{ + struct modem_data *modem = connman_network_get_data(network); + + DBG("%s network %p", modem->path, network); + + if (has_interface(modem->interfaces, OFONO_API_CM) == TRUE) + return context_set_active(modem, TRUE); + else if (has_interface(modem->interfaces, OFONO_API_CDMA_CM) == TRUE) + return cdma_cm_set_powered(modem, TRUE); + + connman_error("Connection manager interface not available"); + + return -ENOSYS; +} + +static int network_disconnect(struct connman_network *network) +{ + struct modem_data *modem = connman_network_get_data(network); + + DBG("%s network %p", modem->path, network); + + if (has_interface(modem->interfaces, OFONO_API_CM) == TRUE) + return context_set_active(modem, FALSE); + else if (has_interface(modem->interfaces, OFONO_API_CDMA_CM) == TRUE) + return cdma_cm_set_powered(modem, FALSE); + + connman_error("Connection manager interface not available"); + + return -ENOSYS; +} + +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, +}; + +static int modem_probe(struct connman_device *device) +{ + struct modem_data *modem = connman_device_get_data(device); + + DBG("%s device %p", modem->path, device); + + return 0; +} + +static void modem_remove(struct connman_device *device) +{ + struct modem_data *modem = connman_device_get_data(device); + + DBG("%s device %p", modem->path, device); +} + +static int modem_enable(struct connman_device *device) +{ + struct modem_data *modem = connman_device_get_data(device); + + DBG("%s device %p", modem->path, device); + + if (modem->online == TRUE) + return 0; + + return modem_set_online(modem, TRUE); +} + +static int modem_disable(struct connman_device *device) +{ + struct modem_data *modem = connman_device_get_data(device); + + DBG("%s device %p", modem->path, device); + + if (modem->online == FALSE) + return 0; + + return modem_set_online(modem, FALSE); +} + +static struct connman_device_driver modem_driver = { + .name = "modem", + .type = CONNMAN_DEVICE_TYPE_CELLULAR, + .probe = modem_probe, + .remove = modem_remove, + .enable = modem_enable, + .disable = modem_disable, +}; + +static int tech_probe(struct connman_technology *technology) +{ + return 0; +} + +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 reg_watch; +static guint modem_added_watch; +static guint modem_removed_watch; +static guint modem_watch; +static guint cm_watch; static guint sim_watch; -static guint gprs_watch; static guint context_added_watch; static guint context_removed_watch; -static guint modem_watch; -static guint modem_added_watch; -static guint modem_removed_watch; +static guint 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) return -EIO; - watch = g_dbus_add_service_watch(connection, OFONO_SERVICE, - ofono_connect, ofono_disconnect, NULL, NULL); - - reg_watch = g_dbus_add_signal_watch(connection, NULL, NULL, - OFONO_REGISTRATION_INTERFACE, - PROPERTY_CHANGED, - reg_changed, - NULL, NULL); - - gprs_watch = g_dbus_add_signal_watch(connection, NULL, NULL, - OFONO_GPRS_INTERFACE, - PROPERTY_CHANGED, - gprs_changed, - NULL, NULL); + watch = g_dbus_add_service_watch(connection, + OFONO_SERVICE, ofono_connect, + ofono_disconnect, NULL, NULL); - context_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL, - OFONO_GPRS_INTERFACE, - CONTEXT_ADDED, - context_added, + modem_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_MANAGER_INTERFACE, + MODEM_ADDED, + modem_added, NULL, NULL); - context_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL, - OFONO_GPRS_INTERFACE, - CONTEXT_REMOVED, - context_removed, + modem_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_MANAGER_INTERFACE, + MODEM_REMOVED, + modem_removed, NULL, NULL); modem_watch = g_dbus_add_signal_watch(connection, NULL, NULL, @@ -1907,22 +2565,28 @@ static int ofono_init(void) modem_changed, NULL, NULL); + cm_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_CM_INTERFACE, + PROPERTY_CHANGED, + cm_changed, + NULL, NULL); + sim_watch = g_dbus_add_signal_watch(connection, NULL, NULL, OFONO_SIM_INTERFACE, PROPERTY_CHANGED, sim_changed, NULL, NULL); - modem_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL, - OFONO_MANAGER_INTERFACE, - MODEM_ADDED, - modem_added, + context_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_CM_INTERFACE, + CONTEXT_ADDED, + cm_context_added, NULL, NULL); - modem_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL, - OFONO_MANAGER_INTERFACE, - MODEM_REMOVED, - modem_removed, + context_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_CM_INTERFACE, + CONTEXT_REMOVED, + cm_context_removed, NULL, NULL); context_watch = g_dbus_add_signal_watch(connection, NULL, NULL, @@ -1931,11 +2595,31 @@ static int ofono_init(void) context_changed, NULL, NULL); - if (watch == 0 || gprs_watch == 0 || context_added_watch == 0 || - context_removed_watch == 0 || modem_watch == 0 || - reg_watch == 0 || sim_watch == 0 || - modem_added_watch == 0 || modem_removed_watch == 0 || - context_watch == 0) { + netreg_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_NETREG_INTERFACE, + PROPERTY_CHANGED, + netreg_changed, + NULL, NULL); + + cdma_cm_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_CDMA_CM_INTERFACE, + PROPERTY_CHANGED, + cdma_cm_changed, + NULL, NULL); + + cdma_netreg_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + OFONO_CDMA_NETREG_INTERFACE, + PROPERTY_CHANGED, + cdma_netreg_changed, + NULL, NULL); + + + 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; } @@ -1950,20 +2634,28 @@ static int ofono_init(void) 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, sim_watch); - g_dbus_remove_watch(connection, reg_watch); - g_dbus_remove_watch(connection, gprs_watch); - g_dbus_remove_watch(connection, context_added_watch); + g_dbus_remove_watch(connection, 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, context_watch); - + g_dbus_remove_watch(connection, modem_added_watch); + g_dbus_remove_watch(connection, watch); dbus_connection_unref(connection); return err; @@ -1971,22 +2663,44 @@ remove: static void ofono_exit(void) { - g_dbus_remove_watch(connection, watch); - g_dbus_remove_watch(connection, sim_watch); - g_dbus_remove_watch(connection, reg_watch); - g_dbus_remove_watch(connection, gprs_watch); - g_dbus_remove_watch(connection, context_added_watch); - g_dbus_remove_watch(connection, context_removed_watch); - g_dbus_remove_watch(connection, modem_watch); - g_dbus_remove_watch(connection, modem_added_watch); - g_dbus_remove_watch(connection, modem_removed_watch); - g_dbus_remove_watch(connection, context_watch); + DBG(""); + + if (modem_hash != NULL) { + /* + * We should propably 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 != NULL) { + 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); }