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);
} else
network->connected = TRUE;
- connman_device_set_disconnected(network->device, FALSE);
-
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
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)
} else
network->connected = FALSE;
- connman_device_set_disconnected(network->device, TRUE);
-
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
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;
+ unsigned int i;
DBG("identifier %s type %d", identifier, type);
__connman_element_initialize(&network->element);
- network->element.name = g_strdup(identifier);
+ 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 = 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->identifier = g_strdup(identifier);
}
/**
+ * 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);
+}
+
+/**
* connman_network_set_available:
* @network: network structure
* @available: availability state
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);
-
- __connman_device_set_network(network->device, network);
-
- 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);
- }
+ set_connected(network);
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;
}
+ __connman_profile_add_network(network);
+
return 0;
}
if (network->driver == NULL)
return;
+ __connman_profile_remove_network(network);
+
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);
if (val > 0)
network->priority = val;
- 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);
projects / connman / blobdiff