X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=cbedb34e893d60915f8a982767d931b7e1357ed6;hb=79ef996f2820cbaaa81d9200060f1bc537fce038;hp=4f7b9b80419f374066952ac5b95b86a6777744f5;hpb=56e947ef09946f78bef35c3bd78065f5b944c6f4;p=platform%2Fupstream%2Fconnman.git diff --git a/src/service.c b/src/service.c old mode 100755 new mode 100644 index 4f7b9b8..cbedb34 --- a/src/service.c +++ b/src/service.c @@ -30,8 +30,6 @@ #include #include #include -#include -#include #include #include @@ -41,11 +39,9 @@ #define CONNECT_TIMEOUT 120 -#define USER_ROOT 0 -#define USER_NONE (uid_t)-1 - #if defined TIZEN_EXT #define WIFI_BSSID_STR_LEN 18 +#define MAX_WIFI_PROFILES 200 #endif static DBusConnection *connection = NULL; @@ -53,11 +49,21 @@ static DBusConnection *connection = 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 vpn_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; +#if defined TIZEN_EXT +static bool auto_connect_mode = TRUE; + +struct saved_profiles { + GTimeVal modified; + gchar *profile_name; +}; + +#endif + struct connman_stats { bool valid; bool enabled; @@ -72,11 +78,6 @@ struct connman_stats_counter { struct connman_stats stats_roaming; }; -struct connman_service_user { - uid_t favorite_user; - uid_t current_user; -}; - struct connman_service { int refcount; char *identifier; @@ -99,8 +100,6 @@ struct connman_service { char *name; char *passphrase; bool roaming; - bool request_passphrase_input; - struct connman_service_user user; struct connman_ipconfig *ipconfig_ipv4; struct connman_ipconfig *ipconfig_ipv6; struct connman_network *network; @@ -108,7 +107,10 @@ 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; @@ -116,8 +118,13 @@ struct connman_service { /* 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; @@ -134,7 +141,10 @@ struct connman_service { char **excludes; char *pac; bool wps; - int online_check_count; + 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; @@ -156,11 +166,24 @@ struct connman_service { */ char *keymgmt_type; int disconnect_reason; -#endif -#ifdef TIZEN_EXT + int assoc_status_code; + /* + * Only for EAP-FAST + */ + char *phase1; + /* + * Description: To indicate that disconnection triggered by user. + */ + bool disconnection_requested; + enum connman_dnsconfig_method dns_config_method_ipv4; enum connman_dnsconfig_method dns_config_method_ipv6; #endif +#if defined TIZEN_EXT + char *connector; + char *c_sign_key; + char *net_access_key; +#endif }; static bool allow_property_changed(struct connman_service *service); @@ -169,7 +192,7 @@ 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); struct find_data { const char *path; @@ -283,6 +306,10 @@ const char *__connman_service_type2string(enum connman_service_type type) return "gadget"; case CONNMAN_SERVICE_TYPE_P2P: return "p2p"; +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: + return "mesh"; +#endif } return NULL; @@ -322,15 +349,21 @@ enum connman_service_security __connman_service_string2security(const char *str) if (!strcmp(str, "psk")) return CONNMAN_SERVICE_SECURITY_PSK; - if (!strcmp(str, "ieee8021x")) + if (!strcmp(str, "ieee8021x") || !strcmp(str, "8021x")) return CONNMAN_SERVICE_SECURITY_8021X; - if (!strcmp(str, "none")) + if (!strcmp(str, "none") || !strcmp(str, "open")) return CONNMAN_SERVICE_SECURITY_NONE; if (!strcmp(str, "wep")) return CONNMAN_SERVICE_SECURITY_WEP; #if defined TIZEN_EXT if (!strcmp(str, "rsn")) return CONNMAN_SERVICE_SECURITY_RSN; + if (!strcmp(str, "sae")) + return CONNMAN_SERVICE_SECURITY_SAE; + if (!strcmp(str, "owe")) + return CONNMAN_SERVICE_SECURITY_OWE; + if (!strcmp(str, "dpp")) + return CONNMAN_SERVICE_SECURITY_DPP; #endif return CONNMAN_SERVICE_SECURITY_UNKNOWN; @@ -351,6 +384,12 @@ static const char *security2string(enum connman_service_security security) return "psk"; case CONNMAN_SERVICE_SECURITY_RSN: return "rsn"; + case CONNMAN_SERVICE_SECURITY_SAE: + return "sae"; + case CONNMAN_SERVICE_SECURITY_OWE: + return "owe"; + case CONNMAN_SERVICE_SECURITY_DPP: + return "dpp"; #else case CONNMAN_SERVICE_SECURITY_RSN: return "psk"; @@ -467,87 +506,17 @@ static enum connman_dnsconfig_method __connman_dnsconfig_string2method( } #endif -static bool -connman_service_is_user_allowed(struct connman_service *service, uid_t uid) -{ - uid_t favorite_user = service->user.favorite_user; - uid_t current_user = uid; - - DBG("Service favorite UID: %d, current UID: %d", favorite_user, current_user); - if (favorite_user == USER_NONE || current_user == USER_ROOT) - return true; - - if (favorite_user != current_user || current_user == USER_NONE) { - DBG("Current user is not a favorite user to this service!"); - return false; - } - - return true; -} - -#if !defined TIZEN_EXT -static GList *connman_service_get_login_users() -{ - struct utmpx *utmp; - struct passwd *pwd; - GList *user_list = NULL; - - setutxent(); - - while ((utmp = getutxent()) != NULL) { - DBG("User Name: %s", utmp->ut_user); - - pwd = getpwnam(utmp->ut_user); - if (pwd) { - if (!g_list_find(user_list, GUINT_TO_POINTER(pwd->pw_uid))) - user_list = g_list_append(user_list, - GUINT_TO_POINTER(pwd->pw_uid)); - - DBG("User Name: %s, UID: %d", utmp->ut_user, pwd->pw_uid); - } - } - - endutxent(); - - return user_list; -} -#endif - -static bool is_service_owner_user_login(struct connman_service *service) +static void set_split_routing(struct connman_service *service, bool value) { -#if defined TIZEN_EXT - return true; -#else - GList *list, *user_list; - bool ret = false; - - /* Here we only care about wifi service */ - if (service->type != CONNMAN_SERVICE_TYPE_WIFI) - return true; - - DBG("service favorite user id is: %d", service->user.favorite_user); - - user_list = connman_service_get_login_users(); - if (user_list == NULL) { - DBG("Can not get any logged in user info."); - return true; - } - - for (list = user_list; list; list = list->next) { - uid_t uid = GPOINTER_TO_UINT(list->data); - - DBG("login user id is %d", uid); - - if (service->user.favorite_user == uid) { - ret = true; - break; - } - } + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + return; - g_list_free(user_list); + service->do_split_routing = value; - return ret; -#endif + if (service->do_split_routing) + service->order = 0; + else + service->order = 10; } int __connman_service_load_modifiable(struct connman_service *service) @@ -568,10 +537,15 @@ int __connman_service_load_modifiable(struct connman_service *service) case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif 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)); + /* fall through */ case CONNMAN_SERVICE_TYPE_WIFI: case CONNMAN_SERVICE_TYPE_GADGET: @@ -598,25 +572,6 @@ int __connman_service_load_modifiable(struct connman_service *service) return 0; } -static int service_load_passphrase(struct connman_service *service) -{ - GKeyFile *keyfile; - gchar *str; - - keyfile = connman_storage_load_service(service->identifier); - if (!keyfile) - return -EIO; - - str = g_key_file_get_string(keyfile, - service->identifier, "Passphrase", NULL); - if (str) - service->passphrase = str; - - g_key_file_free(keyfile); - - return 0; -} - static int service_load(struct connman_service *service) { GKeyFile *keyfile; @@ -641,10 +596,15 @@ static int service_load(struct connman_service *service) case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif 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) @@ -754,11 +714,17 @@ static int service_load(struct connman_service *service) dns_method = g_key_file_get_string(keyfile, service->identifier, "Nameservers.IPv4method", NULL); - service->dns_config_method_ipv4 = __connman_dnsconfig_string2method(dns_method); + if (dns_method) { + service->dns_config_method_ipv4 = __connman_dnsconfig_string2method(dns_method); + g_free(dns_method); + } dns_method = g_key_file_get_string(keyfile, service->identifier, "Nameservers.IPv6method", NULL); - service->dns_config_method_ipv6 = __connman_dnsconfig_string2method(dns_method); + if (dns_method) { + service->dns_config_method_ipv6 = __connman_dnsconfig_string2method(dns_method); + g_free(dns_method); + } #endif service->timeservers_config = g_key_file_get_string_list(keyfile, @@ -803,6 +769,9 @@ static int service_load(struct connman_service *service) 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); @@ -859,10 +828,30 @@ static int service_load(struct connman_service *service) } } #endif +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->security == CONNMAN_SERVICE_SECURITY_DPP) { + str = g_key_file_get_string(keyfile, + service->identifier, "Connector", NULL); + if (str != NULL) { + g_free(service->connector); + service->connector = str; + } + str = g_key_file_get_string(keyfile, + service->identifier, "CSignKey", NULL); + if (str != NULL) { + g_free(service->c_sign_key); + service->c_sign_key = str; + } + str = g_key_file_get_string(keyfile, + service->identifier, "NetAccessKey", NULL); + if (str != NULL) { + g_free(service->net_access_key); + service->net_access_key = str; + } + } +#endif - if (g_key_file_has_key(keyfile, service->identifier, "UID", NULL)) - service->user.favorite_user = g_key_file_get_integer(keyfile, - service->identifier, "UID", NULL); done: g_key_file_free(keyfile); @@ -895,6 +884,9 @@ static int service_save(struct connman_service *service) case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; case CONNMAN_SERVICE_TYPE_VPN: g_key_file_set_boolean(keyfile, service->identifier, @@ -908,13 +900,6 @@ static int service_save(struct connman_service *service) const unsigned char *ssid; unsigned int ssid_len = 0; - if (service->user.favorite_user == USER_NONE) - g_key_file_remove_key(keyfile, service->identifier, - "UID", NULL); - else - g_key_file_set_integer(keyfile, service->identifier, - "UID", service->user.favorite_user); - ssid = connman_network_get_blob(service->network, "WiFi.SSID", &ssid_len); @@ -970,14 +955,12 @@ static int service_save(struct connman_service *service) g_free(str); } - if (service->user.current_user == service->user.favorite_user) { - if (service->passphrase && strlen(service->passphrase) > 0) - g_key_file_set_string(keyfile, service->identifier, + 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); - } + else + g_key_file_remove_key(keyfile, service->identifier, + "Passphrase", NULL); if (service->ipconfig_ipv4) __connman_ipconfig_save(service->ipconfig_ipv4, keyfile, @@ -1071,6 +1054,13 @@ static int service_save(struct connman_service *service) g_key_file_remove_key(keyfile, service->identifier, "Proxy.URL", NULL); + if (service->mdns_config) + g_key_file_set_boolean(keyfile, service->identifier, + "mDNS", TRUE); + else + g_key_file_remove_key(keyfile, service->identifier, + "mDNS", NULL); + if (service->hidden_service) g_key_file_set_boolean(keyfile, service->identifier, "Hidden", TRUE); @@ -1136,6 +1126,29 @@ static int service_save(struct connman_service *service) g_key_file_remove_key(keyfile, service->identifier, "PrivateKeyPassphrase", NULL); } + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->security == CONNMAN_SERVICE_SECURITY_DPP) { + if (service->connector != NULL && strlen(service->connector) > 0) + g_key_file_set_string(keyfile, service->identifier, + "Connector", service->connector); + else + g_key_file_remove_key(keyfile, service->identifier, + "Connector", NULL); + + if (service->c_sign_key != NULL && strlen(service->c_sign_key) > 0) + g_key_file_set_string(keyfile, service->identifier, + "CSignKey", service->c_sign_key); + else + g_key_file_remove_key(keyfile, service->identifier, + "CSignKey", NULL); + + if (service->net_access_key != NULL && strlen(service->net_access_key) > 0) + g_key_file_set_string(keyfile, service->identifier, + "NetAccessKey", service->net_access_key); + else + g_key_file_remove_key(keyfile, service->identifier, + "NetAccessKey", NULL); + } #endif done: @@ -1146,12 +1159,108 @@ done: return err; } +#if defined TIZEN_EXT +static gint sort_entry(gconstpointer a, gconstpointer b, gpointer user_data) +{ + GTimeVal *aval = (GTimeVal *)a; + GTimeVal *bval = (GTimeVal *)b; + + /* Note that the sort order is ascending */ + if (aval->tv_sec > bval->tv_sec) + return 1; + + if (aval->tv_sec < bval->tv_sec) + return -1; + + return 0; +} + +static void free_entry(gpointer data) +{ + struct saved_profiles *entry = data; + g_free(entry->profile_name); + g_free(entry); +} + +static void __connman_manage_saved_profiles() +{ + GKeyFile *keyfile; + gchar **services = NULL; + GTimeVal modified; + int i, num_profiles = 0; + GSequenceIter *iter; + GSequence *profile_list; + struct saved_profiles *entry; + + profile_list = g_sequence_new(free_entry); + if (!profile_list) + return; + + services = connman_storage_get_services(); + + /* Check the count of saved profiles */ + for (i = 0; services && services[i]; i++) { + if (strncmp(services[i], "wifi_", 5) != 0) + continue; + + keyfile = connman_storage_load_service(services[i]); + if (!keyfile) + continue; + + gchar *str = g_key_file_get_string(keyfile, + services[i], "Modified", NULL); + if (!str) { + g_key_file_free(keyfile); + continue; + } + + g_time_val_from_iso8601(str, &modified); + g_free(str); + + entry = g_try_new(struct saved_profiles, 1); + if (!entry) { + g_sequence_free(profile_list); + g_key_file_free(keyfile); + return; + } + + entry->modified = modified; + entry->profile_name = g_strdup(services[i]); + + g_sequence_insert_sorted(profile_list, entry, + sort_entry, NULL); + + num_profiles++; + } + DBG("number of profiles: %d", num_profiles); + + if (num_profiles > MAX_WIFI_PROFILES) { + iter = g_sequence_get_begin_iter(profile_list); + + entry = g_sequence_get(iter); + + if (__connman_storage_remove_service(entry->profile_name) == false) + DBG("Failed to remove service profile: %s", entry->profile_name); + } + + g_sequence_free(profile_list); +} +#endif + void __connman_service_save(struct connman_service *service) { if (!service) return; service_save(service); +#if defined TIZEN_EXT + /* + * Description: Manage the wireless profiles saved in connman. + * If the number of saved profiles is more than 200, remove the + * profile that is not updated for longer duration. + */ + __connman_manage_saved_profiles(); +#endif } static enum connman_service_state combine_state( @@ -1241,15 +1350,12 @@ done: return result; } -static bool 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) - return connman_network_get_connecting(service->network); case CONNMAN_SERVICE_STATE_DISCONNECT: case CONNMAN_SERVICE_STATE_READY: case CONNMAN_SERVICE_STATE_ONLINE: @@ -1262,8 +1368,7 @@ static bool is_connecting_state(struct connman_service *service, return false; } -static bool 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: @@ -1281,57 +1386,127 @@ static bool is_connected_state(const struct connman_service *service, return false; } -static bool 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; } -static bool 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 bool 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 bool nameserver_available(struct connman_service *service, + enum connman_ipconfig_type type, const char *ns) { int family; family = connman_inet_check_ipaddress(ns); - if (family == AF_INET) - return is_connected_state(service, service->state_ipv4); + if (family == AF_INET) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + return false; + + return is_connected(service->state_ipv4); + } + + if (family == AF_INET6) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + return false; - if (family == AF_INET6) - return is_connected_state(service, service->state_ipv6); + return is_connected(service->state_ipv6); + } return false; } +static int searchdomain_add_all(struct connman_service *service) +{ + int index, i = 0; + + if (!is_connected(service->state)) + return -ENOTCONN; + + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; + + 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; + +} + +static int searchdomain_remove_all(struct connman_service *service) +{ + int index, i = 0; + + if (!is_connected(service->state)) + return -ENOTCONN; + + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; + + 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); + + return 0; +} + static int nameserver_add(struct connman_service *service, + enum connman_ipconfig_type type, const char *nameserver) { - int index; + int index, ret; - if (!nameserver_available(service, nameserver)) + if (!nameserver_available(service, type, nameserver)) return 0; index = __connman_service_get_index(service); @@ -1341,15 +1516,15 @@ static int nameserver_add(struct connman_service *service, #if defined TIZEN_EXT DBG("Resolver append nameserver: %s", nameserver); #endif - return connman_resolver_append(index, NULL, nameserver); + ret = connman_resolver_append(index, NULL, nameserver); + if (ret >= 0) + nameservers_changed(service); + + return ret; } -#if defined TIZEN_EXT static int nameserver_add_all(struct connman_service *service, - enum connman_ipconfig_type type) -#else -static int nameserver_add_all(struct connman_service *service) -#endif + enum connman_ipconfig_type type) { int i = 0; @@ -1370,7 +1545,7 @@ static int nameserver_add_all(struct connman_service *service) service->nameservers_config[i]) == AF_INET && service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers_config[i]); } break; @@ -1379,7 +1554,7 @@ static int nameserver_add_all(struct connman_service *service) service->nameservers_config[i]) == AF_INET6 && service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers_config[i]); } break; @@ -1388,14 +1563,14 @@ static int nameserver_add_all(struct connman_service *service) service->nameservers_config[i]) == AF_INET && service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers_config[i]); } if (connman_inet_check_ipaddress( service->nameservers_config[i]) == AF_INET6 && service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers_config[i]); } break; @@ -1407,19 +1582,12 @@ static int nameserver_add_all(struct connman_service *service) break; } #else - nameserver_add(service, service->nameservers_config[i]); + nameserver_add(service, type, + service->nameservers_config[i]); #endif i++; } -#if !defined TIZEN_EXT - return 0; -#endif - } - -#if defined TIZEN_EXT - i = 0; -#endif - if (service->nameservers) { + } else if (service->nameservers) { while (service->nameservers[i]) { #if defined TIZEN_EXT DBG("type %d service->nameservers[%d]: %s",type, @@ -1431,7 +1599,7 @@ static int nameserver_add_all(struct connman_service *service) service->nameservers[i]) == AF_INET && service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_DHCP) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers[i]); } break; @@ -1440,7 +1608,7 @@ static int nameserver_add_all(struct connman_service *service) service->nameservers[i]) == AF_INET6 && service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_DHCP) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers[i]); } break; @@ -1449,14 +1617,14 @@ static int nameserver_add_all(struct connman_service *service) service->nameservers[i]) == AF_INET && service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_DHCP) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers[i]); } if (connman_inet_check_ipaddress( service->nameservers[i]) == AF_INET6 && service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_DHCP) { - nameserver_add(service, + nameserver_add(service, type, service->nameservers[i]); } break; @@ -1468,21 +1636,34 @@ static int nameserver_add_all(struct connman_service *service) break; } #else - nameserver_add(service, service->nameservers[i]); + nameserver_add(service, type, + service->nameservers[i]); #endif i++; } } + if (!i) + __connman_resolver_append_fallback_nameservers(); + +#if defined TIZEN_EXT + const char *global_dns = connman_option_get_string("GlobalNameserver"); + if (global_dns) + nameserver_add(service, type, global_dns); +#endif + + searchdomain_add_all(service); + return 0; } static int nameserver_remove(struct connman_service *service, + enum connman_ipconfig_type type, const char *nameserver) { - int index; + int index, ret; - if (!nameserver_available(service, nameserver)) + if (!nameserver_available(service, type, nameserver)) return 0; index = __connman_service_get_index(service); @@ -1492,15 +1673,15 @@ static int nameserver_remove(struct connman_service *service, #if defined TIZEN_EXT DBG("Resolver remove nameserver: %s", nameserver); #endif - return connman_resolver_remove(index, NULL, nameserver); + ret = connman_resolver_remove(index, NULL, nameserver); + if (ret >= 0) + nameservers_changed(service); + + return ret; } -#if defined TIZEN_EXT static int nameserver_remove_all(struct connman_service *service, - enum connman_ipconfig_type type) -#else -static int nameserver_remove_all(struct connman_service *service) -#endif + enum connman_ipconfig_type type) { #if defined TIZEN_EXT /** @@ -1518,6 +1699,7 @@ static int nameserver_remove_all(struct connman_service *service) return -ENXIO; while (service->nameservers_config && service->nameservers_config[i]) { + #if defined TIZEN_EXT DBG("type %d Remove service->nameservers_config[%d]: %s", type, i, service->nameservers_config[i]); @@ -1529,7 +1711,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_DHCP || service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers_config[i]); } break; @@ -1540,7 +1722,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_DHCP || service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers_config[i]); } break; @@ -1551,7 +1733,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_DHCP || service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers_config[i]); } if (connman_inet_check_ipaddress( @@ -1560,7 +1742,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_DHCP || service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers_config[i]); } break; @@ -1572,7 +1754,8 @@ static int nameserver_remove_all(struct connman_service *service) break; } #else - nameserver_remove(service, service->nameservers_config[i]); + nameserver_remove(service, type, + service->nameservers_config[i]); #endif i++; } @@ -1590,7 +1773,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_MANUAL || service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_DHCP)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers[i]); } break; @@ -1601,7 +1784,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_MANUAL || service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_DHCP)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers[i]); } break; @@ -1612,7 +1795,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_MANUAL || service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_DHCP)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers[i]); } if (connman_inet_check_ipaddress( @@ -1621,7 +1804,7 @@ static int nameserver_remove_all(struct connman_service *service) CONNMAN_DNSCONFIG_METHOD_MANUAL || service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_DHCP)) { - nameserver_remove(service, + nameserver_remove(service, type, service->nameservers[i]); } break; @@ -1633,60 +1816,17 @@ static int nameserver_remove_all(struct connman_service *service) break; } #else - nameserver_remove(service, service->nameservers[i]); + nameserver_remove(service, type, service->nameservers[i]); #endif i++; } - return 0; -} - -static int searchdomain_add_all(struct connman_service *service) -{ - int index, i = 0; - - if (!is_connected(service)) - return -ENOTCONN; - - index = __connman_service_get_index(service); - if (index < 0) - return -ENXIO; - - 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; - -} - -static int searchdomain_remove_all(struct connman_service *service) -{ - int index, i = 0; - - if (!is_connected(service)) - return -ENOTCONN; - - index = __connman_service_get_index(service); - if (index < 0) - return -ENXIO; - - 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); +#if defined TIZEN_EXT + const char *global_dns = connman_option_get_string("GlobalNameserver"); + if (global_dns) + nameserver_remove(service, type, global_dns); +#endif + searchdomain_remove_all(service); return 0; } @@ -1708,7 +1848,7 @@ int __connman_service_nameserver_append(struct connman_service *service, char **nameservers; int len, i; - DBG("service %p nameserver %s auto %d", service, nameserver, is_auto); + DBG("service %p nameserver %s auto %d", service, nameserver, is_auto); if (!nameserver) return -EINVAL; @@ -1745,13 +1885,11 @@ int __connman_service_nameserver_append(struct connman_service *service, #ifdef TIZEN_EXT if(type == CONNMAN_IPCONFIG_TYPE_IPV4 && - service->dns_config_method_ipv4 == - CONNMAN_DNSCONFIG_METHOD_UNKNOWN) + service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_UNKNOWN) service->dns_config_method_ipv4 = CONNMAN_DNSCONFIG_METHOD_DHCP; if(type == CONNMAN_IPCONFIG_TYPE_IPV6 && - service->dns_config_method_ipv6 == - CONNMAN_DNSCONFIG_METHOD_UNKNOWN) + service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_UNKNOWN) service->dns_config_method_ipv6 = CONNMAN_DNSCONFIG_METHOD_DHCP; #endif @@ -1759,12 +1897,13 @@ int __connman_service_nameserver_append(struct connman_service *service, service->nameservers_auto = nameservers; } else { service->nameservers = nameservers; -#if defined TIZEN_EXT - DBG("nameserver add: %s, type: %d", nameserver, type); -#endif - nameserver_add(service, nameserver); + nameserver_add(service, CONNMAN_IPCONFIG_TYPE_ALL, nameserver); } + nameservers_changed(service); + + searchdomain_add_all(service); + return 0; } @@ -1794,7 +1933,7 @@ int __connman_service_nameserver_remove(struct connman_service *service, if (!nameservers) return 0; - for (i = 0; nameservers && nameservers[i]; i++) + for (i = 0; nameservers[i]; i++) if (g_strcmp0(nameservers[i], nameserver) == 0) { found = true; break; @@ -1835,8 +1974,12 @@ set_servers: service->nameservers = nameservers; #if defined TIZEN_EXT DBG("nameserver remove ip_type: %d", type); + nameserver_remove(service, type, + nameserver); +#else + nameserver_remove(service, CONNMAN_IPCONFIG_TYPE_ALL, + nameserver); #endif - nameserver_remove(service, nameserver); } return 0; @@ -1844,23 +1987,12 @@ set_servers: void __connman_service_nameserver_clear(struct connman_service *service) { -#if defined TIZEN_EXT - DBG("nameserver remove all ip_type: CONNMAN_IPCONFIG_TYPE_ALL"); nameserver_remove_all(service, CONNMAN_IPCONFIG_TYPE_ALL); -#else - nameserver_remove_all(service); -#endif g_strfreev(service->nameservers); service->nameservers = NULL; -#if defined TIZEN_EXT - DBG("nameserver add all ip_type: CONNMAN_IPCONFIG_TYPE_ALL"); nameserver_add_all(service, CONNMAN_IPCONFIG_TYPE_ALL); -#else - nameserver_add_all(service); -#endif - } static void add_nameserver_route(int family, int index, char *nameserver, @@ -1973,6 +2105,18 @@ void __connman_service_nameserver_del_routes(struct connman_service *service, nameserver_del_routes(index, service->nameservers, 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); + + __connman_timeserver_sync(service); + } +} + static struct connman_stats *stats_get(struct connman_service *service) { if (service->roaming) @@ -2075,19 +2219,6 @@ static gboolean __connman_service_is_internet_profile( return FALSE; } -static gboolean __connman_service_is_tethering_profile( - struct connman_service *cellular) -{ - const char tethering_suffix[] = "_5"; - - DBG("Service path: %s", cellular->path); - - if (g_str_has_suffix(cellular->path, tethering_suffix) == TRUE) - return TRUE; - - return FALSE; -} - struct connman_service *connman_service_get_default_connection(void) { GList *list; @@ -2101,22 +2232,27 @@ struct connman_service *connman_service_get_default_connection(void) state2string(service->state), __connman_service_type2string(service->type)); +#if defined TIZEN_MAINTAIN_ONLINE + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->state == CONNMAN_SERVICE_STATE_ONLINE) { +#else if (service->type == CONNMAN_SERVICE_TYPE_WIFI && - is_connected(service) == TRUE) { + is_connected(service->state) == TRUE) { +#endif return service; } else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && __connman_service_is_internet_profile(service) == TRUE) { if (default_service == NULL) default_service = service; - else if (is_connected(service) == TRUE && - is_connected(default_service) == FALSE) + else if (is_connected(service->state) == TRUE && + is_connected(default_service->state) == FALSE) default_service = service; } else if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET && - is_connected(service) == TRUE) { + is_connected(service->state) == TRUE) { if (default_service == NULL) default_service = service; } else if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH && - is_connected(service) == TRUE) { + is_connected(service->state) == TRUE) { if (default_service == NULL) default_service = service; } @@ -2126,8 +2262,11 @@ struct connman_service *connman_service_get_default_connection(void) } #endif -struct connman_service *__connman_service_get_default(void) +struct connman_service *connman_service_get_default(void) { +#if defined TIZEN_MAINTAIN_ONLINE + return connman_service_get_default_connection(); +#else struct connman_service *service; if (!service_list) @@ -2135,10 +2274,11 @@ struct connman_service *__connman_service_get_default(void) service = service_list->data; - if (!is_connected(service)) + if (!is_connected(service->state)) return NULL; return service; +#endif } bool __connman_service_index_is_default(int index) @@ -2148,14 +2288,14 @@ bool __connman_service_index_is_default(int index) if (index < 0) return false; - service = __connman_service_get_default(); + 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; @@ -2179,7 +2319,8 @@ static void default_changed(void) connman_setting_get_bool("AllowHostnameUpdates")) __connman_utsname_set_hostname(service->hostname); - if (service->domainname) + if (service->domainname && + connman_setting_get_bool("AllowDomainnameUpdates")) __connman_utsname_set_domainname(service->domainname); } @@ -2199,6 +2340,7 @@ static void state_changed(struct connman_service *service) #if !defined TIZEN_EXT if (!allow_property_changed(service)) return; + #endif #if defined TIZEN_EXT DBG(" %s, %s", str, service->path); @@ -2208,6 +2350,51 @@ static void state_changed(struct connman_service *service) DBUS_TYPE_STRING, &str); } +#if defined TIZEN_EXT +static void connect_reason_changed(struct connman_service *service) +{ + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, + "ConnectReason", + DBUS_TYPE_INT32, + &service->connect_reason); +} + +static void disconnection_requested_changed(struct connman_service *service) +{ + dbus_bool_t disconnection_requested; + + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + disconnection_requested = service->disconnection_requested; + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, + "DisconnectionRequested", + DBUS_TYPE_BOOLEAN, + &disconnection_requested); +} + +void connman_service_set_disconnection_requested(struct connman_service *service, + bool disconnection_requested) +{ + if (service == NULL) + return; + + service->disconnection_requested = disconnection_requested; + disconnection_requested_changed(service); +} +#endif + static void strength_changed(struct connman_service *service) { if (service->strength == 0) @@ -2305,19 +2492,44 @@ static void append_security(DBusMessageIter *iter, void *user_data) case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_SAE: +#endif str = "wps"; dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str); break; +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_OWE: +#endif case CONNMAN_SERVICE_SECURITY_UNKNOWN: case CONNMAN_SERVICE_SECURITY_NONE: case CONNMAN_SERVICE_SECURITY_WEP: 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; @@ -2334,7 +2546,7 @@ static void append_ipv4(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (!is_connected_state(service, service->state_ipv4)) + if (!is_connected(service->state_ipv4)) return; if (service->ipconfig_ipv4) @@ -2345,7 +2557,7 @@ static void append_ipv6(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (!is_connected_state(service, service->state_ipv6)) + if (!is_connected(service->state_ipv6)) return; if (service->ipconfig_ipv6) @@ -2379,9 +2591,9 @@ static void append_nameservers(DBusMessageIter *iter, for (i = 0; servers[i]; i++) { if (service) - available = nameserver_available(service, servers[i]); - - DBG("servers[%d] %s available %d", i, servers[i], available); + available = nameserver_available(service, + CONNMAN_IPCONFIG_TYPE_ALL, + servers[i]); if (available) dbus_message_iter_append_basic(iter, @@ -2396,7 +2608,8 @@ static void append_nameserver_manual(DBusMessageIter *iter, bool available = true; if (service) - available = nameserver_available(service, server); + available = nameserver_available(service, + CONNMAN_IPCONFIG_TYPE_ALL, server); if (available) dbus_message_iter_append_basic(iter, @@ -2409,7 +2622,8 @@ static void append_nameserver_dhcp(DBusMessageIter *iter, bool available = true; if (service) - available = nameserver_available(service, server); + available = nameserver_available(service, + CONNMAN_IPCONFIG_TYPE_ALL, server); if (available) dbus_message_iter_append_basic(iter, @@ -2424,7 +2638,7 @@ static void append_dns(DBusMessageIter *iter, void *user_data) int i; #endif - if (!is_connected(service)) + if (!is_connected(service->state)) return; #ifdef TIZEN_EXT @@ -2634,8 +2848,8 @@ static void append_domain(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (!is_connected(service) && - !is_connecting(service)) + if (!is_connected(service->state) && + !is_connecting(service->state)) return; if (service->domains) @@ -2679,7 +2893,7 @@ static void append_proxy(DBusMessageIter *iter, void *user_data) const char *method = proxymethod2string( CONNMAN_SERVICE_PROXY_METHOD_DIRECT); - if (!is_connected(service)) + if (!is_connected(service->state)) return; proxy = connman_service_get_proxy_method(service); @@ -2766,7 +2980,7 @@ static void append_provider(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (!is_connected(service)) + if (!is_connected(service->state)) return; if (service->provider) @@ -2779,11 +2993,13 @@ static void settings_changed(struct connman_service *service, { enum connman_ipconfig_type type; + type = __connman_ipconfig_get_config_type(ipconfig); + + __connman_notifier_ipconfig_changed(service, ipconfig); + if (!allow_property_changed(service)) return; - type = __connman_ipconfig_get_config_type(ipconfig); - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "IPv4", @@ -2792,8 +3008,6 @@ static void settings_changed(struct connman_service *service, connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "IPv6", append_ipv6, service); - - __connman_notifier_ipconfig_changed(service, ipconfig); } static void ipv4_configuration_changed(struct connman_service *service) @@ -2808,6 +3022,15 @@ 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)) @@ -2886,6 +3109,48 @@ 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)) @@ -3069,7 +3334,7 @@ void __connman_service_notify(struct connman_service *service, if (!service) return; - if (!is_connected(service)) + if (!is_connected(service->state)) return; stats_update(service, @@ -3136,17 +3401,16 @@ void __connman_service_counter_unregister(const char *counter) counter_list = g_slist_remove(counter_list, counter); } -int __connman_service_iterate_services(service_iterate_cb cb, void *user_data) +int connman_service_iterate_services(connman_service_iterate_cb cb, + void *user_data) { GList *list; + int ret = 0; - for (list = service_list; list; list = list->next) { - struct connman_service *service = list->data; - - cb(service, user_data); - } + for (list = service_list; list && ret == 0; list = list->next) + ret = cb((struct connman_service *)list->data, user_data); - return 0; + return ret; } #if defined TIZEN_EXT @@ -3155,28 +3419,48 @@ static void append_wifi_ext_info(DBusMessageIter *dict, { char bssid_buff[WIFI_BSSID_STR_LEN] = {0,}; char *bssid_str = bssid_buff; + const void *ssid; + unsigned int ssid_len; unsigned char *bssid; unsigned int maxrate; + int maxspeed; unsigned int keymgmt; uint16_t frequency; const char *enc_mode; + const char *str; gboolean passpoint; + char country_code_buff[WIFI_COUNTRY_CODE_LEN + 1] = {0,}; + char *country_code_str = country_code_buff; + unsigned char *country_code; + uint16_t connection_mode; + ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len); bssid = connman_network_get_bssid(network); maxrate = connman_network_get_maxrate(network); + maxspeed = connman_network_get_maxspeed(network); frequency = connman_network_get_frequency(network); enc_mode = connman_network_get_enc_mode(network); - passpoint = connman_network_get_is_hs20AP(network); + passpoint = connman_network_get_bool(network, "WiFi.HS20AP"); keymgmt = connman_network_get_keymgmt(network); + country_code = connman_network_get_countrycode(network); + connection_mode = connman_network_get_connection_mode(network); snprintf(bssid_str, WIFI_BSSID_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]); + snprintf(country_code_str, (WIFI_COUNTRY_CODE_LEN + 1), "%c%c", + country_code[0], country_code[1]); + + + connman_dbus_dict_append_fixed_array(dict, "SSID", + DBUS_TYPE_BYTE, &ssid, ssid_len); connman_dbus_dict_append_basic(dict, "BSSID", DBUS_TYPE_STRING, &bssid_str); connman_dbus_dict_append_basic(dict, "MaxRate", DBUS_TYPE_UINT32, &maxrate); + connman_dbus_dict_append_basic(dict, "MaxSpeed", + DBUS_TYPE_INT32, &maxspeed); connman_dbus_dict_append_basic(dict, "Frequency", DBUS_TYPE_UINT16, &frequency); connman_dbus_dict_append_basic(dict, "EncryptionMode", @@ -3185,6 +3469,74 @@ static void append_wifi_ext_info(DBusMessageIter *dict, DBUS_TYPE_BOOLEAN, &passpoint); connman_dbus_dict_append_basic(dict, "Keymgmt", DBUS_TYPE_UINT32, &keymgmt); + connman_dbus_dict_append_basic(dict, "Country", DBUS_TYPE_STRING, + &country_code_str); + connman_dbus_dict_append_basic(dict, "ConnMode", + DBUS_TYPE_UINT16, &connection_mode); + + str = connman_network_get_string(network, "WiFi.Security"); + if (str != NULL && g_str_equal(str, "ieee8021x") == TRUE) { + str = connman_network_get_string(network, "WiFi.EAP"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "EAP", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.Phase2"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "Phase2", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.Identity"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "Identity", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.CACertFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "CACertFile", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, + "WiFi.ClientCertFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "ClientCertFile", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, + "WiFi.PrivateKeyFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "PrivateKeyFile", + DBUS_TYPE_STRING, &str); + } +} + +static void append_bssid_info(DBusMessageIter *iter, void *user_data) +{ + GSList *bssid_list = NULL; + struct connman_network *network = user_data; + struct connman_bssids *bssids; + char bssid_buf[MAC_ADDRESS_LENGTH] = {0,}; + char *bssid_str = bssid_buf; + + bssid_list = (GSList *)connman_network_get_bssid_list(network); + if(bssid_list) { + GSList *list; + for (list = bssid_list; list; list = list->next) { + bssids = (struct connman_bssids *)list->data; + g_snprintf(bssid_buf, MAC_ADDRESS_LENGTH, "%02x:%02x:%02x:%02x:%02x:%02x", + bssids->bssid[0], bssids->bssid[1], bssids->bssid[2], + bssids->bssid[3], bssids->bssid[4], bssids->bssid[5]); + + connman_dbus_dict_append_basic(iter, "BSSID", + DBUS_TYPE_STRING, &bssid_str); + + connman_dbus_dict_append_basic(iter, "Strength", + DBUS_TYPE_UINT16, &bssids->strength); + + connman_dbus_dict_append_basic(iter, "Frequency", + DBUS_TYPE_UINT16, &bssids->frequency); + } + } } #endif @@ -3197,10 +3549,26 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, #if defined TIZEN_EXT unsigned int frequency = 0U; - if (service && service->network) { + unsigned char *wifi_vsie; + unsigned int wifi_vsie_len; + GSList *vsie_list = NULL; + + if (service->network) { frequency = connman_network_get_frequency(service->network); connman_dbus_dict_append_basic(dict, "Frequency", DBUS_TYPE_UINT16, &frequency); + vsie_list = (GSList *)connman_network_get_vsie_list(service->network); + } + + if (vsie_list) { + GSList *list; + for (list = vsie_list; list; list = list->next) { + wifi_vsie = (unsigned char *)list->data; + wifi_vsie_len = wifi_vsie[1] + 2; + + connman_dbus_dict_append_fixed_array(dict, "Vsie", DBUS_TYPE_BYTE, + &wifi_vsie, wifi_vsie_len); + } } #endif @@ -3259,6 +3627,9 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; case CONNMAN_SERVICE_TYPE_CELLULAR: val = service->roaming; @@ -3270,15 +3641,25 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, break; case CONNMAN_SERVICE_TYPE_WIFI: #if defined TIZEN_EXT - if (service->network != NULL) + if (service->network != NULL) { append_wifi_ext_info(dict, service->network); + connman_dbus_dict_append_dict(dict, "BSSID.List", + append_bssid_info, service->network); + } connman_dbus_dict_append_dict(dict, "Ethernet", append_ethernet, service); + service->disconnect_reason = connman_network_get_disconnect_reason(service->network); connman_dbus_dict_append_basic(dict, "DisconnectReason", DBUS_TYPE_INT32, &service->disconnect_reason); + connman_dbus_dict_append_basic(dict, "AssocStatusCode", + DBUS_TYPE_INT32, &service->assoc_status_code); + + connman_dbus_dict_append_basic(dict, "Hidden", + DBUS_TYPE_BOOLEAN, &service->hidden_service); + break; #endif case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -3330,8 +3711,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, @@ -3429,7 +3821,10 @@ void __connman_service_set_hostname(struct connman_service *service, return; g_free(service->hostname); - service->hostname = g_strdup(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) @@ -3447,7 +3842,10 @@ void __connman_service_set_domainname(struct connman_service *service, 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); } @@ -3463,6 +3861,14 @@ const char *connman_service_get_domainname(struct connman_service *service) 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) @@ -3818,13 +4224,88 @@ void __connman_service_set_identity(struct connman_service *service, 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) + if (service->immutable || service->hidden) return; - g_free(service->agent_identity); - service->agent_identity = g_strdup(agent_identity); + + g_free(service->anonymous_identity); + service->anonymous_identity = g_strdup(anonymous_identity); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.AnonymousIdentity", + service->anonymous_identity); +} + +void __connman_service_set_subject_match(struct connman_service *service, + const char *subject_match) +{ + if (service->immutable || service->hidden) + return; + + 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, @@ -3832,7 +4313,7 @@ void __connman_service_set_agent_identity(struct connman_service *service, service->agent_identity); } -static int check_passphrase(enum connman_service_security security, +int __connman_service_check_passphrase(enum connman_service_security security, const char *passphrase) { guint i; @@ -3859,6 +4340,8 @@ static int check_passphrase(enum connman_service_security security, case CONNMAN_SERVICE_SECURITY_PSK: #if defined TIZEN_EXT case CONNMAN_SERVICE_SECURITY_RSN: + /* TO CHECK: We need to check the key length supported by SAE */ + case CONNMAN_SERVICE_SECURITY_SAE: #endif /* A raw key is always 64 bytes length, * its content is in hex representation. @@ -3886,6 +4369,10 @@ static int check_passphrase(enum connman_service_security security, break; case CONNMAN_SERVICE_SECURITY_8021X: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_OWE: + case CONNMAN_SERVICE_SECURITY_DPP: +#endif break; } @@ -3904,7 +4391,20 @@ int __connman_service_set_passphrase(struct connman_service *service, service->security != CONNMAN_SERVICE_SECURITY_8021X) return -EINVAL; - err = check_passphrase(service->security, passphrase); +#if defined TIZEN_EXT + if (service->immutable && + service->security != CONNMAN_SERVICE_SECURITY_DPP) + return -EINVAL; + /* The encrypted passphrase is used here + * and validation is done by net-config before being encrypted. + */ + err = 0; + if (service->security != CONNMAN_SERVICE_SECURITY_PSK && + service->security != CONNMAN_SERVICE_SECURITY_RSN && + service->security != CONNMAN_SERVICE_SECURITY_SAE && + service->security != CONNMAN_SERVICE_SECURITY_WEP) +#endif + err = __connman_service_check_passphrase(service->security, passphrase); if (err < 0) return err; @@ -3934,8 +4434,6 @@ static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *reply; DBusMessageIter array, dict; - DBG("service %p", service); - reply = dbus_message_new_method_return(msg); if (!reply) return NULL; @@ -3949,6 +4447,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) { @@ -4062,20 +4577,24 @@ static int update_proxy_configuration(struct connman_service *service, 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) { 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; } @@ -4087,7 +4606,7 @@ static int update_proxy_configuration(struct connman_service *service, g_free(service->pac); if (url && strlen(url) > 0) - service->pac = g_strdup(url); + service->pac = g_strstrip(g_strdup(url)); else service->pac = NULL; @@ -4164,8 +4683,7 @@ int __connman_service_reset_ipconfig(struct connman_service *service, 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); __connman_ipconfig_unref(ipconfig); @@ -4175,8 +4693,7 @@ int __connman_service_reset_ipconfig(struct connman_service *service, else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) service->ipconfig_ipv6 = new_ipconfig; - if (is_connecting_state(service, state) || - is_connected_state(service, state)) + if (is_connecting(state) || is_connected(state)) __connman_ipconfig_enable(new_ipconfig); if (new_state && new_method != old_method) { @@ -4185,6 +4702,9 @@ int __connman_service_reset_ipconfig(struct connman_service *service, else *new_state = service->state_ipv6; + settings_changed(service, new_ipconfig); + address_updated(service, type); + __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); } @@ -4195,6 +4715,29 @@ int __connman_service_reset_ipconfig(struct connman_service *service, 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 DBusMessage *set_property(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -4211,21 +4754,6 @@ static DBusMessage *set_property(DBusConnection *conn, if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) return __connman_error_invalid_arguments(msg); - if (service->type == CONNMAN_SERVICE_TYPE_WIFI && is_connected(service)) { - uid_t uid; - if (connman_dbus_get_connection_unix_user_sync(conn, - dbus_message_get_sender(msg), - &uid) < 0) { - DBG("Can not get unix user id!"); - return __connman_error_permission_denied(msg); - } - - if (!connman_service_is_user_allowed(service, uid)) { - DBG("Not allow this user to operate this wifi service now!"); - return __connman_error_permission_denied(msg); - } - } - dbus_message_iter_get_basic(&iter, &name); dbus_message_iter_next(&iter); @@ -4283,10 +4811,12 @@ static DBusMessage *set_property(DBusConnection *conn, gw = __connman_ipconfig_get_gateway_from_index(index, CONNMAN_IPCONFIG_TYPE_ALL); +#if !defined TIZEN_EXT if (gw && strlen(gw)) __connman_service_nameserver_del_routes(service, CONNMAN_IPCONFIG_TYPE_ALL); +#endif dbus_message_iter_recurse(&value, &entry); #if defined TIZEN_EXT @@ -4340,12 +4870,13 @@ static DBusMessage *set_property(DBusConnection *conn, continue; } #endif - if (connman_inet_check_ipaddress(val) > 0) { - if (str->len > 0) - g_string_append_printf(str, " %s", val); - else - g_string_append(str, val); - } + if (!val[0]) + continue; + + if (str->len > 0) + g_string_append_printf(str, " %s", val); + else + g_string_append(str, val); } #if defined TIZEN_EXT @@ -4361,13 +4892,21 @@ static DBusMessage *set_property(DBusConnection *conn, DBG("%s ip_type: %d nameserver remove all", name, ip_type); nameserver_remove_all(service, ip_type); #else - nameserver_remove_all(service); + nameserver_remove_all(service, CONNMAN_IPCONFIG_TYPE_ALL); #endif 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; } @@ -4381,25 +4920,22 @@ static DBusMessage *set_property(DBusConnection *conn, DBG("%s ip_type: %d nameserver add all", name, ip_type); nameserver_add_all(service, ip_type); #else - nameserver_add_all(service); + nameserver_add_all(service, CONNMAN_IPCONFIG_TYPE_ALL); #endif dns_configuration_changed(service); if (__connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV4)) - __connman_wispr_start(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_wispr_start(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")) { DBusMessageIter entry; - GSList *list = NULL; - int count = 0; + GString *str; if (service->immutable) return __connman_error_not_supported(msg); @@ -4407,40 +4943,41 @@ static DBusMessage *set_property(DBusConnection *conn, 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) { - service->timeservers_config = g_new0(char *, count+1); - - while (list) { - 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); - if (service == __connman_service_get_default()) + if (service == connman_service_get_default()) __connman_timeserver_sync(service); } else if (g_str_equal(name, "Domains.Configuration")) { @@ -4463,6 +5000,10 @@ 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 @@ -4472,9 +5013,11 @@ static DBusMessage *set_property(DBusConnection *conn, 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); @@ -4503,6 +5046,23 @@ static DBusMessage *set_property(DBusConnection *conn, __connman_notifier_proxy_changed(service); service_save(service); + } 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")) { @@ -4531,8 +5091,7 @@ static DBusMessage *set_property(DBusConnection *conn, &state); if (err < 0) { - if (is_connected_state(service, state) || - is_connecting_state(service, state)) { + if (is_connected(state) || is_connecting(state)) { if (type == CONNMAN_IPCONFIG_TYPE_IPV4) __connman_network_enable_ipconfig(service->network, service->ipconfig_ipv4); @@ -4549,7 +5108,8 @@ static DBusMessage *set_property(DBusConnection *conn, else ipv6_configuration_changed(service); - if (is_connecting(service) || is_connected(service)) { + if (is_connecting(service->state) || + is_connected(service->state)) { if (type == CONNMAN_IPCONFIG_TYPE_IPV4) __connman_network_enable_ipconfig(service->network, service->ipconfig_ipv4); @@ -4559,6 +5119,19 @@ static DBusMessage *set_property(DBusConnection *conn, } service_save(service); +#if defined TIZEN_EXT + /* When AP is connected using WPS without SSID then its password needs + * to be saved for autoconnection */ + } else if (g_str_equal(name, "Passphrase")) { + char *passphrase; + + if (type != DBUS_TYPE_STRING) + return __connman_error_invalid_arguments(msg); + + dbus_message_iter_get_basic(&value, &passphrase); + + __connman_service_set_passphrase(service, passphrase); +#endif } else return __connman_error_invalid_property(msg); @@ -4593,12 +5166,39 @@ static void set_error(struct connman_service *service, DBUS_TYPE_STRING, &str); } -static void set_idle(struct connman_service *service) +static void remove_timeout(struct connman_service *service) { - service->state = service->state_ipv4 = service->state_ipv6 = - CONNMAN_SERVICE_STATE_IDLE; - set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - state_changed(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) + __connman_service_auto_connect(service->connect_reason); + + g_get_current_time(&service->modified); + service_save(service); } static DBusMessage *clear_property(DBusConnection *conn, @@ -4615,8 +5215,8 @@ static DBusMessage *clear_property(DBusConnection *conn, 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); @@ -4637,7 +5237,8 @@ static bool is_ignore(struct connman_service *service) if (!service->autoconnect) return true; - if (service->roaming) + if (service->roaming && + !connman_setting_get_bool("AutoConnectRoamingServices")) return true; if (service->ignore) @@ -4671,6 +5272,7 @@ static void disconnect_on_last_session(enum connman_service_type type) } 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) @@ -4683,7 +5285,7 @@ void __connman_service_set_active_session(bool enable, GSList *list) else active_count--; - while (list != NULL) { + while (list) { enum connman_service_type type = GPOINTER_TO_INT(list->data); switch (type) { @@ -4703,6 +5305,9 @@ void __connman_service_set_active_session(bool enable, GSList *list) case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; } @@ -4755,7 +5360,7 @@ static GList *preferred_tech_list_get(void) for (list = service_list; list; list = list->next) { struct connman_service *service = list->data; - if (!is_connected(service)) + if (!is_connected(service->state)) break; if (service->connect_reason == @@ -4787,6 +5392,43 @@ static GList *preferred_tech_list_get(void) return tech_data.preferred_list; } +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 bool auto_connect_service(GList *services, enum connman_service_connect_reason reason, bool preferred) @@ -4801,6 +5443,12 @@ static bool auto_connect_service(GList *services, ignore[CONNMAN_SERVICE_TYPE_VPN] = true; +#if defined TIZEN_EXT_WIFI_MESH + /* Don't auto connect wifi if mesh interface is created */ + if (connman_mesh_is_interface_created()) + ignore[CONNMAN_SERVICE_TYPE_WIFI] = true; +#endif + for (list = services; list; list = list->next) { service = list->data; @@ -4820,15 +5468,15 @@ static bool auto_connect_service(GList *services, /* Tizen takes Wi-Fi as the highest priority into consideration. */ if (service->type != CONNMAN_SERVICE_TYPE_WIFI) - if (is_connecting(service) == TRUE || is_connected(service) == TRUE) + if (is_connecting(service->state) == TRUE || is_connected(service->state) == TRUE) continue; #endif if (service->pending || - is_connecting(service) || - is_connected(service)) { - if (!active_count) - return true; + is_connecting(service->state) || + is_connected(service->state)) { + if (autoconnect_no_session_active(service)) + return true; ignore[service->type] = true; autoconnecting = true; @@ -4862,23 +5510,18 @@ static bool auto_connect_service(GList *services, CONNMAN_SERVICE_STATE_IDLE) continue; - if (autoconnecting && !active_sessions[service->type]) { + if (autoconnect_already_connecting(service, autoconnecting)) { DBG("service %p type %s has no users", service, __connman_service_type2string(service->type)); continue; } - if (!is_service_owner_user_login(service)) { - DBG("favorite user not login, wifi auto connect denied"); - continue; - } - DBG("service %p %s %s", service, service->name, (preferred) ? "preferred" : reason2string(reason)); __connman_service_connect(service, reason); - if (!active_count) + if (autoconnect_no_session_active(service)) return true; ignore[service->type] = true; @@ -4893,7 +5536,7 @@ static gboolean run_auto_connect(gpointer data) bool autoconnecting = false; GList *preferred_tech; - autoconnect_timeout = 0; + autoconnect_id = 0; DBG(""); @@ -4910,13 +5553,35 @@ static gboolean run_auto_connect(gpointer data) return FALSE; } +#if defined TIZEN_EXT +bool __connman_service_get_auto_connect_mode(void) +{ + return auto_connect_mode; +} + +void __connman_service_set_auto_connect_mode(bool enable) +{ + DBG("set auto_connect_mode = %d", enable); + + if (auto_connect_mode != enable) + auto_connect_mode = enable; +} +#endif + void __connman_service_auto_connect(enum connman_service_connect_reason reason) { DBG(""); - if (autoconnect_timeout != 0) + if (autoconnect_id != 0) return; +#if defined TIZEN_EXT + if (auto_connect_mode == FALSE) { + DBG("Currently, not auto connection mode"); + return; + } +#endif + if (!__connman_session_policy_autoconnect(reason)) return; @@ -4933,9 +5598,9 @@ void __connman_service_auto_connect(enum connman_service_connect_reason reason) * FAILURE state due to this when connection with AP2 is cancelled * then autoconnect with AP1 doesn't works because its autoconnection * is ignored as its last state was FAILURE rather than IDLE */ - autoconnect_timeout = g_timeout_add(500, run_auto_connect, + autoconnect_id = g_timeout_add(500, run_auto_connect, #else - autoconnect_timeout = g_timeout_add_seconds(0, run_auto_connect, + autoconnect_id = g_idle_add(run_auto_connect, #endif GUINT_TO_POINTER(reason)); } @@ -4944,7 +5609,7 @@ static gboolean run_vpn_auto_connect(gpointer data) { GList *list; bool need_split = false; - vpn_autoconnect_timeout = 0; + vpn_autoconnect_id = 0; for (list = service_list; list; list = list->next) { struct connman_service *service = list->data; @@ -4953,7 +5618,8 @@ static gboolean run_vpn_auto_connect(gpointer data) { if (service->type != CONNMAN_SERVICE_TYPE_VPN) continue; - if (is_connected(service) || is_connecting(service)) { + if (is_connected(service->state) || + is_connecting(service->state)) { if (!service->do_split_routing) need_split = true; continue; @@ -4985,35 +5651,11 @@ static gboolean run_vpn_auto_connect(gpointer data) { static void vpn_auto_connect(void) { - if (vpn_autoconnect_timeout) + if (vpn_autoconnect_id) return; - vpn_autoconnect_timeout = - g_timeout_add_seconds(0, run_vpn_auto_connect, NULL); -} - -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; - } + vpn_autoconnect_id = + g_idle_add(run_vpn_auto_connect, NULL); } bool @@ -5038,7 +5680,6 @@ void __connman_service_set_provider_pending(struct connman_service *service, } service->provider_pending = msg; - return; } static void check_pending_msg(struct connman_service *service) @@ -5090,9 +5731,6 @@ static gboolean connect_timeout(gpointer user_data) else if (service->provider) connman_provider_disconnect(service->provider); - __connman_ipconfig_disable(service->ipconfig_ipv4); - __connman_ipconfig_disable(service->ipconfig_ipv6); - __connman_stats_service_unregister(service); if (service->pending) { @@ -5141,35 +5779,19 @@ static DBusMessage *connect_service(DBusConnection *conn, */ if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) connman_service_user_pdn_connection_ref(service); -#endif - - if (service->pending) - return __connman_error_in_progress(msg); - if (service->type == CONNMAN_SERVICE_TYPE_WIFI) { - uid_t uid; - if (connman_dbus_get_connection_unix_user_sync(conn, - dbus_message_get_sender(msg), - &uid) < 0) { - DBG("Can not get unix user id!"); - return __connman_error_permission_denied(msg); - } + /*Reset the Disconnect Reason while issue connect request*/ + service->disconnect_reason = 0; - if (!__connman_service_is_user_allowed(CONNMAN_SERVICE_TYPE_WIFI, uid)) { - DBG("Not allow this user to connect this wifi service now!"); - return __connman_error_permission_denied(msg); - } + /*Reset the association status code while issue connect request*/ + service->assoc_status_code = 0; - if (uid != USER_ROOT && uid != service->user.favorite_user) - service->request_passphrase_input = true; - - service->user.current_user = uid; + /* Reset the disconnection_requested while issue connect request*/ + connman_service_set_disconnection_requested(service, false); +#endif - if (!service->passphrase && uid == service->user.favorite_user) { - DBG("Now load this favorite user's passphrase."); - service_load_passphrase(service); - } - } + if (service->pending) + return __connman_error_in_progress(msg); #if !defined TIZEN_EXT index = __connman_service_get_index(service); @@ -5181,7 +5803,7 @@ static DBusMessage *connect_service(DBusConnection *conn, if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) break; #endif - if (!is_connecting(temp) && !is_connected(temp)) + if (!is_connecting(temp->state) && !is_connected(temp->state)) break; if (service == temp) @@ -5206,18 +5828,10 @@ static DBusMessage *connect_service(DBusConnection *conn, err = __connman_service_connect(service, CONNMAN_SERVICE_CONNECT_REASON_USER); - if (err == -EINPROGRESS) - return NULL; - - if (service->pending) { - dbus_message_unref(service->pending); - service->pending = NULL; - } - - if (err < 0) - return __connman_error_failed(msg, -err); + if (err != -EINPROGRESS) + reply_pending(service, -err); - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); + return NULL; } static DBusMessage *disconnect_service(DBusConnection *conn, @@ -5236,27 +5850,12 @@ static DBusMessage *disconnect_service(DBusConnection *conn, if (connman_service_user_pdn_connection_unref_and_test(service) != TRUE) return __connman_error_failed(msg, EISCONN); - if (is_connected(service) == TRUE && + if (is_connected(service->state) == TRUE && service == connman_service_get_default_connection()) return __connman_error_failed(msg, EISCONN); } #endif - if (service->type == CONNMAN_SERVICE_TYPE_WIFI) { - uid_t uid; - if (connman_dbus_get_connection_unix_user_sync(conn, - dbus_message_get_sender(msg), - &uid) < 0) { - DBG("Can not get unix user id!"); - return __connman_error_permission_denied(msg); - } - - if (!connman_service_is_user_allowed(service, uid)) { - DBG("Not allow this user to disconnect this wifi service now!"); - return __connman_error_permission_denied(msg); - } - } - service->ignore = true; err = __connman_service_disconnect(service); @@ -5281,6 +5880,18 @@ static void __connman_service_cleanup_network_8021x(struct connman_service *serv connman_network_set_string(service->network, "WiFi.PrivateKeyFile", NULL); connman_network_set_string(service->network, "WiFi.PrivateKeyPassphrase", NULL); connman_network_set_string(service->network, "WiFi.Phase2", NULL); + connman_network_set_string(service->network, "WiFi.AnonymousIdentity", NULL); +} +static void __connman_service_cleanup_network_dpp(struct connman_service *service) +{ + if (service == NULL) + return; + + DBG("service %p ", service); + + connman_network_set_string(service->network, "WiFi.Connector", NULL); + connman_network_set_string(service->network, "WiFi.CSignKey", NULL); + connman_network_set_string(service->network, "WiFi.NetAccessKey", NULL); } #endif @@ -5295,8 +5906,7 @@ bool __connman_service_remove(struct connman_service *service) return false; #if !defined TIZEN_EXT - if (!service->favorite && service->state != - CONNMAN_SERVICE_STATE_FAILURE) + if (!service->favorite && !is_idle(service->state)) return false; #endif @@ -5308,6 +5918,21 @@ bool __connman_service_remove(struct connman_service *service) 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; @@ -5341,17 +5966,20 @@ bool __connman_service_remove(struct connman_service *service) g_strfreev(service->nameservers_config); service->nameservers_config = NULL; -#endif + g_free(service->connector); + service->connector = NULL; -#if defined TIZEN_EXT - if (service->security != CONNMAN_SERVICE_SECURITY_8021X) + g_free(service->c_sign_key); + service->c_sign_key = NULL; + + g_free(service->net_access_key); + service->net_access_key = NULL; + + __connman_service_cleanup_network_dpp(service); #endif - set_idle(service); service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; - service->user.favorite_user = USER_NONE; - __connman_service_set_favorite(service, false); __connman_ipconfig_ipv6_reset_privacy(service->ipconfig_ipv6); @@ -5381,23 +6009,6 @@ static DBusMessage *remove_service(DBusConnection *conn, DBG("service %p", service); - if (service->type == CONNMAN_SERVICE_TYPE_WIFI) { - uid_t uid; - if (connman_dbus_get_connection_unix_user_sync(conn, - dbus_message_get_sender(msg), - &uid) < 0) { - DBG("Can not get unix user id!"); - return __connman_error_permission_denied(msg); - } - -#if !defined TIZEN_EXT - if (!connman_service_is_user_allowed(service, uid)) { - DBG("Not allow this user to remove this wifi service now!"); - return __connman_error_permission_denied(msg); - } -#endif - } - if (!__connman_service_remove(service)) return __connman_error_not_supported(msg); @@ -5420,60 +6031,143 @@ static bool check_suitable_state(enum connman_service_state a, return a == b; } -static void downgrade_state(struct connman_service *service) +static void downgrade_state(struct connman_service *service) +{ + if (!service) + return; + + DBG("service %p state4 %d state6 %d", service, service->state_ipv4, + service->state_ipv6); + + if (service->state_ipv4 == CONNMAN_SERVICE_STATE_ONLINE) + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_READY, + CONNMAN_IPCONFIG_TYPE_IPV4); + + if (service->state_ipv6 == CONNMAN_SERVICE_STATE_ONLINE) + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_READY, + CONNMAN_IPCONFIG_TYPE_IPV6); +} + +static void apply_relevant_default_downgrade(struct connman_service *service) +{ + struct connman_service *def_service; + + def_service = connman_service_get_default(); + if (!def_service) + return; + + if (def_service == service && + 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) +{ + struct connman_service *service; + GList *src, *dst; + + apply_relevant_default_downgrade(default_service); + 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) { - if (!service) - return; + DBusMessage *signal; - DBG("service %p state4 %d state6 %d", service, service->state_ipv4, - service->state_ipv6); + DBG(""); - if (service->state_ipv4 == CONNMAN_SERVICE_STATE_ONLINE) - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV4); + services_notify->id = 0; - if (service->state_ipv6 == CONNMAN_SERVICE_STATE_ONLINE) - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV6); -} + signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, "ServicesChanged"); + if (!signal) + return FALSE; -static void apply_relevant_default_downgrade(struct connman_service *service) -{ - struct connman_service *def_service; + __connman_dbus_append_objpath_dict_array(signal, + service_append_ordered, NULL); + __connman_dbus_append_objpath_array(signal, + service_append_removed, NULL); - def_service = __connman_service_get_default(); - if (!def_service) - return; + dbus_connection_send(connection, signal, NULL); + dbus_message_unref(signal); - if (def_service == service && - 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); - } + g_hash_table_remove_all(services_notify->remove); + g_hash_table_remove_all(services_notify->add); + + return FALSE; } -static void switch_default_service(struct connman_service *default_service, - struct connman_service *downgrade_service) +static void service_schedule_changed(void) { - struct connman_service *service; - GList *src, *dst; - - apply_relevant_default_downgrade(default_service); - 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) + if (services_notify->id != 0) 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); + services_notify->id = g_timeout_add(100, service_send_changed, NULL); } static DBusMessage *move_service(DBusConnection *conn, @@ -5510,11 +6204,11 @@ static DBusMessage *move_service(DBusConnection *conn, 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); @@ -5582,6 +6276,8 @@ static DBusMessage *move_service(DBusConnection *conn, __connman_connection_update_gateway(); + service_schedule_changed(); + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } @@ -5607,118 +6303,19 @@ static DBusMessage *reset_counters(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static DBusMessage *get_user_favorite(DBusConnection *conn, +#if defined TIZEN_MAINTAIN_ONLINE +static DBusMessage *downgrade_service(DBusConnection *conn, DBusMessage *msg, void *user_data) { - DBusMessage *reply; - uid_t uid = USER_NONE; - dbus_bool_t user_favorite = false; struct connman_service *service = user_data; - connman_dbus_get_connection_unix_user_sync(conn, - dbus_message_get_sender(msg), - &uid); - if (uid == USER_ROOT) - user_favorite = service->favorite; - else if (uid != USER_NONE && uid == service->user.favorite_user) { - DBG("The service is favorite to this user!"); - user_favorite = true; - } + downgrade_state(service); + __connman_connection_update_gateway(); - reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID); - dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, - &user_favorite, DBUS_TYPE_INVALID); - return reply; + 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 || !service->path) { -#if !defined TIZEN_EXT - DBG("service %p or path is NULL", service); -#endif - return; - } - - if (g_hash_table_lookup(services_notify->add, service->path)) { -#if !defined TIZEN_EXT - DBG("new %s", service->path); -#endif - - append_struct(service, iter); - g_hash_table_remove(services_notify->add, service->path); - } else { -#if !defined TIZEN_EXT - DBG("changed %s", service->path); #endif - 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 void service_schedule_added(struct connman_service *service) { DBG("service %p", service); @@ -5752,10 +6349,8 @@ static bool allow_property_changed(struct connman_service *service) return FALSE; #endif if (g_hash_table_lookup_extended(services_notify->add, service->path, - NULL, NULL)) { - DBG("no property updates for service %p", service); + NULL, NULL)) return false; - } return true; } @@ -5782,9 +6377,9 @@ static const GDBusMethodTable service_methods[] = { GDBUS_ARGS({ "service", "o" }), NULL, move_after) }, { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) }, - { GDBUS_METHOD("GetUserFavorite", - NULL, GDBUS_ARGS({ "value", "v" }), - get_user_favorite) }, +#if defined TIZEN_MAINTAIN_ONLINE + { GDBUS_METHOD("Downgrade", NULL, NULL, downgrade_service) }, +#endif { }, }; @@ -5803,6 +6398,11 @@ static void service_free(gpointer user_data) reply_pending(service, ENOENT); + if (service->nameservers_timeout) { + g_source_remove(service->nameservers_timeout); + dns_changed(service); + } + __connman_notifier_service_remove(service); service_schedule_removed(service); @@ -5861,14 +6461,24 @@ static void service_free(gpointer user_data) 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); g_free(service->phase2); g_free(service->config_file); g_free(service->config_entry); +#if defined TIZEN_EXT + g_free(service->connector); + g_free(service->c_sign_key); + g_free(service->net_access_key); +#endif if (service->stats.timer) g_timer_destroy(service->stats.timer); @@ -5915,11 +6525,6 @@ static void service_initialize(struct connman_service *service) service->ignore = false; - service->user.favorite_user = USER_NONE; - service->user.current_user = USER_NONE; - - service->request_passphrase_input = false; - service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_NONE; service->order = 0; @@ -5929,7 +6534,9 @@ static void service_initialize(struct connman_service *service) service->provider = NULL; service->wps = false; + service->wps_advertizing = false; #if defined TIZEN_EXT + service->disconnection_requested = false; service->storage_reload = false; /* * Description: TIZEN implements system global connection management. @@ -6035,8 +6642,8 @@ static gint service_compare(gconstpointer a, gconstpointer b) state_a = service_a->state; state_b = service_b->state; - a_connected = is_connected(service_a); - b_connected = is_connected(service_b); + a_connected = is_connected(state_a); + b_connected = is_connected(state_b); if (a_connected && b_connected) { if (service_a->order > service_b->order) @@ -6061,9 +6668,9 @@ static gint service_compare(gconstpointer a, gconstpointer b) if (b_connected) return 1; - if (is_connecting(service_a)) + if (is_connecting(state_a)) return -1; - if (is_connecting(service_b)) + if (is_connecting(state_b)) return 1; } @@ -6074,6 +6681,20 @@ static gint service_compare(gconstpointer a, gconstpointer b) return 1; if (service_a->type != service_b->type) { + unsigned int *tech_array; + int i; + + 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 (tech_array[i] == service_b->type) + return 1; + } + } if (service_a->type == CONNMAN_SERVICE_TYPE_ETHERNET) return -1; @@ -6121,6 +6742,12 @@ static void service_list_sort(void) } } +int __connman_service_compare(const struct connman_service *a, + const struct connman_service *b) +{ + return service_compare(a, b); +} + /** * connman_service_get_type: * @service: service structure @@ -6154,40 +6781,6 @@ char *connman_service_get_interface(struct connman_service *service) } /** - * __connman_service_is_user_allowed: - * @type: service type - * @uid: user id - * - * Check a user is allowed to operate a type of service - */ -bool __connman_service_is_user_allowed(enum connman_service_type type, - uid_t uid) -{ - GList *list; - uid_t owner_user = USER_NONE; - - for (list = service_list; list; list = list->next) { - struct connman_service *service = list->data; - - if (service->type != type) - continue; - - if (is_connected(service)) { - owner_user = service->user.favorite_user; - break; - } - } - - if (uid == USER_NONE || - (uid != USER_ROOT && - owner_user != USER_NONE && - owner_user != uid)) - return false; - - return true; -} - -/** * connman_service_get_network: * @service: service structure * @@ -6242,14 +6835,12 @@ bool __connman_service_is_connected_state(struct connman_service *service, 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_state(service, - CONNMAN_IPCONFIG_TYPE_IPV4) && - is_connected_state(service, - CONNMAN_IPCONFIG_TYPE_IPV6); + return is_connected(service->state_ipv4) && + is_connected(service->state_ipv6); } return false; @@ -6312,7 +6903,7 @@ int __connman_service_get_connected_count_of_iface( index2 = __connman_service_get_index(service2); - if (is_connected(service2) && index2 > 0 && index1 == index2) + if (is_connected(service2->state) && index2 > 0 && index1 == index2) count++; index2 = 0; @@ -6355,9 +6946,6 @@ int __connman_service_set_favorite_delayed(struct connman_service *service, service->favorite = favorite; - if (!delay_ordering) - __connman_service_get_order(service); - favorite_changed(service); if (!delay_ordering) { @@ -6432,9 +7020,24 @@ void __connman_service_set_string(struct connman_service *service, } else if (g_str_equal(key, "Identity")) { g_free(service->identity); service->identity = g_strdup(value); + } 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, "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); @@ -6449,6 +7052,19 @@ void __connman_service_set_string(struct connman_service *service, service->phase2 = g_strdup(value); } else if (g_str_equal(key, "Passphrase")) __connman_service_set_passphrase(service, value); +#if defined TIZEN_EXT + else if (g_str_equal(key, "Connector")) { + g_free(service->connector); + service->connector = g_strdup(value); + } else if (g_str_equal(key, "CSignKey")) { + g_free(service->c_sign_key); + service->c_sign_key = g_strdup(value); + } else if (g_str_equal(key, "NetAccessKey")) { + g_free(service->net_access_key); + service->net_access_key = g_strdup(value); + } else + DBG("Unknown key: %s", key); +#endif } void __connman_service_set_search_domains(struct connman_service *service, @@ -6464,15 +7080,12 @@ void __connman_service_set_search_domains(struct connman_service *service, 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); - - if (service->connect_reason != CONNMAN_SERVICE_CONNECT_REASON_USER) - __connman_service_auto_connect(service->connect_reason); + service->mdns_config = enabled; - g_get_current_time(&service->modified); - service_save(service); + return set_mdns(service, enabled); } static void report_error_cb(void *user_context, bool retry, @@ -6550,11 +7163,12 @@ static void request_input_cb(struct connman_service *service, if (g_strcmp0(error, "net.connman.Agent.Error.Canceled") == 0) { - err = -EINVAL; + err = -ECONNABORTED; if (service->hidden) __connman_service_return_error(service, - ECANCELED, user_data); + ECONNABORTED, + user_data); goto done; } else { if (service->hidden) @@ -6635,7 +7249,7 @@ static void downgrade_connected_services(void) for (list = service_list; list; list = list->next) { up_service = list->data; - if (!is_connected(up_service)) + if (!is_connected(up_service->state)) continue; if (up_service->state == CONNMAN_SERVICE_STATE_ONLINE) @@ -6678,7 +7292,7 @@ static int service_update_preferred_order(struct connman_service *default_servic #if defined TIZEN_EXT static gboolean __connman_service_can_drop(struct connman_service *service) { - if (is_connected(service) == TRUE || is_connecting(service) == TRUE) { + if (is_connected(service->state) == TRUE || is_connecting(service->state) == TRUE) { if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR) return TRUE; else if (connman_service_is_no_ref_user_pdn_connection(service) == TRUE) @@ -6709,7 +7323,12 @@ static void __connman_service_disconnect_default(struct connman_service *service default_connecting_device = NULL; } +#if defined TIZEN_MAINTAIN_ONLINE +static void __connman_service_connect_default(struct connman_service *current, + enum connman_service_state old_state) +#else static void __connman_service_connect_default(struct connman_service *current) +#endif { int err; GList *list; @@ -6746,7 +7365,12 @@ static void __connman_service_connect_default(struct connman_service *current) } return; - } else if (is_connected(current) == TRUE || is_connecting(current) == TRUE) +#if defined TIZEN_MAINTAIN_ONLINE + } else if (current->state == CONNMAN_SERVICE_STATE_READY && + old_state == CONNMAN_SERVICE_STATE_ONLINE) { + DBG("Device is downgraded: online --> ready"); +#endif + } else if (is_connected(current->state) == TRUE || is_connecting(current->state) == TRUE) return; /* Always-on: keep default cellular connection as possible */ @@ -6768,8 +7392,8 @@ static void __connman_service_connect_default(struct connman_service *current) if (default_internet) { default_service = service; - if (is_connected(default_service) == TRUE || - is_connecting(default_service) == TRUE) + if (is_connected(default_service->state) == TRUE || + is_connecting(default_service->state) == TRUE) return; default_device = connman_network_get_device(default_service->network); @@ -6815,12 +7439,13 @@ static void single_connected_tech(struct connman_service *allowed) if (service != allowed && service->type != allowed->type && __connman_service_can_drop(service) == TRUE) #else - if (!is_connected(service)) + if (!is_connected(service->state)) break; if (service == allowed) continue; #endif + services = g_slist_prepend(services, service); } @@ -6846,10 +7471,22 @@ static void set_priority_connected_service(void) for (list = service_list; list; list = list->next) { service = list->data; - if (is_connected(service) == FALSE) + if (is_connected(service->state) == FALSE) service->order = 5; else +#if defined TIZEN_MAINTAIN_ONLINE + { + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->state == CONNMAN_SERVICE_STATE_ONLINE) + service->order = 6; + else if (service->type != CONNMAN_SERVICE_TYPE_WIFI) + service->order = 6; + else + service->order = 5; + } +#else service->order = 6; +#endif } } #endif @@ -6885,7 +7522,7 @@ 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, @@ -6897,13 +7534,15 @@ static int service_indicate_state(struct connman_service *service) if (old_state == CONNMAN_SERVICE_STATE_ONLINE) __connman_notifier_leave_online(service->type); - if (is_connected_state(service, old_state) && - !is_connected_state(service, new_state)) + if (is_connected(old_state) && !is_connected(new_state)) searchdomain_remove_all(service); service->state = new_state; state_changed(service); + if (!is_connected(old_state) && is_connected(new_state)) + searchdomain_add_all(service); + switch(new_state) { case CONNMAN_SERVICE_STATE_UNKNOWN: @@ -6954,7 +7593,7 @@ static int service_indicate_state(struct connman_service *service) default_changed(); - def_service = __connman_service_get_default(); + def_service = connman_service_get_default(); service_update_preferred_order(def_service, service, new_state); @@ -6962,17 +7601,6 @@ static int service_indicate_state(struct connman_service *service) reply_pending(service, 0); - g_get_current_time(&service->modified); - service_save(service); - - searchdomain_add_all(service); - dns_changed(service); - domain_changed(service); - proxy_changed(service); - - if (old_state != CONNMAN_SERVICE_STATE_ONLINE) - __connman_notifier_connect(service->type); - if (service->type == CONNMAN_SERVICE_TYPE_WIFI && connman_network_get_bool(service->network, "WiFi.UseWPS")) { @@ -6987,15 +7615,29 @@ static int service_indicate_state(struct connman_service *service) "WiFi.UseWPS", false); } + g_get_current_time(&service->modified); + 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); +#if !defined TIZEN_MAINTAIN_ONLINE if (connman_setting_get_bool("SingleConnectedTechnology")) single_connected_tech(service); else if (service->type != CONNMAN_SERVICE_TYPE_VPN) vpn_auto_connect(); +#else + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + vpn_auto_connect(); +#endif #if defined TIZEN_EXT if (service->type == CONNMAN_SERVICE_TYPE_WIFI) @@ -7005,21 +7647,22 @@ static int service_indicate_state(struct connman_service *service) break; case CONNMAN_SERVICE_STATE_ONLINE: +#if defined TIZEN_MAINTAIN_ONLINE +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) + set_priority_connected_service(); +#endif + + if (connman_setting_get_bool("SingleConnectedTechnology")) + single_connected_tech(service); +#endif break; case CONNMAN_SERVICE_STATE_DISCONNECT: - set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - - reply_pending(service, ECONNABORTED); - - def_service = __connman_service_get_default(); - service->disconnect_reason = connman_network_get_disconnect_reason(service->network); + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - if (!__connman_notifier_is_connected() && - def_service && - def_service->provider) - connman_provider_disconnect(def_service->provider); + reply_pending(service, ECONNABORTED); default_changed(); @@ -7029,14 +7672,13 @@ static int service_indicate_state(struct connman_service *service) #if defined TIZEN_EXT /** - * Skip the functions if there is any connected profiles - * that use same interface - */ + * Skip the functions if there is any connected profiles + * that use same interface + */ if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR || __connman_service_get_connected_count_of_iface( service) <= 0) { #endif - dns_changed(service); domain_changed(service); proxy_changed(service); #if defined TIZEN_EXT @@ -7059,23 +7701,26 @@ static int service_indicate_state(struct connman_service *service) service->order = 5; __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); #endif - if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER && + 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) == -EINPROGRESS) - return 0; + error2string(service->error), + report_error_cb, + get_dbus_sender(service), + NULL); + } service_complete(service); - break; } service_list_sort(); #if defined TIZEN_EXT +#if defined TIZEN_MAINTAIN_ONLINE + __connman_service_connect_default(service, old_state); +#else __connman_service_connect_default(service); #endif +#endif __connman_connection_update_gateway(); @@ -7091,20 +7736,6 @@ static int service_indicate_state(struct connman_service *service) default_changed(); } - if (service->type == CONNMAN_SERVICE_TYPE_WIFI && - service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER && - (new_state == CONNMAN_SERVICE_STATE_READY || - new_state == CONNMAN_SERVICE_STATE_ONLINE)) { - if (service->user.favorite_user != service->user.current_user) { - DBG("Now set service favorite user id from %d to %d", - service->user.favorite_user, service->user.current_user); - - service->user.favorite_user = service->user.current_user; - - service_save(service); - } - } - return 0; } @@ -7182,7 +7813,7 @@ int __connman_service_indicate_default(struct connman_service *service) { DBG("service %p state %s", service, state2string(service->state)); - if (!is_connected(service)) { + 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 @@ -7237,7 +7868,7 @@ static void check_proxy_setup(struct connman_service *service) return; done: - __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); + __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); } #if defined TIZEN_EXT @@ -7302,48 +7933,89 @@ 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; - int refcount = service->refcount - 1; - connman_service_unref(service); - if (refcount == 0) { - DBG("Service %p already removed", service); - return FALSE; - } + 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; } +#if defined TIZEN_MAINTAIN_ONLINE +static gboolean redo_wispr_ipv4(gpointer user_data) +{ + struct connman_service *service = user_data; + + DBG(""); + + __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); + + return FALSE; +} +#endif + 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, connman_service_ref(service)); + if (*interval < ONLINE_CHECK_MAX_INTERVAL) + (*interval)++; return EAGAIN; } +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); +} + int __connman_service_ipconfig_indicate_state(struct connman_service *service, enum connman_service_state new_state, enum connman_ipconfig_type type) @@ -7376,6 +8048,30 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, 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); + +#if defined TIZEN_EXT + if (old_state != CONNMAN_SERVICE_STATE_READY && + old_state != CONNMAN_SERVICE_STATE_ONLINE) +#endif + 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; @@ -7400,11 +8096,9 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, switch (new_state) { case CONNMAN_SERVICE_STATE_UNKNOWN: - case CONNMAN_SERVICE_STATE_IDLE: case CONNMAN_SERVICE_STATE_ASSOCIATION: break; case CONNMAN_SERVICE_STATE_CONFIGURATION: - __connman_ipconfig_enable(ipconfig); break; case CONNMAN_SERVICE_STATE_READY: #if defined TIZEN_EXT @@ -7416,15 +8110,24 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, break; } #endif - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { + if (connman_setting_get_bool("EnableOnlineCheck")) + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { #if !defined TIZEN_EXT - check_proxy_setup(service); + check_proxy_setup(service); #endif +#if defined TIZEN_MAINTAIN_ONLINE +/* if (old_state == CONNMAN_SERVICE_STATE_ONLINE) */ + check_proxy_setup(service); +#endif + } else { + __connman_service_wispr_start(service, type); + } + else + connman_info("Online check disabled. " + "Default service remains in READY state."); + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) service_rp_filter(service, true); - } else { - service->online_check_count = 1; - __connman_wispr_start(service, type); - } + set_mdns(service, service->mdns_config); break; case CONNMAN_SERVICE_STATE_ONLINE: break; @@ -7436,59 +8139,28 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, service_rp_filter(service, false); break; - case CONNMAN_SERVICE_STATE_FAILURE: - break; - } - /* Keep that state, but 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. - */ - method = __connman_ipconfig_get_method(ipconfig); - switch (method) { - case CONNMAN_IPCONFIG_METHOD_UNKNOWN: - case CONNMAN_IPCONFIG_METHOD_OFF: - new_state = CONNMAN_SERVICE_STATE_IDLE; - break; + case CONNMAN_SERVICE_STATE_IDLE: + case CONNMAN_SERVICE_STATE_FAILURE: + __connman_ipconfig_disable(ipconfig); - case CONNMAN_IPCONFIG_METHOD_FIXED: - case CONNMAN_IPCONFIG_METHOD_MANUAL: - case CONNMAN_IPCONFIG_METHOD_DHCP: - case CONNMAN_IPCONFIG_METHOD_AUTO: break; - } - if (is_connected_state(service, old_state) && - !is_connected_state(service, new_state)) -#if defined TIZEN_EXT - { - DBG("nameserver remove all, type: %d", type); + if (is_connected(old_state) && !is_connected(new_state)) { nameserver_remove_all(service, type); -#else - nameserver_remove_all(service); -#endif -#if defined TIZEN_EXT + cancel_online_check(service); } -#endif if (type == CONNMAN_IPCONFIG_TYPE_IPV4) service->state_ipv4 = new_state; else service->state_ipv6 = new_state; - if (!is_connected_state(service, old_state) && - is_connected_state(service, new_state)) -#if defined TIZEN_EXT - { - DBG("nameserver add all, type: %d", type); + if (!is_connected(old_state) && is_connected(new_state)) nameserver_add_all(service, type); -#else - nameserver_add_all(service); -#endif -#if defined TIZEN_EXT - } -#endif + + __connman_timeserver_sync(service); #if defined TIZEN_EXT int ret = service_indicate_state(service); @@ -7547,10 +8219,31 @@ static void prepare_8021x(struct connman_service *service) connman_network_set_string(service->network, "WiFi.Identity", service->identity); + 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->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", @@ -7569,7 +8262,41 @@ static void prepare_8021x(struct connman_service *service) if (service->phase2) connman_network_set_string(service->network, "WiFi.Phase2", service->phase2); + +#if defined TIZEN_EXT + if (service->keymgmt_type) + connman_network_set_string(service->network, "WiFi.KeymgmtType", + service->keymgmt_type); + + DBG("service->phase1 : %s", service->phase1); + if (service->phase1) + connman_network_set_string(service->network, "WiFi.Phase1", + service->phase1); +#endif +} +#if defined TIZEN_EXT + +static bool has_valid_configuration_object(struct connman_service *service) +{ + return service->connector && service->c_sign_key && service->net_access_key; +} + +static void prepare_dpp(struct connman_service *service) +{ + DBG("prepare dpp"); + if (service->connector) + connman_network_set_string(service->network, "WiFi.Connector", + service->connector); + + if (service->c_sign_key) + connman_network_set_string(service->network, "WiFi.CSignKey", + service->c_sign_key); + + if (service->net_access_key) + connman_network_set_string(service->network, "WiFi.NetAccessKey", + service->net_access_key); } +#endif static int service_connect(struct connman_service *service) { @@ -7590,7 +8317,7 @@ static int service_connect(struct connman_service *service) if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) break; - if (!is_connecting(temp) && !is_connected(temp)) + if (!is_connecting(temp->state) && !is_connected(temp->state)) break; if (service == temp) @@ -7610,6 +8337,9 @@ static int service_connect(struct connman_service *service) case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif return -EINVAL; case CONNMAN_SERVICE_TYPE_ETHERNET: case CONNMAN_SERVICE_TYPE_GADGET: @@ -7621,19 +8351,21 @@ static int service_connect(struct connman_service *service) switch (service->security) { case CONNMAN_SERVICE_SECURITY_UNKNOWN: case CONNMAN_SERVICE_SECURITY_NONE: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_OWE: +#endif break; case CONNMAN_SERVICE_SECURITY_WEP: case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_SAE: +#endif if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) return -ENOKEY; - if (service->request_passphrase_input) { - DBG("Now try to connect other user's favorite service"); - service->request_passphrase_input = false; - return -ENOKEY; - } else if (!service->passphrase) { + if (!service->passphrase) { if (!service->network) return -EOPNOTSUPP; @@ -7643,9 +8375,23 @@ static int service_connect(struct connman_service *service) } break; +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_DPP: + if (has_valid_configuration_object(service) && + !service->network) + return -EINVAL; + break; +#endif case CONNMAN_SERVICE_SECURITY_8021X: - if (!service->eap) + 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; + } #if defined TIZEN_EXT /* @@ -7653,9 +8399,13 @@ static int service_connect(struct connman_service *service) * or EAP-AKA (EAP-TLS, EAP-SIM and EAP-AKA networks * need to be fully provisioned) */ + DBG("service eap: %s", service->eap); if (g_str_equal(service->eap, "tls") || g_str_equal(service->eap, "sim") || - g_str_equal(service->eap, "aka")) + g_str_equal(service->eap, "aka") || + g_str_equal(service->eap, "aka'") || + g_str_equal(service->eap, "pwd") || + g_str_equal(service->eap, "fast")) break; #else /* @@ -7664,6 +8414,7 @@ static int service_connect(struct connman_service *service) */ if (g_str_equal(service->eap, "tls")) break; + #endif /* * Return -ENOKEY if either identity or passphrase is @@ -7692,6 +8443,13 @@ static int service_connect(struct connman_service *service) case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_SAE: + case CONNMAN_SERVICE_SECURITY_OWE: + break; + case CONNMAN_SERVICE_SECURITY_DPP: + prepare_dpp(service); +#endif break; case CONNMAN_SERVICE_SECURITY_8021X: prepare_8021x(service); @@ -7705,22 +8463,22 @@ static int service_connect(struct connman_service *service) &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) - err = __connman_provider_connect(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); } } @@ -7738,10 +8496,10 @@ int __connman_service_connect(struct connman_service *service, reason2string(service->connect_reason), reason2string(reason)); - if (is_connected(service)) + if (is_connected(service->state)) return -EISCONN; - if (is_connecting(service)) + if (is_connecting(service->state)) return -EALREADY; switch (service->type) { @@ -7749,6 +8507,9 @@ int __connman_service_connect(struct connman_service *service, case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif return -EINVAL; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -7767,7 +8528,13 @@ int __connman_service_connect(struct connman_service *service, err = service_connect(service); + DBG("service %p err %d", service, err); + service->connect_reason = reason; +#if defined TIZEN_EXT + connect_reason_changed(service); +#endif + if (err >= 0) return 0; @@ -7788,6 +8555,7 @@ int __connman_service_connect(struct connman_service *service, if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) { if (err == -ENOKEY || err == -EPERM) { DBusMessage *pending = NULL; + const char *dbus_sender = get_dbus_sender(service); /* * We steal the reply here. The idea is that the @@ -7802,14 +8570,13 @@ int __connman_service_connect(struct connman_service *service, err = __connman_agent_request_passphrase_input(service, request_input_cb, - get_dbus_sender(service), + dbus_sender, pending); if (service->hidden && err != -EINPROGRESS) service->pending = pending; return err; } - reply_pending(service, -err); } return err; @@ -7826,7 +8593,7 @@ int __connman_service_disconnect(struct connman_service *service) connman_agent_cancel(service); - reply_pending(service, ECONNABORTED); + __connman_stats_service_unregister(service); if (service->network) { err = __connman_network_disconnect(service->network); @@ -7868,8 +8635,6 @@ int __connman_service_disconnect(struct connman_service *service) } #endif - __connman_stats_service_unregister(service); - return err; } @@ -7884,7 +8649,7 @@ int __connman_service_disconnect_all(void) for (iter = service_list; iter; iter = iter->next) { service = iter->data; - if (!is_connected(service)) + if (!is_connected(service->state)) break; services = g_slist_prepend(services, service); @@ -7914,6 +8679,11 @@ static struct connman_service *lookup_by_identifier(const char *identifier) return g_hash_table_lookup(service_hash, identifier); } +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; @@ -8013,8 +8783,15 @@ static int service_register(struct connman_service *service) DBG("path %s", service->path); +#if defined TIZEN_EXT + service_load(service); + int ret = __connman_config_provision_service(service); + if (ret < 0) + DBG("Failed to provision service"); +#else if (__connman_config_provision_service(service) < 0) service_load(service); +#endif g_dbus_register_interface(connection, service->path, CONNMAN_SERVICE_INTERFACE, @@ -8064,12 +8841,6 @@ static void service_lower_down(struct connman_ipconfig *ipconfig, DBG("%s lower down", ifname); - if (!is_idle_state(service, service->state_ipv4)) - __connman_ipconfig_disable(service->ipconfig_ipv4); - - if (!is_idle_state(service, service->state_ipv6)) - __connman_ipconfig_disable(service->ipconfig_ipv6); - stats_stop(service); service_save(service); } @@ -8098,9 +8869,8 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig, { err = __connman_ipconfig_gateway_add(ipconfig, service); - if(err == 0) - __connman_connection_gateway_activate(service, - CONNMAN_IPCONFIG_TYPE_IPV6); + if(err < 0) + DBG("Failed to add gateway"); } #else __connman_service_ipconfig_indicate_state(service, @@ -8109,6 +8879,7 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig, #endif settings_changed(service, ipconfig); + address_updated(service, type); } static void service_ip_release(struct connman_ipconfig *ipconfig, @@ -8309,14 +9080,9 @@ struct connman_service *__connman_service_lookup_from_index(int index) 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) @@ -8329,64 +9095,9 @@ const char *__connman_service_get_name(struct connman_service *service) return service->name; } -enum connman_service_state __connman_service_get_state(struct connman_service *service) -{ - return service->state; -} - -unsigned int __connman_service_get_order(struct connman_service *service) -{ - unsigned int order = 0; - - if (!service) - return 0; - - service->order = 0; - - if (!service->favorite) - return 0; - -#if defined TIZEN_EXT - if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->do_split_routing == FALSE) - order = 10; - else if (service->type == CONNMAN_SERVICE_TYPE_WIFI) { - if (service->order < 5) - order = 5; - } else if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET) - order = 4; - else if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH) - order = 3; - else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && - __connman_service_is_internet_profile(service) == TRUE) - order = 1; - else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && - __connman_service_is_tethering_profile(service) == TRUE) - order = 0; - else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) - order = 0; - else - order = 2; -#else - if (service == service_list->data) - order = 1; - - if (service->type == CONNMAN_SERVICE_TYPE_VPN && - !service->do_split_routing) { - service->order = 10; - order = 10; - } -#endif - DBG("service %p name %s order %d split %d", service, service->name, - order, service->do_split_routing); - - return order; -} - -void __connman_service_update_ordering(void) +enum connman_service_state connman_service_get_state(struct connman_service *service) { - if (service_list && service_list->next) - service_list = g_list_sort(service_list, service_compare); + return service ? service->state : CONNMAN_SERVICE_STATE_UNKNOWN; } static enum connman_service_type convert_network_type(struct connman_network *network) @@ -8430,6 +9141,12 @@ static enum connman_service_security convert_wifi_security(const char *security) else if (g_str_equal(security, "rsn")) return CONNMAN_SERVICE_SECURITY_RSN; #if defined TIZEN_EXT + else if (g_str_equal(security, "sae")) + return CONNMAN_SERVICE_SECURITY_SAE; + else if (g_str_equal(security, "owe")) + return CONNMAN_SERVICE_SECURITY_OWE; + else if (g_str_equal(security, "dpp")) + return CONNMAN_SERVICE_SECURITY_DPP; else if (g_str_equal(security, "ft_psk") == TRUE) return CONNMAN_SERVICE_SECURITY_PSK; else if (g_str_equal(security, "ft_ieee8021x") == TRUE) @@ -8439,6 +9156,35 @@ static enum connman_service_security convert_wifi_security(const char *security) return CONNMAN_SERVICE_SECURITY_UNKNOWN; } +#if defined TIZEN_EXT +int check_passphrase_ext(struct connman_network *network, + const char *passphrase) +{ + const char *str; + enum connman_service_security security; + + str = connman_network_get_string(network, "WiFi.Security"); + security = convert_wifi_security(str); + + return __connman_service_check_passphrase(security, passphrase); +} +#endif + +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) { @@ -8447,10 +9193,10 @@ static void update_from_network(struct connman_service *service, DBG("service %p network %p", service, network); - if (is_connected(service)) + if (is_connected(service->state)) return; - if (is_connecting(service)) + if (is_connecting(service->state)) return; str = connman_network_get_string(network, "Name"); @@ -8479,7 +9225,7 @@ 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) { connman_network_unref(service->network); @@ -8506,7 +9252,7 @@ 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); @@ -8551,20 +9297,13 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne } } - switch (service->type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - case CONNMAN_SERVICE_TYPE_SYSTEM: - 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: - case CONNMAN_SERVICE_TYPE_P2P: - 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; @@ -8582,15 +9321,20 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne service->ipconfig_ipv6 = create_ip6config(service, index); service_register(service); + service_schedule_added(service); if (service->favorite) { device = connman_network_get_device(service->network); - if (device && !connman_device_get_scanning(device)) { + 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: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; case CONNMAN_SERVICE_TYPE_GADGET: @@ -8623,15 +9367,47 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne if (service->phase2 != NULL) connman_network_set_string(service->network, "WiFi.Phase2", service->phase2); + if (service->eap != NULL) + connman_network_set_string(service->network, "WiFi.Connector", + service->connector); + if (service->identity != NULL) + connman_network_set_string(service->network, "WiFi.CSignKey", + service->c_sign_key); + if (service->phase2 != NULL) + connman_network_set_string(service->network, "WiFi.NetAccessKey", + service->net_access_key); #endif } __connman_notifier_service_add(service, service->name); - service_schedule_added(service); return service; } +#if defined TIZEN_EXT +void __connman_service_notify_strength_changed(struct connman_network *network) +{ + struct connman_service *service; + uint8_t strength = 0; + + service = connman_service_lookup_from_network(network); + if (!service) + return; + + if (!service->network) + return; + + strength = connman_network_get_strength(service->network); + if (strength == service->strength) + return; + + service->strength = strength; + DBG("Strength %d", strength); + strength_changed(service); + service_list_sort(); +} +#endif + void __connman_service_update_from_network(struct connman_network *network) { bool need_sort = false; @@ -8667,7 +9443,7 @@ void __connman_service_update_from_network(struct connman_network *network) } 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) @@ -8748,6 +9524,7 @@ __connman_service_create_from_provider(struct connman_provider *provider) 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->favorite = true; @@ -8890,6 +9667,8 @@ int __connman_service_init(void) return err; } + set_always_connecting_technologies(); + connection = connman_dbus_get_connection(); service_hash = g_hash_table_new_full(g_str_hash, g_str_equal, @@ -8909,14 +9688,14 @@ void __connman_service_cleanup(void) { DBG(""); - if (vpn_autoconnect_timeout) { - g_source_remove(vpn_autoconnect_timeout); - vpn_autoconnect_timeout = 0; + if (vpn_autoconnect_id) { + g_source_remove(vpn_autoconnect_id); + vpn_autoconnect_id = 0; } - if (autoconnect_timeout != 0) { - g_source_remove(autoconnect_timeout); - autoconnect_timeout = 0; + if (autoconnect_id != 0) { + g_source_remove(autoconnect_id); + autoconnect_id = 0; } connman_agent_driver_unregister(&agent_driver); @@ -8933,9 +9712,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);