*
* 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.
*
#include "mcc.h"
-#define uninitialized_var(x) x = x
-
#define OFONO_SERVICE "org.ofono"
#define OFONO_MANAGER_INTERFACE OFONO_SERVICE ".Manager"
* attached -> netreg -> ready
*
* Depending on the modem type, this plugin will behave differently.
- * For example CDMA CDMA modems don't have an IMSI. The following
- * description is strictly about GSM modems.
+ *
+ * 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
* 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;
/* 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;
{
DBG("%s", modem->path);
+ if (modem->network == NULL)
+ return;
+
connman_network_set_connected(modem->network, FALSE);
}
{
DBusMessageIter dict;
char *address = NULL, *gateway = NULL;
- unsigned char prefix_length;
+ unsigned char prefix_length = 0;
char *nameservers = NULL;
const char *interface = NULL;
int index = -1;
* different:
* - GSM modems will expose the SIM interface then the
* CM interface.
- * - DUN modems will expose first a unique serial number (BDADDR)
- * and then the CM interface.
* - CDMA modems will expose CM first and sometime later
* a unique serial number.
*
static void create_device(struct modem_data *modem)
{
struct connman_device *device;
- char *uninitialized_var(ident);
+ char *ident = NULL;
DBG("%s", modem->path);
static int add_cm_context(struct modem_data *modem, const char *context_path,
DBusMessageIter *dict)
{
- const char *context_type;
+ const char *context_type = NULL;
struct network_context *context = NULL;
connman_bool_t active = FALSE;
dbus_message_iter_get_basic(&value, &active);
DBG("%s Active %d", modem->path, active);
- }
+ } else if (g_str_equal(key, "AccessPointName") == TRUE) {
+ const char *apn;
+ 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);
}
g_hash_table_replace(context_hash, g_strdup(context_path), modem);
+ if (modem->valid_apn == TRUE && modem->attached == TRUE &&
+ has_interface(modem->interfaces,
+ OFONO_API_NETREG) == TRUE) {
+ add_network(modem);
+ }
+
return 0;
}
if (modem->context == NULL)
return;
+ if (modem->network != NULL)
+ remove_network(modem);
+
g_hash_table_remove(context_hash, context_path);
network_context_free(modem->context);
modem->context = NULL;
+
+ modem->valid_apn = FALSE;
+
+ if (modem->network != NULL)
+ remove_network(modem);
}
static gboolean context_changed(DBusConnection *connection,
set_connected(modem);
else
set_disconnected(modem);
+ } else if (g_str_equal(key, "AccessPointName") == TRUE) {
+ const char *apn;
+
+ 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 (modem->active == TRUE)
+ set_connected(modem);
+ } else {
+ modem->valid_apn = FALSE;
+
+ if (modem->network == NULL)
+ return TRUE;
+
+ remove_network(modem);
+ }
}
return TRUE;
DBG("%s", path);
- modem = g_hash_table_lookup(modem_hash, context_path);
+ modem = g_hash_table_lookup(modem_hash, path);
if (modem == NULL)
return TRUE;
return;
}
- add_network(modem);
+ if (modem->valid_apn == TRUE)
+ add_network(modem);
if (modem->active == TRUE)
set_connected(modem);
}
static struct connman_network_driver network_driver = {
- .name = "network",
+ .name = "cellular",
.type = CONNMAN_NETWORK_TYPE_CELLULAR,
.probe = network_probe,
.remove = network_remove,
projects / framework / connectivity / connman.git / blobdiff