connman_bool_t powered;
connman_bool_t powered_pending;
connman_bool_t powered_persistent;
- connman_bool_t carrier;
connman_bool_t scanning;
connman_bool_t disconnected;
+ connman_bool_t reconnect;
connman_uint16_t scan_interval;
char *name;
char *node;
int phyindex;
unsigned int connections;
guint scan_timeout;
- struct connman_ipconfig *ipconfig;
struct connman_device_driver *driver;
void *driver_data;
}
}
+static void force_scan_trigger(struct connman_device *device)
+{
+ clear_scan_trigger(device);
+
+ device->scan_timeout = g_timeout_add_seconds(5,
+ device_scan_trigger, device);
+}
+
+void connman_device_schedule_scan(struct connman_device *device)
+{
+ reset_scan_trigger(device);
+}
+
static const char *type2description(enum connman_device_type type)
{
switch (type) {
return "Bluetooth";
case CONNMAN_DEVICE_TYPE_GPS:
return "GPS";
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
return "Cellular";
}
return "bluetooth";
case CONNMAN_DEVICE_TYPE_GPS:
return "gps";
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
return "cellular";
}
case CONNMAN_DEVICE_TYPE_UNKNOWN:
case CONNMAN_DEVICE_TYPE_VENDOR:
case CONNMAN_DEVICE_TYPE_GPS:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
break;
case CONNMAN_DEVICE_TYPE_ETHERNET:
return CONNMAN_SERVICE_TYPE_ETHERNET;
return CONNMAN_SERVICE_TYPE_WIMAX;
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
return CONNMAN_SERVICE_TYPE_BLUETOOTH;
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
return CONNMAN_SERVICE_TYPE_CELLULAR;
return CONNMAN_SERVICE_TYPE_UNKNOWN;
}
-static int set_connected(struct connman_device *device,
- connman_bool_t connected)
-{
- if (connected == TRUE) {
- enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
- struct connman_element *element;
-
- device->disconnected = TRUE;
-
- switch (device->element.ipv4.method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
- return 0;
- case CONNMAN_IPCONFIG_METHOD_STATIC:
- type = CONNMAN_ELEMENT_TYPE_IPV4;
- break;
- case CONNMAN_IPCONFIG_METHOD_DHCP:
- type = CONNMAN_ELEMENT_TYPE_DHCP;
- break;
- }
-
- element = connman_element_create(NULL);
- if (element != NULL) {
- struct connman_service *service;
-
- element->type = type;
- element->index = device->element.index;
-
- if (connman_element_register(element,
- &device->element) < 0)
- connman_element_unref(element);
-
- device->disconnected = FALSE;
-
- service = __connman_service_lookup_from_device(device);
- __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_CONFIGURATION);
- }
- } else {
- struct connman_service *service;
-
- connman_element_unregister_children(&device->element);
-
- device->disconnected = TRUE;
-
- service = __connman_service_lookup_from_device(device);
- __connman_service_indicate_state(service,
- CONNMAN_SERVICE_STATE_IDLE);
- }
-
- if (connected == TRUE) {
- enum connman_service_type type;
-
- type = __connman_device_get_service_type(device);
- __connman_notifier_connect(type);
- } else {
- enum connman_service_type type;
-
- type = __connman_device_get_service_type(device);
- __connman_notifier_disconnect(type);
- }
-
- return 0;
-}
-
-static int set_carrier(struct connman_device *device, connman_bool_t carrier)
-{
- if (carrier == TRUE)
- __connman_profile_add_device(device);
- else
- __connman_profile_remove_device(device);
-
- return set_connected(device, carrier);
-}
-
static int powered_changed(struct connman_device *device)
{
DBusMessage *signal;
if (device->powered_pending == powered)
return -EALREADY;
- device->powered_pending = powered;
-
if (!driver)
return -EINVAL;
if (powered == TRUE) {
if (driver->enable) {
+ device->powered_pending = powered;
+
err = driver->enable(device);
if (err == 0)
__connman_notifier_enable(type);
} else
err = -EINVAL;
} else {
+ device->powered_pending = powered;
+
+ device->reconnect = FALSE;
+
clear_scan_trigger(device);
g_hash_table_remove_all(device->networks);
- set_carrier(device, FALSE);
-
if (driver->disable) {
err = driver->disable(device);
if (err == 0)
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
break;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- __connman_element_append_ipv4(&device->element, &dict);
- break;
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
if (device->scan_interval > 0)
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- return __connman_error_invalid_arguments(msg);
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
reset_scan_trigger(device);
}
- } else if (g_str_has_prefix(name, "IPv4.") == TRUE) {
- int err;
-
- if (device->ipconfig == NULL)
- return __connman_error_invalid_property(msg);
-
- switch (device->mode) {
- case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
- case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
- return __connman_error_invalid_arguments(msg);
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- break;
- }
-
- err = __connman_ipconfig_set_ipv4(device->ipconfig,
- name + 5, &value);
- if (err < 0)
- return __connman_error_failed(msg, -err);
} else
return __connman_error_invalid_property(msg);
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
return __connman_error_not_supported(msg);
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- if (device->carrier == TRUE && device->secondary == FALSE)
- __connman_profile_add_device(device);
- break;
}
if (device->offlinemode == FALSE &&
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
break;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- if (device->secondary == FALSE)
- __connman_profile_remove_device(device);
- break;
}
type = __connman_device_get_service_type(device);
device->timeout = 0;
}
+ clear_scan_trigger(device);
+
if (device->pending != NULL) {
dbus_message_unref(device->pending);
device->pending = NULL;
g_free(device->control);
g_free(device->interface);
- if (device->ipconfig != NULL) {
- connman_ipconfig_unref(device->ipconfig);
- device->ipconfig = NULL;
- }
-
g_free(device->last_network);
g_hash_table_destroy(device->networks);
case CONNMAN_DEVICE_TYPE_GPS:
device->scan_interval = 0;
break;
+ case CONNMAN_DEVICE_TYPE_CELLULAR:
case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
device->scan_interval = 0;
break;
}
void connman_device_set_index(struct connman_device *device, int index)
{
device->element.index = index;
-
- if (device->ipconfig != NULL)
- connman_ipconfig_unref(device->ipconfig);
-
- device->ipconfig = connman_ipconfig_create(index);
}
/**
if (device->offlinemode == TRUE)
return 0;
+ connman_info("%s {rfkill} blocked %d", device->interface, blocked);
+
if (blocked == FALSE)
powered = device->powered_persistent;
else
return set_powered(device, powered);
}
-/**
- * connman_device_set_carrier:
- * @device: device structure
- * @carrier: carrier state
- *
- * Change carrier state of device (only for device without scanning)
- */
-int connman_device_set_carrier(struct connman_device *device,
- connman_bool_t carrier)
-{
- DBG("device %p carrier %d", device, carrier);
-
- switch (device->mode) {
- case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
- case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
- return -EINVAL;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- break;
- }
-
- if (device->carrier == carrier)
- return -EALREADY;
-
- device->carrier = carrier;
-
- return set_carrier(device, device->carrier);
-}
-
int __connman_device_scan(struct connman_device *device)
{
if (!device->driver || !device->driver->scan)
if (device->powered == FALSE)
return -ENOLINK;
+ reset_scan_trigger(device);
+
return device->driver->scan(device);
}
device->powered_pending = FALSE;
+ device->reconnect = FALSE;
+
clear_scan_trigger(device);
g_hash_table_remove_all(device->networks);
return __connman_device_disable(device);
}
-int __connman_device_connect(struct connman_device *device)
-{
- DBG("device %p", device);
-
- if (device->disconnected == FALSE)
- return -EINVAL;
-
- if (device->driver && device->driver->connect)
- device->driver->connect(device);
-
- return 0;
-}
-
int __connman_device_disconnect(struct connman_device *device)
{
GHashTableIter iter;
while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
struct connman_network *network = value;
+ if (__connman_network_get_connecting(network) == TRUE) {
+ /*
+ * Skip network in the process of connecting.
+ * This is a workaround for WiFi networks serviced
+ * by the supplicant plugin that hold a reference
+ * to the network. If we disconnect the network
+ * here then the referenced object will not be
+ * registered and usage (like launching DHCP client)
+ * will fail. There is nothing to be gained by
+ * removing the network here anyway.
+ */
+ connman_warn("Skipping disconnect of %s",
+ connman_network_get_identifier(network));
+ continue;
+ }
+
__connman_network_disconnect(network);
}
- if (device->driver && device->driver->disconnect)
- device->driver->disconnect(device);
-
return 0;
}
remove_unavailable_network, NULL);
}
+static void scanning_changed(struct connman_device *device)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *key = "Scanning";
+
+ signal = dbus_message_new_signal(device->element.path,
+ CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_BOOLEAN_AS_STRING, &value);
+ dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
+ &device->scanning);
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(connection, signal);
+}
+
+static void mark_network_available(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct connman_network *network = value;
+
+ connman_network_set_available(network, TRUE);
+}
+
+void connman_device_cleanup_scanning(struct connman_device *device)
+{
+ device->scanning = FALSE;
+
+ scanning_changed(device);
+
+ g_hash_table_foreach(device->networks,
+ mark_network_available, NULL);
+}
+
/**
* connman_device_set_scanning:
* @device: device structure
int connman_device_set_scanning(struct connman_device *device,
connman_bool_t scanning)
{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *key = "Scanning";
-
DBG("device %p scanning %d", device, scanning);
if (!device->driver || !device->driver->scan)
device->scanning = scanning;
- signal = dbus_message_new_signal(device->element.path,
- CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
- if (signal == NULL)
- return 0;
-
- dbus_message_iter_init_append(signal, &entry);
-
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
- dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
- DBUS_TYPE_BOOLEAN_AS_STRING, &value);
- dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &scanning);
- dbus_message_iter_close_container(&entry, &value);
-
- g_dbus_send_message(connection, signal);
+ scanning_changed(device);
if (scanning == TRUE) {
reset_scan_trigger(device);
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
return -EINVAL;
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
device->disconnected = disconnected;
+ if (disconnected == TRUE)
+ force_scan_trigger(device);
+
return 0;
}
}
/**
- * connman_device_set_connected:
- * @device: device structure
- * @connected: connected state
- *
- * Change connected state of device (for Ethernet like devices)
- */
-int connman_device_set_connected(struct connman_device *device,
- connman_bool_t connected)
-{
- DBG("device %p connected %d", device, connected);
-
- switch (device->mode) {
- case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
- case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
- return -EINVAL;
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
- break;
- }
-
- if (device->carrier == FALSE)
- return -ENOTCONN;
-
- return set_connected(device, connected);
-}
-
-/**
* connman_device_set_string:
* @device: device structure
* @key: unique identifier
DBG("device %p network %p", device, network);
+ if (identifier == NULL)
+ return -EINVAL;
+
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
return -EINVAL;
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
return 0;
}
+void connman_device_remove_all_networks(struct connman_device *device)
+{
+ g_hash_table_remove_all(device->networks);
+}
+
void __connman_device_set_network(struct connman_device *device,
struct connman_network *network)
{
}
}
+void __connman_device_set_reconnect(struct connman_device *device,
+ connman_bool_t reconnect)
+{
+ device->reconnect = reconnect;
+}
+
+connman_bool_t __connman_device_get_reconnect(
+ struct connman_device *device)
+{
+ return device->reconnect;
+}
+
/**
* connman_device_register:
* @device: device structure
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
break;
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
switch (device->mode) {
case CONNMAN_DEVICE_MODE_UNKNOWN:
- case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
break;
case CONNMAN_DEVICE_MODE_NETWORK_SINGLE:
case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
projects / framework / connectivity / connman.git / blobdiff