struct connman_element element;
enum connman_network_type type;
enum connman_network_protocol protocol;
+ connman_bool_t associating;
+ connman_bool_t secondary;
connman_bool_t available;
connman_bool_t connected;
connman_bool_t remember;
connman_uint8_t priority;
connman_uint8_t strength;
char *identifier;
+ char *address;
char *name;
char *node;
+ char *group;
struct connman_network_driver *driver;
void *driver_data;
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";
DBUS_TYPE_OBJECT_PATH, &path);
}
+ if (network->address != NULL)
+ connman_dbus_dict_append_variant(&dict, "Address",
+ DBUS_TYPE_STRING, &network->address);
+
if (network->name != NULL)
connman_dbus_dict_append_variant(&dict, "Name",
DBUS_TYPE_STRING, &network->name);
- connman_dbus_dict_append_variant(&dict, "Available",
- DBUS_TYPE_BOOLEAN, &network->available);
-
connman_dbus_dict_append_variant(&dict, "Connected",
DBUS_TYPE_BOOLEAN, &network->connected);
- connman_dbus_dict_append_variant(&dict, "Remember",
- DBUS_TYPE_BOOLEAN, &network->remember);
-
if (network->priority > 0)
connman_dbus_dict_append_variant(&dict, "Priority",
DBUS_TYPE_BYTE, &network->priority);
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) {
+ if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
const char *passphrase;
if (type != DBUS_TYPE_STRING)
return __connman_error_permission_denied(msg);
if (network->connected == TRUE)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, EALREADY);
if (network->driver && network->driver->connect) {
enum connman_device_mode mode;
err = network->driver->connect(network);
if (err < 0 && err != -EINPROGRESS)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
} else
network->connected = TRUE;
return __connman_error_permission_denied(msg);
if (network->connected == FALSE)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, EINVAL);
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)
- return __connman_error_failed(msg);
+ return __connman_error_failed(msg, -err);
} else
network->connected = FALSE;
g_free(network->wifi.security);
g_free(network->wifi.passphrase);
+ g_free(network->group);
g_free(network->node);
g_free(network->name);
+ g_free(network->address);
g_free(network->identifier);
}
struct connman_network *network;
connman_uint8_t strength = 0;
const char *str;
+ char *temp;
DBG("identifier %s type %d", identifier, type);
__connman_element_initialize(&network->element);
- network->element.name = g_strdup(identifier);
+ //temp = connman_dbus_encode_string(identifier);
+ temp = g_strdup(identifier);
+ if (temp == NULL) {
+ g_free(network);
+ return NULL;
+ }
+
+ network->element.name = temp;
network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK;
network->element.network = network;
str = type2string(type);
if (str != NULL)
- connman_element_set_static_property(&network->element,
- "Type", DBUS_TYPE_STRING, &str);
+ connman_element_set_string(&network->element, "Type", str);
- connman_element_set_static_property(&network->element,
- "Strength", DBUS_TYPE_BYTE, &strength);
+ connman_element_set_uint8(&network->element, "Strength", strength);
- network->type = type;
+ network->type = type;
+ network->secondary = FALSE;
network->identifier = g_strdup(identifier);
return network;
connman_element_unref(&network->element);
}
+const char *__connman_network_get_type(struct connman_network *network)
+{
+ return type2string(network->type);
+}
+
+/**
+ * connman_network_get_type:
+ * @network: network structure
+ *
+ * Get type of network
+ */
+enum connman_network_type connman_network_get_type(struct connman_network *network)
+{
+ return network->type;
+}
+
/**
* connman_network_get_identifier:
* @network: network structure
}
/**
+ * connman_network_set_group:
+ * @network: network structure
+ * @group: group name
+ *
+ * Set group name for automatic clustering
+ */
+void connman_network_set_group(struct connman_network *network,
+ const char *group)
+{
+ g_free(network->group);
+ network->group = g_strdup(group);
+}
+
+const char *__connman_network_get_group(struct connman_network *network)
+{
+ return network->group;
+}
+
+const char *__connman_network_get_ident(struct connman_network *network)
+{
+ if (network->device == NULL)
+ return NULL;
+
+ return __connman_device_get_ident(network->device);
+}
+
+/**
* connman_network_set_available:
* @network: network structure
* @available: availability state
int connman_network_set_available(struct connman_network *network,
connman_bool_t available)
{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *key = "Available";
-
DBG("network %p available %d", network, available);
if (network->available == available)
network->available = available;
- if (network->registered == FALSE)
- return 0;
-
- if (network->connected == FALSE && network->remember == FALSE)
- return 0;
-
- signal = dbus_message_new_signal(network->element.path,
- CONNMAN_NETWORK_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, &available);
- dbus_message_iter_close_container(&entry, &value);
-
- g_dbus_send_message(connection, signal);
-
return 0;
}
return network->available;
}
-/**
- * connman_network_set_connected:
- * @network: network structure
- * @connected: connected state
- *
- * Change connected state of network
- */
-int connman_network_set_connected(struct connman_network *network,
- connman_bool_t connected)
+static gboolean set_connected(gpointer user_data)
{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *key = "Connected";
-
- DBG("network %p connected %d", network, connected);
-
- if (network->connected == connected)
- return -EALREADY;
-
- network->connected = connected;
-
- if (network->registered == FALSE)
- return 0;
-
- signal = dbus_message_new_signal(network->element.path,
- CONNMAN_NETWORK_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, &connected);
- dbus_message_iter_close_container(&entry, &value);
+ struct connman_network *network = user_data;
+ struct connman_service *service;
- g_dbus_send_message(connection, signal);
+ service = __connman_service_lookup_from_network(network);
- if (connected == TRUE) {
+ if (network->connected == TRUE) {
struct connman_element *element;
enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
__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;
if (connman_element_register(element,
&network->element) < 0)
connman_element_unref(element);
+
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_CONFIGURATION);
}
} else {
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_IDLE);
+
connman_element_unregister_children(&network->element);
__connman_device_set_network(network->device, NULL);
__connman_device_decrease_connections(network->device);
}
- return 0;
+ return FALSE;
}
/**
- * connman_network_get_connected:
+ * connman_network_set_associating:
* @network: network structure
+ * @associating: associating state
*
- * Get network connection status
+ * Change associating state of network
*/
-connman_bool_t connman_network_get_connected(struct connman_network *network)
+int connman_network_set_associating(struct connman_network *network,
+ connman_bool_t associating)
{
- return network->connected;
+ DBG("network %p associating %d", network, associating);
+
+ if (network->associating == associating)
+ return -EALREADY;
+
+ network->associating = associating;
+
+ if (associating == TRUE) {
+ struct connman_service *service;
+
+ service = __connman_service_lookup_from_network(network);
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_ASSOCIATION);
+ }
+
+ return 0;
}
/**
- * connman_network_set_remember:
+ * connman_network_set_connected:
* @network: network structure
- * @remember: remember state
+ * @connected: connected state
*
- * Change remember state of network (known networks)
+ * Change connected state of network
*/
-int connman_network_set_remember(struct connman_network *network,
- connman_bool_t remember)
+int connman_network_set_connected(struct connman_network *network,
+ connman_bool_t connected)
{
DBusMessage *signal;
DBusMessageIter entry, value;
- const char *key = "Remember";
+ const char *key = "Connected";
- DBG("network %p remember %d", network, remember);
+ DBG("network %p connected %d", network, connected);
- if (network->remember == remember)
+ if (network->connected == connected)
return -EALREADY;
- network->remember = remember;
+ network->connected = connected;
- if (network->registered == FALSE)
+ if (connected == TRUE)
+ network->associating = 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");
dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_BOOLEAN_AS_STRING, &value);
- dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &remember);
+ dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &connected);
dbus_message_iter_close_container(&entry, &value);
g_dbus_send_message(connection, signal);
+ 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
+ *
+ * Change remember state of network (known networks)
+ */
+int connman_network_set_remember(struct connman_network *network,
+ connman_bool_t remember)
+{
+ DBG("network %p remember %d", network, remember);
+
+ if (network->remember == remember)
+ return -EALREADY;
+
+ network->remember = remember;
+
return 0;
}
if (network->connected == FALSE)
return -ENOTCONN;
+ connman_element_unregister_children(&network->element);
+
if (network->driver && network->driver->disconnect)
return network->driver->disconnect(network);
{
DBG("network %p key %s value %s", network, key, value);
- if (g_str_equal(key, "Name") == TRUE) {
+ if (g_str_equal(key, "Address") == TRUE) {
+ g_free(network->address);
+ network->address = g_strdup(value);
+ } else if (g_str_equal(key, "Name") == TRUE) {
g_free(network->name);
network->name = g_strdup(value);
} else if (g_str_equal(key, "Node") == TRUE) {
network->wifi.passphrase = g_strdup(value);
}
- return 0;
+ return connman_element_set_string(&network->element, key, value);
}
/**
{
DBG("network %p key %s", network, key);
- if (g_str_equal(key, "Name") == TRUE)
+ if (g_str_equal(key, "Address") == TRUE)
+ return network->address;
+ else if (g_str_equal(key, "Name") == TRUE)
return network->name;
else if (g_str_equal(key, "Node") == TRUE)
return network->node;
else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
return network->wifi.passphrase;
- return NULL;
+ return connman_element_get_string(&network->element, key);
}
/**
if (g_str_equal(key, "Priority") == TRUE)
network->priority = value;
- else if (g_str_equal(key, "Strength") == TRUE) {
+ else if (g_str_equal(key, "Strength") == TRUE)
network->strength = value;
- connman_element_set_static_property(&network->element,
- "Strength", DBUS_TYPE_BYTE, &value);
- }
- return 0;
+ return connman_element_set_uint8(&network->element, key, value);
}
/**
else if (g_str_equal(key, "Strength") == TRUE)
return network->strength;
- return 0;
+ return connman_element_get_uint8(&network->element, key);
}
/**
network->wifi.ssid_len = 0;
}
- return 0;
+ return connman_element_set_blob(&network->element, key, data, size);
}
/**
return network->wifi.ssid;
}
- return NULL;
+ return connman_element_get_blob(&network->element, key, size);
}
void __connman_network_set_device(struct connman_network *network,
return err;
}
+ network->secondary = connman_device_get_secondary(network->device);
+
+ switch (network->type) {
+ case CONNMAN_NETWORK_TYPE_UNKNOWN:
+ case CONNMAN_NETWORK_TYPE_VENDOR:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_HSO:
+ break;
+ case CONNMAN_NETWORK_TYPE_WIFI:
+ case CONNMAN_NETWORK_TYPE_WIMAX:
+ if (network->secondary == FALSE)
+ __connman_profile_add_network(network);
+ break;
+ }
+
return 0;
}
if (network->driver == NULL)
return;
+ switch (network->type) {
+ case CONNMAN_NETWORK_TYPE_UNKNOWN:
+ case CONNMAN_NETWORK_TYPE_VENDOR:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+ case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+ case CONNMAN_NETWORK_TYPE_HSO:
+ break;
+ case CONNMAN_NETWORK_TYPE_WIFI:
+ case CONNMAN_NETWORK_TYPE_WIMAX:
+ if (network->secondary == FALSE)
+ __connman_profile_remove_network(network);
+ break;
+ }
+
unregister_interface(element);
if (network->driver->remove)
network->driver->remove(network);
}
+static void network_change(struct connman_element *element)
+{
+ struct connman_network *network = element->network;
+
+ DBG("element %p name %s", element, element->name);
+
+ if (element->state != CONNMAN_ELEMENT_STATE_ERROR)
+ return;
+
+ if (element->error != CONNMAN_ELEMENT_ERROR_DHCP_FAILED)
+ return;
+
+ if (network->connected == FALSE)
+ return;
+
+ connman_element_unregister_children(element);
+
+ connman_device_set_disconnected(network->device, TRUE);
+
+ if (network->driver && network->driver->disconnect) {
+ network->driver->disconnect(network);
+ return;
+ }
+
+ network->connected = FALSE;
+}
+
static struct connman_driver network_driver = {
.name = "network",
.type = CONNMAN_ELEMENT_TYPE_NETWORK,
.priority = CONNMAN_DRIVER_PRIORITY_LOW,
.probe = network_probe,
.remove = network_remove,
+ .change = network_change,
};
static int network_init(struct connman_device *device)
gchar *pathname, *data = NULL;
gsize length;
const char *name;
+ char *str;
int val;
DBG("network %p", network);
g_free(data);
- network->remember = g_key_file_get_boolean(keyfile,
- network->identifier, "Remember", NULL);
-
val = g_key_file_get_integer(keyfile, network->identifier,
"Priority", NULL);
if (val > 0)
network->priority = val;
- if (network->remember == TRUE) {
- g_free(network->wifi.security);
- network->wifi.security = g_key_file_get_string(keyfile,
+ str = g_key_file_get_string(keyfile,
network->identifier, "WiFi.Security", NULL);
+ if (str != NULL) {
+ g_free(network->wifi.security);
+ network->wifi.security = str;
+ }
- g_free(network->wifi.passphrase);
- network->wifi.passphrase = g_key_file_get_string(keyfile,
+ str = g_key_file_get_string(keyfile,
network->identifier, "WiFi.Passphrase", NULL);
+ if (str != NULL) {
+ g_free(network->wifi.passphrase);
+ network->wifi.passphrase = str;
}
g_key_file_free(keyfile);
g_free(data);
update:
- g_key_file_set_boolean(keyfile, network->identifier,
- "Remember", network->remember);
-
if (network->priority > 0)
g_key_file_set_integer(keyfile, network->identifier,
"Priority", network->priority);
- if (network->remember == TRUE) {
+ 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);
data = g_key_file_to_data(keyfile, &length, NULL);
- g_file_set_contents(pathname, data, length, NULL);
+ if (g_file_set_contents(pathname, data, length, NULL) == FALSE)
+ connman_error("Failed to store network information");
done:
g_free(data);
projects / connman / blobdiff