connman_bool_t available;
connman_bool_t connected;
connman_bool_t remember;
- connman_uint8_t priority;
connman_uint8_t strength;
char *identifier;
char *address;
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);
-
if (network->strength > 0)
connman_dbus_dict_append_variant(&dict, "Strength",
DBUS_TYPE_BYTE, &network->strength);
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)
g_free(network->wifi.passphrase);
network->wifi.passphrase = g_strdup(passphrase);
- } 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;
}
__connman_storage_save_network(network);
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 == TRUE)
- return 0;
-
- if (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;
}
int connman_network_set_remember(struct connman_network *network,
connman_bool_t remember)
{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *key = "Remember";
-
DBG("network %p remember %d", network, remember);
if (network->remember == remember)
network->remember = remember;
- 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, &remember);
- dbus_message_iter_close_container(&entry, &value);
-
- g_dbus_send_message(connection, signal);
-
return 0;
}
{
DBG("network %p key %s value %d", network, key, value);
- if (g_str_equal(key, "Priority") == TRUE)
- network->priority = value;
- else if (g_str_equal(key, "Strength") == TRUE)
+ if (g_str_equal(key, "Strength") == TRUE)
network->strength = value;
return connman_element_set_uint8(&network->element, key, value);
{
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)
+ if (g_str_equal(key, "Strength") == TRUE)
return network->strength;
return connman_element_get_uint8(&network->element, key);
.change = network_change,
};
-static int network_init(struct connman_device *device)
-{
- DBG("device %p", device);
-
- return 0;
-}
-
-static int network_load(struct connman_network *network)
-{
- GKeyFile *keyfile;
- gchar *pathname, *data = NULL;
- gsize length;
- const char *name;
- char *str;
- int val;
-
- DBG("network %p", network);
-
- name = connman_device_get_name(network->device);
- if (name == NULL)
- return -EINVAL;
-
- pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR, name);
- if (pathname == NULL)
- return -ENOMEM;
-
- keyfile = g_key_file_new();
-
- if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) {
- g_free(pathname);
- return -ENOENT;
- }
-
- g_free(pathname);
-
- if (g_key_file_load_from_data(keyfile, data, length,
- 0, NULL) == FALSE) {
- g_free(data);
- return -EILSEQ;
- }
-
- 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;
-
- str = g_key_file_get_string(keyfile,
- network->identifier, "WiFi.Security", NULL);
- if (str != NULL) {
- g_free(network->wifi.security);
- network->wifi.security = str;
- }
-
- 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);
-
- return 0;
-}
-
-static int network_save(struct connman_network *network)
-{
- GKeyFile *keyfile;
- gchar *pathname, *data = NULL;
- gsize length;
- const char *name;
-
- DBG("network %p", network);
-
- name = connman_device_get_name(network->device);
- if (name == NULL)
- return -EINVAL;
-
- pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR, name);
- if (pathname == NULL)
- return -ENOMEM;
-
- keyfile = g_key_file_new();
-
- if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE)
- goto update;
-
- if (length > 0) {
- if (g_key_file_load_from_data(keyfile, data, length,
- 0, NULL) == FALSE)
- goto done;
- }
-
- 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 || 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,
- "WiFi.Passphrase", network->wifi.passphrase);
- }
-
- data = g_key_file_to_data(keyfile, &length, NULL);
-
- if (g_file_set_contents(pathname, data, length, NULL) == FALSE)
- connman_error("Failed to store network information");
-
-done:
- g_free(data);
-
- g_key_file_free(keyfile);
-
- g_free(pathname);
-
- return 0;
-}
-
-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,
-};
-
int __connman_network_init(void)
{
DBG("");
connection = connman_dbus_get_connection();
- if (connman_storage_register(&network_storage) < 0)
- connman_error("Failed to register network storage");
-
return connman_driver_register(&network_driver);
}
connman_driver_unregister(&network_driver);
- connman_storage_unregister(&network_storage);
-
dbus_connection_unref(connection);
}