X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=2f497d10cef126f9e94d7ab42a68aebfcaec1a13;hb=refs%2Ftags%2Fupstream%2F1.38;hp=8f9db427c9a3960d92fba41a5e07d8053d42a6b6;hpb=309230b1cc7b01332f7a5f8aab3f330d09ee42a1;p=platform%2Fupstream%2Fconnman.git diff --git a/src/service.c b/src/service.c index 8f9db42..2f497d1 100644 --- a/src/service.c +++ b/src/service.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2014 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 @@ -29,39 +29,48 @@ #include #include #include +#include #include #include +#include + +#include "src/shared/util.h" #include "connman.h" #define CONNECT_TIMEOUT 120 +#define VPN_AUTOCONNECT_TIMEOUT_DEFAULT 1 +#define VPN_AUTOCONNECT_TIMEOUT_STEP 30 +#define VPN_AUTOCONNECT_TIMEOUT_ATTEMPTS_THRESHOLD 270 + static DBusConnection *connection = NULL; -static GSequence *service_list = NULL; +static GList *service_list = NULL; static GHashTable *service_hash = NULL; static GSList *counter_list = NULL; -static unsigned int autoconnect_timeout = 0; +static unsigned int autoconnect_id = 0; +static unsigned int vpn_autoconnect_id = 0; static struct connman_service *current_default = NULL; +static bool services_dirty = false; struct connman_stats { - connman_bool_t valid; - connman_bool_t enabled; + bool valid; + bool enabled; struct connman_stats_data data_last; struct connman_stats_data data; GTimer *timer; }; struct connman_stats_counter { - connman_bool_t append_all; + bool append_all; struct connman_stats stats; struct connman_stats stats_roaming; }; struct connman_service { int refcount; - int session_usage_count; char *identifier; char *path; enum connman_service_type type; @@ -70,19 +79,18 @@ struct connman_service { enum connman_service_state state_ipv4; enum connman_service_state state_ipv6; enum connman_service_error error; - connman_uint8_t strength; - connman_bool_t favorite; - connman_bool_t immutable; - connman_bool_t hidden; - connman_bool_t ignore; - connman_bool_t autoconnect; - connman_bool_t userconnect; - GTimeVal modified; + enum connman_service_connect_reason connect_reason; + uint8_t strength; + bool favorite; + bool immutable; + bool hidden; + bool ignore; + bool autoconnect; + struct timeval modified; unsigned int order; char *name; char *passphrase; - char *agent_passphrase; - connman_bool_t roaming; + bool roaming; struct connman_ipconfig *ipconfig_ipv4; struct connman_ipconfig *ipconfig_ipv6; struct connman_network *network; @@ -90,20 +98,30 @@ struct connman_service { char **nameservers; char **nameservers_config; char **nameservers_auto; + int nameservers_timeout; char **domains; + bool mdns; + bool mdns_config; + char *hostname; char *domainname; char **timeservers; char **timeservers_config; /* 802.1x settings from the config files */ char *eap; char *identity; + char *anonymous_identity; char *agent_identity; char *ca_cert_file; + char *subject_match; + char *altsubject_match; + char *domain_suffix_match; + char *domain_match; char *client_cert_file; char *private_key_file; char *private_key_passphrase; char *phase2; DBusMessage *pending; + DBusMessage *provider_pending; guint timeout; struct connman_stats stats; struct connman_stats stats_roaming; @@ -113,15 +131,27 @@ struct connman_service { char **proxies; 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; + bool wps; + bool wps_advertizing; + guint online_timeout; + int online_check_interval_ipv4; + int online_check_interval_ipv6; + bool do_split_routing; + bool new_service; + bool hidden_service; char *config_file; char *config_entry; }; +static bool allow_property_changed(struct connman_service *service); + +static struct connman_ipconfig *create_ip4config(struct connman_service *service, + int index, enum connman_ipconfig_method method); +static struct connman_ipconfig *create_ip6config(struct connman_service *service, + int index); +static void dns_changed(struct connman_service *service); +static void vpn_auto_connect(void); + struct find_data { const char *path; struct connman_service *service; @@ -132,7 +162,7 @@ static void compare_path(gpointer value, gpointer user_data) struct connman_service *service = value; struct find_data *data = user_data; - if (data->service != NULL) + if (data->service) return; if (g_strcmp0(service->path, data->path) == 0) @@ -145,11 +175,28 @@ static struct connman_service *find_service(const char *path) DBG("path %s", path); - g_sequence_foreach(service_list, compare_path, &data); + g_list_foreach(service_list, compare_path, &data); return data.service; } +static const char *reason2string(enum connman_service_connect_reason reason) +{ + + switch (reason) { + case CONNMAN_SERVICE_CONNECT_REASON_NONE: + return "none"; + case CONNMAN_SERVICE_CONNECT_REASON_USER: + return "user"; + case CONNMAN_SERVICE_CONNECT_REASON_AUTO: + return "auto"; + case CONNMAN_SERVICE_CONNECT_REASON_SESSION: + return "session"; + } + + return "unknown"; +} + const char *__connman_service_type2string(enum connman_service_type type) { switch (type) { @@ -161,8 +208,6 @@ const char *__connman_service_type2string(enum connman_service_type type) return "ethernet"; case CONNMAN_SERVICE_TYPE_WIFI: return "wifi"; - case CONNMAN_SERVICE_TYPE_WIMAX: - return "wimax"; case CONNMAN_SERVICE_TYPE_BLUETOOTH: return "bluetooth"; case CONNMAN_SERVICE_TYPE_CELLULAR: @@ -173,6 +218,8 @@ const char *__connman_service_type2string(enum connman_service_type type) return "vpn"; case CONNMAN_SERVICE_TYPE_GADGET: return "gadget"; + case CONNMAN_SERVICE_TYPE_P2P: + return "p2p"; } return NULL; @@ -180,7 +227,7 @@ const char *__connman_service_type2string(enum connman_service_type type) enum connman_service_type __connman_service_string2type(const char *str) { - if (str == NULL) + if (!str) return CONNMAN_SERVICE_TYPE_UNKNOWN; if (strcmp(str, "ethernet") == 0) @@ -193,18 +240,35 @@ enum connman_service_type __connman_service_string2type(const char *str) 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; + if (strcmp(str, "p2p") == 0) + return CONNMAN_SERVICE_TYPE_P2P; return CONNMAN_SERVICE_TYPE_UNKNOWN; } +enum connman_service_security __connman_service_string2security(const char *str) +{ + if (!str) + return CONNMAN_SERVICE_SECURITY_UNKNOWN; + + if (!strcmp(str, "psk")) + return CONNMAN_SERVICE_SECURITY_PSK; + if (!strcmp(str, "ieee8021x") || !strcmp(str, "8021x")) + return CONNMAN_SERVICE_SECURITY_8021X; + if (!strcmp(str, "none") || !strcmp(str, "open")) + return CONNMAN_SERVICE_SECURITY_NONE; + if (!strcmp(str, "wep")) + return CONNMAN_SERVICE_SECURITY_WEP; + + return CONNMAN_SERVICE_SECURITY_UNKNOWN; +} + static const char *security2string(enum connman_service_security security) { switch (security) { @@ -268,23 +332,13 @@ static const char *error2string(enum connman_service_error error) return "auth-failed"; case CONNMAN_SERVICE_ERROR_INVALID_KEY: return "invalid-key"; + case CONNMAN_SERVICE_ERROR_BLOCKED: + return "blocked"; } return NULL; } -static enum connman_service_error string2error(const char *error) -{ - if (g_strcmp0(error, "dhcp-failed") == 0) - return CONNMAN_SERVICE_ERROR_DHCP_FAILED; - else if (g_strcmp0(error, "pin-missing") == 0) - return CONNMAN_SERVICE_ERROR_PIN_MISSING; - else if (g_strcmp0(error, "invalid-key") == 0) - return CONNMAN_SERVICE_ERROR_INVALID_KEY; - - return CONNMAN_SERVICE_ERROR_UNKNOWN; -} - static const char *proxymethod2string(enum connman_service_proxy_method method) { switch (method) { @@ -313,67 +367,137 @@ static enum connman_service_proxy_method string2proxymethod(const char *method) return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN; } +static void set_split_routing(struct connman_service *service, bool value) +{ + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + return; + + service->do_split_routing = value; + + if (service->do_split_routing) + service->order = 0; + else + service->order = 10; +} + +int __connman_service_load_modifiable(struct connman_service *service) +{ + GKeyFile *keyfile; + GError *error = NULL; + gchar *str; + bool autoconnect; + + DBG("service %p", service); + + keyfile = connman_storage_load_service(service->identifier); + if (!keyfile) + return -EIO; + + switch (service->type) { + case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_P2P: + break; + case CONNMAN_SERVICE_TYPE_VPN: + set_split_routing(service, g_key_file_get_boolean(keyfile, + service->identifier, + "SplitRouting", NULL)); + + /* fall through */ + case CONNMAN_SERVICE_TYPE_WIFI: + case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_ETHERNET: + autoconnect = g_key_file_get_boolean(keyfile, + service->identifier, "AutoConnect", &error); + if (!error) + service->autoconnect = autoconnect; + g_clear_error(&error); + break; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "Modified", NULL); + if (str) { + util_iso8601_to_timeval(str, &service->modified); + g_free(str); + } + + g_key_file_free(keyfile); + + return 0; +} + static int service_load(struct connman_service *service) { GKeyFile *keyfile; GError *error = NULL; gsize length; gchar *str; - connman_bool_t autoconnect; + bool autoconnect; unsigned int ssid_len; int err = 0; DBG("service %p", service); keyfile = connman_storage_load_service(service->identifier); - if (keyfile == NULL) { - service->new_service = TRUE; + if (!keyfile) { + service->new_service = true; return -EIO; } else - service->new_service = FALSE; + service->new_service = false; switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: break; case CONNMAN_SERVICE_TYPE_VPN: - service->do_split_routing = g_key_file_get_boolean(keyfile, - service->identifier, "SplitRouting", NULL); + set_split_routing(service, g_key_file_get_boolean(keyfile, + service->identifier, + "SplitRouting", NULL)); + + autoconnect = g_key_file_get_boolean(keyfile, + service->identifier, "AutoConnect", &error); + if (!error) + service->autoconnect = autoconnect; + g_clear_error(&error); break; case CONNMAN_SERVICE_TYPE_WIFI: - if (service->name == NULL) { + if (!service->name) { gchar *name; name = g_key_file_get_string(keyfile, service->identifier, "Name", NULL); - if (name != NULL) { + if (name) { g_free(service->name); service->name = name; } - if (service->network != NULL) + if (service->network) connman_network_set_name(service->network, name); } if (service->network && - connman_network_get_blob(service->network, - "WiFi.SSID", &ssid_len) == NULL) { + !connman_network_get_blob(service->network, + "WiFi.SSID", &ssid_len)) { gchar *hex_ssid; hex_ssid = g_key_file_get_string(keyfile, service->identifier, "SSID", NULL); - if (hex_ssid != NULL) { + if (hex_ssid) { gchar *ssid; unsigned int i, j = 0, hex; size_t hex_ssid_len = strlen(hex_ssid); ssid = g_try_malloc0(hex_ssid_len / 2); - if (ssid == NULL) { + if (!ssid) { g_free(hex_ssid); err = -ENOMEM; goto done; @@ -386,33 +510,26 @@ static int service_load(struct connman_service *service) connman_network_set_blob(service->network, "WiFi.SSID", ssid, hex_ssid_len / 2); + + g_free(ssid); } g_free(hex_ssid); } /* fall through */ - case CONNMAN_SERVICE_TYPE_WIMAX: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: service->favorite = g_key_file_get_boolean(keyfile, service->identifier, "Favorite", NULL); - str = g_key_file_get_string(keyfile, - service->identifier, "Failure", NULL); - if (str != NULL) { - if (service->favorite == FALSE) - 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) + if (!error) service->autoconnect = autoconnect; g_clear_error(&error); break; @@ -420,75 +537,78 @@ static int service_load(struct connman_service *service) str = g_key_file_get_string(keyfile, service->identifier, "Modified", NULL); - if (str != NULL) { - g_time_val_from_iso8601(str, &service->modified); + if (str) { + util_iso8601_to_timeval(str, &service->modified); g_free(str); } str = g_key_file_get_string(keyfile, service->identifier, "Passphrase", NULL); - if (str != NULL) { + if (str) { g_free(service->passphrase); service->passphrase = str; } - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_load(service->ipconfig_ipv4, keyfile, service->identifier, "IPv4."); - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) __connman_ipconfig_load(service->ipconfig_ipv6, keyfile, service->identifier, "IPv6."); service->nameservers_config = g_key_file_get_string_list(keyfile, service->identifier, "Nameservers", &length, NULL); - if (service->nameservers_config != NULL && length == 0) { + if (service->nameservers_config && length == 0) { g_strfreev(service->nameservers_config); 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) { + if (service->timeservers_config && 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) { + if (service->domains && length == 0) { g_strfreev(service->domains); service->domains = NULL; } str = g_key_file_get_string(keyfile, service->identifier, "Proxy.Method", NULL); - if (str != NULL) + if (str) service->proxy_config = string2proxymethod(str); g_free(str); service->proxies = g_key_file_get_string_list(keyfile, service->identifier, "Proxy.Servers", &length, NULL); - if (service->proxies != NULL && length == 0) { + if (service->proxies && length == 0) { g_strfreev(service->proxies); service->proxies = NULL; } service->excludes = g_key_file_get_string_list(keyfile, service->identifier, "Proxy.Excludes", &length, NULL); - if (service->excludes != NULL && length == 0) { + if (service->excludes && length == 0) { g_strfreev(service->excludes); service->excludes = NULL; } str = g_key_file_get_string(keyfile, service->identifier, "Proxy.URL", NULL); - if (str != NULL) { + if (str) { g_free(service->pac); service->pac = str; } + service->mdns_config = g_key_file_get_boolean(keyfile, + service->identifier, "mDNS", NULL); + service->hidden_service = g_key_file_get_boolean(keyfile, service->identifier, "Hidden", NULL); @@ -508,14 +628,14 @@ static int service_save(struct connman_service *service) DBG("service %p new %d", service, service->new_service); - if (service->new_service == TRUE) + if (service->new_service) return -ESRCH; - keyfile = __connman_storage_open_service(service->identifier); - if (keyfile == NULL) + keyfile = g_key_file_new(); + if (!keyfile) return -EIO; - if (service->name != NULL) + if (service->name) g_key_file_set_string(keyfile, service->identifier, "Name", service->name); @@ -523,11 +643,14 @@ static int service_save(struct connman_service *service) case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: break; case CONNMAN_SERVICE_TYPE_VPN: g_key_file_set_boolean(keyfile, service->identifier, "SplitRouting", service->do_split_routing); + if (service->favorite) + g_key_file_set_boolean(keyfile, service->identifier, + "AutoConnect", service->autoconnect); break; case CONNMAN_SERVICE_TYPE_WIFI: if (service->network) { @@ -537,25 +660,25 @@ static int service_save(struct connman_service *service) ssid = connman_network_get_blob(service->network, "WiFi.SSID", &ssid_len); - if (ssid != NULL && ssid_len > 0 && ssid[0] != '\0') { + if (ssid && ssid_len > 0 && ssid[0] != '\0') { char *identifier = service->identifier; - GString *str; + GString *ssid_str; unsigned int i; - str = g_string_sized_new(ssid_len * 2); - if (str == NULL) { + ssid_str = g_string_sized_new(ssid_len * 2); + if (!ssid_str) { err = -ENOMEM; goto done; } for (i = 0; i < ssid_len; i++) - g_string_append_printf(str, + g_string_append_printf(ssid_str, "%02x", ssid[i]); g_key_file_set_string(keyfile, identifier, - "SSID", str->str); + "SSID", ssid_str->str); - g_string_free(str, TRUE); + g_string_free(ssid_str, TRUE); } freq = connman_network_get_frequency(service->network); @@ -564,126 +687,102 @@ static int service_save(struct connman_service *service) } /* fall through */ - case CONNMAN_SERVICE_TYPE_WIMAX: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: g_key_file_set_boolean(keyfile, service->identifier, "Favorite", service->favorite); - if (service->state_ipv4 == CONNMAN_SERVICE_STATE_FAILURE || - service->state_ipv6 == CONNMAN_SERVICE_STATE_FAILURE) { - const char *failure = error2string(service->error); - if (failure != NULL) - g_key_file_set_string(keyfile, - service->identifier, - "Failure", failure); - } else { - g_key_file_remove_key(keyfile, service->identifier, - "Failure", NULL); - } /* fall through */ case CONNMAN_SERVICE_TYPE_ETHERNET: - if (service->favorite == TRUE) + if (service->favorite) g_key_file_set_boolean(keyfile, service->identifier, "AutoConnect", service->autoconnect); break; } - str = g_time_val_to_iso8601(&service->modified); - if (str != NULL) { + str = util_timeval_to_iso8601(&service->modified); + if (str) { g_key_file_set_string(keyfile, service->identifier, - "Modified", str); + "Modified", str); g_free(str); } - if (service->passphrase != NULL && strlen(service->passphrase) > 0) + if (service->passphrase && strlen(service->passphrase) > 0) g_key_file_set_string(keyfile, service->identifier, - "Passphrase", service->passphrase); - else - g_key_file_remove_key(keyfile, service->identifier, - "Passphrase", NULL); + "Passphrase", service->passphrase); - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_save(service->ipconfig_ipv4, keyfile, - service->identifier, "IPv4."); + service->identifier, "IPv4."); - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) __connman_ipconfig_save(service->ipconfig_ipv6, keyfile, - service->identifier, "IPv6."); + service->identifier, "IPv6."); - if (service->nameservers_config != NULL) { + if (service->nameservers_config) { guint len = g_strv_length(service->nameservers_config); g_key_file_set_string_list(keyfile, service->identifier, - "Nameservers", + "Nameservers", (const gchar **) service->nameservers_config, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Nameservers", NULL); + } - if (service->timeservers_config != NULL) { + if (service->timeservers_config) { guint len = g_strv_length(service->timeservers_config); g_key_file_set_string_list(keyfile, service->identifier, - "Timeservers", + "Timeservers", (const gchar **) service->timeservers_config, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Timeservers", NULL); + } - if (service->domains != NULL) { + if (service->domains) { guint len = g_strv_length(service->domains); g_key_file_set_string_list(keyfile, service->identifier, - "Domains", + "Domains", (const gchar **) service->domains, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Domains", NULL); + } cst_str = proxymethod2string(service->proxy_config); - if (cst_str != NULL) + if (cst_str) g_key_file_set_string(keyfile, service->identifier, "Proxy.Method", cst_str); - if (service->proxies != NULL) { + if (service->proxies) { guint len = g_strv_length(service->proxies); g_key_file_set_string_list(keyfile, service->identifier, "Proxy.Servers", (const gchar **) service->proxies, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Proxy.Servers", NULL); + } - if (service->excludes != NULL) { + if (service->excludes) { guint len = g_strv_length(service->excludes); g_key_file_set_string_list(keyfile, service->identifier, "Proxy.Excludes", (const gchar **) service->excludes, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Proxy.Excludes", NULL); + } - if (service->pac != NULL && strlen(service->pac) > 0) + if (service->pac && strlen(service->pac) > 0) g_key_file_set_string(keyfile, service->identifier, - "Proxy.URL", service->pac); - else - g_key_file_remove_key(keyfile, service->identifier, - "Proxy.URL", NULL); + "Proxy.URL", service->pac); + + if (service->mdns_config) + g_key_file_set_boolean(keyfile, service->identifier, + "mDNS", TRUE); - if (service->hidden_service == TRUE) - g_key_file_set_boolean(keyfile, service->identifier, "Hidden", - TRUE); + if (service->hidden_service) + g_key_file_set_boolean(keyfile, service->identifier, + "Hidden", TRUE); - if (service->config_file != NULL && strlen(service->config_file) > 0) + if (service->config_file && 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) + if (service->config_entry && strlen(service->config_entry) > 0) g_key_file_set_string(keyfile, service->identifier, "Config.ident", service->config_entry); @@ -695,6 +794,14 @@ done: return err; } +void __connman_service_save(struct connman_service *service) +{ + if (!service) + return; + + service_save(service); +} + static enum connman_service_state combine_state( enum connman_service_state state_a, enum connman_service_state state_b) @@ -782,29 +889,25 @@ done: return result; } -static connman_bool_t is_connecting_state(struct connman_service *service, - enum connman_service_state state) +static bool is_connecting(enum connman_service_state state) { switch (state) { case CONNMAN_SERVICE_STATE_UNKNOWN: case CONNMAN_SERVICE_STATE_IDLE: case CONNMAN_SERVICE_STATE_FAILURE: - if (service->network != NULL) - return connman_network_get_connecting(service->network); case CONNMAN_SERVICE_STATE_DISCONNECT: case CONNMAN_SERVICE_STATE_READY: case CONNMAN_SERVICE_STATE_ONLINE: break; case CONNMAN_SERVICE_STATE_ASSOCIATION: case CONNMAN_SERVICE_STATE_CONFIGURATION: - return TRUE; + return true; } - return FALSE; + return false; } -static connman_bool_t is_connected_state(const struct connman_service *service, - enum connman_service_state state) +static bool is_connected(enum connman_service_state state) { switch (state) { case CONNMAN_SERVICE_STATE_UNKNOWN: @@ -816,177 +919,218 @@ static connman_bool_t is_connected_state(const struct connman_service *service, break; case CONNMAN_SERVICE_STATE_READY: case CONNMAN_SERVICE_STATE_ONLINE: - return TRUE; + return true; } - return FALSE; + return false; } -static connman_bool_t is_idle_state(const struct connman_service *service, - enum connman_service_state state) +static bool is_idle(enum connman_service_state state) { switch (state) { + case CONNMAN_SERVICE_STATE_IDLE: + case CONNMAN_SERVICE_STATE_DISCONNECT: + case CONNMAN_SERVICE_STATE_FAILURE: + return true; 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; + return false; } -static connman_bool_t is_connecting(struct connman_service *service) +static int nameservers_changed_cb(void *user_data) { - return is_connecting_state(service, service->state); + struct connman_service *service = user_data; + + DBG("service %p", service); + + service->nameservers_timeout = 0; + if ((is_idle(service->state) && !service->nameservers) || + is_connected(service->state)) + dns_changed(service); + + return FALSE; } -static connman_bool_t is_connected(struct connman_service *service) +static void nameservers_changed(struct connman_service *service) { - return is_connected_state(service, service->state); + if (!service->nameservers_timeout) + service->nameservers_timeout = g_idle_add(nameservers_changed_cb, + service); } -static const char *nameserver_get_ifname(struct connman_service *service) +static bool nameserver_available(struct connman_service *service, + enum connman_ipconfig_type type, + const char *ns) { - const char *ifname; + int family; - 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; + family = connman_inet_check_ipaddress(ns); - if (ifname == NULL) - return NULL; + if (family == AF_INET) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + return false; - 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 is_connected(service->state_ipv4); + } + + if (family == AF_INET6) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + return false; + + return is_connected(service->state_ipv6); } - return ifname; + return false; } -static void remove_nameservers(struct connman_service *service, - const char* interface, char **ns) +static int searchdomain_add_all(struct connman_service *service) { - const char *ifname = interface; - int i; + int index, i = 0; - if (ns == NULL) - return; + if (!is_connected(service->state)) + return -ENOTCONN; - if (interface == NULL) - ifname = nameserver_get_ifname(service); + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; - if (ifname == NULL) - return; + if (service->domains) { + while (service->domains[i]) { + connman_resolver_append(index, service->domains[i], + NULL); + i++; + } + + return 0; + } + + if (service->domainname) + connman_resolver_append(index, service->domainname, NULL); + + return 0; - 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) +static int searchdomain_remove_all(struct connman_service *service) { - const char *ifname = interface; - int i; + int index, i = 0; - if (sd == NULL) - return; + if (!is_connected(service->state)) + return -ENOTCONN; - if (interface == NULL) - ifname = nameserver_get_ifname(service); + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; - if (ifname == NULL) - return; + while (service->domains && service->domains[i]) { + connman_resolver_remove(index, service->domains[i], NULL); + i++; + } + + if (service->domainname) + connman_resolver_remove(index, service->domainname, NULL); - for (i = 0; sd[i] != NULL; i++) - connman_resolver_remove(ifname, sd[i], NULL); + return 0; } -static void update_nameservers(struct connman_service *service) +static int nameserver_add(struct connman_service *service, + enum connman_ipconfig_type type, + const char *nameserver) { - const char *ifname; + int index, ret; - 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 (!nameserver_available(service, type, nameserver)) + return 0; - if (ifname == NULL) - return; + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; - 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: - return; - case CONNMAN_SERVICE_STATE_FAILURE: - case CONNMAN_SERVICE_STATE_DISCONNECT: - connman_resolver_remove_all(ifname); - return; - case CONNMAN_SERVICE_STATE_READY: - case CONNMAN_SERVICE_STATE_ONLINE: - break; - } + ret = connman_resolver_append(index, NULL, nameserver); + if (ret >= 0) + nameservers_changed(service); - if (service->nameservers_config != NULL) { - int i; + return ret; +} - remove_nameservers(service, ifname, service->nameservers); +static int nameserver_add_all(struct connman_service *service, + enum connman_ipconfig_type type) +{ + int i = 0; - i = g_strv_length(service->nameservers_config); - while (i != 0) { - i--; - connman_resolver_append(ifname, NULL, - service->nameservers_config[i]); + if (service->nameservers_config) { + while (service->nameservers_config[i]) { + nameserver_add(service, type, + service->nameservers_config[i]); + i++; } - } else if (service->nameservers != NULL) { - int i; - - i = g_strv_length(service->nameservers); - while (i != 0) { - i--; - connman_resolver_append(ifname, NULL, - service->nameservers[i]); + } else if (service->nameservers) { + while (service->nameservers[i]) { + nameserver_add(service, type, + service->nameservers[i]); + i++; } } - if (service->domains != NULL) { - char *searchdomains[2] = {NULL, NULL}; - int i; + if (!i) + __connman_resolver_append_fallback_nameservers(); - searchdomains[0] = service->domainname; - remove_searchdomains(service, ifname, searchdomains); + searchdomain_add_all(service); - 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); + return 0; +} + +static int nameserver_remove(struct connman_service *service, + enum connman_ipconfig_type type, + const char *nameserver) +{ + int index, ret; + + if (!nameserver_available(service, type, nameserver)) + return 0; + + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; + + ret = connman_resolver_remove(index, NULL, nameserver); + if (ret >= 0) + nameservers_changed(service); + + return ret; +} - connman_resolver_flush(); +static int nameserver_remove_all(struct connman_service *service, + enum connman_ipconfig_type type) +{ + int index, i = 0; + + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; + + while (service->nameservers_config && service->nameservers_config[i]) { + + nameserver_remove(service, type, + service->nameservers_config[i]); + i++; + } + + i = 0; + while (service->nameservers && service->nameservers[i]) { + nameserver_remove(service, type, service->nameservers[i]); + i++; + } + + searchdomain_remove_all(service); + + return 0; } /* @@ -995,26 +1139,27 @@ static void update_nameservers(struct connman_service *service) * for details) and not through service.c */ int __connman_service_nameserver_append(struct connman_service *service, - const char *nameserver, gboolean is_auto) + const char *nameserver, bool is_auto) { char **nameservers; int len, i; DBG("service %p nameserver %s auto %d", service, nameserver, is_auto); - if (nameserver == NULL) + if (!nameserver) return -EINVAL; - if (is_auto == TRUE) + if (is_auto) nameservers = service->nameservers_auto; else nameservers = service->nameservers; - for (i = 0; nameservers != NULL && nameservers[i] != NULL; i++) - if (g_strcmp0(nameservers[i], nameserver) == 0) - return -EEXIST; + if (nameservers) { + for (i = 0; nameservers[i]; i++) { + if (g_strcmp0(nameservers[i], nameserver) == 0) + return -EEXIST; + } - if (nameservers != NULL) { len = g_strv_length(nameservers); nameservers = g_try_renew(char *, nameservers, len + 2); } else { @@ -1022,88 +1167,87 @@ int __connman_service_nameserver_append(struct connman_service *service, nameservers = g_try_new0(char *, len + 2); } - if (nameservers == NULL) + if (!nameservers) return -ENOMEM; nameservers[len] = g_strdup(nameserver); - if (nameservers[len] == NULL) - return -ENOMEM; - nameservers[len + 1] = NULL; - if (is_auto == TRUE) { + if (is_auto) { service->nameservers_auto = nameservers; } else { service->nameservers = nameservers; - update_nameservers(service); + nameserver_add(service, CONNMAN_IPCONFIG_TYPE_ALL, nameserver); } + nameservers_changed(service); + + searchdomain_add_all(service); + return 0; } int __connman_service_nameserver_remove(struct connman_service *service, - const char *nameserver, gboolean is_auto) + const char *nameserver, bool is_auto) { char **servers, **nameservers; - gboolean found = FALSE; + bool found = false; int len, i, j; DBG("service %p nameserver %s auto %d", service, nameserver, is_auto); - if (nameserver == NULL) + if (!nameserver) return -EINVAL; - if (is_auto == TRUE) + if (is_auto) nameservers = service->nameservers_auto; else nameservers = service->nameservers; - if (nameservers == NULL) + if (!nameservers) return 0; - for (i = 0; nameservers != NULL && nameservers[i] != NULL; i++) + for (i = 0; nameservers[i]; i++) if (g_strcmp0(nameservers[i], nameserver) == 0) { - found = TRUE; + found = true; break; } - if (found == FALSE) + if (!found) return 0; len = g_strv_length(nameservers); if (len == 1) { - g_strfreev(nameservers); - if (is_auto == TRUE) - service->nameservers_auto = NULL; - else - service->nameservers = NULL; - - return 0; + servers = NULL; + goto set_servers; } servers = g_try_new0(char *, len); - if (servers == NULL) + if (!servers) return -ENOMEM; for (i = 0, j = 0; i < len; i++) { - if (g_strcmp0(nameservers[i], nameserver) != 0) { - servers[j] = g_strdup(nameservers[i]); - if (servers[j] == NULL) - return -ENOMEM; + if (g_strcmp0(nameservers[i], nameserver)) { + servers[j] = nameservers[i]; j++; - } + } else + g_free(nameservers[i]); + + nameservers[i] = NULL; } servers[len - 1] = NULL; +set_servers: g_strfreev(nameservers); nameservers = servers; - if (is_auto == TRUE) { + if (is_auto) { service->nameservers_auto = nameservers; } else { service->nameservers = nameservers; - update_nameservers(service); + nameserver_remove(service, CONNMAN_IPCONFIG_TYPE_ALL, + nameserver); } return 0; @@ -1111,10 +1255,12 @@ int __connman_service_nameserver_remove(struct connman_service *service, void __connman_service_nameserver_clear(struct connman_service *service) { + nameserver_remove_all(service, CONNMAN_IPCONFIG_TYPE_ALL); + g_strfreev(service->nameservers); service->nameservers = NULL; - update_nameservers(service); + nameserver_add_all(service, CONNMAN_IPCONFIG_TYPE_ALL); } static void add_nameserver_route(int family, int index, char *nameserver, @@ -1122,7 +1268,7 @@ static void add_nameserver_route(int family, int index, char *nameserver, { switch (family) { case AF_INET: - if (connman_inet_compare_subnet(index, nameserver) == TRUE) + if (connman_inet_compare_subnet(index, nameserver)) break; if (connman_inet_add_host_route(index, nameserver, gw) < 0) @@ -1142,48 +1288,30 @@ static void add_nameserver_route(int family, int index, char *nameserver, static void nameserver_add_routes(int index, char **nameservers, const char *gw) { - int i, ret, family; - struct addrinfo hints; - struct addrinfo *addr; + int i, ns_family, gw_family; - for (i = 0; nameservers[i] != NULL; i++) { - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_flags = AI_NUMERICHOST; - addr = NULL; + gw_family = connman_inet_check_ipaddress(gw); + if (gw_family < 0) + return; - ret = getaddrinfo(nameservers[i], NULL, &hints, &addr); - if (ret == EAI_NONAME) - family = AF_INET; /* use the IPv4 as a default */ - else if (ret != 0) + for (i = 0; nameservers[i]; i++) { + ns_family = connman_inet_check_ipaddress(nameservers[i]); + if (ns_family < 0 || ns_family != gw_family) continue; - else - family = addr->ai_family; - add_nameserver_route(family, index, nameservers[i], gw); - - freeaddrinfo(addr); + add_nameserver_route(ns_family, index, nameservers[i], gw); } } static void nameserver_del_routes(int index, char **nameservers, enum connman_ipconfig_type type) { - int i, ret, family; - struct addrinfo hints; - struct addrinfo *addr; - - for (i = 0; nameservers[i] != NULL; i++) { - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_flags = AI_NUMERICHOST; - addr = NULL; + int i, family; - ret = getaddrinfo(nameservers[i], NULL, &hints, &addr); - if (ret == EAI_NONAME) - family = AF_INET; /* use the IPv4 as a default */ - else if (ret != 0) + for (i = 0; nameservers[i]; i++) { + family = connman_inet_check_ipaddress(nameservers[i]); + if (family < 0) continue; - else - family = addr->ai_family; switch (family) { case AF_INET: @@ -1197,31 +1325,26 @@ static void nameserver_del_routes(int index, char **nameservers, nameservers[i]); break; } - - freeaddrinfo(addr); } } void __connman_service_nameserver_add_routes(struct connman_service *service, const char *gw) { - int index = -1; + int index; - if (service == NULL) + if (!service) return; - if (service->network != NULL) - index = connman_network_get_index(service->network); - else if (service->provider != NULL) - index = connman_provider_get_index(service->provider); + index = __connman_service_get_index(service); - if (service->nameservers_config != NULL) { + if (service->nameservers_config) { /* * Configured nameserver takes preference over the * discoverd nameserver gathered from DHCP, VPN, etc. */ nameserver_add_routes(index, service->nameservers_config, gw); - } else if (service->nameservers != NULL) { + } else if (service->nameservers) { /* * We add nameservers host routes for nameservers that * are not on our subnet. For those who are, the subnet @@ -1236,37 +1359,97 @@ void __connman_service_nameserver_add_routes(struct connman_service *service, void __connman_service_nameserver_del_routes(struct connman_service *service, enum connman_ipconfig_type type) { - int index = -1; + int index; - if (service == NULL) + if (!service) return; - if (service->network != NULL) - index = connman_network_get_index(service->network); - else if (service->provider != NULL) - index = connman_provider_get_index(service->provider); + index = __connman_service_get_index(service); - if (service->nameservers_config != NULL) + if (service->nameservers_config) nameserver_del_routes(index, service->nameservers_config, type); - else if (service->nameservers != NULL) + else if (service->nameservers) nameserver_del_routes(index, service->nameservers, type); } -static struct connman_stats *stats_get(struct connman_service *service) -{ - if (service->roaming == TRUE) - return &service->stats_roaming; - else - return &service->stats; -} - -static connman_bool_t stats_enabled(struct connman_service *service) +static bool check_proxy_setup(struct connman_service *service) { - struct connman_stats *stats = stats_get(service); + /* + * We start WPAD if we haven't got a PAC URL from DHCP and + * if our proxy manual configuration is either empty or set + * to AUTO with an empty URL. + */ - return stats->enabled; -} + if (service->proxy != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) + return true; + + if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN && + (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_AUTO || + service->pac)) + return true; + + if (__connman_wpad_start(service) < 0) { + service->proxy = CONNMAN_SERVICE_PROXY_METHOD_DIRECT; + __connman_notifier_proxy_changed(service); + return true; + } + + return false; +} + +static void cancel_online_check(struct connman_service *service) +{ + if (service->online_timeout == 0) + return; + + g_source_remove(service->online_timeout); + service->online_timeout = 0; + connman_service_unref(service); +} + +static void start_online_check(struct connman_service *service, + enum connman_ipconfig_type type) +{ + if (!connman_setting_get_bool("EnableOnlineCheck")) { + connman_info("Online check disabled. " + "Default service remains in READY state."); + return; + } + + if (type != CONNMAN_IPCONFIG_TYPE_IPV4 || check_proxy_setup(service)) { + cancel_online_check(service); + __connman_service_wispr_start(service, type); + } +} + +static void address_updated(struct connman_service *service, + enum connman_ipconfig_type type) +{ + if (is_connected(service->state) && + service == connman_service_get_default()) { + nameserver_remove_all(service, type); + nameserver_add_all(service, type); + start_online_check(service, type); + + __connman_timeserver_sync(service); + } +} + +static struct connman_stats *stats_get(struct connman_service *service) +{ + if (service->roaming) + return &service->stats_roaming; + else + return &service->stats; +} + +static bool stats_enabled(struct connman_service *service) +{ + struct connman_stats *stats = stats_get(service); + + return stats->enabled; +} static void stats_start(struct connman_service *service) { @@ -1274,10 +1457,10 @@ static void stats_start(struct connman_service *service) DBG("service %p", service); - if (stats->timer == NULL) + if (!stats->timer) return; - stats->enabled = TRUE; + stats->enabled = true; stats->data_last.time = stats->data.time; g_timer_start(stats->timer); @@ -1290,10 +1473,10 @@ static void stats_stop(struct connman_service *service) DBG("service %p", service); - if (stats->timer == NULL) + if (!stats->timer) return; - if (stats->enabled == FALSE) + if (!stats->enabled) return; g_timer_stop(stats->timer); @@ -1301,7 +1484,7 @@ static void stats_stop(struct connman_service *service) seconds = g_timer_elapsed(stats->timer, NULL); stats->data.time = stats->data_last.time + seconds; - stats->enabled = FALSE; + stats->enabled = false; } static void reset_stats(struct connman_service *service) @@ -1309,7 +1492,7 @@ static void reset_stats(struct connman_service *service) DBG("service %p", service); /* home */ - service->stats.valid = FALSE; + service->stats.valid = false; service->stats.data.rx_packets = 0; service->stats.data.tx_packets = 0; @@ -1325,7 +1508,7 @@ static void reset_stats(struct connman_service *service) g_timer_reset(service->stats.timer); /* roaming */ - service->stats_roaming.valid = FALSE; + service->stats_roaming.valid = false; service->stats_roaming.data.rx_packets = 0; service->stats_roaming.data.tx_packets = 0; @@ -1341,35 +1524,68 @@ static void reset_stats(struct connman_service *service) g_timer_reset(service->stats_roaming.timer); } -struct connman_service *__connman_service_get_default(void) +struct connman_service *connman_service_get_default(void) { struct connman_service *service; - GSequenceIter *iter; - - iter = g_sequence_get_begin_iter(service_list); - if (g_sequence_iter_is_end(iter) == TRUE) + if (!service_list) return NULL; - service = g_sequence_get(iter); + service = service_list->data; - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return NULL; return service; } +bool __connman_service_index_is_default(int index) +{ + struct connman_service *service; + + if (index < 0) + return false; + + service = connman_service_get_default(); + + return __connman_service_get_index(service) == index; +} + static void default_changed(void) { - struct connman_service *service = __connman_service_get_default(); + struct connman_service *service = connman_service_get_default(); if (service == current_default) return; + DBG("current default %p %s", current_default, + current_default ? current_default->identifier : ""); + DBG("new default %p %s", service, service ? service->identifier : ""); + __connman_service_timeserver_changed(current_default, NULL); current_default = service; + if (service) { + if (service->hostname && + connman_setting_get_bool("AllowHostnameUpdates")) + __connman_utsname_set_hostname(service->hostname); + + if (service->domainname && + connman_setting_get_bool("AllowDomainnameUpdates")) + __connman_utsname_set_domainname(service->domainname); + + /* + * Connect VPN automatically when new default service + * is set and connected, unless new default is VPN + */ + if (is_connected(service->state) && + service->type != CONNMAN_SERVICE_TYPE_VPN) { + DBG("running vpn_auto_connect"); + vpn_auto_connect(); + } + } + __connman_notifier_default_changed(service); } @@ -1380,7 +1596,10 @@ static void state_changed(struct connman_service *service) __connman_notifier_service_state_changed(service, service->state); str = state2string(service->state); - if (str == NULL) + if (!str) + return; + + if (!allow_property_changed(service)) return; connman_dbus_property_changed_basic(service->path, @@ -1393,6 +1612,9 @@ static void strength_changed(struct connman_service *service) if (service->strength == 0) return; + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Strength", DBUS_TYPE_BYTE, &service->strength); @@ -1400,42 +1622,78 @@ static void strength_changed(struct connman_service *service) static void favorite_changed(struct connman_service *service) { - if (service->path == NULL) + dbus_bool_t favorite; + + if (!service->path) return; + if (!allow_property_changed(service)) + return; + + favorite = service->favorite; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Favorite", - DBUS_TYPE_BOOLEAN, &service->favorite); + DBUS_TYPE_BOOLEAN, &favorite); } static void immutable_changed(struct connman_service *service) { - if (service->path == NULL) + dbus_bool_t immutable; + + if (!service->path) + return; + + if (!allow_property_changed(service)) return; + immutable = service->immutable; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Immutable", - DBUS_TYPE_BOOLEAN, &service->immutable); + DBUS_TYPE_BOOLEAN, &immutable); } static void roaming_changed(struct connman_service *service) { - if (service->path == NULL) + dbus_bool_t roaming; + + if (!service->path) + return; + + if (!allow_property_changed(service)) return; + roaming = service->roaming; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Roaming", - DBUS_TYPE_BOOLEAN, &service->roaming); + DBUS_TYPE_BOOLEAN, &roaming); } static void autoconnect_changed(struct connman_service *service) { - if (service->path == NULL) + dbus_bool_t autoconnect; + + if (!service->path) + return; + + if (!allow_property_changed(service)) return; + autoconnect = service->autoconnect; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "AutoConnect", - DBUS_TYPE_BOOLEAN, &service->autoconnect); + DBUS_TYPE_BOOLEAN, &autoconnect); +} + +bool connman_service_set_autoconnect(struct connman_service *service, + bool autoconnect) +{ + if (service->autoconnect == autoconnect) + return false; + + service->autoconnect = autoconnect; + autoconnect_changed(service); + + return true; } static void append_security(DBusMessageIter *iter, void *user_data) @@ -1444,7 +1702,7 @@ static void append_security(DBusMessageIter *iter, void *user_data) const char *str; str = security2string(service->security); - if (str != NULL) + if (str) dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str); @@ -1453,14 +1711,14 @@ static void append_security(DBusMessageIter *iter, void *user_data) * are configured as open or no security, so filter * appropriately. */ - if (service->wps == TRUE) { + if (service->wps) { switch (service->security) { case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: str = "wps"; dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &str); + DBUS_TYPE_STRING, &str); break; case CONNMAN_SERVICE_SECURITY_UNKNOWN: case CONNMAN_SERVICE_SECURITY_NONE: @@ -1468,17 +1726,36 @@ static void append_security(DBusMessageIter *iter, void *user_data) case CONNMAN_SERVICE_SECURITY_8021X: break; } + + if (service->wps_advertizing) { + str = "wps_advertising"; + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &str); + } } } +static void security_changed(struct connman_service *service) +{ + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + connman_dbus_property_changed_array(service->path, + CONNMAN_SERVICE_INTERFACE, "Security", + DBUS_TYPE_STRING, append_security, service); +} + static void append_ethernet(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_append_ethernet(service->ipconfig_ipv4, iter); - else if (service->ipconfig_ipv6 != NULL) + else if (service->ipconfig_ipv6) __connman_ipconfig_append_ethernet(service->ipconfig_ipv6, iter); } @@ -1487,13 +1764,10 @@ static void append_ipv4(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - DBG("ipv4 %p state %s", service->ipconfig_ipv4, - state2string(service->state_ipv4)); - - if (is_connected_state(service, service->state_ipv4) == FALSE) + if (!is_connected(service->state_ipv4)) return; - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_append_ipv4(service->ipconfig_ipv4, iter); } @@ -1501,13 +1775,10 @@ static void append_ipv6(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - DBG("ipv6 %p state %s", service->ipconfig_ipv6, - state2string(service->state_ipv6)); - - if (is_connected_state(service, service->state_ipv6) == FALSE) + if (!is_connected(service->state_ipv6)) return; - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) __connman_ipconfig_append_ipv6(service->ipconfig_ipv6, iter, service->ipconfig_ipv4); } @@ -1516,7 +1787,7 @@ static void append_ipv4config(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_append_ipv4config(service->ipconfig_ipv4, iter); } @@ -1525,20 +1796,25 @@ static void append_ipv6config(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) __connman_ipconfig_append_ipv6config(service->ipconfig_ipv6, iter); } -static void append_nameservers(DBusMessageIter *iter, char **servers) +static void append_nameservers(DBusMessageIter *iter, + struct connman_service *service, char **servers) { int i; + bool available = true; - DBG("%p", servers); + for (i = 0; servers[i]; i++) { + if (service) + available = nameserver_available(service, + CONNMAN_IPCONFIG_TYPE_ALL, + servers[i]); - for (i = 0; servers[i] != NULL; i++) { - DBG("servers[%d] %s", i, servers[i]); - dbus_message_iter_append_basic(iter, + if (available) + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &servers[i]); } } @@ -1547,18 +1823,30 @@ static void append_dns(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; - if (service->nameservers_config != NULL) { - append_nameservers(iter, service->nameservers_config); + if (service->nameservers_config) { + append_nameservers(iter, service, service->nameservers_config); return; } else { - if (service->nameservers != NULL) - append_nameservers(iter, service->nameservers); + if (service->nameservers) + append_nameservers(iter, service, + service->nameservers); + + if (service->nameservers_auto) + append_nameservers(iter, service, + service->nameservers_auto); + + if (!service->nameservers && !service->nameservers_auto) { + char **ns; - if (service->nameservers_auto != NULL) - append_nameservers(iter, service->nameservers_auto); + DBG("append fallback nameservers"); + + ns = connman_setting_get_string_list("FallbackNameservers"); + if (ns) + append_nameservers(iter, service, ns); + } } } @@ -1566,20 +1854,20 @@ static void append_dnsconfig(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->nameservers_config == NULL) + if (!service->nameservers_config) return; - append_nameservers(iter, service->nameservers_config); + append_nameservers(iter, NULL, service->nameservers_config); } static void append_ts(DBusMessageIter *iter, void *user_data) { GSList *list = user_data; - while (list != NULL) { + while (list) { char *timeserver = list->data; - if (timeserver != NULL) + if (timeserver) dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, ×erver); @@ -1592,7 +1880,7 @@ static void append_tsconfig(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->timeservers_config == NULL) + if (!service->timeservers_config) return; for (i = 0; service->timeservers_config[i]; i++) { @@ -1607,7 +1895,7 @@ static void append_domainconfig(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->domains == NULL) + if (!service->domains) return; for (i = 0; service->domains[i]; i++) @@ -1619,13 +1907,13 @@ static void append_domain(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (is_connected(service) == FALSE && - is_connecting(service) == FALSE) + if (!is_connected(service->state) && + !is_connecting(service->state)) return; - if (service->domains != NULL) + if (service->domains) append_domainconfig(iter, user_data); - else if (service->domainname != NULL) + else if (service->domainname) dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &service->domainname); } @@ -1635,7 +1923,7 @@ static void append_proxies(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->proxies == NULL) + if (!service->proxies) return; for (i = 0; service->proxies[i]; i++) @@ -1648,7 +1936,7 @@ static void append_excludes(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->excludes == NULL) + if (!service->excludes) return; for (i = 0; service->excludes[i]; i++) @@ -1664,9 +1952,7 @@ static void append_proxy(DBusMessageIter *iter, void *user_data) const char *method = proxymethod2string( CONNMAN_SERVICE_PROXY_METHOD_DIRECT); - DBG(""); - - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; proxy = connman_service_get_proxy_method(service); @@ -1687,17 +1973,17 @@ static void append_proxy(DBusMessageIter *iter, void *user_data) break; case CONNMAN_SERVICE_PROXY_METHOD_AUTO: /* Maybe DHCP, or WPAD, has provided an url for a pac file */ - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) pac = __connman_ipconfig_get_proxy_autoconfig( service->ipconfig_ipv4); - else if (service->ipconfig_ipv6 != NULL) + else if (service->ipconfig_ipv6) pac = __connman_ipconfig_get_proxy_autoconfig( service->ipconfig_ipv6); - if (service->pac == NULL && pac == NULL) + if (!service->pac && !pac) goto done; - if (service->pac != NULL) + if (service->pac) pac = service->pac; connman_dbus_dict_append_basic(iter, "URL", @@ -1726,18 +2012,18 @@ static void append_proxyconfig(DBusMessageIter *iter, void *user_data) case CONNMAN_SERVICE_PROXY_METHOD_DIRECT: break; case CONNMAN_SERVICE_PROXY_METHOD_MANUAL: - if (service->proxies != NULL) + if (service->proxies) connman_dbus_dict_append_array(iter, "Servers", DBUS_TYPE_STRING, append_proxies, service); - if (service->excludes != NULL) + if (service->excludes) connman_dbus_dict_append_array(iter, "Excludes", DBUS_TYPE_STRING, append_excludes, service); break; case CONNMAN_SERVICE_PROXY_METHOD_AUTO: - if (service->pac != NULL) + if (service->pac) connman_dbus_dict_append_basic(iter, "URL", DBUS_TYPE_STRING, &service->pac); break; @@ -1753,12 +2039,10 @@ static void append_provider(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - DBG("%p %p", service, service->provider); - - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; - if (service->provider != NULL) + if (service->provider) __connman_provider_append_properties(service->provider, iter); } @@ -1766,19 +2050,30 @@ static void append_provider(DBusMessageIter *iter, void *user_data) static void settings_changed(struct connman_service *service, struct connman_ipconfig *ipconfig) { - connman_dbus_property_changed_dict(service->path, - CONNMAN_SERVICE_INTERFACE, "IPv4", - append_ipv4, service); + enum connman_ipconfig_type type; - connman_dbus_property_changed_dict(service->path, - CONNMAN_SERVICE_INTERFACE, "IPv6", - append_ipv6, service); + type = __connman_ipconfig_get_config_type(ipconfig); __connman_notifier_ipconfig_changed(service, ipconfig); + + if (!allow_property_changed(service)) + return; + + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + connman_dbus_property_changed_dict(service->path, + CONNMAN_SERVICE_INTERFACE, "IPv4", + append_ipv4, service); + else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + connman_dbus_property_changed_dict(service->path, + CONNMAN_SERVICE_INTERFACE, "IPv6", + append_ipv6, service); } static void ipv4_configuration_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "IPv4.Configuration", @@ -1786,8 +2081,20 @@ static void ipv4_configuration_changed(struct connman_service *service) service); } +void __connman_service_notify_ipv4_configuration( + struct connman_service *service) +{ + if (!service) + return; + + ipv4_configuration_changed(service); +} + static void ipv6_configuration_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "IPv6.Configuration", @@ -1797,6 +2104,9 @@ static void ipv6_configuration_changed(struct connman_service *service) static void dns_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_array(service->path, CONNMAN_SERVICE_INTERFACE, "Nameservers", DBUS_TYPE_STRING, append_dns, service); @@ -1804,6 +2114,9 @@ static void dns_changed(struct connman_service *service) static void dns_configuration_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_array(service->path, CONNMAN_SERVICE_INTERFACE, "Nameservers.Configuration", @@ -1814,6 +2127,9 @@ static void dns_configuration_changed(struct connman_service *service) static void domain_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_array(service->path, CONNMAN_SERVICE_INTERFACE, "Domains", DBUS_TYPE_STRING, append_domain, service); @@ -1821,6 +2137,9 @@ static void domain_changed(struct connman_service *service) static void domain_configuration_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_array(service->path, CONNMAN_SERVICE_INTERFACE, "Domains.Configuration", @@ -1829,6 +2148,9 @@ static void domain_configuration_changed(struct connman_service *service) static void proxy_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "Proxy", append_proxy, service); @@ -1836,6 +2158,9 @@ static void proxy_changed(struct connman_service *service) static void proxy_configuration_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "Proxy.Configuration", append_proxyconfig, service); @@ -1843,8 +2168,53 @@ static void proxy_configuration_changed(struct connman_service *service) proxy_changed(service); } +static void mdns_changed(struct connman_service *service) +{ + dbus_bool_t mdns = service->mdns; + + if (!allow_property_changed(service)) + return; + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "mDNS", DBUS_TYPE_BOOLEAN, + &mdns); +} + +static void mdns_configuration_changed(struct connman_service *service) +{ + dbus_bool_t mdns_config = service->mdns_config; + + if (!allow_property_changed(service)) + return; + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "mDNS.Configuration", + DBUS_TYPE_BOOLEAN, &mdns_config); +} + +static int set_mdns(struct connman_service *service, + bool enabled) +{ + int result; + + result = __connman_resolver_set_mdns( + __connman_service_get_index(service), enabled); + + if (result == 0) { + if (service->mdns != enabled) { + service->mdns = enabled; + mdns_changed(service); + } + } + + return result; +} + static void timeservers_configuration_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_array(service->path, CONNMAN_SERVICE_INTERFACE, "Timeservers.Configuration", @@ -1854,6 +2224,9 @@ static void timeservers_configuration_changed(struct connman_service *service) static void link_changed(struct connman_service *service) { + if (!allow_property_changed(service)) + return; + connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "Ethernet", append_ethernet, service); @@ -1862,7 +2235,7 @@ static void link_changed(struct connman_service *service) static void stats_append_counters(DBusMessageIter *dict, struct connman_stats_data *stats, struct connman_stats_data *counters, - connman_bool_t append_all) + bool append_all) { if (counters->rx_packets != stats->rx_packets || append_all) { counters->rx_packets = stats->rx_packets; @@ -1922,7 +2295,7 @@ static void stats_append_counters(DBusMessageIter *dict, static void stats_append(struct connman_service *service, const char *counter, struct connman_stats_counter *counters, - connman_bool_t append_all) + bool append_all) { DBusMessageIter array, dict; DBusMessage *msg; @@ -1930,7 +2303,7 @@ static void stats_append(struct connman_service *service, DBG("service %p counter %s", service, counter); msg = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_CALL); - if (msg == NULL) + if (!msg) return; dbus_message_append_args(msg, DBUS_TYPE_OBJECT_PATH, @@ -1970,7 +2343,7 @@ static void stats_update(struct connman_service *service, DBG("service %p", service); - if (stats->valid == TRUE) { + if (stats->valid) { data->rx_packets += rx_packets - data_last->rx_packets; data->tx_packets += @@ -1988,7 +2361,7 @@ static void stats_update(struct connman_service *service, data->tx_dropped += tx_dropped - data_last->tx_dropped; } else { - stats->valid = TRUE; + stats->valid = true; } data_last->rx_packets = rx_packets; @@ -2017,10 +2390,10 @@ void __connman_service_notify(struct connman_service *service, struct connman_stats_data *data; int err; - if (service == NULL) + if (!service) return; - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; stats_update(service, @@ -2041,35 +2414,31 @@ void __connman_service_notify(struct connman_service *service, counters = value; stats_append(service, counter, counters, counters->append_all); - counters->append_all = FALSE; + counters->append_all = false; } } int __connman_service_counter_register(const char *counter) { struct connman_service *service; - GSequenceIter *iter; + GList *list; struct connman_stats_counter *counters; DBG("counter %s", counter); - counter_list = g_slist_append(counter_list, (gpointer)counter); + counter_list = g_slist_prepend(counter_list, (gpointer)counter); - iter = g_sequence_get_begin_iter(service_list); - - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + service = list->data; counters = g_try_new0(struct connman_stats_counter, 1); - if (counters == NULL) + if (!counters) return -ENOMEM; - counters->append_all = TRUE; + counters->append_all = true; g_hash_table_replace(service->counter_table, (gpointer)counter, counters); - - iter = g_sequence_iter_next(iter); } return 0; @@ -2078,84 +2447,40 @@ int __connman_service_counter_register(const char *counter) void __connman_service_counter_unregister(const char *counter) { struct connman_service *service; - GSequenceIter *iter; + GList *list; DBG("counter %s", counter); - iter = g_sequence_get_begin_iter(service_list); - - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + service = list->data; g_hash_table_remove(service->counter_table, counter); - - iter = g_sequence_iter_next(iter); } counter_list = g_slist_remove(counter_list, counter); } -GSequence *__connman_service_get_list(struct connman_session *session, - service_match_cb service_match, - create_service_entry_cb create_service_entry, - GDestroyNotify destroy_service_entry) -{ - GSequence *list; - GSequenceIter *iter; - struct connman_service *service; - struct service_entry *entry; - - list = g_sequence_new(destroy_service_entry); - if (list == NULL) - return NULL; - - iter = g_sequence_get_begin_iter(service_list); - - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); - - if (service_match(session, service) == TRUE) { - entry = create_service_entry(service, service->name, - service->state); - if (entry == NULL) - return list; - - g_sequence_append(list, entry); - } - - iter = g_sequence_iter_next(iter); - } - - return list; -} - -void __connman_service_session_inc(struct connman_service *service) +int connman_service_iterate_services(connman_service_iterate_cb cb, + void *user_data) { - DBG("service %p ref count %d", service, - service->session_usage_count + 1); + GList *list; + int ret = 0; - __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, - service->session_usage_count - 1); - - if (__sync_fetch_and_sub(&service->session_usage_count, 1) != 1) - return FALSE; + for (list = service_list; list && ret == 0; list = list->next) + ret = cb((struct connman_service *)list->data, user_data); - return TRUE; + return ret; } static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, struct connman_service *service) { + dbus_bool_t val; const char *str; GSList *list; str = __connman_service_type2string(service->type); - if (str != NULL) + if (str) connman_dbus_dict_append_basic(dict, "Type", DBUS_TYPE_STRING, &str); @@ -2163,12 +2488,12 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, DBUS_TYPE_STRING, append_security, service); str = state2string(service->state); - if (str != NULL) + if (str) connman_dbus_dict_append_basic(dict, "State", DBUS_TYPE_STRING, &str); str = error2string(service->error); - if (str != NULL) + if (str) connman_dbus_dict_append_basic(dict, "Error", DBUS_TYPE_STRING, &str); @@ -2176,20 +2501,23 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, connman_dbus_dict_append_basic(dict, "Strength", DBUS_TYPE_BYTE, &service->strength); + val = service->favorite; connman_dbus_dict_append_basic(dict, "Favorite", - DBUS_TYPE_BOOLEAN, &service->favorite); + DBUS_TYPE_BOOLEAN, &val); + val = service->immutable; connman_dbus_dict_append_basic(dict, "Immutable", - DBUS_TYPE_BOOLEAN, &service->immutable); + DBUS_TYPE_BOOLEAN, &val); - if (service->favorite == TRUE) - connman_dbus_dict_append_basic(dict, "AutoConnect", - DBUS_TYPE_BOOLEAN, &service->autoconnect); + if (service->favorite) + val = service->autoconnect; else - connman_dbus_dict_append_basic(dict, "AutoConnect", - DBUS_TYPE_BOOLEAN, &service->favorite); + val = service->favorite; - if (service->name != NULL) + connman_dbus_dict_append_basic(dict, "AutoConnect", + DBUS_TYPE_BOOLEAN, &val); + + if (service->name) connman_dbus_dict_append_basic(dict, "Name", DBUS_TYPE_STRING, &service->name); @@ -2198,19 +2526,20 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: break; case CONNMAN_SERVICE_TYPE_CELLULAR: + val = service->roaming; connman_dbus_dict_append_basic(dict, "Roaming", - DBUS_TYPE_BOOLEAN, &service->roaming); + DBUS_TYPE_BOOLEAN, &val); connman_dbus_dict_append_dict(dict, "Ethernet", append_ethernet, service); break; case CONNMAN_SERVICE_TYPE_WIFI: case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_GADGET: connman_dbus_dict_append_dict(dict, "Ethernet", append_ethernet, service); break; @@ -2257,8 +2586,19 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, connman_dbus_dict_append_dict(dict, "Proxy.Configuration", append_proxyconfig, service); + val = service->mdns; + connman_dbus_dict_append_basic(dict, "mDNS", DBUS_TYPE_BOOLEAN, + &val); + + val = service->mdns_config; + connman_dbus_dict_append_basic(dict, "mDNS.Configuration", + DBUS_TYPE_BOOLEAN, &val); + connman_dbus_dict_append_dict(dict, "Provider", append_provider, service); + + if (service->network) + connman_network_append_acddbus(dict, service->network); } static void append_struct_service(DBusMessageIter *iter, @@ -2273,7 +2613,7 @@ static void append_struct_service(DBusMessageIter *iter, &service->path); connman_dbus_dict_open(&entry, &dict); - if (function != NULL) + if (function) function(&dict, service); connman_dbus_dict_close(&entry, &dict); @@ -2292,7 +2632,7 @@ static void append_struct(gpointer value, gpointer user_data) struct connman_service *service = value; DBusMessageIter *iter = user_data; - if (service->path == NULL) + if (!service->path) return; append_struct_service(iter, append_dict_properties, service); @@ -2300,28 +2640,42 @@ static void append_struct(gpointer value, gpointer user_data) void __connman_service_list_struct(DBusMessageIter *iter) { - g_sequence_foreach(service_list, append_struct, iter); + g_list_foreach(service_list, append_struct, iter); } -connman_bool_t __connman_service_is_hidden(struct connman_service *service) +bool __connman_service_is_hidden(struct connman_service *service) { return service->hidden; } -connman_bool_t +bool __connman_service_is_split_routing(struct connman_service *service) { return service->do_split_routing; } +bool __connman_service_index_is_split_routing(int index) +{ + struct connman_service *service; + + if (index < 0) + return false; + + service = __connman_service_lookup_from_index(index); + if (!service) + return false; + + return __connman_service_is_split_routing(service); +} + int __connman_service_get_index(struct connman_service *service) { - if (service == NULL) + if (!service) return -1; - if (service->network != NULL) + if (service->network) return connman_network_get_index(service->network); - else if (service->provider != NULL) + else if (service->provider) return connman_provider_get_index(service->provider); return -1; @@ -2329,54 +2683,86 @@ int __connman_service_get_index(struct connman_service *service) void __connman_service_set_hidden(struct connman_service *service) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) + return; + + service->hidden_service = true; +} + +void __connman_service_set_hostname(struct connman_service *service, + const char *hostname) +{ + if (!service || service->hidden) return; - service->hidden_service = TRUE; + g_free(service->hostname); + service->hostname = NULL; + + if (hostname && g_str_is_ascii(hostname)) + service->hostname = g_strdup(hostname); +} + +const char *__connman_service_get_hostname(struct connman_service *service) +{ + if (!service) + return NULL; + + return service->hostname; } void __connman_service_set_domainname(struct connman_service *service, const char *domainname) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) return; g_free(service->domainname); - service->domainname = g_strdup(domainname); + service->domainname = NULL; + + if (domainname && g_str_is_ascii(domainname)) + service->domainname = g_strdup(domainname); domain_changed(service); } const char *connman_service_get_domainname(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; - if (service->domains != NULL) + if (service->domains) return service->domains[0]; else return service->domainname; } +const char *connman_service_get_dbuspath(struct connman_service *service) +{ + if (!service) + return NULL; + + return service->path; +} + char **connman_service_get_nameservers(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; - if (service->nameservers_config != NULL) + if (service->nameservers_config) return g_strdupv(service->nameservers_config); - else if (service->nameservers != NULL || - service->nameservers_auto != NULL) { + else if (service->nameservers || + service->nameservers_auto) { int len = 0, len_auto = 0, i; char **nameservers; - if (service->nameservers != NULL) + if (service->nameservers) len = g_strv_length(service->nameservers); - if (service->nameservers_auto != NULL) + if (service->nameservers_auto) len_auto = g_strv_length(service->nameservers_auto); nameservers = g_try_new0(char *, len + len_auto + 1); - if (nameservers == NULL) + if (!nameservers) return NULL; for (i = 0; i < len; i++) @@ -2389,12 +2775,12 @@ char **connman_service_get_nameservers(struct connman_service *service) return nameservers; } - return NULL; + return g_strdupv(connman_setting_get_string_list("FallbackNameservers")); } char **connman_service_get_timeservers_config(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->timeservers_config; @@ -2402,19 +2788,16 @@ char **connman_service_get_timeservers_config(struct connman_service *service) char **connman_service_get_timeservers(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; - if (service->timeservers != NULL) - return service->timeservers; - - return NULL; + return service->timeservers; } void connman_service_set_proxy_method(struct connman_service *service, enum connman_service_proxy_method method) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) return; service->proxy = method; @@ -2428,12 +2811,12 @@ void connman_service_set_proxy_method(struct connman_service *service, enum connman_service_proxy_method connman_service_get_proxy_method( struct connman_service *service) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN; if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) { if (service->proxy_config == CONNMAN_SERVICE_PROXY_METHOD_AUTO && - service->pac == NULL) + !service->pac) return service->proxy; return service->proxy_config; @@ -2454,7 +2837,7 @@ char **connman_service_get_proxy_excludes(struct connman_service *service) const char *connman_service_get_proxy_url(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->pac; @@ -2463,7 +2846,7 @@ const char *connman_service_get_proxy_url(struct connman_service *service) void __connman_service_set_proxy_autoconfig(struct connman_service *service, const char *url) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) return; service->proxy = CONNMAN_SERVICE_PROXY_METHOD_AUTO; @@ -2486,7 +2869,7 @@ void __connman_service_set_proxy_autoconfig(struct connman_service *service, const char *connman_service_get_proxy_autoconfig(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; if (service->ipconfig_ipv4) @@ -2498,6 +2881,21 @@ const char *connman_service_get_proxy_autoconfig(struct connman_service *service return NULL; } +void __connman_service_set_timeservers(struct connman_service *service, + char **timeservers) +{ + int i; + + if (!service) + return; + + g_strfreev(service->timeservers); + service->timeservers = NULL; + + for (i = 0; timeservers && timeservers[i]; i++) + __connman_service_timeserver_append(service, timeservers[i]); +} + int __connman_service_timeserver_append(struct connman_service *service, const char *timeserver) { @@ -2505,13 +2903,13 @@ int __connman_service_timeserver_append(struct connman_service *service, DBG("service %p timeserver %s", service, timeserver); - if (timeserver == NULL) + if (!timeserver) return -EINVAL; - if (service->timeservers != NULL) { + if (service->timeservers) { int i; - for (i = 0; service->timeservers[i] != NULL; i++) + for (i = 0; service->timeservers[i]; i++) if (g_strcmp0(service->timeservers[i], timeserver) == 0) return -EEXIST; @@ -2523,7 +2921,7 @@ int __connman_service_timeserver_append(struct connman_service *service, service->timeservers = g_try_new0(char *, len + 2); } - if (service->timeservers == NULL) + if (!service->timeservers) return -ENOMEM; service->timeservers[len] = g_strdup(timeserver); @@ -2540,14 +2938,14 @@ int __connman_service_timeserver_remove(struct connman_service *service, DBG("service %p timeserver %s", service, timeserver); - if (timeserver == NULL) + if (!timeserver) return -EINVAL; - if (service->timeservers == NULL) + if (!service->timeservers) return 0; - for (i = 0; service->timeservers != NULL && - service->timeservers[i] != NULL; i++) + for (i = 0; service->timeservers && + service->timeservers[i]; i++) if (g_strcmp0(service->timeservers[i], timeserver) == 0) { found = 1; break; @@ -2566,13 +2964,13 @@ int __connman_service_timeserver_remove(struct connman_service *service, } servers = g_try_new0(char *, len); - if (servers == NULL) + if (!servers) 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) + if (!servers[j]) return -ENOMEM; j++; } @@ -2588,7 +2986,10 @@ int __connman_service_timeserver_remove(struct connman_service *service, void __connman_service_timeserver_changed(struct connman_service *service, GSList *ts_list) { - if (service == NULL) + if (!service) + return; + + if (!allow_property_changed(service)) return; connman_dbus_property_changed_array(service->path, @@ -2599,7 +3000,7 @@ void __connman_service_timeserver_changed(struct connman_service *service, void __connman_service_set_pac(struct connman_service *service, const char *pac) { - if (service->hidden == TRUE) + if (service->hidden) return; g_free(service->pac); service->pac = g_strdup(pac); @@ -2610,47 +3011,130 @@ void __connman_service_set_pac(struct connman_service *service, void __connman_service_set_identity(struct connman_service *service, const char *identity) { - if (service->immutable || service->hidden == TRUE) + if (service->immutable || service->hidden) return; g_free(service->identity); service->identity = g_strdup(identity); - if (service->network != NULL) + if (service->network) connman_network_set_string(service->network, "WiFi.Identity", service->identity); } -void __connman_service_set_agent_identity(struct connman_service *service, - const char *agent_identity) +void __connman_service_set_anonymous_identity(struct connman_service *service, + const char *anonymous_identity) { - if (service->hidden == TRUE) + if (service->immutable || service->hidden) return; - g_free(service->agent_identity); - service->agent_identity = g_strdup(agent_identity); - if (service->network != NULL) + g_free(service->anonymous_identity); + service->anonymous_identity = g_strdup(anonymous_identity); + + if (service->network) connman_network_set_string(service->network, - "WiFi.AgentIdentity", - service->agent_identity); + "WiFi.AnonymousIdentity", + service->anonymous_identity); } -static int check_passphrase(enum connman_service_security security, - const char *passphrase) +void __connman_service_set_subject_match(struct connman_service *service, + const char *subject_match) { - guint i; - gsize length; - - if (passphrase == NULL) - return 0; + if (service->immutable || service->hidden) + return; - length = strlen(passphrase); + g_free(service->subject_match); + service->subject_match = g_strdup(subject_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.SubjectMatch", + service->subject_match); +} + +void __connman_service_set_altsubject_match(struct connman_service *service, + const char *altsubject_match) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->altsubject_match); + service->altsubject_match = g_strdup(altsubject_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.AltSubjectMatch", + service->altsubject_match); +} + +void __connman_service_set_domain_suffix_match(struct connman_service *service, + const char *domain_suffix_match) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->domain_suffix_match); + service->domain_suffix_match = g_strdup(domain_suffix_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.DomainSuffixMatch", + service->domain_suffix_match); +} + +void __connman_service_set_domain_match(struct connman_service *service, + const char *domain_match) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->domain_match); + service->domain_match = g_strdup(domain_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.DomainMatch", + service->domain_match); +} + +void __connman_service_set_agent_identity(struct connman_service *service, + const char *agent_identity) +{ + if (service->hidden) + return; + g_free(service->agent_identity); + service->agent_identity = g_strdup(agent_identity); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.AgentIdentity", + service->agent_identity); +} + +int __connman_service_check_passphrase(enum connman_service_security security, + const char *passphrase) +{ + guint i; + gsize length; + + if (!passphrase) + return 0; + + length = strlen(passphrase); switch (security) { - case CONNMAN_SERVICE_SECURITY_PSK: + 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(security), security); + + return -EOPNOTSUPP; + + case CONNMAN_SERVICE_SECURITY_PSK: /* A raw key is always 64 bytes length, * its content is in hex representation. * A PSK key must be between [8..63]. @@ -2675,8 +3159,7 @@ static int check_passphrase(enum connman_service_security security, } 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; } @@ -2687,39 +3170,36 @@ static int check_passphrase(enum connman_service_security security, int __connman_service_set_passphrase(struct connman_service *service, const char *passphrase) { - int err = 0; + int err; - if (service->immutable == TRUE || service->hidden == TRUE) + if (service->hidden) return -EINVAL; - err = check_passphrase(service->security, passphrase); + if (service->immutable && + service->security != CONNMAN_SERVICE_SECURITY_8021X) + return -EINVAL; - if (err == 0) { - g_free(service->passphrase); - service->passphrase = g_strdup(passphrase); + err = __connman_service_check_passphrase(service->security, passphrase); - if (service->network != NULL) - connman_network_set_string(service->network, - "WiFi.Passphrase", - service->passphrase); - service_save(service); - } + if (err < 0) + return err; - return err; + g_free(service->passphrase); + service->passphrase = g_strdup(passphrase); + + if (service->network) + connman_network_set_string(service->network, "WiFi.Passphrase", + service->passphrase); + + return 0; } -void __connman_service_set_agent_passphrase(struct connman_service *service, - const char *agent_passphrase) +const char *__connman_service_get_passphrase(struct connman_service *service) { - if (service->hidden == TRUE) - return; - g_free(service->agent_passphrase); - service->agent_passphrase = g_strdup(agent_passphrase); + if (!service) + return NULL; - if (service->network != NULL) - connman_network_set_string(service->network, - "WiFi.AgentPassphrase", - service->agent_passphrase); + return service->passphrase; } static DBusMessage *get_properties(DBusConnection *conn, @@ -2729,10 +3209,8 @@ static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *reply; DBusMessageIter array, dict; - DBG("service %p", service); - reply = dbus_message_new_method_return(msg); - if (reply == NULL) + if (!reply) return NULL; dbus_message_iter_init_append(reply, &array); @@ -2744,6 +3222,23 @@ static DBusMessage *get_properties(DBusConnection *conn, return reply; } +static char **remove_empty_strings(char **strv) +{ + int index = 0; + char **iter = strv; + + while (*iter) { + if (**iter) + strv[index++] = *iter; + else + g_free(*iter); + iter++; + } + + strv[index] = NULL; + return strv; +} + static int update_proxy_configuration(struct connman_service *service, DBusMessageIter *array) { @@ -2777,7 +3272,7 @@ static int update_proxy_configuration(struct connman_service *service, type = dbus_message_iter_get_arg_type(&variant); - if (g_str_equal(key, "Method") == TRUE) { + if (g_str_equal(key, "Method")) { const char *val; if (type != DBUS_TYPE_STRING) @@ -2785,19 +3280,19 @@ static int update_proxy_configuration(struct connman_service *service, dbus_message_iter_get_basic(&variant, &val); method = string2proxymethod(val); - } else if (g_str_equal(key, "URL") == TRUE) { + } else if (g_str_equal(key, "URL")) { if (type != DBUS_TYPE_STRING) goto error; dbus_message_iter_get_basic(&variant, &url); - } else if (g_str_equal(key, "Servers") == TRUE) { + } else if (g_str_equal(key, "Servers")) { DBusMessageIter str_array; if (type != DBUS_TYPE_ARRAY) goto error; servers_str = g_string_new(NULL); - if (servers_str == NULL) + if (!servers_str) goto error; dbus_message_iter_recurse(&variant, &str_array); @@ -2816,14 +3311,14 @@ static int update_proxy_configuration(struct connman_service *service, dbus_message_iter_next(&str_array); } - } else if (g_str_equal(key, "Excludes") == TRUE) { + } else if (g_str_equal(key, "Excludes")) { DBusMessageIter str_array; if (type != DBUS_TYPE_ARRAY) goto error; excludes_str = g_string_new(NULL); - if (excludes_str == NULL) + if (!excludes_str) goto error; dbus_message_iter_recurse(&variant, &str_array); @@ -2851,38 +3346,42 @@ static int update_proxy_configuration(struct connman_service *service, case CONNMAN_SERVICE_PROXY_METHOD_DIRECT: break; case CONNMAN_SERVICE_PROXY_METHOD_MANUAL: - if (servers_str == NULL && service->proxies == NULL) + if (!servers_str && !service->proxies) goto error; - if (servers_str != NULL) { + if (servers_str) { g_strfreev(service->proxies); - if (servers_str->len > 0) - service->proxies = g_strsplit_set( + if (servers_str->len > 0) { + char **proxies = g_strsplit_set( servers_str->str, " ", 0); - else + proxies = remove_empty_strings(proxies); + service->proxies = proxies; + } else service->proxies = NULL; } - if (excludes_str != NULL) { + if (excludes_str) { g_strfreev(service->excludes); - if (excludes_str->len > 0) - service->excludes = g_strsplit_set( + if (excludes_str->len > 0) { + char **excludes = g_strsplit_set( excludes_str->str, " ", 0); - else + excludes = remove_empty_strings(excludes); + service->excludes = excludes; + } else service->excludes = NULL; } - if (service->proxies == NULL) + if (!service->proxies) method = CONNMAN_SERVICE_PROXY_METHOD_DIRECT; break; case CONNMAN_SERVICE_PROXY_METHOD_AUTO: g_free(service->pac); - if (url != NULL && strlen(url) > 0) - service->pac = g_strdup(url); + if (url && strlen(url) > 0) + service->pac = g_strstrip(g_strdup(url)); else service->pac = NULL; @@ -2897,10 +3396,10 @@ static int update_proxy_configuration(struct connman_service *service, goto error; } - if (servers_str != NULL) + if (servers_str) g_string_free(servers_str, TRUE); - if (excludes_str != NULL) + if (excludes_str) g_string_free(excludes_str, TRUE); service->proxy_config = method; @@ -2908,61 +3407,140 @@ static int update_proxy_configuration(struct connman_service *service, return 0; error: - if (servers_str != NULL) + if (servers_str) g_string_free(servers_str, TRUE); - if (excludes_str != NULL) + if (excludes_str) g_string_free(excludes_str, TRUE); return -EINVAL; } -static int set_ipconfig(struct connman_service *service, - struct connman_ipconfig *ipconfig, - DBusMessageIter *array, - enum connman_service_state state, - enum connman_service_state *new_state) +static void do_auto_connect(struct connman_service *service, + enum connman_service_connect_reason reason) { - enum connman_ipconfig_method old_method; - enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; - enum connman_ipconfig_type type; - int err; + /* + * CONNMAN_SERVICE_CONNECT_REASON_NONE must be ignored for VPNs. VPNs + * always have reason CONNMAN_SERVICE_CONNECT_REASON_USER/AUTO. + */ + if (!service || (service->type == CONNMAN_SERVICE_TYPE_VPN && + reason == CONNMAN_SERVICE_CONNECT_REASON_NONE)) + return; + + /* + * Run service auto connect for other than VPN services. Afterwards + * start also VPN auto connect process. + */ + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + __connman_service_auto_connect(reason); + /* Only user interaction should get VPN connected in failure state. */ + else if (service->state == CONNMAN_SERVICE_STATE_FAILURE && + reason != CONNMAN_SERVICE_CONNECT_REASON_USER) + return; - if (ipconfig == NULL) + vpn_auto_connect(); +} + +int __connman_service_reset_ipconfig(struct connman_service *service, + enum connman_ipconfig_type type, DBusMessageIter *array, + enum connman_service_state *new_state) +{ + struct connman_ipconfig *ipconfig, *new_ipconfig; + enum connman_ipconfig_method old_method, new_method; + enum connman_service_state state; + int err = 0, index; + + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { + ipconfig = service->ipconfig_ipv4; + state = service->state_ipv4; + new_method = CONNMAN_IPCONFIG_METHOD_DHCP; + } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { + ipconfig = service->ipconfig_ipv6; + state = service->state_ipv6; + new_method = CONNMAN_IPCONFIG_METHOD_AUTO; + } else return -EINVAL; + if (!ipconfig) + return -ENXIO; + old_method = __connman_ipconfig_get_method(ipconfig); + index = __connman_ipconfig_get_index(ipconfig); + + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + new_ipconfig = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_UNKNOWN); + else + new_ipconfig = create_ip6config(service, index); + + if (array) { + err = __connman_ipconfig_set_config(new_ipconfig, array); + if (err < 0) { + __connman_ipconfig_unref(new_ipconfig); + return err; + } + + new_method = __connman_ipconfig_get_method(new_ipconfig); + } - if (is_connecting_state(service, state) || - is_connected_state(service, state)) + if (is_connecting(state) || is_connected(state)) __connman_network_clear_ipconfig(service->network, ipconfig); - err = __connman_ipconfig_set_config(ipconfig, array); - method = __connman_ipconfig_get_method(ipconfig); - type = __connman_ipconfig_get_config_type(ipconfig); + __connman_ipconfig_unref(ipconfig); - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { - if (err == 0 && old_method == CONNMAN_IPCONFIG_METHOD_OFF && - method == CONNMAN_IPCONFIG_METHOD_DHCP) { - *new_state = service->state_ipv4 = - CONNMAN_SERVICE_STATE_CONFIGURATION; - __connman_ipconfig_enable(ipconfig); - } + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + service->ipconfig_ipv4 = new_ipconfig; + else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + service->ipconfig_ipv6 = new_ipconfig; - } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { - if (err == 0 && old_method == CONNMAN_IPCONFIG_METHOD_OFF && - method == CONNMAN_IPCONFIG_METHOD_AUTO) { + if (is_connecting(state) || is_connected(state)) + __connman_ipconfig_enable(new_ipconfig); + + if (new_state && new_method != old_method) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + *new_state = service->state_ipv4; + else *new_state = service->state_ipv6; - __connman_ipconfig_enable(ipconfig); - } + + settings_changed(service, new_ipconfig); + address_updated(service, type); + + do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); } - DBG("err %d ipconfig %p type %d method %d state %s", err, ipconfig, - type, method, state2string(*new_state)); + DBG("err %d ipconfig %p type %d method %d state %s", err, + new_ipconfig, type, new_method, + !new_state ? "-" : state2string(*new_state)); return err; } +/* + * 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. + */ +#define ONLINE_CHECK_INITIAL_INTERVAL 1 +#define ONLINE_CHECK_MAX_INTERVAL 12 + +void __connman_service_wispr_start(struct connman_service *service, + enum connman_ipconfig_type type) +{ + DBG("service %p type %s", service, __connman_ipconfig_type2string(type)); + + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + service->online_check_interval_ipv4 = + ONLINE_CHECK_INITIAL_INTERVAL; + else + service->online_check_interval_ipv6 = + ONLINE_CHECK_INITIAL_INTERVAL; + + __connman_wispr_start(service, type); +} + +static void set_error(struct connman_service *service, + enum connman_service_error error); + static DBusMessage *set_property(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -2973,7 +3551,7 @@ static DBusMessage *set_property(DBusConnection *conn, DBG("service %p", service); - if (dbus_message_iter_init(msg, &iter) == FALSE) + if (!dbus_message_iter_init(msg, &iter)) return __connman_error_invalid_arguments(msg); if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) @@ -2989,39 +3567,55 @@ static DBusMessage *set_property(DBusConnection *conn, type = dbus_message_iter_get_arg_type(&value); - if (g_str_equal(name, "AutoConnect") == TRUE) { - connman_bool_t autoconnect; + if (g_str_equal(name, "AutoConnect")) { + dbus_bool_t autoconnect; if (type != DBUS_TYPE_BOOLEAN) return __connman_error_invalid_arguments(msg); - if (service->favorite == FALSE) + if (!service->favorite) return __connman_error_invalid_service(msg); dbus_message_iter_get_basic(&value, &autoconnect); - if (service->autoconnect == autoconnect) - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); - - service->autoconnect = autoconnect; + if (autoconnect && service->type == CONNMAN_SERVICE_TYPE_VPN) { + /* + * Changing the autoconnect flag on VPN to "on" should + * have the same effect as user connecting the VPN = + * clear previous error and change state to idle. + */ + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - autoconnect_changed(service); + if (service->state == CONNMAN_SERVICE_STATE_FAILURE) { + service->state = CONNMAN_SERVICE_STATE_IDLE; + state_changed(service); + } + } - service_save(service); - } else if (g_str_equal(name, "Nameservers.Configuration") == TRUE) { + if (connman_service_set_autoconnect(service, autoconnect)) { + service_save(service); + if (autoconnect) + do_auto_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + } + } else if (g_str_equal(name, "Nameservers.Configuration")) { DBusMessageIter entry; GString *str; int index; const char *gw; + if (__connman_provider_is_immutable(service->provider) || + service->immutable) + return __connman_error_not_supported(msg); + if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); str = g_string_new(NULL); - if (str == NULL) + if (!str) return __connman_error_invalid_arguments(msg); - index = connman_network_get_index(service->network); + index = __connman_service_get_index(service); gw = __connman_ipconfig_get_gateway_from_index(index, CONNMAN_IPCONFIG_TYPE_ALL); @@ -3035,18 +3629,30 @@ static DBusMessage *set_property(DBusConnection *conn, const char *val; dbus_message_iter_get_basic(&entry, &val); dbus_message_iter_next(&entry); + + if (!val[0]) + continue; + if (str->len > 0) g_string_append_printf(str, " %s", val); else g_string_append(str, val); } - remove_nameservers(service, NULL, service->nameservers_config); + nameserver_remove_all(service, CONNMAN_IPCONFIG_TYPE_ALL); g_strfreev(service->nameservers_config); if (str->len > 0) { - service->nameservers_config = - g_strsplit_set(str->str, " ", 0); + char **nameservers, **iter; + + nameservers = g_strsplit_set(str->str, " ", 0); + + for (iter = nameservers; *iter; iter++) + if (connman_inet_check_ipaddress(*iter) <= 0) + *iter[0] = '\0'; + + nameservers = remove_empty_strings(nameservers); + service->nameservers_config = nameservers; } else { service->nameservers_config = NULL; } @@ -3056,61 +3662,77 @@ static DBusMessage *set_property(DBusConnection *conn, if (gw && strlen(gw)) __connman_service_nameserver_add_routes(service, gw); - update_nameservers(service); + nameserver_add_all(service, CONNMAN_IPCONFIG_TYPE_ALL); dns_configuration_changed(service); + if (__connman_service_is_connected_state(service, + CONNMAN_IPCONFIG_TYPE_IPV4)) + __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); + + if (__connman_service_is_connected_state(service, + CONNMAN_IPCONFIG_TYPE_IPV6)) + __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); + service_save(service); - } else if (g_str_equal(name, "Timeservers.Configuration") == TRUE) { + } else if (g_str_equal(name, "Timeservers.Configuration")) { DBusMessageIter entry; - GSList *list = NULL; - int count = 0; + GString *str; + + if (service->immutable) + return __connman_error_not_supported(msg); if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); + str = g_string_new(NULL); + if (!str) + 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); + dbus_message_iter_next(&entry); - new_head = __connman_timeserver_add_list(list, val); - if (list != new_head) { - count++; - list = new_head; - } + if (!val[0]) + continue; - dbus_message_iter_next(&entry); + if (str->len > 0) + g_string_append_printf(str, " %s", val); + else + g_string_append(str, val); } 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); - }; + if (str->len > 0) { + char **timeservers = g_strsplit_set(str->str, " ", 0); + timeservers = remove_empty_strings(timeservers); + service->timeservers_config = timeservers; } + g_string_free(str, TRUE); + service_save(service); timeservers_configuration_changed(service); - __connman_timeserver_sync(service); - } else if (g_str_equal(name, "Domains.Configuration") == TRUE) { + if (service == connman_service_get_default()) + __connman_timeserver_sync(service); + + } else if (g_str_equal(name, "Domains.Configuration")) { DBusMessageIter entry; GString *str; + if (service->immutable) + return __connman_error_not_supported(msg); + if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); str = g_string_new(NULL); - if (str == NULL) + if (!str) return __connman_error_invalid_arguments(msg); dbus_message_iter_recurse(&value, &entry); @@ -3119,29 +3741,39 @@ static DBusMessage *set_property(DBusConnection *conn, const char *val; dbus_message_iter_get_basic(&entry, &val); dbus_message_iter_next(&entry); + + if (!val[0]) + continue; + if (str->len > 0) g_string_append_printf(str, " %s", val); else g_string_append(str, val); } - remove_searchdomains(service, NULL, service->domains); + searchdomain_remove_all(service); g_strfreev(service->domains); - if (str->len > 0) - service->domains = g_strsplit_set(str->str, " ", 0); - else + if (str->len > 0) { + char **domains = g_strsplit_set(str->str, " ", 0); + domains = remove_empty_strings(domains); + service->domains = domains; + } else service->domains = NULL; g_string_free(str, TRUE); - update_nameservers(service); + searchdomain_add_all(service); domain_configuration_changed(service); + domain_changed(service); service_save(service); - } else if (g_str_equal(name, "Proxy.Configuration") == TRUE) { + } else if (g_str_equal(name, "Proxy.Configuration")) { int err; + if (service->immutable) + return __connman_error_not_supported(msg); + if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); @@ -3155,47 +3787,77 @@ static DBusMessage *set_property(DBusConnection *conn, __connman_notifier_proxy_changed(service); service_save(service); - } else if (g_str_equal(name, "IPv4.Configuration") == TRUE || + } else if (g_str_equal(name, "mDNS.Configuration")) { + dbus_bool_t val; + + if (service->immutable) + return __connman_error_not_supported(msg); + + if (type != DBUS_TYPE_BOOLEAN) + return __connman_error_invalid_arguments(msg); + + dbus_message_iter_get_basic(&value, &val); + service->mdns_config = val; + + mdns_configuration_changed(service); + + set_mdns(service, service->mdns_config); + + service_save(service); + } else if (g_str_equal(name, "IPv4.Configuration") || g_str_equal(name, "IPv6.Configuration")) { - struct connman_ipconfig *ipv4 = NULL, *ipv6 = NULL; enum connman_service_state state = CONNMAN_SERVICE_STATE_UNKNOWN; + enum connman_ipconfig_type type = + CONNMAN_IPCONFIG_TYPE_UNKNOWN; int err = 0; + if (service->type == CONNMAN_SERVICE_TYPE_VPN || + service->immutable) + return __connman_error_not_supported(msg); + DBG("%s", name); - if (service->ipconfig_ipv4 == NULL && - service->ipconfig_ipv6 == NULL) + if (!service->ipconfig_ipv4 && + !service->ipconfig_ipv6) return __connman_error_invalid_property(msg); - if (g_str_equal(name, "IPv4.Configuration") == TRUE) { - ipv4 = service->ipconfig_ipv4; - err = set_ipconfig(service, ipv4, &value, - service->state_ipv4, &state); + if (g_str_equal(name, "IPv4.Configuration")) + type = CONNMAN_IPCONFIG_TYPE_IPV4; + else + type = CONNMAN_IPCONFIG_TYPE_IPV6; - } else if (g_str_equal(name, "IPv6.Configuration") == TRUE) { - ipv6 = service->ipconfig_ipv6; - err = set_ipconfig(service, ipv6, &value, - service->state_ipv6, &state); - } + err = __connman_service_reset_ipconfig(service, type, &value, + &state); if (err < 0) { - if (is_connected_state(service, state) || - is_connecting_state(service, state)) - __connman_network_set_ipconfig(service->network, - ipv4, ipv6); + if (is_connected(state) || is_connecting(state)) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv4); + else + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv6); + } + return __connman_error_failed(msg, -err); } - if (ipv4) + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) ipv4_configuration_changed(service); - else if (ipv6) + else ipv6_configuration_changed(service); - if (is_connecting(service) || is_connected(service)) - __connman_network_set_ipconfig(service->network, - ipv4, ipv6); + if (is_connecting(service->state) || + is_connected(service->state)) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv4); + else + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv6); + } service_save(service); } else @@ -3204,12 +3866,65 @@ static DBusMessage *set_property(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static void set_idle(struct connman_service *service) +static void set_error(struct connman_service *service, + enum connman_service_error error) { - service->state = service->state_ipv4 = service->state_ipv6 = - CONNMAN_SERVICE_STATE_IDLE; - service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; - state_changed(service); + const char *str; + + if (service->error == error) + return; + + service->error = error; + + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + str = error2string(service->error); + + if (!str) + str = ""; + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "Error", + DBUS_TYPE_STRING, &str); +} + +static void remove_timeout(struct connman_service *service) +{ + if (service->timeout > 0) { + g_source_remove(service->timeout); + service->timeout = 0; + } +} + +static void reply_pending(struct connman_service *service, int error) +{ + remove_timeout(service); + + if (service->pending) { + connman_dbus_reply_pending(service->pending, error, NULL); + service->pending = NULL; + } + + if (service->provider_pending) { + connman_dbus_reply_pending(service->provider_pending, + error, service->path); + service->provider_pending = NULL; + } +} + +static void service_complete(struct connman_service *service) +{ + reply_pending(service, EIO); + + if (service->connect_reason != CONNMAN_SERVICE_CONNECT_REASON_USER) + do_auto_connect(service, service->connect_reason); + + gettimeofday(&service->modified, NULL); + service_save(service); } static DBusMessage *clear_property(DBusConnection *conn, @@ -3223,36 +3938,119 @@ static DBusMessage *clear_property(DBusConnection *conn, dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - if (g_str_equal(name, "Error") == TRUE) { - set_idle(service); + if (g_str_equal(name, "Error")) { + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - g_get_current_time(&service->modified); - service_save(service); + __connman_service_clear_error(service); + service_complete(service); } else return __connman_error_invalid_property(msg); return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static connman_bool_t is_ignore(struct connman_service *service) +static bool is_ipconfig_usable(struct connman_service *service) { - if (service->autoconnect == FALSE) - return TRUE; + if (!__connman_ipconfig_is_usable(service->ipconfig_ipv4) && + !__connman_ipconfig_is_usable(service->ipconfig_ipv6)) + return false; - if (service->roaming == TRUE) - return TRUE; + return true; +} + +static bool is_ignore(struct connman_service *service) +{ + if (!service->autoconnect) + return true; - if (service->ignore == TRUE) - return TRUE; + if (service->roaming && + !connman_setting_get_bool("AutoConnectRoamingServices")) + return true; + + if (service->ignore) + return true; if (service->state == CONNMAN_SERVICE_STATE_FAILURE) - return TRUE; + return true; - return FALSE; + if (!is_ipconfig_usable(service)) + return true; + + return false; +} + +static void disconnect_on_last_session(enum connman_service_type type) +{ + GList *list; + + for (list = service_list; list; list = list->next) { + struct connman_service *service = list->data; + + if (service->type != type) + continue; + + if (service->connect_reason != CONNMAN_SERVICE_CONNECT_REASON_SESSION) + continue; + + __connman_service_disconnect(service); + return; + } +} + +static int active_sessions[MAX_CONNMAN_SERVICE_TYPES] = {}; +static int always_connect[MAX_CONNMAN_SERVICE_TYPES] = {}; +static int active_count = 0; + +void __connman_service_set_active_session(bool enable, GSList *list) +{ + if (!list) + return; + + if (enable) + active_count++; + else + active_count--; + + while (list) { + enum connman_service_type type = GPOINTER_TO_INT(list->data); + + switch (type) { + case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_WIFI: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_GADGET: + if (enable) + active_sessions[type]++; + else + active_sessions[type]--; + break; + + case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_P2P: + break; + } + + if (active_sessions[type] == 0) + disconnect_on_last_session(type); + + list = g_slist_next(list); + } + + DBG("eth %d wifi %d bt %d cellular %d gadget %d sessions %d", + active_sessions[CONNMAN_SERVICE_TYPE_ETHERNET], + active_sessions[CONNMAN_SERVICE_TYPE_WIFI], + active_sessions[CONNMAN_SERVICE_TYPE_BLUETOOTH], + active_sessions[CONNMAN_SERVICE_TYPE_CELLULAR], + active_sessions[CONNMAN_SERVICE_TYPE_GADGET], + active_count); } struct preferred_tech_data { - GSequence *preferred_list; + GList *preferred_list; enum connman_service_type type; }; @@ -3262,192 +4060,407 @@ static void preferred_tech_add_by_type(gpointer data, gpointer user_data) struct preferred_tech_data *tech_data = user_data; if (service->type == tech_data->type) { - g_sequence_append(tech_data->preferred_list, service); + tech_data->preferred_list = + g_list_append(tech_data->preferred_list, service); DBG("type %d service %p %s", tech_data->type, service, service->name); } } -static GSequence* preferred_tech_list_get(GSequence *list) +static GList *preferred_tech_list_get(void) { unsigned int *tech_array; - struct preferred_tech_data tech_data; + struct preferred_tech_data tech_data = { 0, }; int i; tech_array = connman_setting_get_uint_list("PreferredTechnologies"); - if (tech_array == NULL) + if (!tech_array) return NULL; - tech_data.preferred_list = g_sequence_new(NULL); + if (connman_setting_get_bool("SingleConnectedTechnology")) { + GList *list; + for (list = service_list; list; list = list->next) { + struct connman_service *service = list->data; + + if (!is_connected(service->state)) + break; + + if (service->connect_reason == + CONNMAN_SERVICE_CONNECT_REASON_USER) { + DBG("service %p name %s is user connected", + service, service->name); + return 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, + g_list_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) +static void set_always_connecting_technologies() +{ + unsigned int *always_connected_techs = + connman_setting_get_uint_list("AlwaysConnectedTechnologies"); + int i; + for (i = 0; always_connected_techs && always_connected_techs[i]; i++) + always_connect[always_connected_techs[i]] = 1; +} + +static bool autoconnect_no_session_active(struct connman_service *service) +{ + /* + * Test active_count to see if there are no sessions set up and + * stop autoconnecting, but continue connecting if the service + * belongs to a technology which should always autoconnect. + */ + if (!active_count && !always_connect[service->type]) + return true; + + return false; +} + +static bool autoconnect_already_connecting(struct connman_service *service, + bool autoconnecting) +{ + /* + * If another service is already connecting and this service type has + * not been marked as always connecting, stop the connecting procedure. + */ + if (autoconnecting && + !active_sessions[service->type] && + !always_connect[service->type]) + return true; + + return false; +} + +static int service_indicate_state(struct connman_service *service); + +static bool auto_connect_service(GList *services, + enum connman_service_connect_reason reason, + bool preferred) { struct connman_service *service = NULL; + bool ignore[MAX_CONNMAN_SERVICE_TYPES] = { }; + bool autoconnecting = false; + GList *list; - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + DBG("preferred %d sessions %d reason %s", preferred, active_count, + reason2string(reason)); - if (service->pending != NULL) - return TRUE; + ignore[CONNMAN_SERVICE_TYPE_VPN] = true; - if (is_connecting(service) == TRUE) - return TRUE; + for (list = services; list; list = list->next) { + service = list->data; - if (service->favorite == FALSE) { - if (preferred == TRUE) - goto next_service; - return FALSE; + if (ignore[service->type]) { + DBG("service %p type %s ignore", service, + __connman_service_type2string(service->type)); + continue; } - if (is_connected(service) == TRUE) { - if (preferred == TRUE && service->state != - CONNMAN_SERVICE_STATE_ONLINE) - goto next_service; - return TRUE; + if (service->pending || + is_connecting(service->state) || + is_connected(service->state)) { + if (autoconnect_no_session_active(service)) + return true; + + ignore[service->type] = true; + autoconnecting = true; + + DBG("service %p type %s busy", service, + __connman_service_type2string(service->type)); + + continue; } - if (is_ignore(service) == FALSE && service->state == - CONNMAN_SERVICE_STATE_IDLE) - break; + if (!service->favorite) { + if (preferred) + continue; - next_service: - service = NULL; + return autoconnecting; + } - iter = g_sequence_iter_next(iter); - } + if (is_ignore(service) || service->state != + CONNMAN_SERVICE_STATE_IDLE) + continue; - if (service != NULL) { + if (autoconnect_already_connecting(service, autoconnecting)) { + DBG("service %p type %s has no users", service, + __connman_service_type2string(service->type)); + continue; + } DBG("service %p %s %s", service, service->name, - (preferred == TRUE)? "preferred": "auto"); + (preferred) ? "preferred" : reason2string(reason)); + + if (__connman_service_connect(service, reason) == 0) + service_indicate_state(service); - service->userconnect = FALSE; - __connman_service_connect(service); - return TRUE; + if (autoconnect_no_session_active(service)) + return true; + + ignore[service->type] = true; } - return FALSE; + + return autoconnecting; } static gboolean run_auto_connect(gpointer data) { - GSequenceIter *iter = NULL; - GSequence *preferred_tech; + enum connman_service_connect_reason reason = GPOINTER_TO_UINT(data); + bool autoconnecting = false; + GList *preferred_tech; - autoconnect_timeout = 0; + autoconnect_id = 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); + preferred_tech = preferred_tech_list_get(); + if (preferred_tech) { + autoconnecting = auto_connect_service(preferred_tech, reason, + true); + g_list_free(preferred_tech); + } - if (preferred_tech != NULL) - g_sequence_free(preferred_tech); + if (!autoconnecting || active_count) + auto_connect_service(service_list, reason, false); return FALSE; } -void __connman_service_auto_connect(void) +void __connman_service_auto_connect(enum connman_service_connect_reason reason) { DBG(""); - if (__connman_session_mode() == TRUE) { - DBG("Session mode enabled: auto connect disabled"); + if (autoconnect_id != 0) return; - } - if (autoconnect_timeout != 0) + if (!__connman_session_policy_autoconnect(reason)) return; - autoconnect_timeout = g_timeout_add_seconds(0, run_auto_connect, NULL); + autoconnect_id = g_idle_add(run_auto_connect, + GUINT_TO_POINTER(reason)); } -static void remove_timeout(struct connman_service *service) +static gboolean run_vpn_auto_connect(gpointer data) { + GList *list; + bool need_split = false; + bool autoconnectable_vpns = false; + int attempts = 0; + int timeout = VPN_AUTOCONNECT_TIMEOUT_DEFAULT; + struct connman_service *def_service; + + attempts = GPOINTER_TO_INT(data); + def_service = connman_service_get_default(); + + /* + * Stop auto connecting VPN if there is no transport service or the + * transport service is not connected or if the current default service + * is a connected VPN (in ready state). + */ + if (!def_service || !is_connected(def_service->state) || + (def_service->type == CONNMAN_SERVICE_TYPE_VPN && + is_connected(def_service->state))) { + + DBG("stopped, default service %s connected %d", + def_service ? def_service->identifier : "NULL", + def_service ? is_connected(def_service->state) : -1); + goto out; + } + + for (list = service_list; list; list = list->next) { + struct connman_service *service = list->data; + int res; + + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + continue; + + if (is_connected(service->state) || + is_connecting(service->state)) { + if (!service->do_split_routing) + need_split = true; + + /* + * If the service is connecting it must be accounted + * for to keep the autoconnection in main loop. + */ + if (is_connecting(service->state)) + autoconnectable_vpns = true; + + continue; + } + + if (is_ignore(service) || !service->favorite) + continue; + + if (need_split && !service->do_split_routing) { + DBG("service %p no split routing", service); + continue; + } + + DBG("service %p %s %s", service, service->name, + service->do_split_routing ? + "split routing" : ""); + + res = __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + + switch (res) { + case 0: + service_indicate_state(service); + /* fall through */ + case -EINPROGRESS: + autoconnectable_vpns = true; + break; + default: + continue; + } + + if (!service->do_split_routing) + need_split = true; + } + + /* Stop if there is no VPN to automatically connect.*/ + if (!autoconnectable_vpns) { + DBG("stopping, no autoconnectable VPNs found"); + goto out; + } + + /* Increase the attempt count up to the threshold.*/ + if (attempts < VPN_AUTOCONNECT_TIMEOUT_ATTEMPTS_THRESHOLD) + attempts++; + + /* + * Timeout increases with 1s after VPN_AUTOCONNECT_TIMEOUT_STEP amount + * of attempts made. After VPN_AUTOCONNECT_TIMEOUT_ATTEMPTS_THRESHOLD is + * reached the delay does not increase. + */ + timeout = timeout + (int)(attempts / VPN_AUTOCONNECT_TIMEOUT_STEP); + + /* Re add this to main loop */ + vpn_autoconnect_id = + g_timeout_add_seconds(timeout, run_vpn_auto_connect, + GINT_TO_POINTER(attempts)); + + DBG("re-added to main loop, next VPN autoconnect in %d seconds (#%d)", + timeout, attempts); + + return G_SOURCE_REMOVE; + +out: + vpn_autoconnect_id = 0; + return G_SOURCE_REMOVE; +} + +static void vpn_auto_connect(void) { - if (service->timeout > 0) { - g_source_remove(service->timeout); - service->timeout = 0; + /* + * Remove existing autoconnect from main loop to reset the attempt + * counter in order to get VPN connected when there is a network change. + */ + if (vpn_autoconnect_id) { + if (!g_source_remove(vpn_autoconnect_id)) + return; } + + vpn_autoconnect_id = + g_idle_add(run_vpn_auto_connect, NULL); } -static void reply_pending(struct connman_service *service, int error) +bool +__connman_service_is_provider_pending(struct connman_service *service) { - remove_timeout(service); + if (!service) + return false; - if (service->pending != NULL) { - if (error > 0) { - DBusMessage *reply; + if (service->provider_pending) + return true; - reply = __connman_error_failed(service->pending, - error); - if (reply != NULL) - g_dbus_send_message(connection, reply); - } else { - const char *sender; + return false; +} - sender = dbus_message_get_interface(service->pending); +void __connman_service_set_provider_pending(struct connman_service *service, + DBusMessage *msg) +{ + if (service->provider_pending) { + DBG("service %p provider pending msg %p already exists", + service, service->provider_pending); + return; + } - DBG("sender %s", sender); + service->provider_pending = msg; +} - if (g_strcmp0(sender, CONNMAN_MANAGER_INTERFACE) == 0) - g_dbus_send_reply(connection, service->pending, - DBUS_TYPE_OBJECT_PATH, &service->path, - DBUS_TYPE_INVALID); - else - g_dbus_send_reply(connection, service->pending, - DBUS_TYPE_INVALID); - } +static void check_pending_msg(struct connman_service *service) +{ + if (!service->pending) + return; - dbus_message_unref(service->pending); - service->pending = NULL; - } + DBG("service %p pending msg %p already exists", service, + service->pending); + dbus_message_unref(service->pending); +} + +void __connman_service_set_hidden_data(struct connman_service *service, + gpointer user_data) +{ + DBusMessage *pending = user_data; + + DBG("service %p pending %p", service, pending); + + if (!pending) + return; + + check_pending_msg(service); + + service->pending = pending; +} + +void __connman_service_return_error(struct connman_service *service, + int error, gpointer user_data) +{ + DBG("service %p error %d user_data %p", service, error, user_data); + + __connman_service_set_hidden_data(service, user_data); + + reply_pending(service, error); } static gboolean connect_timeout(gpointer user_data) { struct connman_service *service = user_data; - connman_bool_t autoconnect = FALSE; + bool autoconnect = false; DBG("service %p", service); service->timeout = 0; - if (service->network != NULL) + if (service->network) __connman_network_disconnect(service->network); - - __connman_ipconfig_disable(service->ipconfig_ipv4); - __connman_ipconfig_disable(service->ipconfig_ipv6); + else if (service->provider) + connman_provider_disconnect(service->provider); __connman_stats_service_unregister(service); - if (service->pending != NULL) { + if (service->pending) { DBusMessage *reply; reply = __connman_error_operation_timeout(service->pending); - if (reply != NULL) + if (reply) g_dbus_send_message(connection, reply); dbus_message_unref(service->pending); service->pending = NULL; } else - autoconnect = TRUE; + autoconnect = true; __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_FAILURE, @@ -3456,88 +4469,59 @@ static gboolean connect_timeout(gpointer user_data) CONNMAN_SERVICE_STATE_FAILURE, CONNMAN_IPCONFIG_TYPE_IPV6); - if (autoconnect == TRUE && service->userconnect == FALSE) - __connman_service_auto_connect(); + if (autoconnect && + service->connect_reason != + CONNMAN_SERVICE_CONNECT_REASON_USER) + do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); return FALSE; } -static void set_reconnect_state(struct connman_service *service, - connman_bool_t reconnect) -{ - struct connman_device *device; - - if (service->network == NULL) - return; - - device = connman_network_get_device(service->network); - if (device == NULL) - return; - - __connman_device_set_reconnect(device, reconnect); -} - -static connman_bool_t get_reconnect_state(struct connman_service *service) -{ - struct connman_device *device; - - if (service->network == NULL) - return FALSE; - - device = connman_network_get_device(service->network); - if (device == NULL) - return FALSE; - - return __connman_device_get_reconnect(device); -} - static DBusMessage *connect_service(DBusConnection *conn, DBusMessage *msg, void *user_data) { struct connman_service *service = user_data; - GSequenceIter *iter; - int err; + int index, err = 0; + GList *list; DBG("service %p", service); - if (service->pending != NULL) + if (service->pending) return __connman_error_in_progress(msg); - iter = g_sequence_get_begin_iter(service_list); + index = __connman_service_get_index(service); - while (g_sequence_iter_is_end(iter) == FALSE) { - struct connman_service *temp = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + struct connman_service *temp = list->data; - if (service->type == temp->type && is_connecting(temp) == TRUE) - return __connman_error_in_progress(msg); - - iter = g_sequence_iter_next(iter); - } + if (!is_connecting(temp->state) && !is_connected(temp->state)) + break; - service->ignore = FALSE; + if (service == temp) + continue; - service->userconnect = TRUE; + if (service->type != temp->type) + continue; - service->pending = dbus_message_ref(msg); + if (__connman_service_get_index(temp) == index && + __connman_service_disconnect(temp) == -EINPROGRESS) + err = -EINPROGRESS; - set_reconnect_state(service, FALSE); + } + if (err == -EINPROGRESS) + return __connman_error_operation_timeout(msg); - err = __connman_service_connect(service); - if (err < 0) { - if (service->pending == NULL) - return NULL; + service->ignore = false; - if (err != -EINPROGRESS) { - dbus_message_unref(service->pending); - service->pending = NULL; + service->pending = dbus_message_ref(msg); - return __connman_error_failed(msg, -err); - } + err = __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_USER); - return NULL; - } + if (err != -EINPROGRESS) + reply_pending(service, -err); - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); + return NULL; } static DBusMessage *disconnect_service(DBusConnection *conn, @@ -3548,61 +4532,66 @@ static DBusMessage *disconnect_service(DBusConnection *conn, DBG("service %p", service); - reply_pending(service, ECONNABORTED); - - service->ignore = TRUE; - - set_reconnect_state(service, FALSE); - - err = __connman_service_disconnect(service); - if (err < 0) { - if (err != -EINPROGRESS) - return __connman_error_failed(msg, -err); - - return NULL; - } + service->ignore = true; + + err = __connman_service_disconnect(service); + if (err < 0 && err != -EINPROGRESS) + return __connman_error_failed(msg, -err); return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -gboolean __connman_service_remove(struct connman_service *service) +bool __connman_service_remove(struct connman_service *service) { - if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET) - return FALSE; + if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET || + service->type == CONNMAN_SERVICE_TYPE_GADGET) + return false; - if (service->immutable == TRUE || service->hidden == TRUE) - return FALSE; - - if (service->favorite == FALSE && service->state != - CONNMAN_SERVICE_STATE_FAILURE) - return FALSE; + if (service->immutable || service->hidden || + __connman_provider_is_immutable(service->provider)) + return false; - set_reconnect_state(service, FALSE); + if (!service->favorite && !is_idle(service->state)) + return false; __connman_service_disconnect(service); g_free(service->passphrase); service->passphrase = NULL; - g_free(service->agent_passphrase); - service->agent_passphrase = NULL; - g_free(service->identity); service->identity = NULL; + g_free(service->anonymous_identity); + service->anonymous_identity = NULL; + + g_free(service->subject_match); + service->subject_match = NULL; + + g_free(service->altsubject_match); + service->altsubject_match = NULL; + + g_free(service->domain_suffix_match); + service->domain_suffix_match = NULL; + + g_free(service->domain_match); + service->domain_match = NULL; + g_free(service->agent_identity); service->agent_identity = NULL; g_free(service->eap); service->eap = NULL; - set_idle(service); + service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; + + __connman_service_set_favorite(service, false); - __connman_service_set_favorite(service, FALSE); + __connman_ipconfig_ipv6_reset_privacy(service->ipconfig_ipv6); service_save(service); - return TRUE; + return true; } static DBusMessage *remove_service(DBusConnection *conn, @@ -3612,13 +4601,13 @@ static DBusMessage *remove_service(DBusConnection *conn, DBG("service %p", service); - if (__connman_service_remove(service) == FALSE) + if (!__connman_service_remove(service)) return __connman_error_not_supported(msg); return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static gboolean check_suitable_state(enum connman_service_state a, +static bool check_suitable_state(enum connman_service_state a, enum connman_service_state b) { /* @@ -3629,14 +4618,14 @@ static gboolean check_suitable_state(enum connman_service_state a, b == CONNMAN_SERVICE_STATE_READY) || (b == CONNMAN_SERVICE_STATE_ONLINE && a == CONNMAN_SERVICE_STATE_READY)) - return TRUE; + return true; return a == b; } static void downgrade_state(struct connman_service *service) { - if (service == NULL) + if (!service) return; DBG("service %p state4 %d state6 %d", service, service->state_ipv4, @@ -3657,30 +4646,125 @@ 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) + def_service = connman_service_get_default(); + if (!def_service) return; if (def_service == service && - def_service->state == CONNMAN_SERVICE_STATE_ONLINE) + def_service->state == CONNMAN_SERVICE_STATE_ONLINE) { def_service->state = CONNMAN_SERVICE_STATE_READY; + __connman_notifier_leave_online(def_service->type); + state_changed(def_service); + } } static void switch_default_service(struct connman_service *default_service, struct connman_service *downgrade_service) { - GSequenceIter *src, *dst; + struct connman_service *service; + GList *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); + src = g_list_find(service_list, downgrade_service); + dst = g_list_find(service_list, default_service); + + /* Nothing to do */ + if (src == dst || src->next == dst) + return; + + service = src->data; + service_list = g_list_delete_link(service_list, src); + service_list = g_list_insert_before(service_list, dst, service); + downgrade_state(downgrade_service); } +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 || !service->path) { + DBG("service %p or path is NULL", service); + return; + } + + if (g_hash_table_lookup(services_notify->add, service->path)) { + 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) +{ + g_list_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 void service_append_removed(DBusMessageIter *iter, void *user_data) +{ + g_hash_table_foreach(services_notify->remove, append_removed, iter); +} + +static gboolean service_send_changed(gpointer data) +{ + DBusMessage *signal; + + DBG(""); + + services_notify->id = 0; + + signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, "ServicesChanged"); + if (!signal) + return FALSE; + + __connman_dbus_append_objpath_dict_array(signal, + service_append_ordered, NULL); + __connman_dbus_append_objpath_array(signal, + service_append_removed, NULL); + + 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); + + 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 DBusMessage *move_service(DBusConnection *conn, DBusMessage *msg, void *user_data, - gboolean before) + bool before) { struct connman_service *service = user_data; struct connman_service *target; @@ -3693,11 +4777,11 @@ static DBusMessage *move_service(DBusConnection *conn, dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); - if (service->favorite == FALSE) + if (!service->favorite) return __connman_error_not_supported(msg); target = find_service(path); - if (target == NULL || target->favorite == FALSE || target == service) + if (!target || !target->favorite || target == service) return __connman_error_invalid_service(msg); if (target->type == CONNMAN_SERVICE_TYPE_VPN) { @@ -3705,19 +4789,18 @@ static DBusMessage *move_service(DBusConnection *conn, * We only allow VPN route splitting if there are * routes defined for a given VPN. */ - if (__connman_provider_check_routes(target->provider) - == FALSE) { + if (!__connman_provider_check_routes(target->provider)) { 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; + set_split_routing(target, true); } else - target->do_split_routing = FALSE; + set_split_routing(target, false); - service->do_split_routing = FALSE; + set_split_routing(service, false); target4 = __connman_ipconfig_get_method(target->ipconfig_ipv4); target6 = __connman_ipconfig_get_method(target->ipconfig_ipv6); @@ -3738,37 +4821,37 @@ static DBusMessage *move_service(DBusConnection *conn, */ if (target4 == CONNMAN_IPCONFIG_METHOD_OFF) { if (service6 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv6, - service->state_ipv6) == FALSE) + if (!check_suitable_state(target->state_ipv6, + service->state_ipv6)) return __connman_error_invalid_service(msg); } } if (target6 == CONNMAN_IPCONFIG_METHOD_OFF) { if (service4 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv4, - service->state_ipv4) == FALSE) + if (!check_suitable_state(target->state_ipv4, + service->state_ipv4)) return __connman_error_invalid_service(msg); } } if (service4 == CONNMAN_IPCONFIG_METHOD_OFF) { if (target6 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv6, - service->state_ipv6) == FALSE) + if (!check_suitable_state(target->state_ipv6, + service->state_ipv6)) return __connman_error_invalid_service(msg); } } if (service6 == CONNMAN_IPCONFIG_METHOD_OFF) { if (target4 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv4, - service->state_ipv4) == FALSE) + if (!check_suitable_state(target->state_ipv4, + service->state_ipv4)) return __connman_error_invalid_service(msg); } } - g_get_current_time(&service->modified); + gettimeofday(&service->modified, NULL); service_save(service); service_save(target); @@ -3778,26 +4861,28 @@ static DBusMessage *move_service(DBusConnection *conn, * the service which goes up, needs to recompute its state which * is triggered via downgrading it - if relevant - to state ready. */ - if (before == TRUE) + if (before) switch_default_service(target, service); else switch_default_service(service, target); __connman_connection_update_gateway(); + service_schedule_changed(); + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } static DBusMessage *move_before(DBusConnection *conn, DBusMessage *msg, void *user_data) { - return move_service(conn, msg, user_data, TRUE); + return move_service(conn, msg, user_data, true); } static DBusMessage *move_after(DBusConnection *conn, DBusMessage *msg, void *user_data) { - return move_service(conn, msg, user_data, FALSE); + return move_service(conn, msg, user_data, false); } static DBusMessage *reset_counters(DBusConnection *conn, @@ -3810,91 +4895,6 @@ static DBusMessage *reset_counters(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -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); @@ -3907,13 +4907,13 @@ static void service_schedule_added(struct connman_service *service) static void service_schedule_removed(struct connman_service *service) { - DBG("service %p %s", service, service->path); - - if (service == NULL || service->path == NULL) { + if (!service || !service->path) { DBG("service %p or path is NULL", service); return; } + DBG("service %p %s", service, service->path); + g_hash_table_remove(services_notify->add, service->path); g_hash_table_replace(services_notify->remove, g_strdup(service->path), NULL); @@ -3921,6 +4921,15 @@ static void service_schedule_removed(struct connman_service *service) service_schedule_changed(); } +static bool allow_property_changed(struct connman_service *service) +{ + if (g_hash_table_lookup_extended(services_notify->add, service->path, + NULL, NULL)) + return false; + + return true; +} + static const GDBusMethodTable service_methods[] = { { GDBUS_DEPRECATED_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), @@ -3961,16 +4970,20 @@ static void service_free(gpointer user_data) reply_pending(service, ENOENT); - g_hash_table_remove(service_hash, service->identifier); + if (service->nameservers_timeout) { + g_source_remove(service->nameservers_timeout); + dns_changed(service); + } __connman_notifier_service_remove(service); service_schedule_removed(service); + __connman_wispr_stop(service); stats_stop(service); service->path = NULL; - if (path != NULL) { + if (path) { __connman_connection_update_gateway(); g_dbus_unregister_interface(connection, path, @@ -3980,23 +4993,23 @@ static void service_free(gpointer user_data) g_hash_table_destroy(service->counter_table); - if (service->network != NULL) { + if (service->network) { __connman_network_disconnect(service->network); connman_network_unref(service->network); service->network = NULL; } - if (service->provider != NULL) + if (service->provider) connman_provider_unref(service->provider); - if (service->ipconfig_ipv4 != NULL) { + if (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) { + if (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); @@ -4012,16 +5025,21 @@ static void service_free(gpointer user_data) g_strfreev(service->proxies); g_strfreev(service->excludes); + g_free(service->hostname); g_free(service->domainname); g_free(service->pac); g_free(service->name); g_free(service->passphrase); - g_free(service->agent_passphrase); g_free(service->identifier); g_free(service->eap); g_free(service->identity); + g_free(service->anonymous_identity); g_free(service->agent_identity); g_free(service->ca_cert_file); + g_free(service->subject_match); + g_free(service->altsubject_match); + g_free(service->domain_suffix_match); + g_free(service->domain_match); g_free(service->client_cert_file); g_free(service->private_key_file); g_free(service->private_key_passphrase); @@ -4029,24 +5047,27 @@ static void service_free(gpointer user_data) g_free(service->config_file); g_free(service->config_entry); - if (service->stats.timer != NULL) + if (service->stats.timer) g_timer_destroy(service->stats.timer); - if (service->stats_roaming.timer != NULL) + if (service->stats_roaming.timer) g_timer_destroy(service->stats_roaming.timer); + if (current_default == service) + current_default = NULL; + g_free(service); } static void stats_init(struct connman_service *service) { /* home */ - service->stats.valid = FALSE; - service->stats.enabled = FALSE; + service->stats.valid = false; + service->stats.enabled = false; service->stats.timer = g_timer_new(); /* roaming */ - service->stats_roaming.valid = FALSE; - service->stats_roaming.enabled = FALSE; + service->stats_roaming.valid = false; + service->stats_roaming.enabled = false; service->stats_roaming.timer = g_timer_new(); } @@ -4055,7 +5076,8 @@ static void service_initialize(struct connman_service *service) DBG("service %p", service); service->refcount = 1; - service->session_usage_count = 0; + + service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; service->type = CONNMAN_SERVICE_TYPE_UNKNOWN; service->security = CONNMAN_SERVICE_SECURITY_UNKNOWN; @@ -4064,13 +5086,13 @@ static void service_initialize(struct connman_service *service) service->state_ipv4 = CONNMAN_SERVICE_STATE_UNKNOWN; service->state_ipv6 = CONNMAN_SERVICE_STATE_UNKNOWN; - service->favorite = FALSE; - service->immutable = FALSE; - service->hidden = FALSE; + service->favorite = false; + service->immutable = false; + service->hidden = false; - service->ignore = FALSE; + service->ignore = false; - service->userconnect = FALSE; + service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_NONE; service->order = 0; @@ -4078,7 +5100,8 @@ static void service_initialize(struct connman_service *service) service->provider = NULL; - service->wps = FALSE; + service->wps = false; + service->wps_advertizing = false; } /** @@ -4097,7 +5120,7 @@ struct connman_service *connman_service_create(void) struct connman_service *service; service = g_try_new0(struct connman_service, 1); - if (service == NULL) + if (!service) return NULL; DBG("service %p", service); @@ -4109,13 +5132,13 @@ struct connman_service *connman_service_create(void) counter = list->data; counters = g_try_new0(struct connman_stats_counter, 1); - if (counters == NULL) { + if (!counters) { g_hash_table_destroy(service->counter_table); g_free(service); return NULL; } - counters->append_all = TRUE; + counters->append_all = true; g_hash_table_replace(service->counter_table, (gpointer)counter, counters); @@ -4154,41 +5177,42 @@ connman_service_ref_debug(struct connman_service *service, void connman_service_unref_debug(struct connman_service *service, const char *file, int line, const char *caller) { - 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); + service_list = g_list_remove(service_list, service); - __connman_service_disconnect(service); + __connman_service_disconnect(service); - g_sequence_remove(iter); - } else { - service_free(service); - } + g_hash_table_remove(service_hash, service->identifier); } -static gint service_compare(gconstpointer a, gconstpointer b, - gpointer user_data) +static gint service_compare(gconstpointer a, gconstpointer b) { struct connman_service *service_a = (void *) a; struct connman_service *service_b = (void *) b; enum connman_service_state state_a, state_b; + bool a_connected, b_connected; + gint strength; state_a = service_a->state; state_b = service_b->state; + a_connected = is_connected(state_a); + b_connected = is_connected(state_b); - if (state_a != state_b) { - gboolean a_connected = is_connected(service_a); - gboolean b_connected = is_connected(service_b); + if (a_connected && b_connected) { + if (service_a->order > service_b->order) + return -1; + + if (service_a->order < service_b->order) + return 1; + } - if (a_connected == TRUE && b_connected == TRUE) { + if (state_a != state_b) { + if (a_connected && b_connected) { /* We prefer online over ready state */ if (state_a == CONNMAN_SERVICE_STATE_ONLINE) return -1; @@ -4197,48 +5221,89 @@ static gint service_compare(gconstpointer a, gconstpointer b, return 1; } - if (a_connected == TRUE) + if (a_connected) return -1; - if (b_connected == TRUE) + if (b_connected) return 1; - if (is_connecting(service_a) == TRUE) + if (is_connecting(state_a)) return -1; - if (is_connecting(service_b) == TRUE) + if (is_connecting(state_b)) return 1; } - if (service_a->order > service_b->order) + if (service_a->favorite && !service_b->favorite) return -1; - if (service_a->order < service_b->order) + if (!service_a->favorite && service_b->favorite) return 1; - if (service_a->favorite == TRUE && service_b->favorite == FALSE) - return -1; + if (service_a->type != service_b->type) { + unsigned int *tech_array; + int i; - if (service_a->favorite == FALSE && service_b->favorite == TRUE) - return 1; + tech_array = connman_setting_get_uint_list( + "PreferredTechnologies"); + if (tech_array) { + for (i = 0; tech_array[i]; i++) { + if (tech_array[i] == service_a->type) + return -1; - if (service_a->type != service_b->type) { - switch (service_a->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_WIFI: + if (tech_array[i] == service_b->type) + return 1; + } + } + + if (service_a->type == CONNMAN_SERVICE_TYPE_ETHERNET) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_ETHERNET) return 1; - case CONNMAN_SERVICE_TYPE_WIMAX: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: + + if (service_a->type == CONNMAN_SERVICE_TYPE_WIFI) return -1; - } + if (service_b->type == CONNMAN_SERVICE_TYPE_WIFI) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_CELLULAR) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_CELLULAR) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_BLUETOOTH) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_BLUETOOTH) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_VPN) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_VPN) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_GADGET) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_GADGET) + return 1; } - return (gint) service_b->strength - (gint) service_a->strength; + strength = (gint) service_b->strength - (gint) service_a->strength; + if (strength) + return strength; + + return g_strcmp0(service_a->name, service_b->name); +} + +static void service_list_sort(void) +{ + if (service_list && service_list->next) { + service_list = g_list_sort(service_list, service_compare); + service_schedule_changed(); + } +} + +int __connman_service_compare(const struct connman_service *a, + const struct connman_service *b) +{ + return service_compare(a, b); } /** @@ -4249,7 +5314,7 @@ static gint service_compare(gconstpointer a, gconstpointer b, */ enum connman_service_type connman_service_get_type(struct connman_service *service) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_TYPE_UNKNOWN; return service->type; @@ -4260,31 +5325,15 @@ enum connman_service_type connman_service_get_type(struct connman_service *servi * @service: service structure * * Get network interface of service - */ -char *connman_service_get_interface(struct connman_service *service) -{ - int index; - - if (service == NULL) - return NULL; - - if (service->type == CONNMAN_SERVICE_TYPE_VPN) { - if (service->ipconfig_ipv4) - index = __connman_ipconfig_get_index( - service->ipconfig_ipv4); - else if (service->ipconfig_ipv6) - index = __connman_ipconfig_get_index( - service->ipconfig_ipv6); - else - return NULL; - - return connman_inet_ifname(index); - } + */ +char *connman_service_get_interface(struct connman_service *service) +{ + int index; - if (service->network == NULL) + if (!service) return NULL; - index = connman_network_get_index(service->network); + index = __connman_service_get_index(service); return connman_inet_ifname(index); } @@ -4298,7 +5347,7 @@ char *connman_service_get_interface(struct connman_service *service) struct connman_network * __connman_service_get_network(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->network; @@ -4307,7 +5356,7 @@ __connman_service_get_network(struct connman_service *service) struct connman_ipconfig * __connman_service_get_ip4config(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->ipconfig_ipv4; @@ -4316,7 +5365,7 @@ __connman_service_get_ip4config(struct connman_service *service) struct connman_ipconfig * __connman_service_get_ip6config(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->ipconfig_ipv6; @@ -4334,26 +5383,30 @@ __connman_service_get_ipconfig(struct connman_service *service, int family) } -connman_bool_t __connman_service_is_connected_state(struct connman_service *service, +bool __connman_service_is_connected_state(struct connman_service *service, enum connman_ipconfig_type type) { - if (service == NULL) - return FALSE; + if (!service) + return false; switch (type) { case CONNMAN_IPCONFIG_TYPE_UNKNOWN: break; case CONNMAN_IPCONFIG_TYPE_IPV4: - return is_connected_state(service, service->state_ipv4); + return is_connected(service->state_ipv4); case CONNMAN_IPCONFIG_TYPE_IPV6: - return is_connected_state(service, service->state_ipv6); + return is_connected(service->state_ipv6); + case CONNMAN_IPCONFIG_TYPE_ALL: + return is_connected(service->state_ipv4) && + is_connected(service->state_ipv6); } - return FALSE; + return false; } -enum connman_service_security __connman_service_get_security(struct connman_service *service) +enum connman_service_security __connman_service_get_security( + struct connman_service *service) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_SECURITY_UNKNOWN; return service->security; @@ -4361,61 +5414,90 @@ enum connman_service_security __connman_service_get_security(struct connman_serv const char *__connman_service_get_phase2(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->phase2; } -connman_bool_t __connman_service_wps_enabled(struct connman_service *service) +bool __connman_service_wps_enabled(struct connman_service *service) { - if (service == NULL) - return FALSE; + if (!service) + return false; return service->wps; } +void __connman_service_mark_dirty(void) +{ + 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, + bool favorite, + bool delay_ordering) { - GSequenceIter *iter; - - if (service->hidden == TRUE) + if (service->hidden) return -EOPNOTSUPP; - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter == NULL) - return -ENOENT; if (service->favorite == favorite) return -EALREADY; service->favorite = favorite; - service->order = __connman_service_get_order(service); favorite_changed(service); - if (g_sequence_get_length(service_list) > 1) { - g_sequence_sort_changed(iter, service_compare, NULL); - service_schedule_changed(); - } + if (!delay_ordering) { - __connman_connection_update_gateway(); + service_list_sort(); + + __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, + bool favorite) +{ + return __connman_service_set_favorite_delayed(service, favorite, + false); +} + +bool connman_service_get_favorite(struct connman_service *service) +{ + return service->favorite; +} + +bool connman_service_get_autoconnect(struct connman_service *service) +{ + return service->autoconnect; +} + int __connman_service_set_immutable(struct connman_service *service, - connman_bool_t immutable) + bool immutable) { - if (service->hidden == TRUE) + if (service->hidden) return -EOPNOTSUPP; + + if (service->immutable == immutable) + return 0; + service->immutable = immutable; immutable_changed(service); @@ -4423,104 +5505,107 @@ int __connman_service_set_immutable(struct connman_service *service, return 0; } +int __connman_service_set_ignore(struct connman_service *service, + bool ignore) +{ + if (!service) + return -EINVAL; + + service->ignore = ignore; + + return 0; +} + void __connman_service_set_string(struct connman_service *service, const char *key, const char *value) { - if (service->hidden == TRUE) + if (service->hidden) return; - if (g_str_equal(key, "EAP") == TRUE) { + if (g_str_equal(key, "EAP")) { g_free(service->eap); service->eap = g_strdup(value); - } else if (g_str_equal(key, "Identity") == TRUE) { + } else if (g_str_equal(key, "Identity")) { g_free(service->identity); service->identity = g_strdup(value); - } else if (g_str_equal(key, "CACertFile") == TRUE) { + } else if (g_str_equal(key, "AnonymousIdentity")) { + g_free(service->anonymous_identity); + service->anonymous_identity = g_strdup(value); + } else if (g_str_equal(key, "CACertFile")) { g_free(service->ca_cert_file); service->ca_cert_file = g_strdup(value); - } else if (g_str_equal(key, "ClientCertFile") == TRUE) { + } else if (g_str_equal(key, "SubjectMatch")) { + g_free(service->subject_match); + service->subject_match = g_strdup(value); + } else if (g_str_equal(key, "AltSubjectMatch")) { + g_free(service->altsubject_match); + service->altsubject_match = g_strdup(value); + } else if (g_str_equal(key, "DomainSuffixMatch")) { + g_free(service->domain_suffix_match); + service->domain_suffix_match = g_strdup(value); + } else if (g_str_equal(key, "DomainMatch")) { + g_free(service->domain_match); + service->domain_match = g_strdup(value); + } else if (g_str_equal(key, "ClientCertFile")) { g_free(service->client_cert_file); service->client_cert_file = g_strdup(value); - } else if (g_str_equal(key, "PrivateKeyFile") == TRUE) { + } else if (g_str_equal(key, "PrivateKeyFile")) { g_free(service->private_key_file); service->private_key_file = g_strdup(value); - } else if (g_str_equal(key, "PrivateKeyPassphrase") == TRUE) { + } else if (g_str_equal(key, "PrivateKeyPassphrase")) { g_free(service->private_key_passphrase); service->private_key_passphrase = g_strdup(value); - } else if (g_str_equal(key, "Phase2") == TRUE) { + } else if (g_str_equal(key, "Phase2")) { g_free(service->phase2); service->phase2 = g_strdup(value); - } else if (g_str_equal(key, "Passphrase") == TRUE) { - g_free(service->passphrase); - service->passphrase = g_strdup(value); - } + } else if (g_str_equal(key, "Passphrase")) + __connman_service_set_passphrase(service, value); } -void __connman_service_set_userconnect(struct connman_service *service, - connman_bool_t userconnect) +void __connman_service_set_search_domains(struct connman_service *service, + char **domains) { - if (service != NULL) - service->userconnect = userconnect; + searchdomain_remove_all(service); + + if (service->domains) + g_strfreev(service->domains); + + service->domains = g_strdupv(domains); + + searchdomain_add_all(service); } -static void service_complete(struct connman_service *service) +int __connman_service_set_mdns(struct connman_service *service, + bool enabled) { - reply_pending(service, EIO); + service->mdns_config = enabled; - if (service->userconnect == FALSE) - __connman_service_auto_connect(); - - g_get_current_time(&service->modified); - service_save(service); + return set_mdns(service, enabled); } -static void report_error_cb(struct connman_service *service, - gboolean retry, void *user_data) +static void report_error_cb(void *user_context, bool retry, + void *user_data) { - if (retry == TRUE) - __connman_service_connect(service); + struct connman_service *service = user_context; + + if (retry) + __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_USER); else { /* It is not relevant to stay on Failure state * when failing is due to wrong user input */ - service->state = CONNMAN_SERVICE_STATE_IDLE; + __connman_service_clear_error(service); 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) + if (!wpspin) return 0; length = strlen(wpspin); @@ -4547,41 +5632,60 @@ static int check_wpspin(struct connman_service *service, const char *wpspin) return 0; } -static void request_input_cb (struct connman_service *service, - connman_bool_t values_received, +static void request_input_cb(struct connman_service *service, + bool values_received, const char *name, int name_len, const char *identity, const char *passphrase, - gboolean wps, const char *wpspin, + bool wps, const char *wpspin, const char *error, void *user_data) { struct connman_device *device; + const char *security; int err = 0; - DBG ("RequestInput return, %p", service); + DBG("RequestInput return, %p", service); - if (error != NULL) { + if (error) { DBG("error: %s", error); if (g_strcmp0(error, "net.connman.Agent.Error.Canceled") == 0) { - err = -EINVAL; - goto done; + err = -ECONNABORTED; + + if (service->hidden) + __connman_service_return_error(service, + ECONNABORTED, + user_data); + } else { + err = -ETIMEDOUT; + + if (service->hidden) + __connman_service_return_error(service, + ETIMEDOUT, user_data); } + + goto done; } - if (service->hidden == TRUE && name_len > 0 && name_len <= 32) { + if (service->hidden && name_len > 0 && name_len <= 32) { device = connman_network_get_device(service->network); - __connman_device_request_hidden_scan(device, + security = connman_network_get_string(service->network, + "WiFi.Security"); + err = __connman_device_request_hidden_scan(device, name, name_len, - identity, passphrase); + identity, passphrase, + security, user_data); + if (err < 0) + __connman_service_return_error(service, -err, + user_data); } - if (values_received == FALSE || service->hidden == TRUE) { + if (!values_received || service->hidden) { err = -EINVAL; goto done; } - if (wps == TRUE && service->network != NULL) { + if (wps && service->network) { err = check_wpspin(service, wpspin); if (err < 0) goto done; @@ -4589,30 +5693,39 @@ static void request_input_cb (struct connman_service *service, connman_network_set_bool(service->network, "WiFi.UseWPS", wps); } - if (identity != NULL) + if (identity) __connman_service_set_agent_identity(service, identity); - if (passphrase != NULL) - err = __connman_service_add_passphrase(service, passphrase); + if (passphrase) + err = __connman_service_set_passphrase(service, passphrase); done: if (err >= 0) { - __connman_service_connect(service); + /* We forget any previous error. */ + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); + + __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_USER); - /* 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; + if (!service->hidden) { + /* + * If there was a real error when requesting + * hidden scan, then that error is returned already + * to the user somewhere above so do not try to + * do this again. + */ + __connman_service_return_error(service, -err, + user_data); + } + service_complete(service); __connman_connection_update_gateway(); } @@ -4621,23 +5734,18 @@ static void request_input_cb (struct connman_service *service, static void downgrade_connected_services(void) { struct connman_service *up_service; - GSequenceIter *iter; + GList *list; - iter = g_sequence_get_begin_iter(service_list); - while (g_sequence_iter_is_end(iter) == FALSE) { - up_service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + up_service = list->data; - if (is_connected(up_service) == FALSE) { - iter = g_sequence_iter_next(iter); + if (!is_connected(up_service->state)) continue; - } if (up_service->state == CONNMAN_SERVICE_STATE_ONLINE) return; downgrade_state(up_service); - - iter = g_sequence_iter_next(iter); } } @@ -4648,37 +5756,75 @@ static int service_update_preferred_order(struct connman_service *default_servic unsigned int *tech_array; int i; - if (default_service == NULL || default_service == new_service || - default_service->state != new_state ) + if (!default_service || default_service == new_service || + default_service->state != new_state) return 0; tech_array = connman_setting_get_uint_list("PreferredTechnologies"); - if (tech_array != NULL) { + if (tech_array) { 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); + switch_default_service(default_service, + new_service); + __connman_connection_update_gateway(); return 0; } } - return -EAGAIN; } return -EALREADY; } +static void single_connected_tech(struct connman_service *allowed) +{ + struct connman_service *service; + GSList *services = NULL, *list; + GList *iter; + + DBG("keeping %p %s", allowed, allowed->path); + + for (iter = service_list; iter; iter = iter->next) { + service = iter->data; + + if (!is_connected(service->state)) + break; + + if (service == allowed) + continue; + + services = g_slist_prepend(services, service); + } + + for (list = services; list; list = list->next) { + service = list->data; + + DBG("disconnecting %p %s", service, service->path); + __connman_service_disconnect(service); + } + + g_slist_free(services); +} + +static const char *get_dbus_sender(struct connman_service *service) +{ + if (!service->pending) + return NULL; + + return dbus_message_get_sender(service->pending); +} + static int service_indicate_state(struct connman_service *service) { enum connman_service_state old_state, new_state; struct connman_service *def_service; + enum connman_ipconfig_method method; int result; - GSequenceIter *iter; - if (service == NULL) + if (!service) return -EINVAL; old_state = service->state; @@ -4694,92 +5840,88 @@ static int service_indicate_state(struct connman_service *service) if (old_state == new_state) return -EALREADY; - def_service = __connman_service_get_default(); + 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); + if (is_connected(old_state) && !is_connected(new_state)) + searchdomain_remove_all(service); + service->state = new_state; state_changed(service); - if (new_state == CONNMAN_SERVICE_STATE_IDLE && - old_state != CONNMAN_SERVICE_STATE_DISCONNECT) { - reply_pending(service, ECONNABORTED); + if (!is_connected(old_state) && is_connected(new_state)) + searchdomain_add_all(service); - __connman_service_disconnect(service); - } + switch(new_state) { + case CONNMAN_SERVICE_STATE_UNKNOWN: + + break; + + case CONNMAN_SERVICE_STATE_IDLE: + if (old_state != CONNMAN_SERVICE_STATE_DISCONNECT) + __connman_service_disconnect(service); + + break; + + case CONNMAN_SERVICE_STATE_ASSOCIATION: + + break; - if (new_state == CONNMAN_SERVICE_STATE_CONFIGURATION) { - if (service->new_service == FALSE && + case CONNMAN_SERVICE_STATE_CONFIGURATION: + if (!service->new_service && __connman_stats_service_register(service) == 0) { /* * For new services the statistics are updated after * we have successfully connected. */ - __connman_stats_get(service, FALSE, + __connman_stats_get(service, false, &service->stats.data); - __connman_stats_get(service, TRUE, + __connman_stats_get(service, true, &service->stats_roaming.data); } - } - - if (new_state == CONNMAN_SERVICE_STATE_IDLE) { - connman_bool_t reconnect; - reconnect = get_reconnect_state(service); - if (reconnect == TRUE) - __connman_service_auto_connect(); - } + break; - if (new_state == CONNMAN_SERVICE_STATE_READY) { - enum connman_ipconfig_method method; + case CONNMAN_SERVICE_STATE_READY: + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - if (service->new_service == TRUE && + if (service->new_service && __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, + __connman_stats_get(service, false, &service->stats.data); - __connman_stats_get(service, TRUE, + __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); + service->new_service = false; - __connman_service_set_favorite(service, TRUE); - - reply_pending(service, 0); + default_changed(); - service->userconnect = FALSE; + def_service = connman_service_get_default(); - g_get_current_time(&service->modified); - service_save(service); + service_update_preferred_order(def_service, service, new_state); - update_nameservers(service); - dns_changed(service); - domain_changed(service); + __connman_service_set_favorite(service, true); - __connman_notifier_connect(service->type); + reply_pending(service, 0); if (service->type == CONNMAN_SERVICE_TYPE_WIFI && connman_network_get_bool(service->network, - "WiFi.UseWPS") == TRUE) { + "WiFi.UseWPS")) { const char *pass; pass = connman_network_get_string(service->network, @@ -4788,23 +5930,38 @@ static int service_indicate_state(struct connman_service *service) __connman_service_set_passphrase(service, pass); connman_network_set_bool(service->network, - "WiFi.UseWPS", FALSE); + "WiFi.UseWPS", false); } - default_changed(); + gettimeofday(&service->modified, NULL); + service_save(service); + + domain_changed(service); + proxy_changed(service); + + if (old_state != CONNMAN_SERVICE_STATE_ONLINE) + __connman_notifier_connect(service->type); method = __connman_ipconfig_get_method(service->ipconfig_ipv6); if (method == CONNMAN_IPCONFIG_METHOD_OFF) __connman_ipconfig_disable_ipv6( service->ipconfig_ipv6); - } else if (new_state == CONNMAN_SERVICE_STATE_DISCONNECT) { - def_service = __connman_service_get_default(); + if (connman_setting_get_bool("SingleConnectedTechnology")) + single_connected_tech(service); + else if (service->type != CONNMAN_SERVICE_TYPE_VPN) + vpn_auto_connect(); + + break; + + case CONNMAN_SERVICE_STATE_ONLINE: + + break; + + case CONNMAN_SERVICE_STATE_DISCONNECT: + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - if (__connman_notifier_is_connected() == FALSE && - def_service != NULL && - def_service->provider != NULL) - __connman_provider_disconnect(def_service->provider); + reply_pending(service, ECONNABORTED); default_changed(); @@ -4812,11 +5969,8 @@ static int service_indicate_state(struct connman_service *service) __connman_wpad_stop(service); - update_nameservers(service); - dns_changed(service); domain_changed(service); - - __connman_notifier_disconnect(service->type); + proxy_changed(service); /* * Previous services which are connected and which states @@ -4824,26 +5978,33 @@ static int service_indicate_state(struct connman_service *service) * 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) == -EINPROGRESS) - return 0; - service_complete(service); - } else - service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; + do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); + break; - 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(); + case CONNMAN_SERVICE_STATE_FAILURE: + if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) { + connman_agent_report_error(service, service->path, + error2string(service->error), + report_error_cb, + get_dbus_sender(service), + NULL); + } + service_complete(service); + break; } + service_list_sort(); + __connman_connection_update_gateway(); + if ((old_state == CONNMAN_SERVICE_STATE_ONLINE && + new_state != CONNMAN_SERVICE_STATE_READY) || + (old_state == CONNMAN_SERVICE_STATE_READY && + new_state != CONNMAN_SERVICE_STATE_ONLINE)) { + __connman_notifier_disconnect(service->type); + } + if (new_state == CONNMAN_SERVICE_STATE_ONLINE) { __connman_notifier_enter_online(service->type); default_changed(); @@ -4857,13 +6018,13 @@ int __connman_service_indicate_error(struct connman_service *service, { DBG("service %p error %d", service, error); - if (service == NULL) + if (!service) return -EINVAL; - service->error = error; + if (service->state == CONNMAN_SERVICE_STATE_FAILURE) + return -EALREADY; - if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) - __connman_service_set_passphrase(service, NULL); + set_error(service, error); __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_FAILURE, @@ -4876,41 +6037,47 @@ int __connman_service_indicate_error(struct connman_service *service, int __connman_service_clear_error(struct connman_service *service) { + DBusMessage *pending, *provider_pending; + DBG("service %p", service); - if (service == NULL) + if (!service) return -EINVAL; if (service->state != CONNMAN_SERVICE_STATE_FAILURE) return -EINVAL; - service->state_ipv4 = service->state_ipv6 = - CONNMAN_SERVICE_STATE_UNKNOWN; - service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; - - if (service->favorite == TRUE) - set_reconnect_state(service, TRUE); + pending = service->pending; + service->pending = NULL; + provider_pending = service->provider_pending; + service->provider_pending = NULL; __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_IDLE, - CONNMAN_IPCONFIG_TYPE_IPV6); - - /* - * Toggling the IPv6 state to IDLE could trigger the auto connect - * machinery and consequently the IPv4 state. - */ - if (service->state_ipv4 != CONNMAN_SERVICE_STATE_UNKNOWN && - service->state_ipv4 != CONNMAN_SERVICE_STATE_FAILURE) - return 0; + CONNMAN_SERVICE_STATE_IDLE, + CONNMAN_IPCONFIG_TYPE_IPV6); - return __connman_service_ipconfig_indicate_state(service, + __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE, CONNMAN_IPCONFIG_TYPE_IPV4); + + service->pending = pending; + service->provider_pending = provider_pending; + + return 0; } int __connman_service_indicate_default(struct connman_service *service) { - DBG("service %p", service); + DBG("service %p state %s", service, state2string(service->state)); + + if (!is_connected(service->state)) { + /* + * If service is not yet fully connected, then we must not + * change the default yet. The default gw will be changed + * after the service state is in ready. + */ + return -EINPROGRESS; + } default_changed(); @@ -4921,7 +6088,7 @@ enum connman_service_state __connman_service_ipconfig_get_state( struct connman_service *service, enum connman_ipconfig_type type) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_STATE_UNKNOWN; if (type == CONNMAN_IPCONFIG_TYPE_IPV4) @@ -4933,34 +6100,6 @@ enum connman_service_state __connman_service_ipconfig_get_state( return CONNMAN_SERVICE_STATE_UNKNOWN; } -static void check_proxy_setup(struct connman_service *service) -{ - /* - * We start WPAD if we haven't got a PAC URL from DHCP and - * if our proxy manual configuration is either empty or set - * to AUTO with an empty URL. - */ - - if (service->proxy != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) - goto done; - - if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN && - (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_AUTO || - service->pac != NULL)) - 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 @@ -4971,7 +6110,7 @@ static int connected_networks_count; static int original_rp_filter; static void service_rp_filter(struct connman_service *service, - gboolean connected) + bool connected) { enum connman_ipconfig_method method; @@ -4988,7 +6127,7 @@ static void service_rp_filter(struct connman_service *service, break; } - if (connected == TRUE) { + if (connected) { if (connected_networks_count == 1) { int filter_value; filter_value = __connman_ipconfig_set_rp_filter(); @@ -5014,13 +6153,33 @@ static void service_rp_filter(struct connman_service *service, connected_networks_count, original_rp_filter); } -static gboolean redo_wispr(gpointer user_data) +static void redo_wispr(struct connman_service *service, + enum connman_ipconfig_type type) +{ + service->online_timeout = 0; + connman_service_unref(service); + + DBG("Retrying %s WISPr for %p %s", + __connman_ipconfig_type2string(type), + service, service->name); + + __connman_wispr_start(service, type); +} + +static gboolean redo_wispr_ipv4(gpointer user_data) { struct connman_service *service = user_data; - DBG(""); + redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV4); + + return FALSE; +} + +static gboolean redo_wispr_ipv6(gpointer user_data) +{ + struct connman_service *service = user_data; - __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); + redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV6); return FALSE; } @@ -5028,25 +6187,28 @@ static gboolean redo_wispr(gpointer user_data) 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); + GSourceFunc redo_func; + int *interval; - /* 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; + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { + interval = &service->online_check_interval_ipv4; + redo_func = redo_wispr_ipv4; + } else { + interval = &service->online_check_interval_ipv6; + redo_func = redo_wispr_ipv6; } - service->online_check_count = 0; + DBG("service %p type %s interval %d", service, + __connman_ipconfig_type2string(type), *interval); - /* - * 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. + service->online_timeout = g_timeout_add_seconds(*interval * *interval, + redo_func, connman_service_ref(service)); + + /* Increment the interval for the next time, set a maximum timeout of + * ONLINE_CHECK_MAX_INTERVAL * ONLINE_CHECK_MAX_INTERVAL seconds. */ - g_timeout_add_seconds(1, redo_wispr, service); + if (*interval < ONLINE_CHECK_MAX_INTERVAL) + (*interval)++; return EAGAIN; } @@ -5057,52 +6219,72 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, { struct connman_ipconfig *ipconfig = NULL; enum connman_service_state old_state; - int ret; + enum connman_ipconfig_method method; - if (service == NULL) + if (!service) return -EINVAL; - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { + switch (type) { + case CONNMAN_IPCONFIG_TYPE_UNKNOWN: + case CONNMAN_IPCONFIG_TYPE_ALL: + return -EINVAL; + + case CONNMAN_IPCONFIG_TYPE_IPV4: old_state = service->state_ipv4; ipconfig = service->ipconfig_ipv4; - } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { + + break; + + case CONNMAN_IPCONFIG_TYPE_IPV6: old_state = service->state_ipv6; ipconfig = service->ipconfig_ipv6; + + break; } - if (ipconfig == NULL) + if (!ipconfig) return -EINVAL; + method = __connman_ipconfig_get_method(ipconfig); + + switch (method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + if (new_state != CONNMAN_SERVICE_STATE_IDLE) + connman_warn("ipconfig state %d ipconfig method %d", + new_state, method); + + new_state = CONNMAN_SERVICE_STATE_IDLE; + break; + + case CONNMAN_IPCONFIG_METHOD_FIXED: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + case CONNMAN_IPCONFIG_METHOD_DHCP: + case CONNMAN_IPCONFIG_METHOD_AUTO: + break; + + } + /* Any change? */ if (old_state == new_state) return -EALREADY; - DBG("service %p (%s) state %d (%s) type %d (%s)", + DBG("service %p (%s) old state %d (%s) new state %d (%s) type %d (%s)", service, service ? service->identifier : NULL, + old_state, state2string(old_state), new_state, state2string(new_state), type, __connman_ipconfig_type2string(type)); switch (new_state) { case CONNMAN_SERVICE_STATE_UNKNOWN: - case CONNMAN_SERVICE_STATE_IDLE: - if (service->state == CONNMAN_SERVICE_STATE_FAILURE) - return -EINVAL; - break; case CONNMAN_SERVICE_STATE_ASSOCIATION: break; case CONNMAN_SERVICE_STATE_CONFIGURATION: - __connman_ipconfig_enable(ipconfig); break; case CONNMAN_SERVICE_STATE_READY: - update_nameservers(service); - - 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); - } + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + service_rp_filter(service, true); + set_mdns(service, service->mdns_config); break; case CONNMAN_SERVICE_STATE_ONLINE: break; @@ -5111,48 +6293,36 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, return -EINVAL; if (type == CONNMAN_IPCONFIG_TYPE_IPV4) - service_rp_filter(service, FALSE); + service_rp_filter(service, false); break; + + case CONNMAN_SERVICE_STATE_IDLE: case CONNMAN_SERVICE_STATE_FAILURE: + __connman_ipconfig_disable(ipconfig); + break; } - /* We keep that state */ + if (is_connected(old_state) && !is_connected(new_state)) { + nameserver_remove_all(service, type); + cancel_online_check(service); + } + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) service->state_ipv4 = new_state; - else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + else service->state_ipv6 = new_state; - ret = service_indicate_state(service); - - /* - * If the ipconfig method is OFF, then we set the state to IDLE - * so that it will not affect the combined state in the future. - */ - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { - enum connman_ipconfig_method method; - method = __connman_ipconfig_get_method(service->ipconfig_ipv4); - if (method == CONNMAN_IPCONFIG_METHOD_OFF || - method == CONNMAN_IPCONFIG_METHOD_UNKNOWN) { - service->state_ipv4 = CONNMAN_SERVICE_STATE_IDLE; - ret = service_indicate_state(service); - } + if (!is_connected(old_state) && is_connected(new_state)) + nameserver_add_all(service, type); - } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { - enum connman_ipconfig_method method; - method = __connman_ipconfig_get_method(service->ipconfig_ipv6); - if (method == CONNMAN_IPCONFIG_METHOD_OFF || - method == CONNMAN_IPCONFIG_METHOD_UNKNOWN) { - service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE; - ret = service_indicate_state(service); - } - } + __connman_timeserver_sync(service); - return ret; + return service_indicate_state(service); } -static connman_bool_t prepare_network(struct connman_service *service) +static bool prepare_network(struct connman_service *service) { enum connman_network_type type; unsigned int ssid_len; @@ -5162,57 +6332,78 @@ static connman_bool_t prepare_network(struct connman_service *service) switch (type) { case CONNMAN_NETWORK_TYPE_UNKNOWN: case CONNMAN_NETWORK_TYPE_VENDOR: - return FALSE; + return false; case CONNMAN_NETWORK_TYPE_WIFI: - if (connman_network_get_blob(service->network, "WiFi.SSID", - &ssid_len) == NULL) - return FALSE; + if (!connman_network_get_blob(service->network, "WiFi.SSID", + &ssid_len)) + return false; - if (service->passphrase != NULL) + if (service->passphrase) connman_network_set_string(service->network, "WiFi.Passphrase", service->passphrase); break; case CONNMAN_NETWORK_TYPE_ETHERNET: - case CONNMAN_NETWORK_TYPE_WIMAX: + case CONNMAN_NETWORK_TYPE_GADGET: case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: break; } - return TRUE; + return true; } static void prepare_8021x(struct connman_service *service) { - if (service->eap != NULL) + if (service->eap) connman_network_set_string(service->network, "WiFi.EAP", service->eap); - if (service->identity != NULL) + if (service->identity) connman_network_set_string(service->network, "WiFi.Identity", service->identity); - if (service->ca_cert_file != NULL) + if (service->anonymous_identity) + connman_network_set_string(service->network, + "WiFi.AnonymousIdentity", + service->anonymous_identity); + + if (service->ca_cert_file) connman_network_set_string(service->network, "WiFi.CACertFile", service->ca_cert_file); - if (service->client_cert_file != NULL) + if (service->subject_match) + connman_network_set_string(service->network, "WiFi.SubjectMatch", + service->subject_match); + + if (service->altsubject_match) + connman_network_set_string(service->network, "WiFi.AltSubjectMatch", + service->altsubject_match); + + if (service->domain_suffix_match) + connman_network_set_string(service->network, "WiFi.DomainSuffixMatch", + service->domain_suffix_match); + + if (service->domain_match) + connman_network_set_string(service->network, "WiFi.DomainMatch", + service->domain_match); + + if (service->client_cert_file) connman_network_set_string(service->network, "WiFi.ClientCertFile", service->client_cert_file); - if (service->private_key_file != NULL) + if (service->private_key_file) connman_network_set_string(service->network, "WiFi.PrivateKeyFile", service->private_key_file); - if (service->private_key_passphrase != NULL) + if (service->private_key_passphrase) connman_network_set_string(service->network, "WiFi.PrivateKeyPassphrase", service->private_key_passphrase); - if (service->phase2 != NULL) + if (service->phase2) connman_network_set_string(service->network, "WiFi.Phase2", service->phase2); } @@ -5221,17 +6412,17 @@ static int service_connect(struct connman_service *service) { int err; - if (service->hidden == TRUE) + if (service->hidden) return -EPERM; switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: return -EINVAL; case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_WIMAX: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: case CONNMAN_SERVICE_TYPE_VPN: @@ -5245,26 +6436,35 @@ static int service_connect(struct connman_service *service) case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: - if (service->passphrase == NULL) { - if (service->network == NULL) + if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) + return -ENOKEY; + + if (!service->passphrase) { + if (!service->network) return -EOPNOTSUPP; - if (service->wps == FALSE || - connman_network_get_bool( - service->network, - "WiFi.UseWPS") == FALSE) + if (!service->wps || + !connman_network_get_bool(service->network, "WiFi.UseWPS")) return -ENOKEY; } break; + case CONNMAN_SERVICE_SECURITY_8021X: - if (service->eap == NULL) + if (!service->eap) { + connman_warn("EAP type has not been found. " + "Most likely ConnMan is not able to " + "find a configuration for given " + "8021X network. " + "Check SSID or Name match with the " + "network name."); return -EINVAL; + } /* * never request credentials if using EAP-TLS * (EAP-TLS networks need to be fully provisioned) */ - if (g_str_equal(service->eap, "tls") == TRUE) + if (g_str_equal(service->eap, "tls")) break; /* @@ -5272,10 +6472,10 @@ static int service_connect(struct connman_service *service) * missing. Agent provided credentials can be used as * fallback if needed. */ - if ((service->identity == NULL && - service->agent_identity == NULL) || - (service->passphrase == NULL && - service->agent_passphrase == NULL)) + if (((!service->identity && + !service->agent_identity) || + !service->passphrase) || + service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) return -ENOKEY; break; @@ -5283,8 +6483,8 @@ static int service_connect(struct connman_service *service) break; } - if (service->network != NULL) { - if (prepare_network(service) == FALSE) + if (service->network) { + if (!prepare_network(service)) return -EINVAL; switch (service->security) { @@ -5301,28 +6501,28 @@ static int service_connect(struct connman_service *service) } if (__connman_stats_service_register(service) == 0) { - __connman_stats_get(service, FALSE, + __connman_stats_get(service, false, &service->stats.data); - __connman_stats_get(service, TRUE, + __connman_stats_get(service, true, &service->stats_roaming.data); } - if (service->ipconfig_ipv4) - __connman_ipconfig_enable(service->ipconfig_ipv4); - if (service->ipconfig_ipv6) - __connman_ipconfig_enable(service->ipconfig_ipv6); - err = __connman_network_connect(service->network); } else if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->provider != NULL) - err = __connman_provider_connect(service->provider); + service->provider) + err = __connman_provider_connect(service->provider, + get_dbus_sender(service)); else return -EOPNOTSUPP; if (err < 0) { if (err != -EINPROGRESS) { - __connman_ipconfig_disable(service->ipconfig_ipv4); - __connman_ipconfig_disable(service->ipconfig_ipv6); + __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); __connman_stats_service_unregister(service); } } @@ -5330,29 +6530,49 @@ static int service_connect(struct connman_service *service) return err; } - -int __connman_service_connect(struct connman_service *service) +int __connman_service_connect(struct connman_service *service, + enum connman_service_connect_reason reason) { int err; - DBG("service %p state %s", service, state2string(service->state)); + DBG("service %p state %s connect reason %s -> %s", + service, state2string(service->state), + reason2string(service->connect_reason), + reason2string(reason)); - if (is_connected(service) == TRUE) + if (is_connected(service->state)) return -EISCONN; - if (is_connecting(service) == TRUE) + if (is_connecting(service->state)) return -EALREADY; switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: return -EINVAL; - default: - err = service_connect(service); + + case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_WIFI: + break; } + if (!is_ipconfig_usable(service)) + return -ENOLINK; + + __connman_service_clear_error(service); + + err = service_connect(service); + + DBG("service %p err %d", service, err); + + service->connect_reason = reason; + if (err >= 0) return 0; @@ -5364,18 +6584,37 @@ int __connman_service_connect(struct connman_service *service) return -EINPROGRESS; } - if (service->network != NULL) + if (service->network) __connman_network_disconnect(service->network); else if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->provider != NULL) - __connman_provider_disconnect(service->provider); + service->provider) + connman_provider_disconnect(service->provider); - if (service->userconnect == TRUE) { + if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) { if (err == -ENOKEY || err == -EPERM) { - return __connman_agent_request_passphrase_input(service, - request_input_cb, NULL); + DBusMessage *pending = NULL; + const char *dbus_sender = get_dbus_sender(service); + + /* + * We steal the reply here. The idea is that the + * connecting client will see the connection status + * after the real hidden network is connected or + * connection failed. + */ + if (service->hidden) { + pending = service->pending; + service->pending = NULL; + } + + err = __connman_agent_request_passphrase_input(service, + request_input_cb, + dbus_sender, + pending); + if (service->hidden && err != -EINPROGRESS) + service->pending = pending; + + return err; } - reply_pending(service, -err); } return err; @@ -5387,11 +6626,18 @@ int __connman_service_disconnect(struct connman_service *service) DBG("service %p", service); - if (service->network != NULL) { + service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_NONE; + service->proxy = CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN; + + connman_agent_cancel(service); + + __connman_stats_service_unregister(service); + + if (service->network) { err = __connman_network_disconnect(service->network); } else if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->provider != NULL) - err = __connman_provider_disconnect(service->provider); + service->provider) + err = connman_provider_disconnect(service->provider); else return -EOPNOTSUPP; @@ -5408,47 +6654,45 @@ int __connman_service_disconnect(struct connman_service *service) NULL); __connman_ipconfig_address_remove(service->ipconfig_ipv4); + settings_changed(service, service->ipconfig_ipv4); + __connman_ipconfig_address_remove(service->ipconfig_ipv6); + settings_changed(service, service->ipconfig_ipv6); __connman_ipconfig_disable(service->ipconfig_ipv4); __connman_ipconfig_disable(service->ipconfig_ipv6); - __connman_stats_service_unregister(service); - return err; } int __connman_service_disconnect_all(void) { - GSequenceIter *iter; + struct connman_service *service; GSList *services = NULL, *list; + GList *iter; DBG(""); - iter = g_sequence_get_begin_iter(service_list); + for (iter = service_list; iter; iter = iter->next) { + service = iter->data; - while (g_sequence_iter_is_end(iter) == FALSE) { - struct connman_service *service = g_sequence_get(iter); + if (!is_connected(service->state)) + break; services = g_slist_prepend(services, service); - - iter = g_sequence_iter_next(iter); } - for (list = services; list != NULL; list = list->next) { + for (list = services; list; list = list->next) { struct connman_service *service = list->data; - service->ignore = TRUE; - - set_reconnect_state(service, FALSE); + service->ignore = true; __connman_service_disconnect(service); } - g_slist_free(list); + g_slist_free(services); return 0; - } /** @@ -5459,32 +6703,60 @@ int __connman_service_disconnect_all(void) */ static struct connman_service *lookup_by_identifier(const char *identifier) { - GSequenceIter *iter; - - iter = g_hash_table_lookup(service_hash, identifier); - if (iter != NULL) - return g_sequence_get(iter); + return g_hash_table_lookup(service_hash, identifier); +} - return NULL; +struct connman_service *connman_service_lookup_from_identifier(const char* identifier) +{ + return identifier ? lookup_by_identifier(identifier) : NULL; } +struct provision_user_data { + const char *ident; + int ret; +}; + static void provision_changed(gpointer value, gpointer user_data) { struct connman_service *service = value; - char *path = user_data; + struct provision_user_data *data = user_data; + const char *path = data->ident; + int ret; - __connman_config_provision_service_ident(service, path); + ret = __connman_config_provision_service_ident(service, path, + service->config_file, service->config_entry); + if (ret > 0) + data->ret = ret; } -void __connman_service_provision_changed(const char *ident) +int __connman_service_provision_changed(const char *ident) { - g_sequence_foreach(service_list, provision_changed, (void *)ident); + struct provision_user_data data = { + .ident = ident, + .ret = 0 + }; + + g_list_foreach(service_list, provision_changed, (void *)&data); + + /* + * Because the provision_changed() might have set some services + * as favorite, we must sort the sequence now. + */ + if (services_dirty) { + services_dirty = false; + + service_list_sort(); + + __connman_connection_update_gateway(); + } + + return data.ret; } void __connman_service_set_config(struct connman_service *service, const char *file_id, const char *entry) { - if (service == NULL) + if (!service) return; g_free(service->config_file); @@ -5503,39 +6775,34 @@ void __connman_service_set_config(struct connman_service *service, static struct connman_service *service_get(const char *identifier) { struct connman_service *service; - GSequenceIter *iter; - iter = g_hash_table_lookup(service_hash, identifier); - if (iter != NULL) { - service = g_sequence_get(iter); - if (service != NULL) - connman_service_ref(service); + service = g_hash_table_lookup(service_hash, identifier); + if (service) { + connman_service_ref(service); return service; } service = connman_service_create(); - if (service == NULL) + if (!service) return NULL; DBG("service %p", service); service->identifier = g_strdup(identifier); - iter = g_sequence_insert_sorted(service_list, service, - service_compare, NULL); + service_list = g_list_insert_sorted(service_list, service, + service_compare); - g_hash_table_insert(service_hash, service->identifier, iter); + g_hash_table_insert(service_hash, service->identifier, service); return service; } static int service_register(struct connman_service *service) { - GSequenceIter *iter; - DBG("service %p", service); - if (service->path != NULL) + if (service->path) return -EALREADY; service->path = g_strdup_printf("%s/service/%s", CONNMAN_PATH, @@ -5543,75 +6810,69 @@ static int service_register(struct connman_service *service) DBG("path %s", service->path); - __connman_config_provision_service(service); - - service_load(service); + if (__connman_config_provision_service(service) < 0) + service_load(service); g_dbus_register_interface(connection, service->path, CONNMAN_SERVICE_INTERFACE, service_methods, service_signals, NULL, service, NULL); - 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(); - } + service_list_sort(); __connman_connection_update_gateway(); return 0; } -static void service_up(struct connman_ipconfig *ipconfig) +static void service_up(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s up", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s up", ifname); link_changed(service); - service->stats.valid = FALSE; - service->stats_roaming.valid = FALSE; + service->stats.valid = false; + service->stats_roaming.valid = false; } -static void service_down(struct connman_ipconfig *ipconfig) +static void service_down(struct connman_ipconfig *ipconfig, + const char *ifname) { - DBG("%s down", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s down", ifname); } -static void service_lower_up(struct connman_ipconfig *ipconfig) +static void service_lower_up(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s lower up", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s lower up", ifname); stats_start(service); } -static void service_lower_down(struct connman_ipconfig *ipconfig) +static void service_lower_down(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(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); + DBG("%s lower down", ifname); stats_stop(service); service_save(service); } -static void service_ip_bound(struct connman_ipconfig *ipconfig) +static void service_ip_bound(struct connman_ipconfig *ipconfig, + const char *ifname) { 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", ifname); type = __connman_ipconfig_get_config_type(ipconfig); method = __connman_ipconfig_get_method(ipconfig); @@ -5626,15 +6887,17 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig) CONNMAN_IPCONFIG_TYPE_IPV6); settings_changed(service, ipconfig); + address_updated(service, type); } -static void service_ip_release(struct connman_ipconfig *ipconfig) +static void service_ip_release(struct connman_ipconfig *ipconfig, + const char *ifname) { 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", ifname); type = __connman_ipconfig_get_config_type(ipconfig); method = __connman_ipconfig_get_method(ipconfig); @@ -5657,6 +6920,16 @@ static void service_ip_release(struct connman_ipconfig *ipconfig) settings_changed(service, ipconfig); } +static void service_route_changed(struct connman_ipconfig *ipconfig, + const char *ifname) +{ + struct connman_service *service = __connman_ipconfig_get_data(ipconfig); + + DBG("%s route changed", ifname); + + settings_changed(service, ipconfig); +} + static const struct connman_ipconfig_ops service_ops = { .up = service_up, .down = service_down, @@ -5664,44 +6937,55 @@ static const struct connman_ipconfig_ops service_ops = { .lower_down = service_lower_down, .ip_bound = service_ip_bound, .ip_release = service_ip_release, + .route_set = service_route_changed, + .route_unset = service_route_changed, }; -static void setup_ip4config(struct connman_service *service, int index, - enum connman_ipconfig_method method) +static struct connman_ipconfig *create_ip4config(struct connman_service *service, + int index, enum connman_ipconfig_method method) { - service->ipconfig_ipv4 = __connman_ipconfig_create(index, + struct connman_ipconfig *ipconfig_ipv4; + + ipconfig_ipv4 = __connman_ipconfig_create(index, CONNMAN_IPCONFIG_TYPE_IPV4); - if (service->ipconfig_ipv4 == NULL) - return; + if (!ipconfig_ipv4) + return NULL; - __connman_ipconfig_set_method(service->ipconfig_ipv4, method); + __connman_ipconfig_set_method(ipconfig_ipv4, method); - __connman_ipconfig_set_data(service->ipconfig_ipv4, service); + __connman_ipconfig_set_data(ipconfig_ipv4, service); - __connman_ipconfig_set_ops(service->ipconfig_ipv4, &service_ops); + __connman_ipconfig_set_ops(ipconfig_ipv4, &service_ops); + + return ipconfig_ipv4; } -static void setup_ip6config(struct connman_service *service, int index) +static struct connman_ipconfig *create_ip6config(struct connman_service *service, + int index) { - service->ipconfig_ipv6 = __connman_ipconfig_create(index, + struct connman_ipconfig *ipconfig_ipv6; + + ipconfig_ipv6 = __connman_ipconfig_create(index, CONNMAN_IPCONFIG_TYPE_IPV6); - if (service->ipconfig_ipv6 == NULL) - return; + if (!ipconfig_ipv6) + return NULL; + + __connman_ipconfig_set_data(ipconfig_ipv6, service); - __connman_ipconfig_set_data(service->ipconfig_ipv6, service); + __connman_ipconfig_set_ops(ipconfig_ipv6, &service_ops); - __connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops); + return ipconfig_ipv6; } void __connman_service_read_ip4config(struct connman_service *service) { GKeyFile *keyfile; - if (service->ipconfig_ipv4 == NULL) + if (!service->ipconfig_ipv4) return; keyfile = connman_storage_load_service(service->identifier); - if (keyfile == NULL) + if (!keyfile) return; __connman_ipconfig_load(service->ipconfig_ipv4, keyfile, @@ -5710,15 +6994,16 @@ void __connman_service_read_ip4config(struct connman_service *service) g_key_file_free(keyfile); } -void __connman_service_create_ip4config(struct connman_service *service, +void connman_service_create_ip4config(struct connman_service *service, int index) { DBG("ipv4 %p", service->ipconfig_ipv4); - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) return; - setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_DHCP); + service->ipconfig_ipv4 = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_DHCP); __connman_service_read_ip4config(service); } @@ -5726,11 +7011,11 @@ void __connman_service_read_ip6config(struct connman_service *service) { GKeyFile *keyfile; - if (service->ipconfig_ipv6 == NULL) + if (!service->ipconfig_ipv6) return; keyfile = connman_storage_load_service(service->identifier); - if (keyfile == NULL) + if (!keyfile) return; __connman_ipconfig_load(service->ipconfig_ipv6, keyfile, @@ -5739,42 +7024,40 @@ void __connman_service_read_ip6config(struct connman_service *service) g_key_file_free(keyfile); } -void __connman_service_create_ip6config(struct connman_service *service, +void connman_service_create_ip6config(struct connman_service *service, int index) { DBG("ipv6 %p", service->ipconfig_ipv6); - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) return; - setup_ip6config(service, index); + service->ipconfig_ipv6 = create_ip6config(service, index); __connman_service_read_ip6config(service); } /** - * __connman_service_lookup_from_network: + * connman_service_lookup_from_network: * @network: network structure * * Look up a service by network (reference count will not be increased) */ -struct connman_service *__connman_service_lookup_from_network(struct connman_network *network) +struct connman_service *connman_service_lookup_from_network(struct connman_network *network) { struct connman_service *service; const char *ident, *group; char *name; - DBG("network %p", network); - - if (network == NULL) + if (!network) return NULL; ident = __connman_network_get_ident(network); - if (ident == NULL) + if (!ident) return NULL; group = connman_network_get_group(network); - if (group == NULL) + if (!group) return NULL; name = g_strdup_printf("%s_%s_%s", @@ -5788,12 +7071,10 @@ struct connman_service *__connman_service_lookup_from_network(struct connman_net struct connman_service *__connman_service_lookup_from_index(int index) { struct connman_service *service; - GSequenceIter *iter; - - iter = g_sequence_get_begin_iter(service_list); + GList *list; - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + service = list->data; if (__connman_ipconfig_get_index(service->ipconfig_ipv4) == index) @@ -5802,21 +7083,14 @@ struct connman_service *__connman_service_lookup_from_index(int index) if (__connman_ipconfig_get_index(service->ipconfig_ipv6) == index) return service; - - iter = g_sequence_iter_next(iter); } 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) +const char *connman_service_get_identifier(struct connman_service *service) { - return service->identifier; + return service ? service->identifier : NULL; } const char *__connman_service_get_path(struct connman_service *service) @@ -5824,43 +7098,14 @@ const char *__connman_service_get_path(struct connman_service *service) return service->path; } -unsigned int __connman_service_get_order(struct connman_service *service) +const char *__connman_service_get_name(struct connman_service *service) { - GSequenceIter *iter; - - if (service == NULL) - return 0; - - if (service->favorite == FALSE) { - service->order = 0; - goto done; - } - - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter != NULL) { - if (g_sequence_iter_get_position(iter) == 0) - service->order = 1; - 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; + return service->name; } -void __connman_service_update_ordering(void) +enum connman_service_state connman_service_get_state(struct connman_service *service) { - 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); + return service ? service->state : CONNMAN_SERVICE_STATE_UNKNOWN; } static enum connman_service_type convert_network_type(struct connman_network *network) @@ -5875,13 +7120,13 @@ static enum connman_service_type convert_network_type(struct connman_network *ne return CONNMAN_SERVICE_TYPE_ETHERNET; case CONNMAN_NETWORK_TYPE_WIFI: return CONNMAN_SERVICE_TYPE_WIFI; - case CONNMAN_NETWORK_TYPE_WIMAX: - return CONNMAN_SERVICE_TYPE_WIMAX; case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: return CONNMAN_SERVICE_TYPE_BLUETOOTH; case CONNMAN_NETWORK_TYPE_CELLULAR: return CONNMAN_SERVICE_TYPE_CELLULAR; + case CONNMAN_NETWORK_TYPE_GADGET: + return CONNMAN_SERVICE_TYPE_GADGET; } return CONNMAN_SERVICE_TYPE_UNKNOWN; @@ -5889,48 +7134,62 @@ static enum connman_service_type convert_network_type(struct connman_network *ne static enum connman_service_security convert_wifi_security(const char *security) { - if (security == NULL) + if (!security) return CONNMAN_SERVICE_SECURITY_UNKNOWN; - else if (g_str_equal(security, "none") == TRUE) + else if (g_str_equal(security, "none")) return CONNMAN_SERVICE_SECURITY_NONE; - else if (g_str_equal(security, "wep") == TRUE) + else if (g_str_equal(security, "wep")) return CONNMAN_SERVICE_SECURITY_WEP; - else if (g_str_equal(security, "psk") == TRUE) + else if (g_str_equal(security, "psk")) return CONNMAN_SERVICE_SECURITY_PSK; - else if (g_str_equal(security, "ieee8021x") == TRUE) + else if (g_str_equal(security, "ieee8021x")) return CONNMAN_SERVICE_SECURITY_8021X; - else if (g_str_equal(security, "wpa") == TRUE) + else if (g_str_equal(security, "wpa")) return CONNMAN_SERVICE_SECURITY_WPA; - else if (g_str_equal(security, "rsn") == TRUE) + else if (g_str_equal(security, "rsn")) return CONNMAN_SERVICE_SECURITY_RSN; else return CONNMAN_SERVICE_SECURITY_UNKNOWN; } +static void update_wps_values(struct connman_service *service, + struct connman_network *network) +{ + bool wps = connman_network_get_bool(network, "WiFi.WPS"); + bool wps_advertising = connman_network_get_bool(network, + "WiFi.WPSAdvertising"); + + if (service->wps != wps || + service->wps_advertizing != wps_advertising) { + service->wps = wps; + service->wps_advertizing = wps_advertising; + security_changed(service); + } +} + static void update_from_network(struct connman_service *service, struct connman_network *network) { - connman_uint8_t strength = service->strength; - GSequenceIter *iter; + uint8_t strength = service->strength; const char *str; DBG("service %p network %p", service, network); - if (is_connected(service) == TRUE) + if (is_connected(service->state)) return; - if (is_connecting(service) == TRUE) + if (is_connecting(service->state)) return; str = connman_network_get_string(network, "Name"); - if (str != NULL) { + if (str) { g_free(service->name); service->name = g_strdup(str); - service->hidden = FALSE; + service->hidden = false; } else { g_free(service->name); service->name = NULL; - service->hidden = TRUE; + service->hidden = true; } service->strength = connman_network_get_strength(network); @@ -5948,23 +7207,19 @@ static void update_from_network(struct connman_service *service, service->security = convert_wifi_security(str); if (service->type == CONNMAN_SERVICE_TYPE_WIFI) - service->wps = connman_network_get_bool(network, "WiFi.WPS"); + update_wps_values(service, network); - if (service->strength > strength && service->network != NULL) { + if (service->strength > strength && service->network) { connman_network_unref(service->network); service->network = connman_network_ref(network); strength_changed(service); } - if (service->network == NULL) + if (!service->network) service->network = connman_network_ref(network); - 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(); - } + service_list_sort(); } /** @@ -5979,20 +7234,20 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne struct connman_device *device; const char *ident, *group; char *name; - unsigned int *auto_connect_types; + unsigned int *auto_connect_types, *favorite_types; int i, index; DBG("network %p", network); - if (network == NULL) + if (!network) return NULL; ident = __connman_network_get_ident(network); - if (ident == NULL) + if (!ident) return NULL; group = connman_network_get_group(network); - if (group == NULL) + if (!group) return NULL; name = g_strdup_printf("%s_%s_%s", @@ -6000,13 +7255,13 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne service = service_get(name); g_free(name); - if (service == NULL) + if (!service) return NULL; - if (__connman_network_get_weakness(network) == TRUE) + if (__connman_network_get_weakness(network)) return service; - if (service->path != NULL) { + if (service->path) { update_from_network(service, network); __connman_connection_update_gateway(); return service; @@ -6015,29 +7270,22 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne 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 && + service->autoconnect = false; + for (i = 0; auto_connect_types && auto_connect_types[i] != 0; i++) { if (service->type == auto_connect_types[i]) { - service->autoconnect = TRUE; + service->autoconnect = true; break; } } - switch (service->type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - case CONNMAN_SERVICE_TYPE_SYSTEM: - 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: - case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; - case CONNMAN_SERVICE_TYPE_ETHERNET: - service->favorite = TRUE; - break; + favorite_types = connman_setting_get_uint_list("DefaultFavoriteTechnologies"); + service->favorite = false; + for (i = 0; favorite_types && favorite_types[i] != 0; i++) { + if (service->type == favorite_types[i]) { + service->favorite = true; + break; + } } service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE; @@ -6047,63 +7295,89 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne index = connman_network_get_index(network); - if (service->ipconfig_ipv4 == NULL) - setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_DHCP); + if (!service->ipconfig_ipv4) + service->ipconfig_ipv4 = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_DHCP); - if (service->ipconfig_ipv6 == NULL) - setup_ip6config(service, index); + if (!service->ipconfig_ipv6) + service->ipconfig_ipv6 = create_ip6config(service, index); service_register(service); + service_schedule_added(service); - if (service->favorite == TRUE) { + if (service->favorite) { device = connman_network_get_device(service->network); - if (device && connman_device_get_scanning(device) == FALSE) - __connman_service_auto_connect(); + if (device && !connman_device_get_scanning(device, + CONNMAN_SERVICE_TYPE_UNKNOWN)) { + + switch (service->type) { + case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_P2P: + break; + + case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_ETHERNET: + if (service->autoconnect) { + __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + break; + } + + /* fall through */ + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_WIFI: + case CONNMAN_SERVICE_TYPE_CELLULAR: + do_auto_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + break; + } + } } __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; + bool need_sort = false; struct connman_service *service; - connman_uint8_t strength; - connman_bool_t roaming; - GSequenceIter *iter; + uint8_t strength; + bool roaming; const char *name; - connman_bool_t stats_enable; - - DBG("network %p", network); + bool stats_enable; - service = __connman_service_lookup_from_network(network); - if (service == NULL) + service = connman_service_lookup_from_network(network); + if (!service) return; - if (service->network == NULL) + if (!service->network) return; name = connman_network_get_string(service->network, "Name"); if (g_strcmp0(service->name, name) != 0) { g_free(service->name); service->name = g_strdup(name); - connman_dbus_property_changed_basic(service->path, - CONNMAN_SERVICE_INTERFACE, "Name", - DBUS_TYPE_STRING, &service->name); + + if (allow_property_changed(service)) + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "Name", + DBUS_TYPE_STRING, &service->name); } if (service->type == CONNMAN_SERVICE_TYPE_WIFI) - service->wps = connman_network_get_bool(network, "WiFi.WPS"); + update_wps_values(service, network); strength = connman_network_get_strength(service->network); if (strength == service->strength) goto roaming; service->strength = strength; - need_sort = TRUE; + need_sort = true; strength_changed(service); @@ -6113,24 +7387,20 @@ roaming: goto sorting; stats_enable = stats_enabled(service); - if (stats_enable == TRUE) + if (stats_enable) stats_stop(service); service->roaming = roaming; - need_sort = TRUE; + need_sort = true; - if (stats_enable == TRUE) + if (stats_enable) stats_start(service); roaming_changed(service); 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(); - } + if (need_sort) { + service_list_sort(); } } @@ -6138,13 +7408,14 @@ void __connman_service_remove_from_network(struct connman_network *network) { struct connman_service *service; - DBG("network %p", network); + service = connman_service_lookup_from_network(network); + + DBG("network %p service %p", network, service); - service = __connman_service_lookup_from_network(network); - if (service == NULL) + if (!service) return; - service->ignore = TRUE; + service->ignore = true; __connman_connection_gateway_remove(service, CONNMAN_IPCONFIG_TYPE_ALL); @@ -6169,42 +7440,44 @@ __connman_service_create_from_provider(struct connman_provider *provider) DBG("provider %p", provider); ident = __connman_provider_get_ident(provider); - if (ident == NULL) + if (!ident) return NULL; name = g_strdup_printf("vpn_%s", ident); service = service_get(name); g_free(name); - if (service == NULL) + if (!service) return NULL; service->type = CONNMAN_SERVICE_TYPE_VPN; + service->order = service->do_split_routing ? 0 : 10; service->provider = connman_provider_ref(provider); - service->autoconnect = FALSE; - service->userconnect = TRUE; + service->autoconnect = false; + service->favorite = 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) { + if (str) { g_free(service->name); service->name = g_strdup(str); - service->hidden = FALSE; + service->hidden = false; } else { g_free(service->name); service->name = NULL; - service->hidden = TRUE; + service->hidden = true; } service->strength = 0; - if (service->ipconfig_ipv4 == NULL) - setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_MANUAL); + if (!service->ipconfig_ipv4) + service->ipconfig_ipv4 = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_MANUAL); - if (service->ipconfig_ipv6 == NULL) - setup_ip6config(service, index); + if (!service->ipconfig_ipv6) + service->ipconfig_ipv6 = create_ip6config(service, index); service_register(service); @@ -6214,39 +7487,148 @@ __connman_service_create_from_provider(struct connman_provider *provider) return service; } +static void remove_unprovisioned_services(void) +{ + gchar **services; + GKeyFile *keyfile, *configkeyfile; + char *file, *section; + int i = 0; + + services = connman_storage_get_services(); + if (!services) + return; + + for (; services[i]; i++) { + file = section = NULL; + keyfile = configkeyfile = NULL; + + keyfile = connman_storage_load_service(services[i]); + if (!keyfile) + continue; + + file = g_key_file_get_string(keyfile, services[i], + "Config.file", NULL); + if (!file) + goto next; + + section = g_key_file_get_string(keyfile, services[i], + "Config.ident", NULL); + if (!section) + goto next; + + configkeyfile = __connman_storage_load_config(file); + if (!configkeyfile) { + /* + * Config file is missing, remove the provisioned + * service. + */ + __connman_storage_remove_service(services[i]); + goto next; + } + + if (!g_key_file_has_group(configkeyfile, section)) + /* + * Config section is missing, remove the provisioned + * service. + */ + __connman_storage_remove_service(services[i]); + + next: + if (keyfile) + g_key_file_free(keyfile); + + if (configkeyfile) + g_key_file_free(configkeyfile); + + g_free(section); + g_free(file); + } + + g_strfreev(services); +} + +static int agent_probe(struct connman_agent *agent) +{ + DBG("agent %p", agent); + return 0; +} + +static void agent_remove(struct connman_agent *agent) +{ + DBG("agent %p", agent); +} + +static void *agent_context_ref(void *context) +{ + struct connman_service *service = context; + + return (void *)connman_service_ref(service); +} + +static void agent_context_unref(void *context) +{ + struct connman_service *service = context; + + connman_service_unref(service); +} + +static struct connman_agent_driver agent_driver = { + .name = "service", + .interface = CONNMAN_AGENT_INTERFACE, + .probe = agent_probe, + .remove = agent_remove, + .context_ref = agent_context_ref, + .context_unref = agent_context_unref, +}; + int __connman_service_init(void) { + int err; + DBG(""); + err = connman_agent_driver_register(&agent_driver); + if (err < 0) { + connman_error("Cannot register agent driver for %s", + agent_driver.name); + return err; + } + + set_always_connecting_technologies(); + connection = connman_dbus_get_connection(); service_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - NULL, NULL); - - service_list = g_sequence_new(service_free); + NULL, 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; } void __connman_service_cleanup(void) { - GSequence *list; - DBG(""); - if (autoconnect_timeout != 0) { - g_source_remove(autoconnect_timeout); - autoconnect_timeout = 0; + if (vpn_autoconnect_id) { + g_source_remove(vpn_autoconnect_id); + vpn_autoconnect_id = 0; } - list = service_list; + if (autoconnect_id != 0) { + g_source_remove(autoconnect_id); + autoconnect_id = 0; + } + + connman_agent_driver_unregister(&agent_driver); + + g_list_free(service_list); service_list = NULL; - g_sequence_free(list); g_hash_table_destroy(service_hash); service_hash = NULL; @@ -6257,9 +7639,10 @@ void __connman_service_cleanup(void) 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_hash_table_destroy(services_notify->remove); + g_hash_table_destroy(services_notify->add); g_free(services_notify); dbus_connection_unref(connection);