*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include <string.h>
#include <netdb.h>
#include <gdbus.h>
+#include <ctype.h>
+
+#include <connman/storage.h>
+#include <connman/setting.h>
#include "connman.h"
static GSequence *service_list = NULL;
static GHashTable *service_hash = NULL;
static GSList *counter_list = NULL;
+static unsigned int autoconnect_timeout = 0;
+static struct connman_service *current_default = NULL;
+static connman_bool_t services_dirty = FALSE;
struct connman_stats {
connman_bool_t valid;
};
struct connman_service {
- gint refcount;
- gint session_usage_count;
+ int refcount;
+ int session_usage_count;
char *identifier;
char *path;
enum connman_service_type type;
char *passphrase;
char *agent_passphrase;
connman_bool_t roaming;
- connman_bool_t login_required;
- connman_bool_t network_created;
struct connman_ipconfig *ipconfig_ipv4;
struct connman_ipconfig *ipconfig_ipv6;
struct connman_network *network;
struct connman_provider *provider;
char **nameservers;
char **nameservers_config;
+ char **nameservers_auto;
char **domains;
char *domainname;
char **timeservers;
+ char **timeservers_config;
/* 802.1x settings from the config files */
char *eap;
char *identity;
char *phase2;
DBusMessage *pending;
guint timeout;
- struct connman_location *location;
struct connman_stats stats;
struct connman_stats stats_roaming;
GHashTable *counter_table;
char **excludes;
char *pac;
connman_bool_t wps;
+ int online_check_count;
+ connman_bool_t do_split_routing;
+ connman_bool_t new_service;
+ connman_bool_t hidden_service;
+ char *config_file;
+ char *config_entry;
};
-static void append_path(gpointer value, gpointer user_data)
-{
- struct connman_service *service = value;
- DBusMessageIter *iter = user_data;
-
- if (service->path == NULL || service->hidden == TRUE)
- return;
-
- dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH,
- &service->path);
-}
-
-void __connman_service_list(DBusMessageIter *iter, void *user_data)
-{
- if (service_list == NULL)
- return;
-
- g_sequence_foreach(service_list, append_path, iter);
-}
-
struct find_data {
const char *path;
struct connman_service *service;
return NULL;
}
+enum connman_service_type __connman_service_string2type(const char *str)
+{
+ if (str == NULL)
+ return CONNMAN_SERVICE_TYPE_UNKNOWN;
+
+ if (strcmp(str, "ethernet") == 0)
+ return CONNMAN_SERVICE_TYPE_ETHERNET;
+ if (strcmp(str, "gadget") == 0)
+ return CONNMAN_SERVICE_TYPE_GADGET;
+ if (strcmp(str, "wifi") == 0)
+ return CONNMAN_SERVICE_TYPE_WIFI;
+ if (strcmp(str, "cellular") == 0)
+ return CONNMAN_SERVICE_TYPE_CELLULAR;
+ if (strcmp(str, "bluetooth") == 0)
+ return CONNMAN_SERVICE_TYPE_BLUETOOTH;
+ if (strcmp(str, "wimax") == 0)
+ return CONNMAN_SERVICE_TYPE_WIMAX;
+ if (strcmp(str, "vpn") == 0)
+ return CONNMAN_SERVICE_TYPE_VPN;
+ if (strcmp(str, "gps") == 0)
+ return CONNMAN_SERVICE_TYPE_GPS;
+ if (strcmp(str, "system") == 0)
+ return CONNMAN_SERVICE_TYPE_SYSTEM;
+
+ return CONNMAN_SERVICE_TYPE_UNKNOWN;
+}
+
static const char *security2string(enum connman_service_security security)
{
switch (security) {
case CONNMAN_SERVICE_SECURITY_WEP:
return "wep";
case CONNMAN_SERVICE_SECURITY_PSK:
+ case CONNMAN_SERVICE_SECURITY_WPA:
+ case CONNMAN_SERVICE_SECURITY_RSN:
return "psk";
case CONNMAN_SERVICE_SECURITY_8021X:
return "ieee8021x";
- case CONNMAN_SERVICE_SECURITY_WPA:
- return "wpa";
- case CONNMAN_SERVICE_SECURITY_RSN:
- return "rsn";
}
return NULL;
DBG("service %p", service);
- keyfile = __connman_storage_load_service(service->identifier);
- if (keyfile == NULL)
+ keyfile = connman_storage_load_service(service->identifier);
+ if (keyfile == NULL) {
+ service->new_service = TRUE;
return -EIO;
+ } else
+ service->new_service = FALSE;
switch (service->type) {
case CONNMAN_SERVICE_TYPE_UNKNOWN:
case CONNMAN_SERVICE_TYPE_SYSTEM:
- case CONNMAN_SERVICE_TYPE_ETHERNET:
case CONNMAN_SERVICE_TYPE_GPS:
- case CONNMAN_SERVICE_TYPE_VPN:
case CONNMAN_SERVICE_TYPE_GADGET:
break;
+ case CONNMAN_SERVICE_TYPE_VPN:
+ service->do_split_routing = g_key_file_get_boolean(keyfile,
+ service->identifier, "SplitRouting", NULL);
+ break;
case CONNMAN_SERVICE_TYPE_WIFI:
if (service->name == NULL) {
gchar *name;
service->favorite = g_key_file_get_boolean(keyfile,
service->identifier, "Favorite", NULL);
- autoconnect = g_key_file_get_boolean(keyfile,
- service->identifier, "AutoConnect", &error);
- if (error == NULL)
- service->autoconnect = autoconnect;
- g_clear_error(&error);
-
str = g_key_file_get_string(keyfile,
service->identifier, "Failure", NULL);
if (str != NULL) {
service->state_ipv4 = service->state_ipv6 =
CONNMAN_SERVICE_STATE_FAILURE;
service->error = string2error(str);
+ g_free(str);
}
+ /* fall through */
+
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ autoconnect = g_key_file_get_boolean(keyfile,
+ service->identifier, "AutoConnect", &error);
+ if (error == NULL)
+ service->autoconnect = autoconnect;
+ g_clear_error(&error);
break;
}
service->nameservers_config = NULL;
}
+ service->timeservers_config = g_key_file_get_string_list(keyfile,
+ service->identifier, "Timeservers", &length, NULL);
+ if (service->timeservers_config != NULL && length == 0) {
+ g_strfreev(service->timeservers_config);
+ service->timeservers_config = NULL;
+ }
+
service->domains = g_key_file_get_string_list(keyfile,
service->identifier, "Domains", &length, NULL);
if (service->domains != NULL && length == 0) {
service->pac = str;
}
+ service->hidden_service = g_key_file_get_boolean(keyfile,
+ service->identifier, "Hidden", NULL);
+
done:
g_key_file_free(keyfile);
{
GKeyFile *keyfile;
gchar *str;
+ guint freq;
const char *cst_str = NULL;
int err = 0;
- DBG("service %p", service);
+ DBG("service %p new %d", service, service->new_service);
+
+ if (service->new_service == TRUE)
+ return -ESRCH;
keyfile = __connman_storage_open_service(service->identifier);
if (keyfile == NULL)
switch (service->type) {
case CONNMAN_SERVICE_TYPE_UNKNOWN:
case CONNMAN_SERVICE_TYPE_SYSTEM:
- case CONNMAN_SERVICE_TYPE_ETHERNET:
case CONNMAN_SERVICE_TYPE_GPS:
- case CONNMAN_SERVICE_TYPE_VPN:
case CONNMAN_SERVICE_TYPE_GADGET:
break;
+ case CONNMAN_SERVICE_TYPE_VPN:
+ g_key_file_set_boolean(keyfile, service->identifier,
+ "SplitRouting", service->do_split_routing);
+ break;
case CONNMAN_SERVICE_TYPE_WIFI:
if (service->network) {
const unsigned char *ssid;
g_string_free(str, TRUE);
}
+
+ freq = connman_network_get_frequency(service->network);
+ g_key_file_set_integer(keyfile, service->identifier,
+ "Frequency", freq);
}
/* fall through */
g_key_file_set_boolean(keyfile, service->identifier,
"Favorite", service->favorite);
- if (service->favorite == TRUE)
- g_key_file_set_boolean(keyfile, service->identifier,
- "AutoConnect", service->autoconnect);
-
if (service->state_ipv4 == CONNMAN_SERVICE_STATE_FAILURE ||
service->state_ipv6 == CONNMAN_SERVICE_STATE_FAILURE) {
const char *failure = error2string(service->error);
g_key_file_remove_key(keyfile, service->identifier,
"Failure", NULL);
}
+ /* fall through */
+
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ if (service->favorite == TRUE)
+ g_key_file_set_boolean(keyfile, service->identifier,
+ "AutoConnect", service->autoconnect);
break;
}
g_key_file_remove_key(keyfile, service->identifier,
"Nameservers", NULL);
+ if (service->timeservers_config != NULL) {
+ guint len = g_strv_length(service->timeservers_config);
+
+ g_key_file_set_string_list(keyfile, service->identifier,
+ "Timeservers",
+ (const gchar **) service->timeservers_config, len);
+ } else
+ g_key_file_remove_key(keyfile, service->identifier,
+ "Timeservers", NULL);
+
if (service->domains != NULL) {
guint len = g_strv_length(service->domains);
g_key_file_remove_key(keyfile, service->identifier,
"Proxy.URL", NULL);
+ if (service->hidden_service == TRUE)
+ g_key_file_set_boolean(keyfile, service->identifier, "Hidden",
+ TRUE);
+
+ if (service->config_file != NULL && strlen(service->config_file) > 0)
+ g_key_file_set_string(keyfile, service->identifier,
+ "Config.file", service->config_file);
+
+ if (service->config_entry != NULL &&
+ strlen(service->config_entry) > 0)
+ g_key_file_set_string(keyfile, service->identifier,
+ "Config.ident", service->config_entry);
+
done:
__connman_storage_save_service(keyfile, service->identifier);
return err;
}
-static guint changed_timeout = 0;
-
-static gboolean notify_services_changed(gpointer user_data)
-{
- changed_timeout = 0;
-
- connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "Services",
- DBUS_TYPE_OBJECT_PATH, __connman_service_list,
- NULL);
-
- return FALSE;
-}
-
-static void services_changed(gboolean delayed)
+void __connman_service_save(struct connman_service *service)
{
- DBG("");
-
- if (changed_timeout > 0) {
- g_source_remove(changed_timeout);
- changed_timeout = 0;
- }
-
- if (__connman_connection_update_gateway() == TRUE) {
- notify_services_changed(NULL);
- return;
- }
-
- if (delayed == FALSE) {
- notify_services_changed(NULL);
- return;
- }
-
- changed_timeout = g_timeout_add_seconds(1, notify_services_changed,
- NULL);
+ service_save(service);
}
static enum connman_service_state combine_state(
return FALSE;
}
+static connman_bool_t is_idle_state(const struct connman_service *service,
+ enum connman_service_state state)
+{
+ switch (state) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ case CONNMAN_SERVICE_STATE_READY:
+ case CONNMAN_SERVICE_STATE_ONLINE:
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ break;
+ case CONNMAN_SERVICE_STATE_IDLE:
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static connman_bool_t is_connecting(struct connman_service *service)
{
return is_connecting_state(service, service->state);
return is_connected_state(service, service->state);
}
+static const char *nameserver_get_ifname(struct connman_service *service)
+{
+ const char *ifname;
+
+ if (service->ipconfig_ipv4)
+ ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv4);
+ else if (service->ipconfig_ipv6)
+ ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv6);
+ else
+ ifname = NULL;
+
+ if (ifname == NULL)
+ return NULL;
+
+ switch (combine_state(service->state_ipv4, service->state_ipv6)) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ case CONNMAN_SERVICE_STATE_IDLE:
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ return NULL;
+ case CONNMAN_SERVICE_STATE_READY:
+ case CONNMAN_SERVICE_STATE_ONLINE:
+ break;
+ }
+
+ return ifname;
+}
+
+static void remove_nameservers(struct connman_service *service,
+ const char* interface, char **ns)
+{
+ const char *ifname = interface;
+ int i;
+
+ if (ns == NULL)
+ return;
+
+ if (interface == NULL)
+ ifname = nameserver_get_ifname(service);
+
+ if (ifname == NULL)
+ return;
+
+ for (i = 0; ns[i] != NULL; i++)
+ connman_resolver_remove(ifname, NULL, ns[i]);
+}
+
+static void remove_searchdomains(struct connman_service *service,
+ const char *interface, char **sd)
+{
+ const char *ifname = interface;
+ int i;
+
+ if (sd == NULL)
+ return;
+
+ if (interface == NULL)
+ ifname = nameserver_get_ifname(service);
+
+ if (ifname == NULL)
+ return;
+
+ for (i = 0; sd[i] != NULL; i++)
+ connman_resolver_remove(ifname, sd[i], NULL);
+}
+
static void update_nameservers(struct connman_service *service)
{
const char *ifname;
if (service->ipconfig_ipv4)
- ifname = connman_ipconfig_get_ifname(service->ipconfig_ipv4);
+ ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv4);
else if (service->ipconfig_ipv6)
- ifname = connman_ipconfig_get_ifname(service->ipconfig_ipv6);
+ ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv6);
else
ifname = NULL;
break;
}
- connman_resolver_remove_all(ifname);
-
if (service->nameservers_config != NULL) {
int i;
- for (i = 0; service->nameservers_config[i] != NULL; i++) {
+ remove_nameservers(service, ifname, service->nameservers);
+
+ i = g_strv_length(service->nameservers_config);
+ while (i != 0) {
+ i--;
connman_resolver_append(ifname, NULL,
- service->nameservers_config[i]);
+ service->nameservers_config[i]);
}
} else if (service->nameservers != NULL) {
int i;
- for (i = 0; service->nameservers[i] != NULL; i++) {
+ i = g_strv_length(service->nameservers);
+ while (i != 0) {
+ i--;
connman_resolver_append(ifname, NULL,
- service->nameservers[i]);
+ service->nameservers[i]);
}
}
if (service->domains != NULL) {
+ char *searchdomains[2] = {NULL, NULL};
int i;
- for (i = 0; service->domains[i]; i++)
+ searchdomains[0] = service->domainname;
+ remove_searchdomains(service, ifname, searchdomains);
+
+ i = g_strv_length(service->domains);
+ while (i != 0) {
+ i--;
connman_resolver_append(ifname, service->domains[i],
NULL);
+ }
} else if (service->domainname != NULL)
connman_resolver_append(ifname, service->domainname, NULL);
connman_resolver_flush();
}
+/*
+ * The is_auto variable is set to true when IPv6 autoconf nameservers are
+ * inserted to resolver via netlink message (see rtnl.c:rtnl_newnduseropt()
+ * for details) and not through service.c
+ */
int __connman_service_nameserver_append(struct connman_service *service,
- const char *nameserver)
+ const char *nameserver, gboolean is_auto)
{
- int len;
+ char **nameservers;
+ int len, i;
- DBG("service %p nameserver %s", service, nameserver);
+ DBG("service %p nameserver %s auto %d", service, nameserver, is_auto);
if (nameserver == NULL)
return -EINVAL;
- if (service->nameservers != NULL) {
- int i;
+ if (is_auto == TRUE)
+ nameservers = service->nameservers_auto;
+ else
+ nameservers = service->nameservers;
- for (i = 0; service->nameservers[i] != NULL; i++)
- if (g_strcmp0(service->nameservers[i], nameserver) == 0)
- return -EEXIST;
+ for (i = 0; nameservers != NULL && nameservers[i] != NULL; i++)
+ if (g_strcmp0(nameservers[i], nameserver) == 0)
+ return -EEXIST;
- len = g_strv_length(service->nameservers);
- service->nameservers = g_try_renew(char *, service->nameservers,
- len + 2);
+ if (nameservers != NULL) {
+ len = g_strv_length(nameservers);
+ nameservers = g_try_renew(char *, nameservers, len + 2);
} else {
len = 0;
- service->nameservers = g_try_new0(char *, len + 2);
+ nameservers = g_try_new0(char *, len + 2);
}
- if (service->nameservers == NULL)
+ if (nameservers == NULL)
return -ENOMEM;
- service->nameservers[len] = g_strdup(nameserver);
- service->nameservers[len + 1] = NULL;
+ nameservers[len] = g_strdup(nameserver);
+ if (nameservers[len] == NULL)
+ return -ENOMEM;
- update_nameservers(service);
+ nameservers[len + 1] = NULL;
+
+ if (is_auto == TRUE) {
+ service->nameservers_auto = nameservers;
+ } else {
+ service->nameservers = nameservers;
+ update_nameservers(service);
+ }
return 0;
}
int __connman_service_nameserver_remove(struct connman_service *service,
- const char *nameserver)
+ const char *nameserver, gboolean is_auto)
{
- char **servers;
+ char **servers, **nameservers;
+ gboolean found = FALSE;
int len, i, j;
- DBG("service %p nameserver %s", service, nameserver);
+ DBG("service %p nameserver %s auto %d", service, nameserver, is_auto);
if (nameserver == NULL)
return -EINVAL;
- if (service->nameservers == NULL)
+ if (is_auto == TRUE)
+ nameservers = service->nameservers_auto;
+ else
+ nameservers = service->nameservers;
+
+ if (nameservers == NULL)
return 0;
- len = g_strv_length(service->nameservers);
- if (len == 1) {
- if (g_strcmp0(service->nameservers[0], nameserver) != 0)
- return 0;
+ for (i = 0; nameservers != NULL && nameservers[i] != NULL; i++)
+ if (g_strcmp0(nameservers[i], nameserver) == 0) {
+ found = TRUE;
+ break;
+ }
+
+ if (found == FALSE)
+ return 0;
+
+ len = g_strv_length(nameservers);
- g_strfreev(service->nameservers);
- service->nameservers = NULL;
+ if (len == 1) {
+ g_strfreev(nameservers);
+ if (is_auto == TRUE)
+ service->nameservers_auto = NULL;
+ else
+ service->nameservers = NULL;
return 0;
}
return -ENOMEM;
for (i = 0, j = 0; i < len; i++) {
- if (g_strcmp0(service->nameservers[i], nameserver) != 0) {
- servers[j] = g_strdup(service->nameservers[i]);
+ if (g_strcmp0(nameservers[i], nameserver) != 0) {
+ servers[j] = g_strdup(nameservers[i]);
+ if (servers[j] == NULL)
+ return -ENOMEM;
j++;
}
}
servers[len - 1] = NULL;
- g_strfreev(service->nameservers);
- service->nameservers = servers;
+ g_strfreev(nameservers);
+ nameservers = servers;
- update_nameservers(service);
+ if (is_auto == TRUE) {
+ service->nameservers_auto = nameservers;
+ } else {
+ service->nameservers = nameservers;
+ update_nameservers(service);
+ }
return 0;
}
update_nameservers(service);
}
+static void add_nameserver_route(int family, int index, char *nameserver,
+ const char *gw)
+{
+ switch (family) {
+ case AF_INET:
+ if (connman_inet_compare_subnet(index, nameserver) == TRUE)
+ break;
+
+ if (connman_inet_add_host_route(index, nameserver, gw) < 0)
+ /* For P-t-P link the above route add will fail */
+ connman_inet_add_host_route(index, nameserver, NULL);
+ break;
+
+ case AF_INET6:
+ if (connman_inet_add_ipv6_host_route(index, nameserver,
+ gw) < 0)
+ connman_inet_add_ipv6_host_route(index, nameserver,
+ NULL);
+ break;
+ }
+}
+
static void nameserver_add_routes(int index, char **nameservers,
const char *gw)
{
else
family = addr->ai_family;
- if (family == AF_INET) {
- if (connman_inet_compare_subnet(index,
- nameservers[i]) != TRUE)
- connman_inet_add_host_route(index,
- nameservers[i], gw);
- } else if (family == AF_INET6)
- connman_inet_add_ipv6_host_route(index,
- nameservers[i], gw);
+ add_nameserver_route(family, index, nameservers[i], gw);
freeaddrinfo(addr);
}
}
-static void nameserver_del_routes(int index, char **nameservers)
+static void nameserver_del_routes(int index, char **nameservers,
+ enum connman_ipconfig_type type)
{
int i, ret, family;
struct addrinfo hints;
else
family = addr->ai_family;
- if (family == AF_INET)
- connman_inet_del_host_route(index, nameservers[i]);
- else if (family == AF_INET6)
- connman_inet_del_ipv6_host_route(index,
+ switch (family) {
+ case AF_INET:
+ if (type != CONNMAN_IPCONFIG_TYPE_IPV6)
+ connman_inet_del_host_route(index,
+ nameservers[i]);
+ break;
+ case AF_INET6:
+ if (type != CONNMAN_IPCONFIG_TYPE_IPV4)
+ connman_inet_del_ipv6_host_route(index,
nameservers[i]);
+ break;
+ }
freeaddrinfo(addr);
}
}
}
-void __connman_service_nameserver_del_routes(struct connman_service *service)
+void __connman_service_nameserver_del_routes(struct connman_service *service,
+ enum connman_ipconfig_type type)
{
int index = -1;
index = connman_provider_get_index(service->provider);
if (service->nameservers_config != NULL)
- nameserver_del_routes(index, service->nameservers_config);
+ nameserver_del_routes(index, service->nameservers_config,
+ type);
else if (service->nameservers != NULL)
- nameserver_del_routes(index, service->nameservers);
+ nameserver_del_routes(index, service->nameservers, type);
}
static struct connman_stats *stats_get(struct connman_service *service)
g_timer_reset(service->stats_roaming.timer);
}
-static struct connman_service *get_default(void)
+struct connman_service *__connman_service_get_default(void)
{
struct connman_service *service;
GSequenceIter *iter;
static void default_changed(void)
{
- struct connman_service *service = get_default();
+ struct connman_service *service = __connman_service_get_default();
- __connman_notifier_default_changed(service);
-}
+ if (service == current_default)
+ return;
-const char *__connman_service_default(void)
-{
- struct connman_service *service;
+ __connman_service_timeserver_changed(current_default, NULL);
- service = get_default();
- if (service == NULL)
- return "";
+ current_default = service;
- return __connman_service_type2string(service->type);
+ __connman_notifier_default_changed(service);
}
static void state_changed(struct connman_service *service)
DBUS_TYPE_BOOLEAN, &service->autoconnect);
}
-static void passphrase_changed(struct connman_service *service)
+static void append_security(DBusMessageIter *iter, void *user_data)
{
- dbus_bool_t required;
+ struct connman_service *service = user_data;
+ const char *str;
- switch (service->type) {
- case CONNMAN_SERVICE_TYPE_UNKNOWN:
- case CONNMAN_SERVICE_TYPE_SYSTEM:
- case CONNMAN_SERVICE_TYPE_ETHERNET:
- case CONNMAN_SERVICE_TYPE_WIMAX:
- case CONNMAN_SERVICE_TYPE_BLUETOOTH:
- case CONNMAN_SERVICE_TYPE_CELLULAR:
- case CONNMAN_SERVICE_TYPE_GPS:
- case CONNMAN_SERVICE_TYPE_VPN:
- case CONNMAN_SERVICE_TYPE_GADGET:
- return;
- case CONNMAN_SERVICE_TYPE_WIFI:
- required = FALSE;
+ str = security2string(service->security);
+ if (str != NULL)
+ dbus_message_iter_append_basic(iter,
+ DBUS_TYPE_STRING, &str);
+ /*
+ * Some access points incorrectly advertise WPS even when they
+ * are configured as open or no security, so filter
+ * appropriately.
+ */
+ if (service->wps == TRUE) {
switch (service->security) {
- case CONNMAN_SERVICE_SECURITY_UNKNOWN:
- case CONNMAN_SERVICE_SECURITY_NONE:
- break;
- case CONNMAN_SERVICE_SECURITY_WEP:
case CONNMAN_SERVICE_SECURITY_PSK:
case CONNMAN_SERVICE_SECURITY_WPA:
case CONNMAN_SERVICE_SECURITY_RSN:
- if (service->passphrase == NULL)
- required = TRUE;
+ str = "wps";
+ dbus_message_iter_append_basic(iter,
+ DBUS_TYPE_STRING, &str);
break;
+ case CONNMAN_SERVICE_SECURITY_UNKNOWN:
+ case CONNMAN_SERVICE_SECURITY_NONE:
+ case CONNMAN_SERVICE_SECURITY_WEP:
case CONNMAN_SERVICE_SECURITY_8021X:
break;
}
- break;
}
-
- connman_dbus_property_changed_basic(service->path,
- CONNMAN_SERVICE_INTERFACE, "PassphraseRequired",
- DBUS_TYPE_BOOLEAN, &required);
}
-static void login_changed(struct connman_service *service)
+static void append_ethernet(DBusMessageIter *iter, void *user_data)
{
- dbus_bool_t required = service->login_required;
-
- if (service->path == NULL)
- return;
-
- connman_dbus_property_changed_basic(service->path,
- CONNMAN_SERVICE_INTERFACE, "LoginRequired",
- DBUS_TYPE_BOOLEAN, &required);
-}
-
-static void append_security(DBusMessageIter *iter, void *user_data)
-{
- struct connman_service *service = user_data;
- const char *str;
-
- str = security2string(service->security);
- if (str != NULL)
- dbus_message_iter_append_basic(iter,
- DBUS_TYPE_STRING, &str);
-
- str = "wps";
- if (service->wps == TRUE)
- dbus_message_iter_append_basic(iter,
- DBUS_TYPE_STRING, &str);
-}
-
-static void append_ethernet(DBusMessageIter *iter, void *user_data)
-{
- struct connman_service *service = user_data;
+ struct connman_service *service = user_data;
if (service->ipconfig_ipv4 != NULL)
__connman_ipconfig_append_ethernet(service->ipconfig_ipv4,
iter);
}
-static void append_nameserver(DBusMessageIter *iter, char ***nameservers)
+static void append_nameservers(DBusMessageIter *iter, char **servers)
{
- char **servers;
int i;
- servers = *nameservers;
+ DBG("%p", servers);
for (i = 0; servers[i] != NULL; i++) {
+ DBG("servers[%d] %s", i, servers[i]);
dbus_message_iter_append_basic(iter,
DBUS_TYPE_STRING, &servers[i]);
}
return;
if (service->nameservers_config != NULL) {
- append_nameserver(iter, &service->nameservers_config);
- return;
- } else if (service->nameservers != NULL) {
- append_nameserver(iter, &service->nameservers);
+ append_nameservers(iter, service->nameservers_config);
return;
+ } else {
+ if (service->nameservers != NULL)
+ append_nameservers(iter, service->nameservers);
+
+ if (service->nameservers_auto != NULL)
+ append_nameservers(iter, service->nameservers_auto);
}
}
static void append_dnsconfig(DBusMessageIter *iter, void *user_data)
{
struct connman_service *service = user_data;
- int i;
if (service->nameservers_config == NULL)
return;
- for (i = 0; service->nameservers_config[i]; i++) {
- dbus_message_iter_append_basic(iter,
- DBUS_TYPE_STRING,
- &service->nameservers_config[i]);
+ append_nameservers(iter, service->nameservers_config);
+}
+
+static void append_ts(DBusMessageIter *iter, void *user_data)
+{
+ GSList *list = user_data;
+
+ while (list != NULL) {
+ char *timeserver = list->data;
+
+ if (timeserver != NULL)
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+ ×erver);
+
+ list = g_slist_next(list);
}
}
-static void append_domain(DBusMessageIter *iter, void *user_data)
+static void append_tsconfig(DBusMessageIter *iter, void *user_data)
{
struct connman_service *service = user_data;
+ int i;
- if (is_connected(service) == FALSE &&
- is_connecting(service) == FALSE)
- return;
-
- if (service->domainname == NULL)
+ if (service->timeservers_config == NULL)
return;
- dbus_message_iter_append_basic(iter,
- DBUS_TYPE_STRING, &service->domainname);
+ for (i = 0; service->timeservers_config[i]; i++) {
+ dbus_message_iter_append_basic(iter,
+ DBUS_TYPE_STRING,
+ &service->timeservers_config[i]);
+ }
}
static void append_domainconfig(DBusMessageIter *iter, void *user_data)
DBUS_TYPE_STRING, &service->domains[i]);
}
+static void append_domain(DBusMessageIter *iter, void *user_data)
+{
+ struct connman_service *service = user_data;
+
+ if (is_connected(service) == FALSE &&
+ is_connecting(service) == FALSE)
+ return;
+
+ if (service->domains != NULL)
+ append_domainconfig(iter, user_data);
+ else if (service->domainname != NULL)
+ dbus_message_iter_append_basic(iter,
+ DBUS_TYPE_STRING, &service->domainname);
+}
+
static void append_proxies(DBusMessageIter *iter, void *user_data)
{
struct connman_service *service = user_data;
proxy_changed(service);
}
+static void timeservers_configuration_changed(struct connman_service *service)
+{
+ connman_dbus_property_changed_array(service->path,
+ CONNMAN_SERVICE_INTERFACE,
+ "Timeservers.Configuration",
+ DBUS_TYPE_STRING,
+ append_tsconfig, service);
+}
+
static void link_changed(struct connman_service *service)
{
connman_dbus_property_changed_dict(service->path,
stats->data.time = stats->data_last.time + seconds;
}
-static char *wifi_build_group_name(const unsigned char *ssid,
- unsigned int ssid_len,
- const char *mode,
- const char *security)
-{
- GString *str;
- unsigned int i;
-
- /* the last 3 is for the 2 '_' and '\0' */
- str = g_string_sized_new((ssid_len * 2) + strlen(mode)
- + strlen(security) + 3);
- if (str == NULL)
- return NULL;
-
- for (i = 0; i < ssid_len; i++)
- g_string_append_printf(str, "%02x", ssid[i]);
-
- g_string_append_printf(str, "_%s_%s", mode, security);
-
- return g_string_free(str, FALSE);
-}
-
void __connman_service_notify(struct connman_service *service,
unsigned int rx_packets, unsigned int tx_packets,
unsigned int rx_bytes, unsigned int tx_bytes,
void __connman_service_session_inc(struct connman_service *service)
{
DBG("service %p ref count %d", service,
- g_atomic_int_get(&service->session_usage_count) + 1);
+ service->session_usage_count + 1);
- g_atomic_int_inc(&service->session_usage_count);
+ __sync_fetch_and_add(&service->session_usage_count, 1);
}
connman_bool_t __connman_service_session_dec(struct connman_service *service)
{
DBG("service %p ref count %d", service,
- g_atomic_int_get(&service->session_usage_count) - 1);
+ service->session_usage_count - 1);
- if (g_atomic_int_dec_and_test(&service->session_usage_count) == FALSE)
+ if (__sync_fetch_and_sub(&service->session_usage_count, 1) != 1)
return FALSE;
return TRUE;
static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
struct connman_service *service)
{
- dbus_bool_t required;
const char *str;
+ GSList *list;
str = __connman_service_type2string(service->type);
if (str != NULL)
connman_dbus_dict_append_basic(dict, "Name",
DBUS_TYPE_STRING, &service->name);
- connman_dbus_dict_append_basic(dict, "LoginRequired",
- DBUS_TYPE_BOOLEAN, &service->login_required);
-
switch (service->type) {
case CONNMAN_SERVICE_TYPE_UNKNOWN:
case CONNMAN_SERVICE_TYPE_SYSTEM:
connman_dbus_dict_append_basic(dict, "Roaming",
DBUS_TYPE_BOOLEAN, &service->roaming);
- required = FALSE;
- connman_dbus_dict_append_basic(dict, "SetupRequired",
- DBUS_TYPE_BOOLEAN, &required);
connman_dbus_dict_append_dict(dict, "Ethernet",
append_ethernet, service);
break;
case CONNMAN_SERVICE_TYPE_WIFI:
- if (service->passphrase != NULL && limited == FALSE)
- connman_dbus_dict_append_basic(dict, "Passphrase",
- DBUS_TYPE_STRING, &service->passphrase);
-
- required = FALSE;
-
- switch (service->security) {
- case CONNMAN_SERVICE_SECURITY_UNKNOWN:
- case CONNMAN_SERVICE_SECURITY_NONE:
- break;
- case CONNMAN_SERVICE_SECURITY_WEP:
- case CONNMAN_SERVICE_SECURITY_PSK:
- case CONNMAN_SERVICE_SECURITY_WPA:
- case CONNMAN_SERVICE_SECURITY_RSN:
- if (service->passphrase == NULL)
- required = TRUE;
- break;
- case CONNMAN_SERVICE_SECURITY_8021X:
- break;
- }
-
- connman_dbus_dict_append_basic(dict, "PassphraseRequired",
- DBUS_TYPE_BOOLEAN, &required);
-
- /* fall through */
case CONNMAN_SERVICE_TYPE_ETHERNET:
case CONNMAN_SERVICE_TYPE_WIMAX:
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
connman_dbus_dict_append_array(dict, "Nameservers.Configuration",
DBUS_TYPE_STRING, append_dnsconfig, service);
+ if (service->state == CONNMAN_SERVICE_STATE_READY ||
+ service->state == CONNMAN_SERVICE_STATE_ONLINE)
+ list = __connman_timeserver_get_all(service);
+ else
+ list = NULL;
+
+ connman_dbus_dict_append_array(dict, "Timeservers",
+ DBUS_TYPE_STRING, append_ts, list);
+
+ g_slist_free_full(list, g_free);
+
+ connman_dbus_dict_append_array(dict, "Timeservers.Configuration",
+ DBUS_TYPE_STRING, append_tsconfig, service);
+
connman_dbus_dict_append_array(dict, "Domains",
DBUS_TYPE_STRING, append_domain, service);
append_provider, service);
}
-static void append_struct(gpointer value, gpointer user_data)
+static void append_struct_service(DBusMessageIter *iter,
+ connman_dbus_append_cb_t function,
+ struct connman_service *service)
{
- struct connman_service *service = value;
- DBusMessageIter *iter = user_data;
DBusMessageIter entry, dict;
- if (service->path == NULL || service->hidden == TRUE)
- return;
-
dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, NULL, &entry);
dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH,
&service->path);
connman_dbus_dict_open(&entry, &dict);
- append_properties(&dict, TRUE, service);
+ if (function != NULL)
+ function(&dict, service);
connman_dbus_dict_close(&entry, &dict);
dbus_message_iter_close_container(iter, &entry);
}
+static void append_dict_properties(DBusMessageIter *dict, void *user_data)
+{
+ struct connman_service *service = user_data;
+
+ append_properties(dict, TRUE, service);
+}
+
+static void append_struct(gpointer value, gpointer user_data)
+{
+ struct connman_service *service = value;
+ DBusMessageIter *iter = user_data;
+
+ if (service->path == NULL)
+ return;
+
+ append_struct_service(iter, append_dict_properties, service);
+}
+
void __connman_service_list_struct(DBusMessageIter *iter)
{
g_sequence_foreach(service_list, append_struct, iter);
}
+connman_bool_t __connman_service_is_hidden(struct connman_service *service)
+{
+ return service->hidden;
+}
+
+connman_bool_t
+__connman_service_is_split_routing(struct connman_service *service)
+{
+ return service->do_split_routing;
+}
+
int __connman_service_get_index(struct connman_service *service)
{
if (service == NULL)
return -1;
}
+void __connman_service_set_hidden(struct connman_service *service)
+{
+ if (service == NULL || service->hidden == TRUE)
+ return;
+
+ service->hidden_service = TRUE;
+}
+
void __connman_service_set_domainname(struct connman_service *service,
const char *domainname)
{
- if (service == NULL)
+ if (service == NULL || service->hidden == TRUE)
return;
g_free(service->domainname);
return NULL;
if (service->nameservers_config != NULL)
- return service->nameservers_config;
- else if (service->nameservers != NULL)
- return service->nameservers;
+ return g_strdupv(service->nameservers_config);
+ else if (service->nameservers != NULL ||
+ service->nameservers_auto != NULL) {
+ int len = 0, len_auto = 0, i;
+ char **nameservers;
+
+ if (service->nameservers != NULL)
+ len = g_strv_length(service->nameservers);
+ if (service->nameservers_auto != NULL)
+ len_auto = g_strv_length(service->nameservers_auto);
+
+ nameservers = g_try_new0(char *, len + len_auto + 1);
+ if (nameservers == NULL)
+ return NULL;
+
+ for (i = 0; i < len; i++)
+ nameservers[i] = g_strdup(service->nameservers[i]);
+
+ for (i = 0; i < len_auto; i++)
+ nameservers[i + len] =
+ g_strdup(service->nameservers_auto[i]);
+
+ return nameservers;
+ }
+
+ return NULL;
+}
+
+char **connman_service_get_timeservers_config(struct connman_service *service)
+{
+ if (service == NULL)
+ return NULL;
+
+ return service->timeservers_config;
+}
+
+char **connman_service_get_timeservers(struct connman_service *service)
+{
+ if (service == NULL)
+ return NULL;
+
+ if (service->timeservers != NULL)
+ return service->timeservers;
return NULL;
}
void connman_service_set_proxy_method(struct connman_service *service,
enum connman_service_proxy_method method)
{
- if (service == NULL)
+ if (service == NULL || service->hidden == TRUE)
return;
service->proxy = method;
void __connman_service_set_proxy_autoconfig(struct connman_service *service,
const char *url)
{
- if (service == NULL)
+ if (service == NULL || service->hidden == TRUE)
return;
service->proxy = CONNMAN_SERVICE_PROXY_METHOD_AUTO;
return NULL;
}
-static void update_timeservers(struct connman_service *service)
-{
- int i;
-
- if (service->timeservers == NULL)
- return;
-
- switch (service->state) {
- case CONNMAN_SERVICE_STATE_UNKNOWN:
- case CONNMAN_SERVICE_STATE_IDLE:
- case CONNMAN_SERVICE_STATE_ASSOCIATION:
- case CONNMAN_SERVICE_STATE_CONFIGURATION:
- return;
- case CONNMAN_SERVICE_STATE_FAILURE:
- case CONNMAN_SERVICE_STATE_DISCONNECT:
- for (i = 0; service->timeservers[i] != NULL; i++)
- connman_timeserver_remove(service->timeservers[i]);
- return;
- case CONNMAN_SERVICE_STATE_READY:
- case CONNMAN_SERVICE_STATE_ONLINE:
- break;
- }
-
- for (i = 0; service->timeservers[i] != NULL; i++)
- connman_timeserver_append(service->timeservers[i]);
-}
-
int __connman_service_timeserver_append(struct connman_service *service,
const char *timeserver)
{
service->timeservers[len] = g_strdup(timeserver);
service->timeservers[len + 1] = NULL;
- update_timeservers(service);
-
return 0;
}
const char *timeserver)
{
char **servers;
- int len, i, j;
+ int len, i, j, found = 0;
DBG("service %p timeserver %s", service, timeserver);
if (service->timeservers == NULL)
return 0;
+ for (i = 0; service->timeservers != NULL &&
+ service->timeservers[i] != NULL; i++)
+ if (g_strcmp0(service->timeservers[i], timeserver) == 0) {
+ found = 1;
+ break;
+ }
+
+ if (found == 0)
+ return 0;
+
len = g_strv_length(service->timeservers);
- if (len == 1) {
- if (g_strcmp0(service->timeservers[0], timeserver) != 0)
- return 0;
+ if (len == 1) {
g_strfreev(service->timeservers);
service->timeservers = NULL;
return 0;
}
- servers = g_try_new0(char *, len - 1);
+ servers = g_try_new0(char *, len);
if (servers == NULL)
return -ENOMEM;
for (i = 0, j = 0; i < len; i++) {
if (g_strcmp0(service->timeservers[i], timeserver) != 0) {
servers[j] = g_strdup(service->timeservers[i]);
+ if (servers[j] == NULL)
+ return -ENOMEM;
j++;
}
}
- servers[len - 2] = NULL;
+ servers[len - 1] = NULL;
g_strfreev(service->timeservers);
service->timeservers = servers;
- update_timeservers(service);
-
return 0;
}
+void __connman_service_timeserver_changed(struct connman_service *service,
+ GSList *ts_list)
+{
+ if (service == NULL)
+ return;
+
+ connman_dbus_property_changed_array(service->path,
+ CONNMAN_SERVICE_INTERFACE, "Timeservers",
+ DBUS_TYPE_STRING, append_ts, ts_list);
+}
+
void __connman_service_set_pac(struct connman_service *service,
const char *pac)
{
+ if (service->hidden == TRUE)
+ return;
g_free(service->pac);
service->pac = g_strdup(pac);
void __connman_service_set_identity(struct connman_service *service,
const char *identity)
{
- if (service->immutable)
+ if (service->immutable || service->hidden == TRUE)
return;
g_free(service->identity);
void __connman_service_set_agent_identity(struct connman_service *service,
const char *agent_identity)
{
+ if (service->hidden == TRUE)
+ return;
g_free(service->agent_identity);
service->agent_identity = g_strdup(agent_identity);
service->agent_identity);
}
-void __connman_service_set_passphrase(struct connman_service *service,
- const char* passphrase)
+static int check_passphrase(enum connman_service_security security,
+ const char *passphrase)
{
- if (service->immutable == TRUE)
- return;
+ guint i;
+ gsize length;
- g_free(service->passphrase);
- service->passphrase = g_strdup(passphrase);
+ if (passphrase == NULL)
+ return 0;
- passphrase_changed(service);
+ length = strlen(passphrase);
- if (service->network != NULL)
- connman_network_set_string(service->network,
- "WiFi.Passphrase",
- service->passphrase);
+ switch (security) {
+ case CONNMAN_SERVICE_SECURITY_PSK:
+ case CONNMAN_SERVICE_SECURITY_WPA:
+ case CONNMAN_SERVICE_SECURITY_RSN:
+ /* A raw key is always 64 bytes length,
+ * its content is in hex representation.
+ * A PSK key must be between [8..63].
+ */
+ if (length == 64) {
+ for (i = 0; i < 64; i++)
+ if (!isxdigit((unsigned char)
+ passphrase[i]))
+ return -ENOKEY;
+ } else if (length < 8 || length > 63)
+ return -ENOKEY;
+ break;
+ case CONNMAN_SERVICE_SECURITY_WEP:
+ /* length of WEP key is 10 or 26
+ * length of WEP passphrase is 5 or 13
+ */
+ if (length == 10 || length == 26) {
+ for (i = 0; i < length; i++)
+ if (!isxdigit((unsigned char)
+ passphrase[i]))
+ return -ENOKEY;
+ } else if (length != 5 && length != 13)
+ return -ENOKEY;
+ break;
+ case CONNMAN_SERVICE_SECURITY_UNKNOWN:
+ case CONNMAN_SERVICE_SECURITY_NONE:
+ case CONNMAN_SERVICE_SECURITY_8021X:
+ break;
+ }
- service_save(service);
+ return 0;
+}
+
+int __connman_service_set_passphrase(struct connman_service *service,
+ const char *passphrase)
+{
+ int err = 0;
+
+ if (service->immutable == TRUE || service->hidden == TRUE)
+ return -EINVAL;
+
+ err = check_passphrase(service->security, passphrase);
+
+ if (err == 0) {
+ g_free(service->passphrase);
+ service->passphrase = g_strdup(passphrase);
+
+ if (service->network != NULL)
+ connman_network_set_string(service->network,
+ "WiFi.Passphrase",
+ service->passphrase);
+ service_save(service);
+ }
+
+ return err;
}
void __connman_service_set_agent_passphrase(struct connman_service *service,
const char *agent_passphrase)
{
+ if (service->hidden == TRUE)
+ return;
g_free(service->agent_passphrase);
service->agent_passphrase = g_strdup(agent_passphrase);
dbus_message_iter_get_basic(&entry, &key);
dbus_message_iter_next(&entry);
- if (dbus_message_iter_get_arg_type(&entry) !=
- DBUS_TYPE_VARIANT)
+ if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_VARIANT)
goto error;
dbus_message_iter_recurse(&entry, &variant);
+
type = dbus_message_iter_get_arg_type(&variant);
if (g_str_equal(key, "Method") == TRUE) {
if (dbus_message_iter_init(msg, &iter) == FALSE)
return __connman_error_invalid_arguments(msg);
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_get_basic(&iter, &name);
dbus_message_iter_next(&iter);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+ return __connman_error_invalid_arguments(msg);
+
dbus_message_iter_recurse(&iter, &value);
type = dbus_message_iter_get_arg_type(&value);
autoconnect_changed(service);
service_save(service);
- } else if (g_str_equal(name, "Passphrase") == TRUE) {
- const char *passphrase;
-
- if (type != DBUS_TYPE_STRING)
- return __connman_error_invalid_arguments(msg);
-
- if (service->immutable == TRUE)
- return __connman_error_not_supported(msg);
-
- dbus_message_iter_get_basic(&value, &passphrase);
-
- __connman_service_set_passphrase(service, passphrase);
} else if (g_str_equal(name, "Nameservers.Configuration") == TRUE) {
DBusMessageIter entry;
GString *str;
return __connman_error_invalid_arguments(msg);
index = connman_network_get_index(service->network);
- gw = __connman_ipconfig_get_gateway_from_index(index);
+ gw = __connman_ipconfig_get_gateway_from_index(index,
+ CONNMAN_IPCONFIG_TYPE_ALL);
if (gw && strlen(gw))
- __connman_service_nameserver_del_routes(service);
+ __connman_service_nameserver_del_routes(service,
+ CONNMAN_IPCONFIG_TYPE_ALL);
dbus_message_iter_recurse(&value, &entry);
const char *val;
dbus_message_iter_get_basic(&entry, &val);
dbus_message_iter_next(&entry);
- if (str->len > 0)
- g_string_append_printf(str, " %s", val);
- else
- g_string_append(str, val);
+ if (connman_inet_check_ipaddress(val) > 0) {
+ if (str->len > 0)
+ g_string_append_printf(str, " %s", val);
+ else
+ g_string_append(str, val);
+ }
}
+ remove_nameservers(service, NULL, service->nameservers_config);
g_strfreev(service->nameservers_config);
if (str->len > 0) {
dns_configuration_changed(service);
service_save(service);
- } else if (g_str_equal(name, "Domains.Configuration") == TRUE) {
+ } else if (g_str_equal(name, "Timeservers.Configuration") == TRUE) {
+ DBusMessageIter entry;
+ GSList *list = NULL;
+ int count = 0;
+
+ if (type != DBUS_TYPE_ARRAY)
+ return __connman_error_invalid_arguments(msg);
+
+ dbus_message_iter_recurse(&value, &entry);
+
+ while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
+ const char *val;
+ GSList *new_head;
+
+ dbus_message_iter_get_basic(&entry, &val);
+
+ new_head = __connman_timeserver_add_list(list, val);
+ if (list != new_head) {
+ count++;
+ list = new_head;
+ }
+
+ dbus_message_iter_next(&entry);
+ }
+
+ g_strfreev(service->timeservers_config);
+ service->timeservers_config = NULL;
+
+ if (list != NULL) {
+ service->timeservers_config = g_new0(char *, count+1);
+
+ while (list != NULL) {
+ count--;
+ service->timeservers_config[count] = list->data;
+ list = g_slist_delete_link(list, list);
+ };
+ }
+
+ service_save(service);
+ timeservers_configuration_changed(service);
+
+ __connman_timeserver_sync(service);
+ } else if (g_str_equal(name, "Domains.Configuration") == TRUE) {
DBusMessageIter entry;
GString *str;
g_string_append(str, val);
}
+ remove_searchdomains(service, NULL, service->domains);
g_strfreev(service->domains);
if (str->len > 0)
g_get_current_time(&service->modified);
service_save(service);
- } else if (g_str_equal(name, "Passphrase") == TRUE) {
- if (service->immutable == TRUE)
- return __connman_error_not_supported(msg);
-
- g_free(service->passphrase);
- service->passphrase = NULL;
-
- passphrase_changed(service);
-
- service_save(service);
} else
return __connman_error_invalid_property(msg);
return FALSE;
}
-void __connman_service_auto_connect(void)
+struct preferred_tech_data {
+ GSequence *preferred_list;
+ enum connman_service_type type;
+};
+
+static void preferred_tech_add_by_type(gpointer data, gpointer user_data)
{
- struct connman_service *service = NULL;
- GSequenceIter *iter;
+ struct connman_service *service = data;
+ struct preferred_tech_data *tech_data = user_data;
- DBG("");
+ if (service->type == tech_data->type) {
+ g_sequence_append(tech_data->preferred_list, service);
- if (__connman_session_mode() == TRUE) {
- DBG("Session mode enabled: auto connect disabled");
- return;
+ DBG("type %d service %p %s", tech_data->type, service,
+ service->name);
}
+}
- iter = g_sequence_get_begin_iter(service_list);
+static GSequence* preferred_tech_list_get(GSequence *list)
+{
+ unsigned int *tech_array;
+ struct preferred_tech_data tech_data;
+ int i;
+
+ tech_array = connman_setting_get_uint_list("PreferredTechnologies");
+ if (tech_array == NULL)
+ return NULL;
+
+ tech_data.preferred_list = g_sequence_new(NULL);
+
+ for (i = 0; tech_array[i] != 0; i += 1) {
+ tech_data.type = tech_array[i];
+ g_sequence_foreach(service_list, preferred_tech_add_by_type,
+ &tech_data);
+ }
+
+ return tech_data.preferred_list;
+}
+
+static connman_bool_t auto_connect_service(GSequenceIter* iter,
+ connman_bool_t preferred)
+{
+ struct connman_service *service = NULL;
while (g_sequence_iter_is_end(iter) == FALSE) {
service = g_sequence_get(iter);
if (service->pending != NULL)
- return;
+ return TRUE;
if (is_connecting(service) == TRUE)
- return;
+ return TRUE;
- if (service->favorite == FALSE)
- return;
+ if (service->favorite == FALSE) {
+ if (preferred == TRUE)
+ goto next_service;
+ return FALSE;
+ }
- if (is_connected(service) == TRUE)
- return;
+ if (is_connected(service) == TRUE) {
+ if (preferred == TRUE && service->state !=
+ CONNMAN_SERVICE_STATE_ONLINE)
+ goto next_service;
+ return TRUE;
+ }
if (is_ignore(service) == FALSE && service->state ==
- CONNMAN_SERVICE_STATE_IDLE)
+ CONNMAN_SERVICE_STATE_IDLE)
break;
+ next_service:
service = NULL;
iter = g_sequence_iter_next(iter);
}
if (service != NULL) {
+
+ DBG("service %p %s %s", service, service->name,
+ (preferred == TRUE)? "preferred": "auto");
+
service->userconnect = FALSE;
__connman_service_connect(service);
+ return TRUE;
}
+ return FALSE;
+}
+
+static gboolean run_auto_connect(gpointer data)
+{
+ GSequenceIter *iter = NULL;
+ GSequence *preferred_tech;
+
+ autoconnect_timeout = 0;
+
+ DBG("");
+
+ preferred_tech = preferred_tech_list_get(service_list);
+ if (preferred_tech != NULL)
+ iter = g_sequence_get_begin_iter(preferred_tech);
+
+ if (iter == NULL || auto_connect_service(iter, TRUE) == FALSE)
+ iter = g_sequence_get_begin_iter(service_list);
+
+ if (iter != NULL)
+ auto_connect_service(iter, FALSE);
+
+ if (preferred_tech != NULL)
+ g_sequence_free(preferred_tech);
+
+ return FALSE;
+}
+
+void __connman_service_auto_connect(void)
+{
+ DBG("");
+
+ if (__connman_session_mode() == TRUE) {
+ DBG("Session mode enabled: auto connect disabled");
+ return;
+ }
+
+ if (autoconnect_timeout != 0)
+ return;
+
+ autoconnect_timeout = g_timeout_add_seconds(0, run_auto_connect, NULL);
}
static void remove_timeout(struct connman_service *service)
return __connman_device_get_reconnect(device);
}
-static void request_input_cb (struct connman_service *service,
- const char *identity, const char *passphrase,
- void *user_data)
-{
- DBG ("RequestInput return, %p", service);
-
- if (identity == NULL && passphrase == NULL && service->wps == FALSE)
- return;
-
- if (identity != NULL)
- __connman_service_set_agent_identity(service, identity);
-
- if (passphrase != NULL) {
- switch (service->security) {
- case CONNMAN_SERVICE_SECURITY_WEP:
- case CONNMAN_SERVICE_SECURITY_PSK:
- __connman_service_set_passphrase(service, passphrase);
- break;
- case CONNMAN_SERVICE_SECURITY_8021X:
- __connman_service_set_agent_passphrase(service,
- passphrase);
- break;
- case CONNMAN_SERVICE_SECURITY_UNKNOWN:
- case CONNMAN_SERVICE_SECURITY_NONE:
- case CONNMAN_SERVICE_SECURITY_WPA:
- case CONNMAN_SERVICE_SECURITY_RSN:
- DBG("service security '%s' not handled",
- security2string(service->security));
- break;
- }
- }
-
- __connman_service_connect(service);
-
- /* Never cache agent provided credentials */
- __connman_service_set_agent_identity(service, NULL);
- __connman_service_set_agent_passphrase(service, NULL);
-}
-
static DBusMessage *connect_service(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static DBusMessage *remove_service(DBusConnection *conn,
- DBusMessage *msg, void *user_data)
+gboolean __connman_service_remove(struct connman_service *service)
{
- struct connman_service *service = user_data;
-
- DBG("service %p", service);
-
if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET)
- return __connman_error_not_supported(msg);
+ return FALSE;
- if (service->immutable == TRUE)
- return __connman_error_not_supported(msg);
+ if (service->immutable == TRUE || service->hidden == TRUE)
+ return FALSE;
if (service->favorite == FALSE && service->state !=
CONNMAN_SERVICE_STATE_FAILURE)
- return __connman_error_not_supported(msg);
+ return FALSE;
- if (service->network != NULL) {
- set_reconnect_state(service, FALSE);
+ set_reconnect_state(service, FALSE);
- __connman_network_disconnect(service->network);
- }
+ __connman_service_disconnect(service);
g_free(service->passphrase);
service->passphrase = NULL;
- passphrase_changed(service);
+ g_free(service->agent_passphrase);
+ service->agent_passphrase = NULL;
+
+ g_free(service->identity);
+ service->identity = NULL;
+
+ g_free(service->agent_identity);
+ service->agent_identity = NULL;
+
+ g_free(service->eap);
+ service->eap = NULL;
set_idle(service);
__connman_service_set_favorite(service, FALSE);
+
service_save(service);
+ return TRUE;
+}
+
+static DBusMessage *remove_service(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ struct connman_service *service = user_data;
+
+ DBG("service %p", service);
+
+ if (__connman_service_remove(service) == FALSE)
+ return __connman_error_not_supported(msg);
+
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
return a == b;
}
+static void downgrade_state(struct connman_service *service)
+{
+ if (service == NULL)
+ return;
+
+ DBG("service %p state4 %d state6 %d", service, service->state_ipv4,
+ service->state_ipv6);
+
+ if (service->state_ipv4 == CONNMAN_SERVICE_STATE_ONLINE)
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
+
+ if (service->state_ipv6 == CONNMAN_SERVICE_STATE_ONLINE)
+ __connman_service_ipconfig_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY,
+ CONNMAN_IPCONFIG_TYPE_IPV6);
+}
+
+static void apply_relevant_default_downgrade(struct connman_service *service)
+{
+ struct connman_service *def_service;
+
+ def_service = __connman_service_get_default();
+ if (def_service == NULL)
+ return;
+
+ if (def_service == service &&
+ def_service->state == CONNMAN_SERVICE_STATE_ONLINE)
+ def_service->state = CONNMAN_SERVICE_STATE_READY;
+}
+
+static void switch_default_service(struct connman_service *default_service,
+ struct connman_service *downgrade_service)
+{
+ GSequenceIter *src, *dst;
+
+ apply_relevant_default_downgrade(default_service);
+ src = g_hash_table_lookup(service_hash, downgrade_service->identifier);
+ dst = g_hash_table_lookup(service_hash, default_service->identifier);
+ g_sequence_move(src, dst);
+ downgrade_state(downgrade_service);
+}
+
static DBusMessage *move_service(DBusConnection *conn,
DBusMessage *msg, void *user_data,
gboolean before)
struct connman_service *service = user_data;
struct connman_service *target;
const char *path;
- GSequenceIter *src, *dst;
enum connman_ipconfig_method target4, target6;
enum connman_ipconfig_method service4, service6;
if (target == NULL || target->favorite == FALSE || target == service)
return __connman_error_invalid_service(msg);
+ if (target->type == CONNMAN_SERVICE_TYPE_VPN) {
+ /*
+ * We only allow VPN route splitting if there are
+ * routes defined for a given VPN.
+ */
+ if (__connman_provider_check_routes(target->provider)
+ == FALSE) {
+ connman_info("Cannot move service. "
+ "No routes defined for provider %s",
+ __connman_provider_get_ident(target->provider));
+ return __connman_error_invalid_service(msg);
+ }
+
+ target->do_split_routing = TRUE;
+ } else
+ target->do_split_routing = FALSE;
+
+ service->do_split_routing = FALSE;
+
target4 = __connman_ipconfig_get_method(target->ipconfig_ipv4);
target6 = __connman_ipconfig_get_method(target->ipconfig_ipv6);
service4 = __connman_ipconfig_get_method(service->ipconfig_ipv4);
service6 = __connman_ipconfig_get_method(service->ipconfig_ipv6);
- DBG("target %s method %d/%d state %d/%d", target->identifier,
- target4, target6,
- target->state_ipv4, target->state_ipv6);
+ DBG("target %s method %d/%d state %d/%d split %d", target->identifier,
+ target4, target6, target->state_ipv4, target->state_ipv6,
+ target->do_split_routing);
DBG("service %s method %d/%d state %d/%d", service->identifier,
service4, service6,
g_get_current_time(&service->modified);
service_save(service);
+ service_save(target);
- src = g_hash_table_lookup(service_hash, service->identifier);
- dst = g_hash_table_lookup(service_hash, target->identifier);
-
- before ? g_sequence_move(src, dst) : g_sequence_move(dst, src);
+ /*
+ * If the service which goes down is the default service and is
+ * online, we downgrade directly its state to ready so:
+ * the service which goes up, needs to recompute its state which
+ * is triggered via downgrading it - if relevant - to state ready.
+ */
+ if (before == TRUE)
+ switch_default_service(target, service);
+ else
+ switch_default_service(service, target);
- services_changed(FALSE);
+ __connman_connection_update_gateway();
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static GDBusMethodTable service_methods[] = {
- { "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property },
- { "ClearProperty", "s", "", clear_property },
- { "Connect", "", "", connect_service,
- G_DBUS_METHOD_FLAG_ASYNC },
- { "Disconnect", "", "", disconnect_service },
- { "Remove", "", "", remove_service },
- { "MoveBefore", "o", "", move_before },
- { "MoveAfter", "o", "", move_after },
- { "ResetCounters", "", "", reset_counters },
+static struct _services_notify {
+ int id;
+ GHashTable *add;
+ GHashTable *remove;
+} *services_notify;
+
+static void service_append_added_foreach(gpointer data, gpointer user_data)
+{
+ struct connman_service *service = data;
+ DBusMessageIter *iter = user_data;
+
+ if (service == NULL || service->path == NULL) {
+ DBG("service %p or path is NULL", service);
+ return;
+ }
+
+ if (g_hash_table_lookup(services_notify->add, service->path) != NULL) {
+ DBG("new %s", service->path);
+
+ append_struct(service, iter);
+ g_hash_table_remove(services_notify->add, service->path);
+ } else {
+ DBG("changed %s", service->path);
+
+ append_struct_service(iter, NULL, service);
+ }
+}
+
+static void service_append_ordered(DBusMessageIter *iter, void *user_data)
+{
+ if (service_list != NULL)
+ g_sequence_foreach(service_list,
+ service_append_added_foreach, iter);
+}
+
+static void append_removed(gpointer key, gpointer value, gpointer user_data)
+{
+ char *objpath = key;
+ DBusMessageIter *iter = user_data;
+
+ DBG("removed %s", objpath);
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &objpath);
+}
+
+static gboolean service_send_changed(gpointer data)
+{
+ DBusMessage *signal;
+ DBusMessageIter iter, array;
+
+ DBG("");
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "ServicesChanged");
+ if (signal == NULL)
+ return FALSE;
+
+ __connman_dbus_append_objpath_dict_array(signal,
+ service_append_ordered, NULL);
+
+ dbus_message_iter_init_append(signal, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_OBJECT_PATH_AS_STRING, &array);
+
+ g_hash_table_foreach(services_notify->remove, append_removed, &array);
+
+ dbus_message_iter_close_container(&iter, &array);
+
+ dbus_connection_send(connection, signal, NULL);
+ dbus_message_unref(signal);
+
+ g_hash_table_remove_all(services_notify->remove);
+ g_hash_table_remove_all(services_notify->add);
+
+ services_notify->id = 0;
+ return FALSE;
+}
+
+static void service_schedule_changed(void)
+{
+ if (services_notify->id != 0)
+ return;
+
+ services_notify->id = g_timeout_add(100, service_send_changed, NULL);
+}
+
+static void service_schedule_added(struct connman_service *service)
+{
+ DBG("service %p", service);
+
+ g_hash_table_remove(services_notify->remove, service->path);
+ g_hash_table_replace(services_notify->add, service->path, service);
+
+ service_schedule_changed();
+}
+
+static void service_schedule_removed(struct connman_service *service)
+{
+ DBG("service %p %s", service, service->path);
+
+ if (service == NULL || service->path == NULL) {
+ DBG("service %p or path is NULL", service);
+ return;
+ }
+
+ g_hash_table_remove(services_notify->add, service->path);
+ g_hash_table_replace(services_notify->remove, g_strdup(service->path),
+ NULL);
+
+ service_schedule_changed();
+}
+
+static const GDBusMethodTable service_methods[] = {
+ { GDBUS_DEPRECATED_METHOD("GetProperties",
+ NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+ get_properties) },
+ { GDBUS_METHOD("SetProperty",
+ GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
+ NULL, set_property) },
+ { GDBUS_METHOD("ClearProperty",
+ GDBUS_ARGS({ "name", "s" }), NULL,
+ clear_property) },
+ { GDBUS_ASYNC_METHOD("Connect", NULL, NULL,
+ connect_service) },
+ { GDBUS_METHOD("Disconnect", NULL, NULL,
+ disconnect_service) },
+ { GDBUS_METHOD("Remove", NULL, NULL, remove_service) },
+ { GDBUS_METHOD("MoveBefore",
+ GDBUS_ARGS({ "service", "o" }), NULL,
+ move_before) },
+ { GDBUS_METHOD("MoveAfter",
+ GDBUS_ARGS({ "service", "o" }), NULL,
+ move_after) },
+ { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) },
{ },
};
-static GDBusSignalTable service_signals[] = {
- { "PropertyChanged", "sv" },
+static const GDBusSignalTable service_signals[] = {
+ { GDBUS_SIGNAL("PropertyChanged",
+ GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
{ },
};
g_hash_table_remove(service_hash, service->identifier);
__connman_notifier_service_remove(service);
+ service_schedule_removed(service);
stats_stop(service);
service->path = NULL;
if (path != NULL) {
- services_changed(FALSE);
+ __connman_connection_update_gateway();
g_dbus_unregister_interface(connection, path,
CONNMAN_SERVICE_INTERFACE);
g_hash_table_destroy(service->counter_table);
if (service->network != NULL) {
- if (service->network_created == TRUE)
- connman_network_unref(service->network);
+ __connman_network_disconnect(service->network);
+ connman_network_unref(service->network);
+ service->network = NULL;
}
if (service->provider != NULL)
connman_provider_unref(service->provider);
if (service->ipconfig_ipv4 != NULL) {
- connman_ipconfig_set_ops(service->ipconfig_ipv4, NULL);
- connman_ipconfig_set_data(service->ipconfig_ipv4, NULL);
- connman_ipconfig_unref(service->ipconfig_ipv4);
+ __connman_ipconfig_set_ops(service->ipconfig_ipv4, NULL);
+ __connman_ipconfig_set_data(service->ipconfig_ipv4, NULL);
+ __connman_ipconfig_unref(service->ipconfig_ipv4);
service->ipconfig_ipv4 = NULL;
}
if (service->ipconfig_ipv6 != NULL) {
- connman_ipconfig_set_ops(service->ipconfig_ipv6, NULL);
- connman_ipconfig_set_data(service->ipconfig_ipv6, NULL);
- connman_ipconfig_unref(service->ipconfig_ipv6);
+ __connman_ipconfig_set_ops(service->ipconfig_ipv6, NULL);
+ __connman_ipconfig_set_data(service->ipconfig_ipv6, NULL);
+ __connman_ipconfig_unref(service->ipconfig_ipv6);
service->ipconfig_ipv6 = NULL;
}
- if (service->location != NULL)
- connman_location_unref(service->location);
-
+ g_strfreev(service->timeservers);
+ g_strfreev(service->timeservers_config);
g_strfreev(service->nameservers);
g_strfreev(service->nameservers_config);
+ g_strfreev(service->nameservers_auto);
g_strfreev(service->domains);
g_strfreev(service->proxies);
g_strfreev(service->excludes);
g_free(service->private_key_file);
g_free(service->private_key_passphrase);
g_free(service->phase2);
+ g_free(service->config_file);
+ g_free(service->config_entry);
if (service->stats.timer != NULL)
g_timer_destroy(service->stats.timer);
- if (service->stats_roaming.timer != NULL)
- g_timer_destroy(service->stats_roaming.timer);
-
- g_free(service);
-}
-
-/**
- * __connman_service_put:
- * @service: service structure
- *
- * Release service if no longer needed
- */
-void __connman_service_put(struct connman_service *service)
-{
- DBG("service %p", service);
-
- if (g_atomic_int_dec_and_test(&service->refcount) == TRUE) {
- GSequenceIter *iter;
-
- iter = g_hash_table_lookup(service_hash, service->identifier);
- if (iter != NULL) {
- reply_pending(service, ECONNABORTED);
-
- __connman_service_disconnect(service);
+ if (service->stats_roaming.timer != NULL)
+ g_timer_destroy(service->stats_roaming.timer);
- g_sequence_remove(iter);
- } else
- service_free(service);
- }
+ g_free(service);
}
static void stats_init(struct connman_service *service)
service->refcount = 1;
service->session_usage_count = 0;
- service->network_created = FALSE;
-
service->type = CONNMAN_SERVICE_TYPE_UNKNOWN;
service->security = CONNMAN_SERVICE_SECURITY_UNKNOWN;
service_initialize(service);
- service->location = __connman_location_create(service);
-
return service;
}
-struct connman_location *__connman_service_get_location(struct connman_service *service)
-{
- return service->location;
-}
-
/**
* connman_service_ref:
* @service: service structure
*
* Increase reference counter of service
*/
-struct connman_service *connman_service_ref(struct connman_service *service)
+struct connman_service *
+connman_service_ref_debug(struct connman_service *service,
+ const char *file, int line, const char *caller)
{
- DBG("%p", service);
+ DBG("%p ref %d by %s:%d:%s()", service, service->refcount + 1,
+ file, line, caller);
- g_atomic_int_inc(&service->refcount);
+ __sync_fetch_and_add(&service->refcount, 1);
return service;
}
* connman_service_unref:
* @service: service structure
*
- * Decrease reference counter of service
+ * Decrease reference counter of service and release service if no
+ * longer needed.
*/
-void connman_service_unref(struct connman_service *service)
+void connman_service_unref_debug(struct connman_service *service,
+ const char *file, int line, const char *caller)
{
- __connman_service_put(service);
+ GSequenceIter *iter;
+
+ DBG("%p ref %d by %s:%d:%s()", service, service->refcount - 1,
+ file, line, caller);
+
+ if (__sync_fetch_and_sub(&service->refcount, 1) != 1)
+ return;
+
+ iter = g_hash_table_lookup(service_hash, service->identifier);
+ if (iter != NULL) {
+ reply_pending(service, ECONNABORTED);
+
+ __connman_service_disconnect(service);
+
+ g_sequence_remove(iter);
+ } else {
+ service_free(service);
+ }
}
static gint service_compare(gconstpointer a, gconstpointer b,
if (service->type == CONNMAN_SERVICE_TYPE_VPN) {
if (service->ipconfig_ipv4)
- index = connman_ipconfig_get_index(
+ index = __connman_ipconfig_get_index(
service->ipconfig_ipv4);
else if (service->ipconfig_ipv6)
- index = connman_ipconfig_get_index(
+ index = __connman_ipconfig_get_index(
service->ipconfig_ipv6);
else
return NULL;
}
+connman_bool_t __connman_service_is_connected_state(struct connman_service *service,
+ enum connman_ipconfig_type type)
+{
+ if (service == NULL)
+ return FALSE;
+
+ switch (type) {
+ case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+ break;
+ case CONNMAN_IPCONFIG_TYPE_IPV4:
+ return is_connected_state(service, service->state_ipv4);
+ case CONNMAN_IPCONFIG_TYPE_IPV6:
+ return is_connected_state(service, service->state_ipv6);
+ }
+
+ return FALSE;
+}
enum connman_service_security __connman_service_get_security(struct connman_service *service)
{
if (service == NULL)
return service->wps;
}
+void __connman_service_mark_dirty()
+ {
+ services_dirty = TRUE;
+ }
+
/**
- * __connman_service_set_favorite:
+ * __connman_service_set_favorite_delayed:
* @service: service structure
* @favorite: favorite value
+ * @delay_ordering: do not order service sequence
*
* Change the favorite setting of service
*/
-int __connman_service_set_favorite(struct connman_service *service,
- connman_bool_t favorite)
+int __connman_service_set_favorite_delayed(struct connman_service *service,
+ connman_bool_t favorite,
+ gboolean delay_ordering)
{
GSequenceIter *iter;
+ if (service->hidden == TRUE)
+ return -EOPNOTSUPP;
iter = g_hash_table_lookup(service_hash, service->identifier);
if (iter == NULL)
return -ENOENT;
service->favorite = favorite;
+ if (delay_ordering == FALSE)
+ service->order = __connman_service_get_order(service);
+
favorite_changed(service);
- g_sequence_sort_changed(iter, service_compare, NULL);
+ if (delay_ordering == FALSE) {
- services_changed(FALSE);
+ if (g_sequence_get_length(service_list) > 1) {
+ g_sequence_sort_changed(iter, service_compare, NULL);
+ service_schedule_changed();
+ }
+
+ __connman_connection_update_gateway();
+ }
return 0;
}
+/**
+ * __connman_service_set_favorite:
+ * @service: service structure
+ * @favorite: favorite value
+ *
+ * Change the favorite setting of service
+ */
+int __connman_service_set_favorite(struct connman_service *service,
+ connman_bool_t favorite)
+{
+ return __connman_service_set_favorite_delayed(service, favorite,
+ FALSE);
+}
+
int __connman_service_set_immutable(struct connman_service *service,
connman_bool_t immutable)
{
+ if (service->hidden == TRUE)
+ return -EOPNOTSUPP;
service->immutable = immutable;
immutable_changed(service);
void __connman_service_set_string(struct connman_service *service,
const char *key, const char *value)
{
+ if (service->hidden == TRUE)
+ return;
if (g_str_equal(key, "EAP") == TRUE) {
g_free(service->eap);
service->eap = g_strdup(value);
}
}
+void __connman_service_set_userconnect(struct connman_service *service,
+ connman_bool_t userconnect)
+{
+ if (service != NULL)
+ service->userconnect = userconnect;
+}
+
static void service_complete(struct connman_service *service)
{
reply_pending(service, EIO);
if (retry == TRUE)
__connman_service_connect(service);
else {
+ /* It is not relevant to stay on Failure state
+ * when failing is due to wrong user input */
+ service->state = CONNMAN_SERVICE_STATE_IDLE;
+
+ service_complete(service);
+ __connman_connection_update_gateway();
+ }
+}
+
+int __connman_service_add_passphrase(struct connman_service *service,
+ const gchar *passphrase)
+{
+ int err = 0;
+
+ switch (service->security) {
+ case CONNMAN_SERVICE_SECURITY_WEP:
+ case CONNMAN_SERVICE_SECURITY_PSK:
+ err = __connman_service_set_passphrase(service, passphrase);
+ break;
+ case CONNMAN_SERVICE_SECURITY_8021X:
+ __connman_service_set_agent_passphrase(service,
+ passphrase);
+ break;
+ case CONNMAN_SERVICE_SECURITY_UNKNOWN:
+ case CONNMAN_SERVICE_SECURITY_NONE:
+ case CONNMAN_SERVICE_SECURITY_WPA:
+ case CONNMAN_SERVICE_SECURITY_RSN:
+ DBG("service security '%s' (%d) not handled",
+ security2string(service->security),
+ service->security);
+ break;
+ }
+
+ return err;
+}
+
+static int check_wpspin(struct connman_service *service, const char *wpspin)
+{
+ int length;
+ guint i;
+
+ if (wpspin == NULL)
+ return 0;
+
+ length = strlen(wpspin);
+
+ /* If 0, it will mean user wants to use PBC method */
+ if (length == 0) {
+ connman_network_set_string(service->network,
+ "WiFi.PinWPS", NULL);
+ return 0;
+ }
+
+ /* A WPS PIN is always 8 chars length,
+ * its content is in digit representation.
+ */
+ if (length != 8)
+ return -ENOKEY;
+
+ for (i = 0; i < 8; i++)
+ if (!isdigit((unsigned char) wpspin[i]))
+ return -ENOKEY;
+
+ connman_network_set_string(service->network, "WiFi.PinWPS", wpspin);
+
+ return 0;
+}
+
+static void request_input_cb (struct connman_service *service,
+ connman_bool_t values_received,
+ const char *name, int name_len,
+ const char *identity, const char *passphrase,
+ gboolean wps, const char *wpspin,
+ const char *error, void *user_data)
+{
+ struct connman_device *device;
+ int err = 0;
+
+ DBG ("RequestInput return, %p", service);
+
+ if (error != NULL) {
+ DBG("error: %s", error);
+
+ if (g_strcmp0(error,
+ "net.connman.Agent.Error.Canceled") == 0) {
+ err = -EINVAL;
+ goto done;
+ }
+ }
+
+ if (service->hidden == TRUE && name_len > 0 && name_len <= 32) {
+ device = connman_network_get_device(service->network);
+ __connman_device_request_hidden_scan(device,
+ name, name_len,
+ identity, passphrase);
+ }
+
+ if (values_received == FALSE || service->hidden == TRUE) {
+ err = -EINVAL;
+ goto done;
+ }
+
+ if (wps == TRUE && service->network != NULL) {
+ err = check_wpspin(service, wpspin);
+ if (err < 0)
+ goto done;
+
+ connman_network_set_bool(service->network, "WiFi.UseWPS", wps);
+ }
+
+ if (identity != NULL)
+ __connman_service_set_agent_identity(service, identity);
+
+ if (passphrase != NULL)
+ err = __connman_service_add_passphrase(service, passphrase);
+
+ done:
+ if (err >= 0) {
+ __connman_service_connect(service);
+
+ /* Never cache agent provided credentials */
+ __connman_service_set_agent_identity(service, NULL);
+ __connman_service_set_agent_passphrase(service, NULL);
+ } else if (err == -ENOKEY) {
+ __connman_service_indicate_error(service,
+ CONNMAN_SERVICE_ERROR_INVALID_KEY);
+ __connman_agent_report_error(service,
+ error2string(service->error),
+ report_error_cb, NULL);
+ } else {
+ /* It is not relevant to stay on Failure state
+ * when failing is due to wrong user input */
+ service->state = CONNMAN_SERVICE_STATE_IDLE;
+
service_complete(service);
- services_changed(FALSE);
- __connman_device_request_scan(CONNMAN_DEVICE_TYPE_UNKNOWN);
+ __connman_connection_update_gateway();
+ }
+}
+
+static void downgrade_connected_services(void)
+{
+ struct connman_service *up_service;
+ GSequenceIter *iter;
+
+ iter = g_sequence_get_begin_iter(service_list);
+ while (g_sequence_iter_is_end(iter) == FALSE) {
+ up_service = g_sequence_get(iter);
+
+ if (is_connected(up_service) == FALSE) {
+ iter = g_sequence_iter_next(iter);
+ continue;
+ }
+
+ if (up_service->state == CONNMAN_SERVICE_STATE_ONLINE)
+ return;
+
+ downgrade_state(up_service);
+
+ iter = g_sequence_iter_next(iter);
+ }
+}
+
+static int service_update_preferred_order(struct connman_service *default_service,
+ struct connman_service *new_service,
+ enum connman_service_state new_state)
+{
+ unsigned int *tech_array;
+ int i;
+
+ if (default_service == NULL || default_service == new_service ||
+ default_service->state != new_state )
+ return 0;
+
+ tech_array = connman_setting_get_uint_list("PreferredTechnologies");
+ if (tech_array != NULL) {
+
+ for (i = 0; tech_array[i] != 0; i += 1) {
+ if (default_service->type == tech_array[i])
+ return -EALREADY;
+
+ if (new_service->type == tech_array[i]) {
+ switch_default_service(new_service,
+ default_service);
+ return 0;
+ }
+ }
+ return -EAGAIN;
}
+
+ return -EALREADY;
}
static int service_indicate_state(struct connman_service *service)
{
enum connman_service_state old_state, new_state;
+ struct connman_service *def_service;
+ int result;
GSequenceIter *iter;
if (service == NULL)
if (old_state == new_state)
return -EALREADY;
+ def_service = __connman_service_get_default();
+
+ if (new_state == CONNMAN_SERVICE_STATE_ONLINE) {
+ result = service_update_preferred_order(def_service,
+ service, new_state);
+ if (result == -EALREADY)
+ return result;
+ if (result == -EAGAIN)
+ __connman_service_auto_connect();
+ }
+
+ if (old_state == CONNMAN_SERVICE_STATE_ONLINE)
+ __connman_notifier_leave_online(service->type);
+
service->state = new_state;
state_changed(service);
}
if (new_state == CONNMAN_SERVICE_STATE_CONFIGURATION) {
- if (__connman_stats_service_register(service) == 0) {
+ if (service->new_service == FALSE &&
+ __connman_stats_service_register(service) == 0) {
+ /*
+ * For new services the statistics are updated after
+ * we have successfully connected.
+ */
__connman_stats_get(service, FALSE,
&service->stats.data);
__connman_stats_get(service, TRUE,
}
}
- if (new_state == CONNMAN_SERVICE_STATE_ONLINE) {
- if (service->login_required == TRUE) {
- service->login_required = FALSE;
- login_changed(service);
- }
-
- connman_timeserver_sync();
- }
-
if (new_state == CONNMAN_SERVICE_STATE_IDLE) {
connman_bool_t reconnect;
reconnect = get_reconnect_state(service);
if (reconnect == TRUE)
__connman_service_auto_connect();
-
- __connman_device_request_scan(CONNMAN_DEVICE_TYPE_UNKNOWN);
}
if (new_state == CONNMAN_SERVICE_STATE_READY) {
enum connman_ipconfig_method method;
+ if (service->new_service == TRUE &&
+ __connman_stats_service_register(service) == 0) {
+ /*
+ * This is normally done after configuring state
+ * but for new service do this after we have connected
+ * successfully.
+ */
+ __connman_stats_get(service, FALSE,
+ &service->stats.data);
+ __connman_stats_get(service, TRUE,
+ &service->stats_roaming.data);
+ }
+
+ service->new_service = FALSE;
+
+ service_update_preferred_order(def_service, service, new_state);
+
set_reconnect_state(service, TRUE);
__connman_service_set_favorite(service, TRUE);
service->ipconfig_ipv6);
} else if (new_state == CONNMAN_SERVICE_STATE_DISCONNECT) {
- struct connman_service *def_service = get_default();
+ def_service = __connman_service_get_default();
- if (__connman_notifier_count_connected() == 0 &&
+ if (__connman_notifier_is_connected() == FALSE &&
def_service != NULL &&
def_service->provider != NULL)
__connman_provider_disconnect(def_service->provider);
- __connman_location_finish(service);
-
default_changed();
+ __connman_wispr_stop(service);
+
__connman_wpad_stop(service);
update_nameservers(service);
domain_changed(service);
__connman_notifier_disconnect(service->type);
+
+ /*
+ * Previous services which are connected and which states
+ * are set to online should reset relevantly ipconfig_state
+ * to ready so wispr/portal will be rerun on those
+ */
+ downgrade_connected_services();
}
if (new_state == CONNMAN_SERVICE_STATE_FAILURE) {
if (service->userconnect == TRUE &&
__connman_agent_report_error(service,
error2string(service->error),
- report_error_cb, NULL) == -EIO)
+ report_error_cb, NULL) == -EINPROGRESS)
return 0;
service_complete(service);
-
- __connman_device_request_scan(CONNMAN_DEVICE_TYPE_UNKNOWN);
} else
service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
iter = g_hash_table_lookup(service_hash, service->identifier);
- if (iter != NULL)
+ if (iter != NULL && g_sequence_get_length(service_list) > 1) {
g_sequence_sort_changed(iter, service_compare, NULL);
+ service_schedule_changed();
+ }
- services_changed(FALSE);
+ __connman_connection_update_gateway();
- if (new_state == CONNMAN_SERVICE_STATE_ONLINE)
+ if (new_state == CONNMAN_SERVICE_STATE_ONLINE) {
+ __connman_notifier_enter_online(service->type);
default_changed();
+ }
return 0;
}
service->state_ipv4 = service->state_ipv6 =
CONNMAN_SERVICE_STATE_UNKNOWN;
- service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;;
+ service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
if (service->favorite == TRUE)
set_reconnect_state(service, TRUE);
default_changed();
- __connman_location_detect(service);
-
return 0;
}
struct connman_service *service,
enum connman_ipconfig_type type)
{
+ if (service == NULL)
+ return CONNMAN_SERVICE_STATE_UNKNOWN;
+
if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
return service->state_ipv4;
*/
if (service->proxy != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN)
- return;
+ goto done;
if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN &&
(service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_AUTO ||
service->pac != NULL))
- return;
+ goto done;
if (__connman_wpad_start(service) < 0) {
service->proxy = CONNMAN_SERVICE_PROXY_METHOD_DIRECT;
__connman_notifier_proxy_changed(service);
+ goto done;
+ }
+
+ return;
+
+done:
+ __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+}
+
+/*
+ * How many networks are connected at the same time. If more than 1,
+ * then set the rp_filter setting properly (loose mode routing) so that network
+ * connectivity works ok. This is only done for IPv4 networks as IPv6
+ * does not have rp_filter knob.
+ */
+static int connected_networks_count;
+static int original_rp_filter;
+
+static void service_rp_filter(struct connman_service *service,
+ gboolean connected)
+{
+ enum connman_ipconfig_method method;
+
+ method = __connman_ipconfig_get_method(service->ipconfig_ipv4);
+
+ switch (method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ return;
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ break;
+ }
+
+ if (connected == TRUE) {
+ if (connected_networks_count == 1) {
+ int filter_value;
+ filter_value = __connman_ipconfig_set_rp_filter();
+ if (filter_value < 0)
+ return;
+
+ original_rp_filter = filter_value;
+ }
+ connected_networks_count++;
+
+ } else {
+ if (connected_networks_count == 2)
+ __connman_ipconfig_unset_rp_filter(original_rp_filter);
+
+ connected_networks_count--;
+ if (connected_networks_count < 0)
+ connected_networks_count = 0;
+ }
+
+ DBG("%s %s ipconfig %p method %d count %d filter %d",
+ connected ? "connected" : "disconnected", service->identifier,
+ service->ipconfig_ipv4, method,
+ connected_networks_count, original_rp_filter);
+}
+
+static gboolean redo_wispr(gpointer user_data)
+{
+ struct connman_service *service = user_data;
+
+ DBG("");
+
+ __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6);
+
+ return FALSE;
+}
+
+int __connman_service_online_check_failed(struct connman_service *service,
+ enum connman_ipconfig_type type)
+{
+ DBG("service %p type %d count %d", service, type,
+ service->online_check_count);
+
+ /* currently we only retry IPv6 stuff */
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4 ||
+ service->online_check_count != 1) {
+ connman_warn("Online check failed for %p %s", service,
+ service->name);
+ return 0;
}
+
+ service->online_check_count = 0;
+
+ /*
+ * We set the timeout to 1 sec so that we have a chance to get
+ * necessary IPv6 router advertisement messages that might have
+ * DNS data etc.
+ */
+ g_timeout_add_seconds(1, redo_wispr, service);
+
+ return EAGAIN;
}
int __connman_service_ipconfig_indicate_state(struct connman_service *service,
case CONNMAN_SERVICE_STATE_READY:
update_nameservers(service);
- if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
check_proxy_setup(service);
+ service_rp_filter(service, TRUE);
+ } else {
+ service->online_check_count = 1;
+ __connman_wispr_start(service, type);
+ }
break;
case CONNMAN_SERVICE_STATE_ONLINE:
break;
case CONNMAN_SERVICE_STATE_DISCONNECT:
if (service->state == CONNMAN_SERVICE_STATE_IDLE)
return -EINVAL;
+
+ if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+ service_rp_filter(service, FALSE);
+
break;
case CONNMAN_SERVICE_STATE_FAILURE:
break;
return ret;
}
-int __connman_service_request_login(struct connman_service *service)
-{
- DBG("service %p", service);
-
- if (service == NULL)
- return -EINVAL;
-
- service->login_required = TRUE;
- login_changed(service);
-
- return 0;
-}
-
static connman_bool_t prepare_network(struct connman_service *service)
{
enum connman_network_type type;
{
int err;
+ if (service->hidden == TRUE)
+ return -EPERM;
+
switch (service->type) {
case CONNMAN_SERVICE_TYPE_UNKNOWN:
case CONNMAN_SERVICE_TYPE_SYSTEM:
return -EINPROGRESS;
}
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_FAILURE,
- CONNMAN_IPCONFIG_TYPE_IPV4);
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_FAILURE,
- CONNMAN_IPCONFIG_TYPE_IPV6);
-
if (service->network != NULL)
__connman_network_disconnect(service->network);
else if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
__connman_provider_disconnect(service->provider);
if (service->userconnect == TRUE) {
- if (err == -ENOKEY) {
- if (__connman_agent_request_input(service,
- request_input_cb,
- NULL) == -EIO)
- return -EINPROGRESS;
+ if (err == -ENOKEY || err == -EPERM) {
+ return __connman_agent_request_passphrase_input(service,
+ request_input_cb, NULL);
}
- reply_pending(service, err);
+ reply_pending(service, -err);
}
return err;
int __connman_service_disconnect_all(void)
{
GSequenceIter *iter;
+ GSList *services = NULL, *list;
DBG("");
while (g_sequence_iter_is_end(iter) == FALSE) {
struct connman_service *service = g_sequence_get(iter);
- service->ignore = TRUE;
-
- set_reconnect_state(service, FALSE);
-
- __connman_service_disconnect(service);
+ services = g_slist_prepend(services, service);
iter = g_sequence_iter_next(iter);
}
- return 0;
+ for (list = services; list != NULL; list = list->next) {
+ struct connman_service *service = list->data;
-}
+ service->ignore = TRUE;
-/**
- * __connman_service_lookup:
- * @pattern: search pattern
- * @path: return object path
- *
- * Look up a service path from a search pattern
- */
-int __connman_service_lookup(const char *pattern, const char **path)
-{
- GHashTableIter iter;
- gpointer key, value;
+ set_reconnect_state(service, FALSE);
- g_hash_table_iter_init(&iter, service_hash);
+ __connman_service_disconnect(service);
+ }
- while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
- GSequenceIter *iter = value;
- struct connman_service *service = g_sequence_get(iter);
+ g_slist_free(list);
- if (g_strcmp0(service->identifier, pattern) == 0 ||
- g_strcmp0(service->name, pattern) == 0) {
- *path = (const char *) service->path;
- return 0;
- }
- }
+ return 0;
- return -ENXIO;
}
/**
return NULL;
}
-static struct connman_network *create_hidden_wifi(struct connman_device *device,
- const char *ssid, const char *mode, const char *security,
- const char *group)
-{
- struct connman_network *network;
- char *name;
- int index;
- unsigned int i, ssid_len;
-
- ssid_len = strlen(ssid);
- if (ssid_len < 1)
- return NULL;
-
- network = connman_network_create(group, CONNMAN_NETWORK_TYPE_WIFI);
- if (network == NULL)
- return NULL;
-
- connman_network_set_blob(network, "WiFi.SSID",
- (unsigned char *) ssid, ssid_len);
-
- connman_network_set_string(network, "WiFi.Mode", mode);
- connman_network_set_string(network, "WiFi.Security", security);
-
- name = g_try_malloc0(ssid_len + 1);
- if (name == NULL) {
- connman_network_unref(network);
- return NULL;
- }
-
- for (i = 0; i < ssid_len; i++) {
- if (g_ascii_isprint(ssid[i]))
- name[i] = ssid[i];
- else
- name[i] = ' ';
- }
-
- connman_network_set_name(network, name);
-
- g_free(name);
-
- index = connman_device_get_index(device);
- connman_network_set_index(network, index);
-
- if (connman_device_add_network(device, network) < 0) {
- connman_network_unref(network);
- return NULL;
- }
-
- connman_network_set_available(network, TRUE);
-
- return network;
-}
-
-int __connman_service_create_and_connect(DBusMessage *msg)
-{
- struct connman_service *service;
- struct connman_network *network;
- struct connman_device *device;
- DBusMessageIter iter, array;
- const char *mode = "managed", *security = "none", *group_security;
- const char *type = NULL, *ssid = NULL, *passphrase = NULL;
- unsigned int ssid_len = 0;
+struct provision_user_data {
const char *ident;
- char *name, *group;
- int err;
-
- dbus_message_iter_init(msg, &iter);
- dbus_message_iter_recurse(&iter, &array);
-
- while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
- DBusMessageIter entry, value;
- const char *key;
-
- dbus_message_iter_recurse(&array, &entry);
- dbus_message_iter_get_basic(&entry, &key);
-
- dbus_message_iter_next(&entry);
- dbus_message_iter_recurse(&entry, &value);
-
- switch (dbus_message_iter_get_arg_type(&value)) {
- case DBUS_TYPE_STRING:
- if (g_str_equal(key, "Type") == TRUE)
- dbus_message_iter_get_basic(&value, &type);
- else if (g_str_equal(key, "WiFi.Mode") == TRUE ||
- g_str_equal(key, "Mode") == TRUE)
- dbus_message_iter_get_basic(&value, &mode);
- else if (g_str_equal(key, "WiFi.Security") == TRUE ||
- g_str_equal(key, "Security") == TRUE)
- dbus_message_iter_get_basic(&value, &security);
- else if (g_str_equal(key, "WiFi.Passphrase") == TRUE ||
- g_str_equal(key, "Passphrase") == TRUE)
- dbus_message_iter_get_basic(&value, &passphrase);
- else if (g_str_equal(key, "WiFi.SSID") == TRUE ||
- g_str_equal(key, "SSID") == TRUE)
- dbus_message_iter_get_basic(&value, &ssid);
- }
-
- dbus_message_iter_next(&array);
- }
-
- if (type == NULL)
- return -EINVAL;
-
- if (g_strcmp0(type, "wifi") != 0 || g_strcmp0(mode, "managed") != 0)
- return -EOPNOTSUPP;
-
- if (ssid == NULL)
- return -EINVAL;
-
- ssid_len = strlen(ssid);
- if (ssid_len < 1)
- return -EINVAL;
-
- if (g_strcmp0(security, "none") != 0 &&
- g_strcmp0(security, "wep") != 0 &&
- g_strcmp0(security, "psk") != 0 &&
- g_strcmp0(security, "wpa") != 0 &&
- g_strcmp0(security, "rsn") != 0 &&
- g_strcmp0(security, "ieee8021x") != 0)
- return -EINVAL;
-
- device = __connman_device_find_device(CONNMAN_SERVICE_TYPE_WIFI);
- if (device == NULL)
- return -EOPNOTSUPP;
-
- ident = connman_device_get_ident(device);
- if (ident == NULL)
- return -EOPNOTSUPP;
-
-
- if (!g_strcmp0(security, "wpa") ||
- !g_strcmp0(security, "rsn"))
- group_security = "psk";
- else
- group_security = security;
-
- group = wifi_build_group_name((unsigned char *) ssid,
- ssid_len, mode, group_security);
- if (group == NULL)
- return -EINVAL;
-
- name = g_strdup_printf("%s_%s_%s", type, ident, group);
-
- service = lookup_by_identifier(name);
-
- if (service != NULL)
- goto done;
-
- network = create_hidden_wifi(device, ssid, mode, security, group);
- if (network != NULL)
- connman_network_set_group(network, group);
-
- service = lookup_by_identifier(name);
-
-done:
- g_free(name);
- g_free(group);
-
- if (service == NULL) {
- err = -EOPNOTSUPP;
- goto failed;
- }
-
- service->network_created = TRUE;
-
- if (is_connected(service) == TRUE) {
- err = -EISCONN;
- goto failed;
- }
-
- if (is_connecting(service) == TRUE) {
- err = -EALREADY;
- goto failed;
- }
-
- set_reconnect_state(service, FALSE);
-
- __connman_device_disconnect(device);
-
- if (passphrase != NULL) {
- g_free(service->passphrase);
- service->passphrase = g_strdup(passphrase);
- }
-
- service->userconnect = TRUE;
-
- err = __connman_service_connect(service);
- if (err < 0 && err != -EINPROGRESS)
- goto failed;
-
- service->pending = dbus_message_ref(msg);
-
- return 0;
-
-failed:
- if (service != NULL && service->network_created == TRUE) {
- struct connman_network *network = service->network;
-
- if (network != NULL) {
- connman_network_set_available(network, FALSE);
- __connman_device_cleanup_networks(device);
- } else
- __connman_service_put(service);
- }
-
- return err;
-}
+ int ret;
+};
static void provision_changed(gpointer value, gpointer user_data)
{
struct connman_service *service = value;
- char *path = user_data;
-
- __connman_config_provision_service_ident(service, path);
-}
+ struct provision_user_data *data = user_data;
+ const char *path = data->ident;
+ int ret;
-void __connman_service_provision_changed(const char *ident)
-{
- g_sequence_foreach(service_list, provision_changed, (void *)ident);
+ ret = __connman_config_provision_service_ident(service, path,
+ service->config_file, service->config_entry);
+ if (ret > 0)
+ data->ret = ret;
}
-int __connman_service_provision(DBusMessage *msg)
+int __connman_service_provision_changed(const char *ident)
{
- GKeyFile *keyfile = NULL;
- const char *config_str = NULL;
- char *group = NULL, *ident = NULL;
- int err = 0;
- struct connman_service *service;
-
- DBG("");
-
- dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &config_str,
- DBUS_TYPE_INVALID);
+ struct provision_user_data data = {
+ .ident = ident,
+ .ret = 0
+ };
- if (config_str == NULL || strlen(config_str) == 0)
- return -EINVAL;
-
- keyfile = g_key_file_new();
-
- /* populate GKeyFile with config_str */
- if (g_key_file_load_from_data(keyfile, config_str,
- strlen(config_str), 0, NULL) == FALSE) {
- err = -EINVAL;
- goto done;
- }
+ g_sequence_foreach(service_list, provision_changed, (void *)&data);
/*
- * read only one group of settings (only one service supported, no
- * global settings)
+ * Because the provision_changed() might have set some services
+ * as favorite, we must sort the sequence now.
*/
- group = g_key_file_get_start_group(keyfile);
-
- if (group == NULL || g_str_has_prefix(group, "service_") == FALSE) {
- err = -EINVAL;
- goto done;
- }
-
- err = __connman_config_load_service(keyfile, group, TRUE);
- if (err < 0)
- goto done;
+ if (services_dirty == TRUE) {
+ services_dirty = FALSE;
- ident = group + strlen("service_");
+ if (g_sequence_get_length(service_list) > 1) {
+ g_sequence_sort(service_list, service_compare, NULL);
+ service_schedule_changed();
+ }
- /* trigger service provisioning if service exists */
- service = lookup_by_identifier(ident);
- if (service != NULL)
- __connman_config_provision_service(service);
+ __connman_connection_update_gateway();
+ }
- g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
+ return data.ret;
+}
-done:
- if (group != NULL)
- g_free(group);
+void __connman_service_set_config(struct connman_service *service,
+ const char *file_id, const char *entry)
+{
+ if (service == NULL)
+ return;
- if (keyfile != NULL)
- g_key_file_free(keyfile);
+ g_free(service->config_file);
+ service->config_file = g_strdup(file_id);
- return err;
+ g_free(service->config_entry);
+ service->config_entry = g_strdup(entry);
}
/**
NULL, service, NULL);
iter = g_hash_table_lookup(service_hash, service->identifier);
- if (iter != NULL)
+ if (iter != NULL && g_sequence_get_length(service_list) > 1) {
g_sequence_sort_changed(iter, service_compare, NULL);
+ service_schedule_changed();
+ }
- services_changed(TRUE);
+ __connman_connection_update_gateway();
return 0;
}
static void service_up(struct connman_ipconfig *ipconfig)
{
- struct connman_service *service = connman_ipconfig_get_data(ipconfig);
+ struct connman_service *service = __connman_ipconfig_get_data(ipconfig);
- DBG("%s up", connman_ipconfig_get_ifname(ipconfig));
+ DBG("%s up", __connman_ipconfig_get_ifname(ipconfig));
link_changed(service);
static void service_down(struct connman_ipconfig *ipconfig)
{
- DBG("%s down", connman_ipconfig_get_ifname(ipconfig));
+ DBG("%s down", __connman_ipconfig_get_ifname(ipconfig));
}
static void service_lower_up(struct connman_ipconfig *ipconfig)
{
- struct connman_service *service = connman_ipconfig_get_data(ipconfig);
+ struct connman_service *service = __connman_ipconfig_get_data(ipconfig);
- DBG("%s lower up", connman_ipconfig_get_ifname(ipconfig));
+ DBG("%s lower up", __connman_ipconfig_get_ifname(ipconfig));
stats_start(service);
}
static void service_lower_down(struct connman_ipconfig *ipconfig)
{
- struct connman_service *service = connman_ipconfig_get_data(ipconfig);
+ struct connman_service *service = __connman_ipconfig_get_data(ipconfig);
- DBG("%s lower down", connman_ipconfig_get_ifname(ipconfig));
+ DBG("%s lower down", __connman_ipconfig_get_ifname(ipconfig));
+
+ if (is_idle_state(service, service->state_ipv4) == FALSE)
+ __connman_ipconfig_disable(service->ipconfig_ipv4);
+
+ if (is_idle_state(service, service->state_ipv6) == FALSE)
+ __connman_ipconfig_disable(service->ipconfig_ipv6);
stats_stop(service);
service_save(service);
static void service_ip_bound(struct connman_ipconfig *ipconfig)
{
- struct connman_service *service = connman_ipconfig_get_data(ipconfig);
+ struct connman_service *service = __connman_ipconfig_get_data(ipconfig);
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
enum connman_ipconfig_type type = CONNMAN_IPCONFIG_TYPE_UNKNOWN;
- DBG("%s ip bound", connman_ipconfig_get_ifname(ipconfig));
+ DBG("%s ip bound", __connman_ipconfig_get_ifname(ipconfig));
type = __connman_ipconfig_get_config_type(ipconfig);
method = __connman_ipconfig_get_method(ipconfig);
static void service_ip_release(struct connman_ipconfig *ipconfig)
{
- struct connman_service *service = connman_ipconfig_get_data(ipconfig);
+ struct connman_service *service = __connman_ipconfig_get_data(ipconfig);
enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
enum connman_ipconfig_type type = CONNMAN_IPCONFIG_TYPE_UNKNOWN;
- DBG("%s ip release", connman_ipconfig_get_ifname(ipconfig));
+ DBG("%s ip release", __connman_ipconfig_get_ifname(ipconfig));
type = __connman_ipconfig_get_config_type(ipconfig);
method = __connman_ipconfig_get_method(ipconfig);
static void setup_ip4config(struct connman_service *service, int index,
enum connman_ipconfig_method method)
{
- if (index < 0)
- return;
-
- service->ipconfig_ipv4 = connman_ipconfig_create(index,
+ service->ipconfig_ipv4 = __connman_ipconfig_create(index,
CONNMAN_IPCONFIG_TYPE_IPV4);
if (service->ipconfig_ipv4 == NULL)
return;
- connman_ipconfig_set_method(service->ipconfig_ipv4, method);
+ __connman_ipconfig_set_method(service->ipconfig_ipv4, method);
- connman_ipconfig_set_data(service->ipconfig_ipv4, service);
+ __connman_ipconfig_set_data(service->ipconfig_ipv4, service);
- connman_ipconfig_set_ops(service->ipconfig_ipv4, &service_ops);
+ __connman_ipconfig_set_ops(service->ipconfig_ipv4, &service_ops);
}
static void setup_ip6config(struct connman_service *service, int index)
{
- if (index < 0)
- return;
-
- service->ipconfig_ipv6 = connman_ipconfig_create(index,
+ service->ipconfig_ipv6 = __connman_ipconfig_create(index,
CONNMAN_IPCONFIG_TYPE_IPV6);
if (service->ipconfig_ipv6 == NULL)
return;
- connman_ipconfig_set_data(service->ipconfig_ipv6, service);
+ __connman_ipconfig_set_data(service->ipconfig_ipv6, service);
- connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops);
+ __connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops);
}
void __connman_service_read_ip4config(struct connman_service *service)
if (service->ipconfig_ipv4 == NULL)
return;
- keyfile = __connman_storage_load_global();
+ keyfile = connman_storage_load_service(service->identifier);
if (keyfile == NULL)
return;
if (service->ipconfig_ipv6 == NULL)
return;
- keyfile = __connman_storage_load_service(service->identifier);
+ keyfile = connman_storage_load_service(service->identifier);
if (keyfile == NULL)
return;
while (g_sequence_iter_is_end(iter) == FALSE) {
service = g_sequence_get(iter);
- if (connman_ipconfig_get_index(service->ipconfig_ipv4)
+ if (__connman_ipconfig_get_index(service->ipconfig_ipv4)
== index)
return service;
- if (connman_ipconfig_get_index(service->ipconfig_ipv6)
+ if (__connman_ipconfig_get_index(service->ipconfig_ipv6)
== index)
return service;
return NULL;
}
+struct connman_service *__connman_service_lookup_from_ident(const char *identifier)
+{
+ return lookup_by_identifier(identifier);
+}
+
const char *__connman_service_get_ident(struct connman_service *service)
{
return service->identifier;
if (iter != NULL) {
if (g_sequence_iter_get_position(iter) == 0)
service->order = 1;
- else if (service->type == CONNMAN_SERVICE_TYPE_VPN)
+ else if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
+ service->do_split_routing == FALSE)
service->order = 10;
else
service->order = 0;
}
+ DBG("service %p name %s order %d split %d", service, service->name,
+ service->order, service->do_split_routing);
+
done:
return service->order;
}
+void __connman_service_update_ordering(void)
+{
+ GSequenceIter *iter;
+
+ iter = g_sequence_get_begin_iter(service_list);
+ if (iter != NULL && g_sequence_get_length(service_list) > 1)
+ g_sequence_sort_changed(iter, service_compare, NULL);
+}
+
static enum connman_service_type convert_network_type(struct connman_network *network)
{
enum connman_network_type type = connman_network_get_type(network);
service->wps = connman_network_get_bool(network, "WiFi.WPS");
if (service->strength > strength && service->network != NULL) {
- service->network = network;
+ connman_network_unref(service->network);
+ service->network = connman_network_ref(network);
strength_changed(service);
}
if (service->network == NULL)
- service->network = network;
+ service->network = connman_network_ref(network);
iter = g_hash_table_lookup(service_hash, service->identifier);
- if (iter != NULL)
+ if (iter != NULL && g_sequence_get_length(service_list) > 1) {
g_sequence_sort_changed(iter, service_compare, NULL);
+ service_schedule_changed();
+ }
}
/**
struct connman_device *device;
const char *ident, *group;
char *name;
- int index;
+ unsigned int *auto_connect_types;
+ int i, index;
DBG("network %p", network);
if (service->path != NULL) {
update_from_network(service, network);
- services_changed(TRUE);
+ __connman_connection_update_gateway();
return service;
}
service->type = convert_network_type(network);
+ auto_connect_types = connman_setting_get_uint_list("DefaultAutoConnectTechnologies");
+ service->autoconnect = FALSE;
+ for (i = 0; auto_connect_types != NULL &&
+ auto_connect_types[i] != 0; i++) {
+ if (service->type == auto_connect_types[i]) {
+ service->autoconnect = TRUE;
+ break;
+ }
+ }
+
switch (service->type) {
case CONNMAN_SERVICE_TYPE_UNKNOWN:
case CONNMAN_SERVICE_TYPE_SYSTEM:
- case CONNMAN_SERVICE_TYPE_ETHERNET:
case CONNMAN_SERVICE_TYPE_WIMAX:
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
case CONNMAN_SERVICE_TYPE_GPS:
case CONNMAN_SERVICE_TYPE_VPN:
case CONNMAN_SERVICE_TYPE_GADGET:
- service->autoconnect = FALSE;
- break;
case CONNMAN_SERVICE_TYPE_WIFI:
case CONNMAN_SERVICE_TYPE_CELLULAR:
- service->autoconnect = TRUE;
+ break;
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ service->favorite = TRUE;
break;
}
if (service->favorite == TRUE) {
device = connman_network_get_device(service->network);
- if (device && __connman_device_scanning(device) == FALSE)
+ if (device && connman_device_get_scanning(device) == FALSE)
__connman_service_auto_connect();
}
__connman_notifier_service_add(service, service->name);
+ service_schedule_added(service);
return service;
}
void __connman_service_update_from_network(struct connman_network *network)
{
+ connman_bool_t need_sort = FALSE;
struct connman_service *service;
connman_uint8_t strength;
connman_bool_t roaming;
goto roaming;
service->strength = strength;
+ need_sort = TRUE;
strength_changed(service);
roaming:
roaming = connman_network_get_bool(service->network, "Roaming");
if (roaming == service->roaming)
- return;
+ goto sorting;
stats_enable = stats_enabled(service);
if (stats_enable == TRUE)
stats_stop(service);
service->roaming = roaming;
+ need_sort = TRUE;
if (stats_enable == TRUE)
stats_start(service);
roaming_changed(service);
- iter = g_hash_table_lookup(service_hash, service->identifier);
- if (iter != NULL)
- g_sequence_sort_changed(iter, service_compare, NULL);
+sorting:
+ if (need_sort == TRUE) {
+ iter = g_hash_table_lookup(service_hash, service->identifier);
+ if (iter != NULL && g_sequence_get_length(service_list) > 1) {
+ g_sequence_sort_changed(iter, service_compare, NULL);
+ service_schedule_changed();
+ }
+ }
}
void __connman_service_remove_from_network(struct connman_network *network)
if (service == NULL)
return;
- __connman_service_put(service);
+ service->ignore = TRUE;
+
+ __connman_connection_gateway_remove(service,
+ CONNMAN_IPCONFIG_TYPE_ALL);
+
+ connman_service_unref(service);
}
/**
service->userconnect = TRUE;
service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE;
+ service->state = combine_state(service->state_ipv4, service->state_ipv6);
str = connman_provider_get_string(provider, "Name");
if (str != NULL) {
service_register(service);
__connman_notifier_service_add(service, service->name);
+ service_schedule_added(service);
return service;
}
-void __connman_service_downgrade_state(struct connman_service *service)
+static void remove_unprovisioned_services()
{
- if (service == NULL)
+ gchar **services;
+ GKeyFile *keyfile, *configkeyfile;
+ char *file, *section;
+ int i = 0;
+
+ services = connman_storage_get_services();
+ if (services == NULL)
return;
- DBG("service %p state4 %d state6 %d", service, service->state_ipv4,
- service->state_ipv6);
+ for (;services[i] != NULL; i++) {
+ file = section = NULL;
+ keyfile = configkeyfile = NULL;
- if (service->state_ipv4 == CONNMAN_SERVICE_STATE_ONLINE)
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_READY,
- CONNMAN_IPCONFIG_TYPE_IPV4);
+ keyfile = connman_storage_load_service(services[i]);
+ if (keyfile == NULL)
+ continue;
- if (service->state_ipv6 == CONNMAN_SERVICE_STATE_ONLINE)
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_READY,
- CONNMAN_IPCONFIG_TYPE_IPV6);
+ file = g_key_file_get_string(keyfile, services[i],
+ "Config.file", NULL);
+ if (file == NULL)
+ goto next;
+
+ section = g_key_file_get_string(keyfile, services[i],
+ "Config.ident", NULL);
+ if (section == NULL)
+ goto next;
+
+ configkeyfile = __connman_storage_load_config(file);
+ if (configkeyfile == NULL) {
+ /*
+ * Config file is missing, remove the provisioned
+ * service.
+ */
+ __connman_storage_remove_service(services[i]);
+ goto next;
+ }
+
+ if (g_key_file_has_group(configkeyfile, section) == FALSE)
+ /*
+ * Config section is missing, remove the provisioned
+ * service.
+ */
+ __connman_storage_remove_service(services[i]);
+
+ next:
+ if (keyfile != NULL)
+ g_key_file_free(keyfile);
+
+ if (configkeyfile != NULL)
+ g_key_file_free(configkeyfile);
+
+ g_free(section);
+ g_free(file);
+ }
+
+ g_strfreev(services);
}
int __connman_service_init(void)
service_list = g_sequence_new(service_free);
+ services_notify = g_new0(struct _services_notify, 1);
+ services_notify->remove = g_hash_table_new_full(g_str_hash,
+ g_str_equal, g_free, NULL);
+ services_notify->add = g_hash_table_new(g_str_hash, g_str_equal);
+
+ remove_unprovisioned_services();
+
return 0;
}
DBG("");
+ if (autoconnect_timeout != 0) {
+ g_source_remove(autoconnect_timeout);
+ autoconnect_timeout = 0;
+ }
+
list = service_list;
service_list = NULL;
g_sequence_free(list);
g_slist_free(counter_list);
counter_list = NULL;
+ if (services_notify->id != 0) {
+ g_source_remove(services_notify->id);
+ service_send_changed(NULL);
+ g_hash_table_destroy(services_notify->remove);
+ g_hash_table_destroy(services_notify->add);
+ }
+ g_free(services_notify);
+
dbus_connection_unref(connection);
}
projects / framework / connectivity / connman.git / blobdiff