#include <errno.h>
#include <string.h>
-#include <gdbus.h>
-
#include "connman.h"
-static DBusConnection *connection = NULL;
-
struct connman_device {
struct connman_element element;
enum connman_device_type type;
connman_bool_t disconnected;
connman_bool_t reconnect;
connman_uint16_t scan_interval;
+ connman_uint16_t backoff_interval;
char *name;
char *node;
char *address;
char *interface;
- char *control;
char *ident;
+ char *path;
int phyindex;
unsigned int connections;
guint scan_timeout;
struct connman_device_driver *driver;
void *driver_data;
- connman_bool_t registered;
-
char *last_network;
struct connman_network *network;
GHashTable *networks;
-
- DBusMessage *pending;
- guint timeout;
};
+#define SCAN_INITIAL_DELAY 10
+
static gboolean device_scan_trigger(gpointer user_data)
{
struct connman_device *device = user_data;
clear_scan_trigger(device);
if (device->scan_interval > 0) {
- guint interval = device->scan_interval;
+ guint interval;
+
+ if (g_hash_table_size(device->networks) == 0) {
+ if (device->backoff_interval >= device->scan_interval)
+ device->backoff_interval = SCAN_INITIAL_DELAY;
+ interval = device->backoff_interval;
+ } else
+ interval = device->scan_interval;
+
+ DBG("interval %d", interval);
+
device->scan_timeout = g_timeout_add_seconds(interval,
device_scan_trigger, device);
+
+ device->backoff_interval *= 2;
+ if (device->backoff_interval > device->scan_interval)
+ device->backoff_interval = device->scan_interval;
}
}
return "GPS";
case CONNMAN_DEVICE_TYPE_CELLULAR:
return "Cellular";
+ case CONNMAN_DEVICE_TYPE_GADGET:
+ return "Gadget";
+
}
return NULL;
return "gps";
case CONNMAN_DEVICE_TYPE_CELLULAR:
return "cellular";
+ case CONNMAN_DEVICE_TYPE_GADGET:
+ return "gadget";
+
}
return NULL;
return CONNMAN_SERVICE_TYPE_BLUETOOTH;
case CONNMAN_DEVICE_TYPE_CELLULAR:
return CONNMAN_SERVICE_TYPE_CELLULAR;
+ case CONNMAN_DEVICE_TYPE_GADGET:
+ return CONNMAN_SERVICE_TYPE_GADGET;
+
}
return CONNMAN_SERVICE_TYPE_UNKNOWN;
}
-static void powered_changed(struct connman_device *device)
-{
- connman_dbus_property_changed_basic(device->element.path,
- CONNMAN_DEVICE_INTERFACE, "Powered",
- DBUS_TYPE_BOOLEAN, &device->powered);
-}
-
-static void blocked_changed(struct connman_device *device)
-{
- connman_dbus_property_changed_basic(device->element.path,
- CONNMAN_DEVICE_INTERFACE, "Blocked",
- DBUS_TYPE_BOOLEAN, &device->blocked);
-}
-
int __connman_device_enable(struct connman_device *device)
{
int err;
+ enum connman_service_type type;
DBG("device %p %d", device, device->blocked);
if (device->blocked == TRUE)
return -ENOLINK;
+ connman_device_set_disconnected(device, FALSE);
+ device->scanning = FALSE;
+
err = device->driver->enable(device);
- if (err < 0) {
+ if (err < 0 && err != -EALREADY) {
if (err == -EINPROGRESS) {
device->powered_pending = TRUE;
device->offlinemode = FALSE;
if (__connman_profile_get_offlinemode() == TRUE)
__connman_profile_set_offlinemode(FALSE, FALSE);
- __connman_technology_enable_device(device);
+ type = __connman_device_get_service_type(device);
+ __connman_technology_enable(type);
return 0;
}
int __connman_device_disable(struct connman_device *device)
{
int err;
+ enum connman_service_type type;
DBG("device %p", device);
g_hash_table_remove_all(device->networks);
err = device->driver->disable(device);
- if (err < 0) {
+ if (err < 0 && err != -EALREADY) {
if (err == -EINPROGRESS)
device->powered_pending = FALSE;
return err;
}
+ device->connections = 0;
+
device->powered_pending = FALSE;
device->powered = FALSE;
- __connman_technology_disable_device(device);
+ type = __connman_device_get_service_type(device);
+ __connman_technology_disable(type);
return 0;
}
return __connman_device_disable(device);
}
-void __connman_device_list(DBusMessageIter *iter, void *user_data)
-{
- __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, iter);
-}
-
-static void append_path(gpointer key, gpointer value, gpointer user_data)
-{
- struct connman_element *element = value;
- DBusMessageIter *iter = user_data;
-
- dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH,
- &element->path);
-}
-
-static void append_networks(DBusMessageIter *iter, void *user_data)
-{
- struct connman_device *device = user_data;
-
- g_hash_table_foreach(device->networks, append_path, iter);
-}
-
-static DBusMessage *get_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_device *device = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *str;
-
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
-
- dbus_message_iter_init_append(reply, &array);
-
- connman_dbus_dict_open(&array, &dict);
-
- if (device->name != NULL)
- connman_dbus_dict_append_basic(&dict, "Name",
- DBUS_TYPE_STRING, &device->name);
-
- str = type2string(device->type);
- if (str != NULL)
- connman_dbus_dict_append_basic(&dict, "Type",
- DBUS_TYPE_STRING, &str);
-
- if (device->address != NULL)
- connman_dbus_dict_append_basic(&dict, "Address",
- DBUS_TYPE_STRING, &device->address);
-
- if (device->interface != NULL)
- connman_dbus_dict_append_basic(&dict, "Interface",
- DBUS_TYPE_STRING, &device->interface);
-
- connman_dbus_dict_append_basic(&dict, "Powered",
- DBUS_TYPE_BOOLEAN, &device->powered);
-
- connman_dbus_dict_append_basic(&dict, "Blocked",
- DBUS_TYPE_BOOLEAN, &device->blocked);
-
- if (device->driver && device->driver->scan)
- connman_dbus_dict_append_basic(&dict, "Scanning",
- DBUS_TYPE_BOOLEAN, &device->scanning);
-
- if (device->scan_interval > 0)
- connman_dbus_dict_append_basic(&dict, "ScanInterval",
- DBUS_TYPE_UINT16, &device->scan_interval);
-
- connman_dbus_dict_append_array(&dict, "Networks",
- DBUS_TYPE_OBJECT_PATH, append_networks, device);
-
- connman_dbus_dict_close(&array, &dict);
-
- return reply;
-}
-
-static gboolean powered_timeout(gpointer user_data)
-{
- struct connman_device *device = user_data;
-
- DBG("device %p", device);
-
- device->timeout = 0;
-
- if (device->pending != NULL) {
- DBusMessage *reply;
-
- reply = __connman_error_operation_timeout(device->pending);
- if (reply != NULL)
- g_dbus_send_message(connection, reply);
-
- dbus_message_unref(device->pending);
- device->pending = NULL;
- }
-
- return FALSE;
-}
-
-static DBusMessage *set_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_device *device = data;
- DBusMessageIter iter, value;
- const char *name;
- int type;
-
- DBG("conn %p", conn);
-
- if (dbus_message_iter_init(msg, &iter) == FALSE)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_get_basic(&iter, &name);
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
-
- type = dbus_message_iter_get_arg_type(&value);
-
- if (g_str_equal(name, "Powered") == TRUE) {
- connman_bool_t powered;
- int err;
-
- if (type != DBUS_TYPE_BOOLEAN)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_get_basic(&value, &powered);
-
- device->powered_persistent = powered;
-
- __connman_storage_save_device(device);
-
- if (device->powered == powered)
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
- if (device->pending != NULL)
- return __connman_error_in_progress(msg);
-
- err = set_powered(device, powered);
- if (err < 0) {
- if (err != -EINPROGRESS)
- return __connman_error_failed(msg, -err);
-
- device->pending = dbus_message_ref(msg);
-
- device->timeout = g_timeout_add_seconds(15,
- powered_timeout, device);
-
- return NULL;
- }
- } else if (g_str_equal(name, "ScanInterval") == TRUE) {
- connman_uint16_t interval;
-
- if (type != DBUS_TYPE_UINT16)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_get_basic(&value, &interval);
-
- if (device->scan_interval != interval) {
- device->scan_interval = interval;
-
- __connman_storage_save_device(device);
-
- reset_scan_trigger(device);
- }
- } else
- return __connman_error_invalid_property(msg);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *propose_scan(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_device *device = data;
- int err;
-
- DBG("conn %p", conn);
-
- err = __connman_device_scan(device);
- if (err < 0)
- return __connman_error_failed(msg, -err);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static GDBusMethodTable device_methods[] = {
- { "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property,
- G_DBUS_METHOD_FLAG_ASYNC },
- { "ProposeScan", "", "", propose_scan },
- { },
-};
-
-static GDBusSignalTable device_signals[] = {
- { "PropertyChanged", "sv" },
- { },
-};
-
-static int register_interface(struct connman_element *element)
-{
- struct connman_device *device = element->device;
-
- DBG("element %p name %s", element, element->name);
-
- if (g_dbus_register_interface(connection, element->path,
- CONNMAN_DEVICE_INTERFACE,
- device_methods, device_signals,
- NULL, device, NULL) == FALSE) {
- connman_error("Failed to register %s device", element->path);
- return -EIO;
- }
-
- device->registered = TRUE;
-
- return 0;
-}
-
-static void unregister_interface(struct connman_element *element)
-{
- struct connman_device *device = element->device;
-
- DBG("element %p name %s", element, element->name);
-
- device->registered = FALSE;
-
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_DEVICE_INTERFACE);
-}
-
static int setup_device(struct connman_device *device)
{
- int err;
-
DBG("device %p", device);
- err = register_interface(&device->element);
- if (err < 0) {
- if (device->driver->remove)
- device->driver->remove(device);
- device->driver = NULL;
- return err;
- }
-
__connman_technology_add_device(device);
if (device->offlinemode == FALSE &&
static void remove_device(struct connman_device *device)
{
- int err;
-
DBG("device %p", device);
- err = __connman_device_disable(device);
- if (err < 0 && err == -EINPROGRESS)
- __connman_technology_disable_device(device);
+ __connman_device_disable(device);
__connman_technology_remove_device(device);
- unregister_interface(&device->element);
-
if (device->driver->remove)
device->driver->remove(device);
if (device == NULL || device->driver == NULL)
return FALSE;
- return device->registered;
+ return TRUE;
}
static GSList *driver_list = NULL;
DBG("element %p name %s", element, element->name);
- if (device->timeout > 0) {
- g_source_remove(device->timeout);
- device->timeout = 0;
- }
-
clear_scan_trigger(device);
- if (device->pending != NULL) {
- dbus_message_unref(device->pending);
- device->pending = NULL;
- }
-
g_free(device->ident);
g_free(device->node);
g_free(device->name);
g_free(device->address);
- g_free(device->control);
g_free(device->interface);
+ g_free(device->path);
g_free(device->last_network);
struct connman_device *device;
const char *str;
enum connman_service_type service_type;
+ connman_bool_t bg_scan;
DBG("node %s type %d", node, type);
DBG("device %p", device);
+ bg_scan = connman_setting_get_bool("BackgroundScanning");
+
__connman_element_initialize(&device->element);
device->element.name = g_strdup(node);
connman_element_set_string(&device->element,
CONNMAN_PROPERTY_ID_TYPE, str);
- device->element.ipv4.method = CONNMAN_IPCONFIG_METHOD_DHCP;
-
device->type = type;
device->name = g_strdup(type2description(device->type));
service_type = __connman_device_get_service_type(device);
device->blocked = __connman_technology_get_blocked(service_type);
+ device->backoff_interval = SCAN_INITIAL_DELAY;
switch (type) {
case CONNMAN_DEVICE_TYPE_UNKNOWN:
- case CONNMAN_DEVICE_TYPE_VENDOR:
- device->scan_interval = 0;
- break;
case CONNMAN_DEVICE_TYPE_ETHERNET:
- case CONNMAN_DEVICE_TYPE_WIFI:
- device->scan_interval = 300;
- break;
case CONNMAN_DEVICE_TYPE_WIMAX:
- device->scan_interval = 0;
- break;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- device->scan_interval = 0;
- break;
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_GPS:
+ case CONNMAN_DEVICE_TYPE_GADGET:
+ case CONNMAN_DEVICE_TYPE_VENDOR:
device->scan_interval = 0;
break;
- case CONNMAN_DEVICE_TYPE_CELLULAR:
- device->scan_interval = 0;
+ case CONNMAN_DEVICE_TYPE_WIFI:
+ if (bg_scan == TRUE)
+ device->scan_interval = 300;
+ else
+ device->scan_interval = 0;
break;
}
}
/**
- * connman_device_get_name:
- * @device: device structure
- *
- * Get unique name of device
- */
-const char *connman_device_get_name(struct connman_device *device)
-{
- return device->element.name;
-}
-
-/**
- * connman_device_get_path:
- * @device: device structure
- *
- * Get path name of device
- */
-const char *connman_device_get_path(struct connman_device *device)
-{
- return device->element.path;
-}
-
-/**
* connman_device_set_index:
* @device: device structure
* @index: index number
* connman_device_set_interface:
* @device: device structure
* @interface: interface name
- * @control: control interface
*
* Set interface name of device
*/
void connman_device_set_interface(struct connman_device *device,
- const char *interface, const char *control)
+ const char *interface)
{
g_free(device->element.devname);
device->element.devname = g_strdup(interface);
g_free(device->interface);
device->interface = g_strdup(interface);
- g_free(device->control);
- device->control = g_strdup(control);
-
if (device->name == NULL) {
const char *str = type2description(device->type);
if (str != NULL && device->interface != NULL)
}
}
-const char *connman_device_get_control(struct connman_device *device)
-{
- return device->control;
-}
-
/**
* connman_device_set_ident:
* @device: device structure
int connman_device_set_powered(struct connman_device *device,
connman_bool_t powered)
{
- DBG("driver %p powered %d", device, powered);
-
- if (device->timeout > 0) {
- g_source_remove(device->timeout);
- device->timeout = 0;
- }
-
- if (device->pending != NULL) {
- g_dbus_send_reply(connection, device->pending,
- DBUS_TYPE_INVALID);
+ int err;
+ enum connman_service_type type;
- dbus_message_unref(device->pending);
- device->pending = NULL;
- }
+ DBG("driver %p powered %d", device, powered);
if (device->powered == powered) {
device->powered_pending = powered;
}
if (powered == TRUE)
- __connman_device_enable(device);
+ err = __connman_device_enable(device);
else
- __connman_device_disable(device);
+ err = __connman_device_disable(device);
+
+ if (err < 0 && err != -EINPROGRESS && err != -EALREADY)
+ return err;
device->powered = powered;
device->powered_pending = powered;
+ type = __connman_device_get_service_type(device);
+
if (device->powered == TRUE)
- __connman_technology_enable_device(device);
+ __connman_technology_enable(type);
else
- __connman_technology_disable_device(device);
+ __connman_technology_disable(type);
- if (device->offlinemode == TRUE && powered == TRUE) {
- powered_changed(device);
+ if (device->offlinemode == TRUE && powered == TRUE)
return connman_device_set_powered(device, FALSE);
- }
-
- if (device->registered == FALSE)
- return 0;
-
- powered_changed(device);
if (powered == FALSE)
return 0;
reset_scan_trigger(device);
- if (device->driver->scan)
+ if (device->driver && device->driver->scan)
device->driver->scan(device);
return 0;
device->blocked = blocked;
- blocked_changed(device);
-
if (device->offlinemode == TRUE)
return 0;
while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
struct connman_network *network = value;
- if (__connman_network_get_connecting(network) == TRUE) {
+ if (connman_network_get_connecting(network) == TRUE) {
/*
* Skip network in the process of connecting.
* This is a workaround for WiFi networks serviced
* will fail. There is nothing to be gained by
* removing the network here anyway.
*/
- connman_warn("Skipping disconnect of %s",
+ connman_warn("Skipping disconnect of %s, network is connecting.",
connman_network_get_identifier(network));
continue;
}
return 0;
}
+static void mark_network_available(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct connman_network *network = value;
+
+ connman_network_set_available(network, TRUE);
+}
+
static void mark_network_unavailable(gpointer key, gpointer value,
gpointer user_data)
{
remove_unavailable_network, NULL);
}
-static void scanning_changed(struct connman_device *device)
+connman_bool_t __connman_device_scanning(struct connman_device *device)
{
- connman_dbus_property_changed_basic(device->element.path,
- CONNMAN_DEVICE_INTERFACE, "Scanning",
- DBUS_TYPE_BOOLEAN, &device->scanning);
+ return device->scanning;
+}
+
+void connman_device_reset_scanning(struct connman_device *device)
+{
+ device->scanning = FALSE;
+
+ g_hash_table_foreach(device->networks,
+ mark_network_available, NULL);
+
}
/**
device->scanning = scanning;
- scanning_changed(device);
-
if (scanning == TRUE) {
reset_scan_trigger(device);
if (device->connections > 0)
return 0;
- if (device->disconnected == TRUE)
- return 0;
-
__connman_service_auto_connect();
return 0;
} else if (g_str_equal(key, "Node") == TRUE) {
g_free(device->node);
device->node = g_strdup(value);
+ } else if (g_str_equal(key, "Path") == TRUE) {
+ g_free(device->path);
+ device->path = g_strdup(value);
+ } else {
+ return -EINVAL;
}
- return connman_element_set_string(&device->element, key, value);
+ return 0;
}
/**
return device->node;
else if (g_str_equal(key, "Interface") == TRUE)
return device->interface;
+ else if (g_str_equal(key, "Path") == TRUE)
+ return device->path;
- return connman_element_get_string(&device->element, key);
+ return NULL;
}
static void set_offlinemode(struct connman_element *element, gpointer user_data)
return;
device->connections--;
+
+ if (device->connections == 0)
+ device->backoff_interval = SCAN_INITIAL_DELAY;
}
/**
GError *error = NULL;
gchar *identifier;
connman_bool_t powered;
- int val;
DBG("device %p", device);
device->powered_persistent = powered;
g_clear_error(&error);
- val = g_key_file_get_integer(keyfile, identifier,
- "ScanInterval", &error);
- if (error == NULL)
- device->scan_interval = val;
- g_clear_error(&error);
-
done:
g_free(identifier);
g_key_file_set_boolean(keyfile, identifier,
"Powered", device->powered_persistent);
- g_key_file_set_integer(keyfile, identifier,
- "ScanInterval", device->scan_interval);
-
done:
g_free(identifier);
{
DBG("");
- connection = connman_dbus_get_connection();
-
if (connman_storage_register(&device_storage) < 0)
connman_error("Failed to register device storage");
connman_driver_unregister(&device_driver);
connman_storage_unregister(&device_storage);
-
- dbus_connection_unref(connection);
}
projects / framework / connectivity / connman.git / blobdiff