break;
case CONNMAN_NETWORK_TYPE_WIFI:
return "wifi";
+ case CONNMAN_NETWORK_TYPE_WIMAX:
+ return "wimax";
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
return "bluetooth";
struct connman_network *network = data;
DBusMessageIter iter, value;
const char *name;
+ int type;
DBG("conn %p", conn);
CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
return __connman_error_permission_denied(msg);
+ type = dbus_message_iter_get_arg_type(&value);
+
if (g_str_equal(name, "Remember") == TRUE) {
connman_bool_t remember;
+ if (type != DBUS_TYPE_BOOLEAN)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_get_basic(&value, &remember);
if (network->remember == remember)
return __connman_error_invalid_arguments(msg);
+
+ network->remember = remember;
} else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
const char *passphrase;
+ if (type != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
if (__connman_security_check_privilege(msg,
CONNMAN_SECURITY_PRIVILEGE_SECRET) < 0)
return __connman_error_permission_denied(msg);
} else if (g_str_equal(name, "Priority") == TRUE) {
connman_uint8_t priority;
+ if (type != DBUS_TYPE_BYTE)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_get_basic(&value, &priority);
network->priority = priority;
return __connman_error_failed(msg);
if (network->driver && network->driver->connect) {
+ enum connman_device_mode mode;
+
+ mode = connman_device_get_mode(network->device);
+ if (mode == CONNMAN_DEVICE_MODE_NETWORK_SINGLE)
+ __connman_device_disconnect(network->device);
+
err = network->driver->connect(network);
if (err < 0 && err != -EINPROGRESS)
return __connman_error_failed(msg);
connman_element_unregister_children(&network->element);
+ connman_device_set_disconnected(network->device, TRUE);
+
if (network->driver && network->driver->disconnect) {
err = network->driver->disconnect(network);
if (err < 0 && err != -EINPROGRESS)
static void emit_networks_signal(struct connman_device *device)
{
+ const char *path = connman_device_get_path(device);
DBusMessage *signal;
DBusMessageIter entry;
- signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ signal = dbus_message_new_signal(path,
+ CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
if (signal == NULL)
return;
struct connman_network *network;
connman_uint8_t strength = 0;
const char *str;
+ char *temp;
+ unsigned int i;
DBG("identifier %s type %d", identifier, type);
DBG("network %p", network);
- network->element.refcount = 1;
+ __connman_element_initialize(&network->element);
+
+ temp = g_strdup(identifier);
+ if (temp == NULL) {
+ g_free(network);
+ return NULL;
+ }
+
+ for (i = 0; i < strlen(temp); i++) {
+ char tmp = temp[i];
+ if ((tmp < '0' || tmp > '9') && (tmp < 'A' || tmp > 'Z') &&
+ (tmp < 'a' || tmp > 'z'))
+ temp[i] = '_';
+ }
- network->element.name = g_strdup(identifier);
+ network->element.name = temp;
network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK;
- network->element.index = -1;
network->element.network = network;
network->element.destruct = network_destruct;
str = type2string(type);
if (str != NULL)
- connman_element_add_static_property(&network->element,
+ connman_element_set_static_property(&network->element,
"Type", DBUS_TYPE_STRING, &str);
- connman_element_add_static_property(&network->element,
+ connman_element_set_static_property(&network->element,
"Strength", DBUS_TYPE_BYTE, &strength);
network->type = type;
if (network->registered == FALSE)
return 0;
- if (network->connected == FALSE && network->remember == FALSE)
+ if (network->connected == TRUE)
+ return 0;
+
+ if (network->remember == FALSE)
return 0;
signal = dbus_message_new_signal(network->element.path,
return network->available;
}
+static gboolean set_connected(gpointer user_data)
+{
+ struct connman_network *network = user_data;
+
+ if (network->connected == TRUE) {
+ struct connman_element *element;
+ enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
+
+ switch (network->protocol) {
+ case CONNMAN_NETWORK_PROTOCOL_UNKNOWN:
+ return 0;
+ case CONNMAN_NETWORK_PROTOCOL_IP:
+ type = CONNMAN_ELEMENT_TYPE_DHCP;
+ break;
+ case CONNMAN_NETWORK_PROTOCOL_PPP:
+ type = CONNMAN_ELEMENT_TYPE_PPP;
+ break;
+ }
+
+ __connman_device_increase_connections(network->device);
+
+ __connman_device_set_network(network->device, network);
+
+ connman_device_set_disconnected(network->device, FALSE);
+
+ element = connman_element_create(NULL);
+ if (element != NULL) {
+ element->type = type;
+ element->index = network->element.index;
+
+ if (connman_element_register(element,
+ &network->element) < 0)
+ connman_element_unref(element);
+ }
+ } else {
+ connman_element_unregister_children(&network->element);
+
+ __connman_device_set_network(network->device, NULL);
+
+ __connman_device_decrease_connections(network->device);
+ }
+
+ return FALSE;
+}
+
/**
* connman_network_set_connected:
* @network: network structure
network->connected = connected;
- if (network->registered == FALSE)
+ if (network->registered == FALSE) {
+ g_idle_add(set_connected, network);
return 0;
+ }
signal = dbus_message_new_signal(network->element.path,
CONNMAN_NETWORK_INTERFACE, "PropertyChanged");
g_dbus_send_message(connection, signal);
- if (connected == TRUE) {
- struct connman_element *element;
- enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
-
- switch (network->protocol) {
- case CONNMAN_NETWORK_PROTOCOL_UNKNOWN:
- return 0;
- case CONNMAN_NETWORK_PROTOCOL_IP:
- type = CONNMAN_ELEMENT_TYPE_DHCP;
- break;
- case CONNMAN_NETWORK_PROTOCOL_PPP:
- type = CONNMAN_ELEMENT_TYPE_PPP;
- break;
- }
-
- __connman_device_increase_connections(network->device);
-
- element = connman_element_create(NULL);
- if (element != NULL) {
- element->type = type;
- element->index = network->element.index;
-
- if (connman_element_register(element,
- &network->element) < 0)
- connman_element_unref(element);
- }
- } else {
- connman_element_unregister_children(&network->element);
-
- __connman_device_decrease_connections(network->device);
- }
+ set_connected(network);
return 0;
}
/**
+ * connman_network_get_connected:
+ * @network: network structure
+ *
+ * Get network connection status
+ */
+connman_bool_t connman_network_get_connected(struct connman_network *network)
+{
+ return network->connected;
+}
+
+/**
* connman_network_set_remember:
* @network: network structure
* @remember: remember state
return 0;
}
+int __connman_network_disconnect(struct connman_network *network)
+{
+ if (network->connected == FALSE)
+ return -ENOTCONN;
+
+ if (network->driver && network->driver->disconnect)
+ return network->driver->disconnect(network);
+
+ network->connected = FALSE;
+
+ return 0;
+}
+
/**
* connman_network_set_string:
* @network: network structure
{
DBG("network %p key %s value %d", network, key, value);
- if (g_str_equal(key, "Strength") == TRUE) {
+ if (g_str_equal(key, "Priority") == TRUE)
+ network->priority = value;
+ else if (g_str_equal(key, "Strength") == TRUE) {
network->strength = value;
connman_element_set_static_property(&network->element,
"Strength", DBUS_TYPE_BYTE, &value);
}
/**
+ * connman_network_get_uint8:
+ * @network: network structure
+ * @key: unique identifier
+ *
+ * Get integer value for specific key
+ */
+connman_uint8_t connman_network_get_uint8(struct connman_network *network,
+ const char *key)
+{
+ DBG("network %p key %s", network, key);
+
+ if (g_str_equal(key, "Priority") == TRUE)
+ return network->priority;
+ else if (g_str_equal(key, "Strength") == TRUE)
+ return network->strength;
+
+ return 0;
+}
+
+/**
* connman_network_set_blob:
* @network: network structure
* @key: unique identifier
.remove = network_remove,
};
+static int network_init(struct connman_device *device)
+{
+ DBG("device %p", device);
+
+ return 0;
+}
+
static int network_load(struct connman_network *network)
{
GKeyFile *keyfile;
g_key_file_set_integer(keyfile, network->identifier,
"Priority", network->priority);
- if (network->wifi.security != NULL)
- g_key_file_set_string(keyfile, network->identifier,
+ if (network->remember == TRUE || network->connected == TRUE) {
+ if (network->wifi.security != NULL)
+ g_key_file_set_string(keyfile, network->identifier,
"WiFi.Security", network->wifi.security);
- if (network->wifi.passphrase != NULL)
- g_key_file_set_string(keyfile, network->identifier,
+ if (network->wifi.passphrase != NULL)
+ g_key_file_set_string(keyfile, network->identifier,
"WiFi.Passphrase", network->wifi.passphrase);
+ }
data = g_key_file_to_data(keyfile, &length, NULL);
static struct connman_storage network_storage = {
.name = "network",
.priority = CONNMAN_STORAGE_PRIORITY_LOW,
+ .network_init = network_init,
.network_load = network_load,
.network_save = network_save,
};
projects / connman / blobdiff