X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=356a21870c320bd1e71d12b64411d3e4442950e0;hb=00b8c314dc2cfb641494d413f4b00d90a10ecbeb;hp=34de494accd5604aa6a982258a374f1e4653b18d;hpb=b7ff33d7bc0b2b6efaf8e2f0c69c75b8efbc2490;p=platform%2Fupstream%2Fconnman.git diff --git a/src/service.c b/src/service.c old mode 100644 new mode 100755 index 34de494..356a218 --- a/src/service.c +++ b/src/service.c @@ -35,13 +35,27 @@ #include #include +#include "src/shared/util.h" + #include "connman.h" #define CONNECT_TIMEOUT 120 #if defined TIZEN_EXT #define WIFI_BSSID_STR_LEN 18 +#define MAX_WIFI_PROFILES 200 + +#define FREQ_RANGE_24GHZ_CHANNEL_1 2412 +#define FREQ_RANGE_24GHZ_CHANNEL_14 2484 +#define FREQ_RANGE_5GHZ_CHANNEL_32 5160 +#define FREQ_RANGE_5GHZ_CHANNEL_165 5825 + +#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5] +#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x" #endif +#define VPN_AUTOCONNECT_TIMEOUT_DEFAULT 1 +#define VPN_AUTOCONNECT_TIMEOUT_STEP 30 +#define VPN_AUTOCONNECT_TIMEOUT_ATTEMPTS_THRESHOLD 270 static DBusConnection *connection = NULL; @@ -52,11 +66,51 @@ 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; +static bool enable_online_to_ready_transition = false; +static unsigned int online_check_initial_interval = 0; +static unsigned int online_check_max_interval = 0; #if defined TIZEN_EXT static bool auto_connect_mode = TRUE; + +struct saved_profiles { + GTimeVal modified; + gchar *profile_name; +}; + +static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; #endif +#if defined TIZEN_EXT && defined TIZEN_EXT_INS +enum connman_ins_preferred_freq { + CONNMAN_INS_PREFERRED_FREQ_UNKNOWN, + CONNMAN_INS_PREFERRED_FREQ_24GHZ, + CONNMAN_INS_PREFERRED_FREQ_5GHZ, +}; + +struct connman_ins_settings { + bool last_user_selection; + unsigned int last_user_selection_time; + unsigned int last_user_selection_score; + bool last_connected; + unsigned int last_connected_score; + enum connman_ins_preferred_freq preferred_freq; + unsigned int preferred_freq_score; + unsigned int security_priority[CONNMAN_SERVICE_SECURITY_MAX]; + unsigned int security_priority_count; + unsigned int security_priority_score; + bool signal; + bool internet; + unsigned int internet_score; + int signal_level3_5ghz; + int signal_level3_24ghz; +}; + +static struct connman_ins_settings ins_settings; +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + struct connman_stats { bool valid; bool enabled; @@ -88,7 +142,7 @@ struct connman_service { bool hidden; bool ignore; bool autoconnect; - GTimeVal modified; + struct timeval modified; unsigned int order; char *name; char *passphrase; @@ -136,8 +190,8 @@ struct connman_service { bool wps; bool wps_advertizing; guint online_timeout; - int online_check_interval_ipv4; - int online_check_interval_ipv6; + unsigned int online_check_interval_ipv4; + unsigned int online_check_interval_ipv6; bool do_split_routing; bool new_service; bool hidden_service; @@ -161,9 +215,15 @@ struct connman_service { int disconnect_reason; int assoc_status_code; /* - * Only for EAP-FAST + * Only for EAP-FAST and EAP-PEAP in EAPoL. */ char *phase1; +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + /* + * Only for EAP-FAST + */ + char *pac_file; +#endif /* * Description: To indicate that disconnection triggered by user. */ @@ -176,7 +236,25 @@ struct connman_service { char *connector; char *c_sign_key; char *net_access_key; -#endif + unsigned char last_connected_bssid[WIFI_BSSID_LEN_MAX]; + bool is_internet_connection; + int assoc_reject_count; +#if defined TIZEN_EXT_INS + int score_last_user_selection; + int score_last_connected; + int score_frequency; + int score_security_priority; + int score_internet_connection; + int score_strength; +#endif + int ins_score; +#endif +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + /* + * To indicate use of EAP over Ethernet. + */ + bool use_eapol; +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ }; static bool allow_property_changed(struct connman_service *service); @@ -186,6 +264,7 @@ static struct connman_ipconfig *create_ip4config(struct connman_service *service static struct connman_ipconfig *create_ip6config(struct connman_service *service, int index); static void dns_changed(struct connman_service *service); +static void vpn_auto_connect(void); struct find_data { const char *path; @@ -193,6 +272,11 @@ struct find_data { }; #if defined TIZEN_EXT +struct assoc_reject_data { + char *bssid; + GSList *reject_time_list; +}; + /* * Public APIs to use user_pdn_connection_refcount */ @@ -271,6 +355,8 @@ static const char *reason2string(enum connman_service_connect_reason reason) return "auto"; case CONNMAN_SERVICE_CONNECT_REASON_SESSION: return "session"; + case CONNMAN_SERVICE_CONNECT_REASON_NATIVE: + return "native"; } return "unknown"; @@ -435,6 +521,10 @@ static const char *error2string(enum connman_service_error error) return "login-failed"; case CONNMAN_SERVICE_ERROR_AUTH_FAILED: return "auth-failed"; +#ifdef TIZEN_EXT + case CONNMAN_SERVICE_ERROR_ASSOC_FAILED: + return "assoc-failed"; +#endif case CONNMAN_SERVICE_ERROR_INVALID_KEY: return "invalid-key"; case CONNMAN_SERVICE_ERROR_BLOCKED: @@ -499,7 +589,26 @@ static enum connman_dnsconfig_method __connman_dnsconfig_string2method( } #endif -static void set_split_routing(struct connman_service *service, bool value) +void __connman_service_split_routing_changed(struct connman_service *service) +{ + dbus_bool_t split_routing; + + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + split_routing = service->do_split_routing; + if (!connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "SplitRouting", + DBUS_TYPE_BOOLEAN, &split_routing)) + connman_warn("cannot send SplitRouting property change on %s", + service->identifier); +} + +void __connman_service_set_split_routing(struct connman_service *service, + bool value) { if (service->type != CONNMAN_SERVICE_TYPE_VPN) return; @@ -510,6 +619,12 @@ static void set_split_routing(struct connman_service *service, bool value) service->order = 0; else service->order = 10; + + /* + * In order to make sure the value is propagated also when loading the + * VPN service signal the value regardless of the value change. + */ + __connman_service_split_routing_changed(service); } int __connman_service_load_modifiable(struct connman_service *service) @@ -535,9 +650,10 @@ int __connman_service_load_modifiable(struct connman_service *service) #endif break; case CONNMAN_SERVICE_TYPE_VPN: - set_split_routing(service, g_key_file_get_boolean(keyfile, - service->identifier, - "SplitRouting", NULL)); + __connman_service_set_split_routing(service, + g_key_file_get_boolean(keyfile, + service->identifier, + "SplitRouting", NULL)); /* fall through */ case CONNMAN_SERVICE_TYPE_WIFI: @@ -556,7 +672,7 @@ int __connman_service_load_modifiable(struct connman_service *service) str = g_key_file_get_string(keyfile, service->identifier, "Modified", NULL); if (str) { - g_time_val_from_iso8601(str, &service->modified); + util_iso8601_to_timeval(str, &service->modified); g_free(str); } @@ -565,6 +681,382 @@ int __connman_service_load_modifiable(struct connman_service *service) return 0; } +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +static void __connman_service_cleanup_8021x(struct connman_service *service) +{ + if (service == NULL) + return; + + DBG("service %p ", service); + + __connman_service_set_string(service, "EAP", NULL); + __connman_service_set_string(service, "Identity", NULL); + __connman_service_set_string(service, "Passphrase", NULL); + __connman_service_set_string(service, "AnonymousIdentity", NULL); + __connman_service_set_string(service, "CACertFile", NULL); + __connman_service_set_string(service, "ClientCertFile", NULL); + __connman_service_set_string(service, "PrivateKeyFile", NULL); + __connman_service_set_string(service, "PrivateKeyPassphrase", NULL); + __connman_service_set_string(service, "Phase1", NULL); + __connman_service_set_string(service, "Phase2", NULL); + __connman_service_set_string(service, "PacFile", NULL); +} + +static int connman_service_set_eapol_property(struct connman_service *service, + DBusMessageIter *array) +{ + DBusMessageIter dict; + char *str = NULL; + + __connman_service_cleanup_8021x(service); + + if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY) + return -EINVAL; + + dbus_message_iter_recurse(array, &dict); + + while(dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter entry, value; + const char *key; + int type; + + dbus_message_iter_recurse(&dict, &entry); + + if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, &key); + dbus_message_iter_next(&entry); + + if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_VARIANT) + return -EINVAL; + + dbus_message_iter_recurse(&entry, &value); + + type = dbus_message_iter_get_arg_type(&value); + + if (g_str_equal(key, "UseEapol")) { + dbus_bool_t use_eapol; + + if (type != DBUS_TYPE_BOOLEAN) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &use_eapol); + service->use_eapol = use_eapol; + + } else if (g_str_equal(key, "EAP")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "EAP", str); + + } else if (g_str_equal(key, "Identity")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "Identity", str); + + } else if (g_str_equal(key, "AnonymousIdentity")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "AnonymousIdentity", str); + + } else if (g_str_equal(key, "CACertFile")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "CACertFile", str); + } else if (g_str_equal(key, "ClientCertFile")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "ClientCertFile", str); + } else if (g_str_equal(key, "PrivateKeyFile")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "PrivateKeyFile", str); + } else if (g_str_equal(key, "PrivateKeyPassphrase")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "PrivateKeyPassphrase", str); + } else if (g_str_equal(key, "Phase2")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "Phase2", str); + } else if (g_str_equal(key, "Phase1")) { + int val; + char phase1[5] = {0,}; + + if (type != DBUS_TYPE_INT32) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &val); + sprintf(phase1, "%d", val); + __connman_service_set_string(service, "Phase1", phase1); + } else if (g_str_equal(key, "PacFile")) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&value, &str); + __connman_service_set_string(service, "PacFile", str); + } + + dbus_message_iter_next(&dict); + } + + return 0; +} +#endif + +#if defined TIZEN_EXT +static void save_assoc_reject(gpointer key, gpointer value, gpointer user_data) +{ + struct assoc_reject_data *assoc_rd = value; + GString *assoc_reject_str = user_data; + GSList *list; + char *val_str; + + if (g_slist_length(assoc_rd->reject_time_list) < 1) + return; + + for (list = assoc_rd->reject_time_list; list; list = list->next) { + time_t assoc_reject_time = GPOINTER_TO_INT(list->data); + + val_str = g_strdup_printf("%s_%ld", assoc_rd->bssid, assoc_reject_time); + + if (assoc_reject_str->len > 0) + g_string_append_printf(assoc_reject_str, " %s", val_str); + else + g_string_append(assoc_reject_str, val_str); + + g_free(val_str); + } +} + +static void count_assoc_reject(gpointer key, gpointer value, gpointer user_data) +{ + struct assoc_reject_data *assoc_data = value; + int *assoc_reject_count = user_data; + + if (assoc_data) + *assoc_reject_count += g_slist_length(assoc_data->reject_time_list); +} + +static bool update_assoc_reject(struct connman_service *service) +{ + GHashTable *assoc_reject_table; + int assoc_reject_count; + + if (!service->network) + return false; + + assoc_reject_table = connman_network_get_assoc_reject_table(service->network); + if (assoc_reject_table) { + assoc_reject_count = 0; + g_hash_table_foreach(assoc_reject_table, count_assoc_reject, &assoc_reject_count); +#if defined TIZEN_EXT_INS + DBG("assoc reject count [%d -> %d]", + service->assoc_reject_count, assoc_reject_count); +#endif + if (service->assoc_reject_count != assoc_reject_count) { + service->assoc_reject_count = assoc_reject_count; + return true; + } + } + + return false; +} + +static int service_ext_load(struct connman_service *service) +{ + GKeyFile *keyfile; + GHashTable *reject_table; + char **reject_list; + gsize reject_len; + struct assoc_reject_data *reject_data; + char **bssid_time; + char *bssid; + time_t reject_time; + time_t curr_time; + time_t ref_time; + struct tm* ref_timeinfo; + int i; + int err = 0; + + if (!simplified_log) + DBG("service %p", service); + + if (!service->network) + return -EINVAL; + + if (service->type != CONNMAN_SERVICE_TYPE_WIFI) + return -EINVAL; + + keyfile = connman_storage_load_service(service->identifier); + if (!keyfile) + return -EIO; + + reject_table = connman_network_get_assoc_reject_table(service->network); + + reject_list = g_key_file_get_string_list(keyfile, + service->identifier, "AssocReject", &reject_len, NULL); + + if (!reject_list || reject_len == 0) { + g_strfreev(reject_list); + goto done; + } + + /* Only events that occur within one hour are appened. */ + curr_time = time(NULL); + ref_timeinfo = localtime(&curr_time); + ref_timeinfo->tm_hour -= 1; + ref_time = mktime(ref_timeinfo); + + for (i = 0; reject_list[i]; i++) { + bssid_time = g_strsplit(reject_list[i], "_", 0); + if (!bssid_time) { + err = -ERANGE; + continue; + } + + bssid = bssid_time[0]; + reject_time = strtol(bssid_time[1], NULL, 10); + + if (reject_time < ref_time) { + g_strfreev(bssid_time); + err = -ERANGE; + continue; + } + + reject_data = g_hash_table_lookup(reject_table, bssid); + if (!reject_data) { + reject_data = g_try_new0(struct assoc_reject_data, 1); + if (!reject_data) { + g_strfreev(bssid_time); + err = -ERANGE; + continue; + } + + reject_data->bssid = g_strdup(bssid); + g_hash_table_insert(reject_table, reject_data->bssid, reject_data); + } + + reject_data->reject_time_list = g_slist_append(reject_data->reject_time_list, + GINT_TO_POINTER(reject_time)); + +#if defined TIZEN_EXT_INS + DBG("assoc reject [%s_%ld]", bssid, reject_time); +#endif + + g_strfreev(bssid_time); + } + + g_strfreev(reject_list); + +done: + g_key_file_free(keyfile); + return err; +} + +static int service_ext_save(struct connman_service *service) +{ + GKeyFile *keyfile; + GHashTable *reject_table; + GString *reject_str; + char **reject_list; + guint reject_len; + int err = 0; + + DBG("service %p", service); + + if (!service->network) + return -EINVAL; + + if (service->type != CONNMAN_SERVICE_TYPE_WIFI) + return -EINVAL; + + keyfile = g_key_file_new(); + if (!keyfile) + return -EIO; + + /* Last connected BSSID */ + if (memcmp(service->last_connected_bssid, invalid_bssid, WIFI_BSSID_LEN_MAX)) { + char *identifier = service->identifier; + GString *bssid_str; + unsigned int i; + + bssid_str = g_string_sized_new(MAC_ADDRESS_LENGTH); + if (!bssid_str) { + err = -ENOMEM; + goto next; + } + + for (i = 0; i < WIFI_BSSID_LEN_MAX; i++) { + g_string_append_printf(bssid_str, + "%02x", service->last_connected_bssid[i]); + if (i < WIFI_BSSID_LEN_MAX - 1) + g_string_append(bssid_str, ":"); + } + + g_key_file_set_string(keyfile, identifier, + "LastConnectedBSSID", bssid_str->str); + +#if defined TIZEN_EXT_INS + DBG("last connected bssid[%s]", bssid_str->str); +#endif + + g_string_free(bssid_str, TRUE); + } + +next: + + /* Assoc reject */ + reject_table = connman_network_get_assoc_reject_table(service->network); + if (reject_table && g_hash_table_size(reject_table) > 0) { + reject_str = g_string_new(NULL); + if (!reject_str) { + err = -ENOMEM; + goto done; + } + + g_hash_table_foreach(reject_table, save_assoc_reject, reject_str); + + reject_list = g_strsplit_set(reject_str->str, " ", 0); + reject_len = g_strv_length(reject_list); + + g_key_file_set_string_list(keyfile, service->identifier, + "AssocReject", (const gchar **)reject_list, reject_len); + +#if defined TIZEN_EXT_INS + DBG("assoc reject table [%d]", reject_len); +#endif + + g_strfreev(reject_list); + g_string_free(reject_str, TRUE); + } else { + g_key_file_remove_key(keyfile, service->identifier, "AssocReject", NULL); + } + +done: + __connman_storage_save_service(keyfile, service->identifier); + + g_key_file_free(keyfile); + return err; +} +#endif + static int service_load(struct connman_service *service) { GKeyFile *keyfile; @@ -574,7 +1066,15 @@ static int service_load(struct connman_service *service) bool autoconnect; unsigned int ssid_len; int err = 0; - +#if defined TIZEN_EXT + bool internet_connection; +#endif +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + bool use_eapol; +#endif +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); keyfile = connman_storage_load_service(service->identifier); @@ -594,9 +1094,10 @@ static int service_load(struct connman_service *service) #endif break; case CONNMAN_SERVICE_TYPE_VPN: - set_split_routing(service, g_key_file_get_boolean(keyfile, - service->identifier, - "SplitRouting", NULL)); + __connman_service_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); @@ -654,6 +1155,46 @@ static int service_load(struct connman_service *service) g_free(hex_ssid); } + +#if defined TIZEN_EXT + /* Last connected BSSID */ + if (service->network) { + gchar *bssid_str; + unsigned char last_connected_bssid[WIFI_BSSID_LEN_MAX]; + char **str_list; + unsigned int i; + + bssid_str = g_key_file_get_string(keyfile, + service->identifier, "LastConnectedBSSID", NULL); + + if (bssid_str) { + str_list = g_strsplit(bssid_str, ":", 0); + + if (str_list) { + for (i = 0; i < WIFI_BSSID_LEN_MAX; i++) + last_connected_bssid[i] = strtol(str_list[i], NULL, 16); + + memcpy(service->last_connected_bssid, + last_connected_bssid, WIFI_BSSID_LEN_MAX); + + connman_network_set_last_connected_bssid(service->network, + last_connected_bssid); + + g_strfreev(str_list); + } + + g_free(bssid_str); + } + } + + /* Internet connection */ + internet_connection = g_key_file_get_boolean(keyfile, + service->identifier, "InternetConnection", &error); + if (!error) + service->is_internet_connection = internet_connection; + + g_clear_error(&error); +#endif /* fall through */ case CONNMAN_SERVICE_TYPE_GADGET: @@ -670,21 +1211,31 @@ static int service_load(struct connman_service *service) if (!error) service->autoconnect = autoconnect; g_clear_error(&error); + +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + use_eapol = g_key_file_get_boolean(keyfile, + service->identifier, "UseEapol", &error); + if (!error) + service->use_eapol = use_eapol; + g_clear_error(&error); +#endif break; } str = g_key_file_get_string(keyfile, service->identifier, "Modified", NULL); if (str) { - g_time_val_from_iso8601(str, &service->modified); + util_iso8601_to_timeval(str, &service->modified); g_free(str); } str = g_key_file_get_string(keyfile, service->identifier, "Passphrase", NULL); if (str) { + char *dec = g_strcompress(str); + g_free(str); g_free(service->passphrase); - service->passphrase = str; + service->passphrase = dec; } if (service->ipconfig_ipv4) @@ -769,8 +1320,12 @@ static int service_load(struct connman_service *service) service->identifier, "Hidden", NULL); #if defined TIZEN_EXT - if (service->type == CONNMAN_SERVICE_TYPE_WIFI && - service->security == CONNMAN_SERVICE_SECURITY_8021X) { + if ((service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->security == CONNMAN_SERVICE_SECURITY_8021X) +#if defined TIZEN_EXT_EAP_ON_ETHERNET + || (service->type == CONNMAN_SERVICE_TYPE_ETHERNET && service->use_eapol) +#endif + ) { str = g_key_file_get_string(keyfile, service->identifier, "EAP", NULL); if (str != NULL) { @@ -792,6 +1347,14 @@ static int service_load(struct connman_service *service) service->identity = str; } +#if defined TIZEN_EXT_EAP_ON_ETHERNET + str = g_key_file_get_string(keyfile, + service->identifier, "AnonymousIdentity", NULL); + if (str != NULL) { + g_free(service->anonymous_identity); + service->anonymous_identity = str; + } +#endif str = g_key_file_get_string(keyfile, service->identifier, "CACertFile", NULL); if (str != NULL) { @@ -819,6 +1382,22 @@ static int service_load(struct connman_service *service) g_free(service->private_key_passphrase); service->private_key_passphrase = str; } + +#if defined TIZEN_EXT_EAP_ON_ETHERNET + str = g_key_file_get_string(keyfile, + service->identifier, "Phase1", NULL); + if (str != NULL) { + g_free(service->phase1); + service->phase1 = str; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "PacFile", NULL); + if (str != NULL) { + g_free(service->pac_file); + service->pac_file = str; + } +#endif } #endif #if defined TIZEN_EXT @@ -864,7 +1443,7 @@ static int service_save(struct connman_service *service) if (service->new_service) return -ESRCH; - keyfile = __connman_storage_open_service(service->identifier); + keyfile = g_key_file_new(); if (!keyfile) return -EIO; @@ -892,6 +1471,9 @@ static int service_save(struct connman_service *service) if (service->network) { const unsigned char *ssid; unsigned int ssid_len = 0; +#if defined TIZEN_EXT + GHashTable *assoc_reject_table; +#endif ssid = connman_network_get_blob(service->network, "WiFi.SSID", &ssid_len); @@ -920,6 +1502,74 @@ static int service_save(struct connman_service *service) freq = connman_network_get_frequency(service->network); g_key_file_set_integer(keyfile, service->identifier, "Frequency", freq); + +#if defined TIZEN_EXT + /* Last connected BSSID */ + if (memcmp(service->last_connected_bssid, invalid_bssid, WIFI_BSSID_LEN_MAX)) { + char *identifier = service->identifier; + GString *bssid_str; + unsigned int i; + + bssid_str = g_string_sized_new(18); + if (!bssid_str) { + err = -ENOMEM; + goto done; + } + + for (i = 0; i < WIFI_BSSID_LEN_MAX; i++) { + g_string_append_printf(bssid_str, + "%02x", service->last_connected_bssid[i]); + if (i < WIFI_BSSID_LEN_MAX - 1) + g_string_append(bssid_str, ":"); + } + + g_key_file_set_string(keyfile, identifier, + "LastConnectedBSSID", bssid_str->str); + +#if defined TIZEN_EXT_INS + DBG("last connected bssid[%s]", bssid_str->str); +#endif + + g_string_free(bssid_str, TRUE); + } + + /* Assoc reject */ + assoc_reject_table = connman_network_get_assoc_reject_table(service->network); + if (assoc_reject_table && g_hash_table_size(assoc_reject_table) > 0) { + GString *assoc_reject_str; + char **assoc_reject_list; + guint assoc_reject_len; + + assoc_reject_str = g_string_new(NULL); + if (!assoc_reject_str) { + err = -ENOMEM; + goto done; + } + + g_hash_table_foreach(assoc_reject_table, save_assoc_reject, assoc_reject_str); + + assoc_reject_list = g_strsplit_set(assoc_reject_str->str, " ", 0); + assoc_reject_len = g_strv_length(assoc_reject_list); + + g_key_file_set_string_list(keyfile, service->identifier, + "AssocReject", (const gchar **)assoc_reject_list, assoc_reject_len); + +#if defined TIZEN_EXT_INS + DBG("assoc reject table [%d]", assoc_reject_len); +#endif + + g_strfreev(assoc_reject_list); + g_string_free(assoc_reject_str, TRUE); + } else + g_key_file_remove_key(keyfile, service->identifier, "AssocReject", NULL); + + /* Internet connection */ + g_key_file_set_boolean(keyfile, service->identifier, + "InternetConnection", service->is_internet_connection); +#if defined TIZEN_EXT_INS + DBG("internet connection [%s]", service->is_internet_connection ? "true" : "false"); +#endif +#endif } /* fall through */ @@ -929,49 +1579,48 @@ static int service_save(struct connman_service *service) g_key_file_set_boolean(keyfile, service->identifier, "Favorite", service->favorite); - g_key_file_remove_key(keyfile, service->identifier, - "Failure", NULL); - /* fall through */ case CONNMAN_SERVICE_TYPE_ETHERNET: if (service->favorite) g_key_file_set_boolean(keyfile, service->identifier, "AutoConnect", service->autoconnect); +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + g_key_file_set_boolean(keyfile, service->identifier, + "UseEapol", service->use_eapol); +#endif break; } - str = g_time_val_to_iso8601(&service->modified); + str = util_timeval_to_iso8601(&service->modified); if (str) { g_key_file_set_string(keyfile, service->identifier, - "Modified", str); + "Modified", str); g_free(str); } - if (service->passphrase && strlen(service->passphrase) > 0) + if (service->passphrase && strlen(service->passphrase) > 0) { + char *enc = g_strescape(service->passphrase, NULL); g_key_file_set_string(keyfile, service->identifier, - "Passphrase", service->passphrase); - else - g_key_file_remove_key(keyfile, service->identifier, - "Passphrase", NULL); + "Passphrase", enc); + g_free(enc); + } if (service->ipconfig_ipv4) __connman_ipconfig_save(service->ipconfig_ipv4, keyfile, - service->identifier, "IPv4."); + service->identifier, "IPv4."); if (service->ipconfig_ipv6) __connman_ipconfig_save(service->ipconfig_ipv6, keyfile, - service->identifier, "IPv6."); + service->identifier, "IPv6."); if (service->nameservers_config) { guint len = g_strv_length(service->nameservers_config); g_key_file_set_string_list(keyfile, service->identifier, - "Nameservers", + "Nameservers", (const gchar **) service->nameservers_config, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Nameservers", NULL); + } #if defined TIZEN_EXT if(service->dns_config_method_ipv4 != 0) { @@ -999,21 +1648,17 @@ static int service_save(struct connman_service *service) guint len = g_strv_length(service->timeservers_config); g_key_file_set_string_list(keyfile, service->identifier, - "Timeservers", + "Timeservers", (const gchar **) service->timeservers_config, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Timeservers", NULL); + } if (service->domains) { guint len = g_strv_length(service->domains); g_key_file_set_string_list(keyfile, service->identifier, - "Domains", + "Domains", (const gchar **) service->domains, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Domains", NULL); + } cst_str = proxymethod2string(service->proxy_config); if (cst_str) @@ -1026,9 +1671,7 @@ static int service_save(struct connman_service *service) g_key_file_set_string_list(keyfile, service->identifier, "Proxy.Servers", (const gchar **) service->proxies, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Proxy.Servers", NULL); + } if (service->excludes) { guint len = g_strv_length(service->excludes); @@ -1036,40 +1679,35 @@ static int service_save(struct connman_service *service) g_key_file_set_string_list(keyfile, service->identifier, "Proxy.Excludes", (const gchar **) service->excludes, len); - } else - g_key_file_remove_key(keyfile, service->identifier, - "Proxy.Excludes", NULL); + } if (service->pac && strlen(service->pac) > 0) g_key_file_set_string(keyfile, service->identifier, - "Proxy.URL", service->pac); - else - g_key_file_remove_key(keyfile, service->identifier, - "Proxy.URL", NULL); + "Proxy.URL", service->pac); if (service->mdns_config) g_key_file_set_boolean(keyfile, service->identifier, - "mDNS", TRUE); - else - g_key_file_remove_key(keyfile, service->identifier, - "mDNS", NULL); + "mDNS", TRUE); if (service->hidden_service) - g_key_file_set_boolean(keyfile, service->identifier, "Hidden", - TRUE); + g_key_file_set_boolean(keyfile, service->identifier, + "Hidden", TRUE); if (service->config_file && strlen(service->config_file) > 0) g_key_file_set_string(keyfile, service->identifier, "Config.file", service->config_file); - if (service->config_entry && - strlen(service->config_entry) > 0) + if (service->config_entry && strlen(service->config_entry) > 0) g_key_file_set_string(keyfile, service->identifier, "Config.ident", service->config_entry); #if defined TIZEN_EXT - if (service->type == CONNMAN_SERVICE_TYPE_WIFI && - service->security == CONNMAN_SERVICE_SECURITY_8021X) { + if ((service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->security == CONNMAN_SERVICE_SECURITY_8021X) +#if defined TIZEN_EXT_EAP_ON_ETHERNET + || (service->type == CONNMAN_SERVICE_TYPE_ETHERNET) +#endif + ) { if (service->eap != NULL && strlen(service->eap) > 0) g_key_file_set_string(keyfile, service->identifier, "EAP", service->eap); @@ -1090,6 +1728,14 @@ static int service_save(struct connman_service *service) else g_key_file_remove_key(keyfile, service->identifier, "Identity", NULL); +#if defined TIZEN_EXT_EAP_ON_ETHERNET + if (service->anonymous_identity != NULL && strlen(service->anonymous_identity) > 0) + g_key_file_set_string(keyfile, service->identifier, + "AnonymousIdentity", service->anonymous_identity); + else + g_key_file_remove_key(keyfile, service->identifier, + "AnonymousIdentity", NULL); +#endif if (service->ca_cert_file != NULL && strlen(service->ca_cert_file) > 0) g_key_file_set_string(keyfile, service->identifier, @@ -1118,7 +1764,22 @@ static int service_save(struct connman_service *service) else g_key_file_remove_key(keyfile, service->identifier, "PrivateKeyPassphrase", NULL); +#if defined TIZEN_EXT_EAP_ON_ETHERNET + if (service->phase1 != NULL && strlen(service->phase1) > 0) + g_key_file_set_string(keyfile, service->identifier, + "Phase1", service->phase1); + else + g_key_file_remove_key(keyfile, service->identifier, + "Phase1", NULL); + if (service->pac_file != NULL && strlen(service->pac_file) > 0) + g_key_file_set_string(keyfile, service->identifier, + "PacFile", service->pac_file); + else + g_key_file_remove_key(keyfile, service->identifier, + "PacFile", NULL); +#endif } + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && service->security == CONNMAN_SERVICE_SECURITY_DPP) { if (service->connector != NULL && strlen(service->connector) > 0) @@ -1152,12 +1813,110 @@ 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); + g_strfreev(services); + 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); + g_strfreev(services); +} +#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( @@ -1544,7 +2303,7 @@ static int nameserver_add_all(struct connman_service *service, __connman_resolver_append_fallback_nameservers(); #if defined TIZEN_EXT - const char *global_dns = connman_option_get_string("GlobalNameserver"); + const char *global_dns = connman_setting_get_string("GlobalNameserver"); if (global_dns) nameserver_add(service, type, global_dns); #endif @@ -1719,7 +2478,7 @@ static int nameserver_remove_all(struct connman_service *service, } #if defined TIZEN_EXT - const char *global_dns = connman_option_get_string("GlobalNameserver"); + const char *global_dns = connman_setting_get_string("GlobalNameserver"); if (global_dns) nameserver_remove(service, type, global_dns); #endif @@ -1755,18 +2514,15 @@ int __connman_service_nameserver_append(struct connman_service *service, else nameservers = service->nameservers; - for (i = 0; nameservers && nameservers[i]; i++) -#if defined TIZEN_EXT - { - DBG("nameservers[%d] %s, nameserver %s", i, nameservers[i], nameserver); -#endif - if (g_strcmp0(nameservers[i], nameserver) == 0) - return -EEXIST; + if (nameservers) { + for (i = 0; nameservers[i]; i++) { #if defined TIZEN_EXT - } + DBG("nameservers[%d] %s, nameserver %s", i, nameservers[i], nameserver); #endif + if (g_strcmp0(nameservers[i], nameserver) == 0) + return -EEXIST; + } - if (nameservers) { len = g_strv_length(nameservers); nameservers = g_try_renew(char *, nameservers, len + 2); } else { @@ -2002,6 +2758,62 @@ void __connman_service_nameserver_del_routes(struct connman_service *service, nameserver_del_routes(index, service->nameservers, type); } +static bool check_proxy_setup(struct connman_service *service) +{ + /* + * We start WPAD if we haven't got a PAC URL from DHCP and + * if our proxy manual configuration is either empty or set + * to AUTO with an empty URL. + */ + + if (service->proxy != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) + return true; + + if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN && + (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_AUTO || + service->pac)) + return true; + + if (__connman_wpad_start(service) < 0) { + service->proxy = CONNMAN_SERVICE_PROXY_METHOD_DIRECT; + __connman_notifier_proxy_changed(service); + return true; + } + + return false; +} + +static void cancel_online_check(struct connman_service *service) +{ + if (service->online_timeout == 0) + return; + + g_source_remove(service->online_timeout); + service->online_timeout = 0; + connman_service_unref(service); +} + +static void start_online_check(struct connman_service *service, + enum connman_ipconfig_type type) +{ + if (!connman_setting_get_bool("EnableOnlineCheck")) { + connman_info("Online check disabled. " + "Default service remains in READY state."); + return; + } + enable_online_to_ready_transition = + connman_setting_get_bool("EnableOnlineToReadyTransition"); + online_check_initial_interval = + connman_setting_get_uint("OnlineCheckInitialInterval"); + online_check_max_interval = + connman_setting_get_uint("OnlineCheckMaxInterval"); + + if (type != CONNMAN_IPCONFIG_TYPE_IPV4 || check_proxy_setup(service)) { + cancel_online_check(service); + __connman_service_wispr_start(service, type); + } +} + static void address_updated(struct connman_service *service, enum connman_ipconfig_type type) { @@ -2009,6 +2821,7 @@ static void address_updated(struct connman_service *service, service == connman_service_get_default()) { nameserver_remove_all(service, type); nameserver_add_all(service, type); + start_online_check(service, type); __connman_timeserver_sync(service); } @@ -2157,6 +2970,31 @@ struct connman_service *connman_service_get_default_connection(void) return default_service; } + +struct connman_service *connman_service_get_connected_service(const char *ifname) +{ + GList *list; + const char *svc_ifname; + struct connman_service *service; + + if (!ifname) + return NULL; + + for (list = service_list; list; list = list->next) { + service = list->data; + + if (!is_connected(service->state)) + continue; + + svc_ifname = connman_device_get_string( + connman_network_get_device(service->network), "Interface"); + + if (svc_ifname && g_strcmp0(svc_ifname, ifname) == 0) + return service; + } + + return NULL; +} #endif struct connman_service *connman_service_get_default(void) @@ -2192,7 +3030,11 @@ bool __connman_service_index_is_default(int index) static void default_changed(void) { +#if defined TIZEN_EXT + struct connman_service *service = connman_service_get_default_connection(); +#else struct connman_service *service = connman_service_get_default(); +#endif if (service == current_default) return; @@ -2219,11 +3061,56 @@ static void default_changed(void) if (service->domainname && connman_setting_get_bool("AllowDomainnameUpdates")) __connman_utsname_set_domainname(service->domainname); + + if (__connman_service_is_connected_state(service, + CONNMAN_IPCONFIG_TYPE_IPV4)) + __connman_service_wispr_start(service, + CONNMAN_IPCONFIG_TYPE_IPV4); + + if (__connman_service_is_connected_state(service, + CONNMAN_IPCONFIG_TYPE_IPV6)) + __connman_service_wispr_start(service, + CONNMAN_IPCONFIG_TYPE_IPV6); + + /* + * Connect VPN automatically when new default service + * is set and connected, unless new default is VPN + */ + if (is_connected(service->state) && + service->type != CONNMAN_SERVICE_TYPE_VPN) { + DBG("running vpn_auto_connect"); + vpn_auto_connect(); + } } __connman_notifier_default_changed(service); } +#if defined TIZEN_EXT +static void append_struct(gpointer value, gpointer user_data); + +static void emit_state_changed_with_properties(struct connman_service *service) +{ + DBusMessage *signal; + DBusMessageIter iter; + + if (!service) + return; + + signal = dbus_message_new_signal(service->path, CONNMAN_SERVICE_INTERFACE, + "StateChangedProperties"); + if (!signal) + return; + + dbus_message_iter_init_append(signal, &iter); + append_struct(service, &iter); + + g_dbus_send_message(connection, signal); + + return; +} +#endif + static void state_changed(struct connman_service *service) { const char *str; @@ -2237,32 +3124,59 @@ static void state_changed(struct connman_service *service) #if !defined TIZEN_EXT if (!allow_property_changed(service)) return; - -#endif -#if defined TIZEN_EXT +#else DBG(" %s, %s", str, service->path); #endif + connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "State", DBUS_TYPE_STRING, &str); + +#if defined TIZEN_EXT + emit_state_changed_with_properties(service); +#endif } #if defined TIZEN_EXT static void connect_reason_changed(struct connman_service *service) { +#if defined TIZEN_EXT_INS + struct connman_device *device; +#endif if (!service->path) return; if (!allow_property_changed(service)) return; +#if defined TIZEN_EXT_INS + if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) { + device = connman_network_get_device(service->network); + if (device) { + bool need_save = false; + + need_save |= connman_device_set_last_user_selection_ident(device, service->identifier); + need_save |= connman_device_set_last_user_selection_time(device, time(NULL)); + + DBG("last user selection ident[%s] time[%ld]", + connman_device_get_last_user_selection_ident(device), + connman_device_get_last_user_selection_time(device)); + + if (need_save) + connman_device_save_last_user_selection(device); + } + } +#endif + connman_dbus_property_changed_basic(service->path, - CONNMAN_SERVICE_INTERFACE, - "ConnectReason", - DBUS_TYPE_INT32, - &service->connect_reason); + CONNMAN_SERVICE_INTERFACE, + "ConnectReason", + DBUS_TYPE_INT32, + &service->connect_reason); } +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ +#if defined TIZEN_EXT static void disconnection_requested_changed(struct connman_service *service) { dbus_bool_t disconnection_requested; @@ -2282,7 +3196,7 @@ static void disconnection_requested_changed(struct connman_service *service) } void connman_service_set_disconnection_requested(struct connman_service *service, - bool disconnection_requested) + bool disconnection_requested) { if (service == NULL) return; @@ -2290,6 +3204,47 @@ void connman_service_set_disconnection_requested(struct connman_service *service service->disconnection_requested = disconnection_requested; disconnection_requested_changed(service); } + +static void connman_service_emit_state(struct connman_service *service, + enum connman_service_state state) +{ + const char *str; + enum connman_service_state cur_state = service->state; + + if (service->state != state) + service->state = state; + + str = state2string(service->state); + if (!str) { + service->state = cur_state; + return; + } + + DBG(" %s, %s", str, service->path); + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "State", + DBUS_TYPE_STRING, &str); + + emit_state_changed_with_properties(service); + service->state = cur_state; +} + +void connman_service_notify_reconnection(struct connman_service *service) +{ + if (!service) + return; + + if (service->state != CONNMAN_SERVICE_STATE_READY && + service->state != CONNMAN_SERVICE_STATE_ONLINE) + return; + + connman_service_emit_state(service, CONNMAN_SERVICE_STATE_CONFIGURATION); + connman_service_emit_state(service, CONNMAN_SERVICE_STATE_READY); + + if (service->state == CONNMAN_SERVICE_STATE_ONLINE) + connman_service_emit_state(service, CONNMAN_SERVICE_STATE_ONLINE); +} #endif static void strength_changed(struct connman_service *service) @@ -2305,6 +3260,27 @@ static void strength_changed(struct connman_service *service) DBUS_TYPE_BYTE, &service->strength); } +#if defined TIZEN_EXT +static bool update_last_connected_bssid(struct connman_service *service) +{ + const unsigned char *last_connected_bssid; + + if (!service->network) + return false; + + last_connected_bssid = connman_network_get_last_connected_bssid(service->network); + if (memcmp(last_connected_bssid, invalid_bssid, WIFI_BSSID_LEN_MAX) == 0) + return false; + + if (memcmp(last_connected_bssid, service->last_connected_bssid, WIFI_BSSID_LEN_MAX) != 0) { + memcpy(service->last_connected_bssid, last_connected_bssid, WIFI_BSSID_LEN_MAX); + return true; + } + + return false; +} +#endif + static void favorite_changed(struct connman_service *service) { dbus_bool_t favorite; @@ -2369,6 +3345,20 @@ static void autoconnect_changed(struct connman_service *service) DBUS_TYPE_BOOLEAN, &autoconnect); } +bool connman_service_set_autoconnect(struct connman_service *service, + bool autoconnect) +{ + if (service->autoconnect == autoconnect) + return false; + + service->autoconnect = autoconnect; + autoconnect_changed(service); + + connman_network_set_autoconnect(service->network, autoconnect); + + return true; +} + static void append_security(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; @@ -2439,6 +3429,57 @@ static void append_ethernet(DBusMessageIter *iter, void *user_data) iter); } +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +static void append_eap_over_ethernet(DBusMessageIter *iter, void *user_data) +{ + struct connman_service *service = user_data; + dbus_bool_t val; + + val = service->use_eapol; + connman_dbus_dict_append_basic(iter, "UseEapol", + DBUS_TYPE_BOOLEAN, &val); + if (service->use_eapol) { + if (service->eap) + connman_dbus_dict_append_basic(iter, "EAP", + DBUS_TYPE_STRING, &service->eap); + + if (service->identity) + connman_dbus_dict_append_basic(iter, "Identity", + DBUS_TYPE_STRING, &service->identity); + + if (service->anonymous_identity) + connman_dbus_dict_append_basic(iter, "AnonymousIdentity", + DBUS_TYPE_STRING, &service->anonymous_identity); + + if (service->ca_cert_file) + connman_dbus_dict_append_basic(iter, "CACertFile", + DBUS_TYPE_STRING, &service->ca_cert_file); + + if (service->client_cert_file) + connman_dbus_dict_append_basic(iter, "ClientCertFile", + DBUS_TYPE_STRING, &service->client_cert_file); + + if (service->private_key_file) + connman_dbus_dict_append_basic(iter, "PrivateKeyFile", + DBUS_TYPE_STRING, &service->private_key_file); + + if (service->phase2) + connman_dbus_dict_append_basic(iter, "Phase2", + DBUS_TYPE_STRING, &service->phase2); + + if (service->phase1) + connman_dbus_dict_append_basic(iter, "Phase1", + DBUS_TYPE_STRING, &service->phase1); + + if (service->pac_file) + connman_dbus_dict_append_basic(iter, "PacFile", + DBUS_TYPE_STRING, &service->pac_file); + + /* Should we include passphrase? */ + } +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ + static void append_ipv4(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; @@ -3311,6 +4352,22 @@ int connman_service_iterate_services(connman_service_iterate_cb cb, } #if defined TIZEN_EXT +static void append_security_list(DBusMessageIter *iter, void *user_data) +{ + GSList *sec_list = (GSList *)user_data; + const char *sec_str; + + if (sec_list) { + GSList *list; + for (list = sec_list; list; list = list->next) { + sec_str = (const char *)list->data; + + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &sec_str); + } + } +} + static void append_wifi_ext_info(DBusMessageIter *dict, struct connman_network *network) { @@ -3326,10 +4383,12 @@ static void append_wifi_ext_info(DBusMessageIter *dict, const char *enc_mode; const char *str; gboolean passpoint; + gboolean pmf_required; 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; + GSList *sec_list = NULL; ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len); bssid = connman_network_get_bssid(network); @@ -3339,16 +4398,19 @@ static void append_wifi_ext_info(DBusMessageIter *dict, enc_mode = connman_network_get_enc_mode(network); passpoint = connman_network_get_bool(network, "WiFi.HS20AP"); keymgmt = connman_network_get_keymgmt(network); + pmf_required = connman_network_get_bool(network, "WiFi.PMFRequired"); country_code = connman_network_get_countrycode(network); connection_mode = connman_network_get_connection_mode(network); + sec_list = (GSList *)connman_network_get_sec_list(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(bssid_str, WIFI_BSSID_STR_LEN, MACSTR, MAC2STR(bssid)); snprintf(country_code_str, (WIFI_COUNTRY_CODE_LEN + 1), "%c%c", country_code[0], country_code[1]); + connman_dbus_dict_append_array(dict, "SecurityList", + DBUS_TYPE_STRING, + append_security_list, sec_list); connman_dbus_dict_append_fixed_array(dict, "SSID", DBUS_TYPE_BYTE, &ssid, ssid_len); @@ -3366,6 +4428,8 @@ 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, "PmfReq", + DBUS_TYPE_BOOLEAN, &pmf_required); connman_dbus_dict_append_basic(dict, "Country", DBUS_TYPE_STRING, &country_code_str); connman_dbus_dict_append_basic(dict, "ConnMode", @@ -3420,9 +4484,7 @@ static void append_bssid_info(DBusMessageIter *iter, void *user_data) 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]); + g_snprintf(bssid_buf, MAC_ADDRESS_LENGTH, MACSTR, MAC2STR(bssids->bssid)); connman_dbus_dict_append_basic(iter, "BSSID", DBUS_TYPE_STRING, &bssid_str); @@ -3446,18 +4508,16 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, #if defined TIZEN_EXT unsigned int frequency = 0U; - if (service && service->network) { - frequency = connman_network_get_frequency(service->network); - connman_dbus_dict_append_basic(dict, "Frequency", - DBUS_TYPE_UINT16, &frequency); - } - unsigned char *wifi_vsie; unsigned int wifi_vsie_len; GSList *vsie_list = NULL; - if (service->network) + 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; @@ -3556,12 +4616,18 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, connman_dbus_dict_append_basic(dict, "AssocStatusCode", DBUS_TYPE_INT32, &service->assoc_status_code); + val = service->hidden_service; connman_dbus_dict_append_basic(dict, "Hidden", - DBUS_TYPE_BOOLEAN, &service->hidden_service); + DBUS_TYPE_BOOLEAN, &val); break; #endif case CONNMAN_SERVICE_TYPE_ETHERNET: +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + connman_dbus_dict_append_dict(dict, "EapOverEthernet", + append_eap_over_ethernet, service); + /* fall through */ +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_GADGET: connman_dbus_dict_append_dict(dict, "Ethernet", @@ -3625,6 +4691,99 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, connman_network_append_acddbus(dict, service->network); } +#if defined TIZEN_EXT && defined TIZEN_EXT_INS +static void append_ins_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, MACSTR, MAC2STR(bssids->bssid)); + + connman_dbus_dict_append_basic(iter, "BSSID", + DBUS_TYPE_STRING, &bssid_str); + + connman_dbus_dict_append_basic(iter, "ScoreINS", + DBUS_TYPE_INT32, &bssids->ins_score); + + connman_dbus_dict_append_basic(iter, "ScoreLastConnected", + DBUS_TYPE_INT32, &bssids->score_last_connected_bssid); + + connman_dbus_dict_append_basic(iter, "ScoreAssocReject", + DBUS_TYPE_INT32, &bssids->score_assoc_reject); + + connman_dbus_dict_append_basic(iter, "Frequency", + DBUS_TYPE_UINT16, &bssids->frequency); + + connman_dbus_dict_append_basic(iter, "ScoreFrequency", + DBUS_TYPE_INT32, &bssids->score_frequency); + + connman_dbus_dict_append_basic(iter, "Strength", + DBUS_TYPE_UINT16, &bssids->strength); + + connman_dbus_dict_append_basic(iter, "ScoreStrength", + DBUS_TYPE_INT32, &bssids->score_strength); + } + } +} + +static void append_ins_properties(DBusMessageIter *dict, + struct connman_service *service) +{ + const char *str; + unsigned int frequency = 0U; + + if (service->name) + connman_dbus_dict_append_basic(dict, "Name", + DBUS_TYPE_STRING, &service->name); + + connman_dbus_dict_append_basic(dict, "ScoreINS", + DBUS_TYPE_INT32, &service->ins_score); + + connman_dbus_dict_append_basic(dict, "ScoreLastUserSelection", + DBUS_TYPE_INT32, &service->score_last_user_selection); + + connman_dbus_dict_append_basic(dict, "ScoreLastConnected", + DBUS_TYPE_INT32, &service->score_last_connected); + + str = security2string(service->security); + if (str) + connman_dbus_dict_append_basic(dict, "Security", + DBUS_TYPE_STRING, &str); + + connman_dbus_dict_append_basic(dict, "ScoreSecurityPriority", + DBUS_TYPE_INT32, &service->score_security_priority); + + connman_dbus_dict_append_basic(dict, "Strength", + DBUS_TYPE_BYTE, &service->strength); + + connman_dbus_dict_append_basic(dict, "ScoreStrength", + DBUS_TYPE_INT32, &service->score_strength); + + connman_dbus_dict_append_basic(dict, "ScoreInternetConnection", + DBUS_TYPE_INT32, &service->score_internet_connection); + + if (service->network) { + frequency = connman_network_get_frequency(service->network); + connman_dbus_dict_append_basic(dict, "Frequency", + DBUS_TYPE_UINT16, &frequency); + + connman_dbus_dict_append_basic(dict, "ScoreFrequency", + DBUS_TYPE_INT32, &service->score_frequency); + + connman_dbus_dict_append_dict(dict, "BSSID.List", + append_ins_bssid_info, service->network); + } +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + static void append_struct_service(DBusMessageIter *iter, connman_dbus_append_cb_t function, struct connman_service *service) @@ -3662,6 +4821,34 @@ static void append_struct(gpointer value, gpointer user_data) append_struct_service(iter, append_dict_properties, service); } +#if defined TIZEN_EXT && defined TIZEN_EXT_INS +static void append_dict_ins_properties(DBusMessageIter *dict, void *user_data) +{ + struct connman_service *service = user_data; + + append_ins_properties(dict, service); +} + +static void append_ins_struct(gpointer value, gpointer user_data) +{ + struct connman_service *service = value; + DBusMessageIter *iter = user_data; + + if (!service->path) + return; + + if (service->type != CONNMAN_SERVICE_TYPE_WIFI) + return; + + append_struct_service(iter, append_dict_ins_properties, service); +} + +void __connman_ins_list_struct(DBusMessageIter *iter) +{ + g_list_foreach(service_list, append_ins_struct, iter); +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + void __connman_service_list_struct(DBusMessageIter *iter) { g_list_foreach(service_list, append_struct, iter); @@ -3915,6 +5102,54 @@ const char *connman_service_get_proxy_url(struct connman_service *service) return service->pac; } +#if defined TIZEN_EXT +void connman_service_set_internet_connection(struct connman_service *service, + bool internet_connection) +{ + if (!service) + return; + + if (service->is_internet_connection != internet_connection) { + service->is_internet_connection = internet_connection; + + g_get_current_time(&service->modified); + service_save(service); + } +} + +bool connman_service_get_internet_connection(struct connman_service *service) +{ + if (!service) + return false; + + return service->is_internet_connection; +} + +DBusMessage *connman_service_create_dbus_service_reply(DBusMessage *msg, + struct connman_service *service) +{ + DBusMessage *reply; + DBusMessageIter array, dict; + + reply = dbus_message_new_method_return(msg); + if (!reply) + return NULL; + + dbus_message_iter_init_append(reply, &array); + + if (service) + dbus_message_iter_append_basic(&array, DBUS_TYPE_OBJECT_PATH, + &service->path); + + connman_dbus_dict_open(&array, &dict); + if (service) + append_properties(&dict, FALSE, service); + connman_dbus_dict_close(&array, &dict); + + return reply; +} +#endif + void __connman_service_set_proxy_autoconfig(struct connman_service *service, const char *url) { @@ -4326,6 +5561,28 @@ const char *__connman_service_get_passphrase(struct connman_service *service) return service->passphrase; } +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +int __connman_service_get_use_eapol(struct connman_service *service) +{ + if (!service) { + DBG("Service is NULL"); + return -1; + } + + return service->use_eapol; +} + +int __connman_service_get_connect_reason(struct connman_service *service) +{ + if (!service) { + DBG("Service is NULL"); + return -1; + } + + return service->connect_reason; +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ + static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -4530,14 +5787,52 @@ static int update_proxy_configuration(struct connman_service *service, return 0; -error: - if (servers_str) - g_string_free(servers_str, TRUE); +error: + if (servers_str) + g_string_free(servers_str, TRUE); + + if (excludes_str) + g_string_free(excludes_str, TRUE); + + return -EINVAL; +} + +static void do_auto_connect(struct connman_service *service, + enum connman_service_connect_reason reason) +{ + /* + * CONNMAN_SERVICE_CONNECT_REASON_NONE must be ignored for VPNs. VPNs + * always have reason CONNMAN_SERVICE_CONNECT_REASON_USER/AUTO. + */ + if (!service || (service->type == CONNMAN_SERVICE_TYPE_VPN && + reason == CONNMAN_SERVICE_CONNECT_REASON_NONE)) + return; + + /* + * Only user interaction should get VPN or WIFI connected in failure + * state. + */ + if (service->state == CONNMAN_SERVICE_STATE_FAILURE && + reason != CONNMAN_SERVICE_CONNECT_REASON_USER && + (service->type == CONNMAN_SERVICE_TYPE_VPN || + service->type == CONNMAN_SERVICE_TYPE_WIFI)) + return; + + /* + * Do not use the builtin auto connect, instead rely on the + * native auto connect feature of the service. + */ + if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_NATIVE) + return; - if (excludes_str) - g_string_free(excludes_str, TRUE); + /* + * Run service auto connect for other than VPN services. Afterwards + * start also VPN auto connect process. + */ + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + __connman_service_auto_connect(reason); - return -EINVAL; + vpn_auto_connect(); } int __connman_service_reset_ipconfig(struct connman_service *service, @@ -4604,7 +5899,7 @@ int __connman_service_reset_ipconfig(struct connman_service *service, settings_changed(service, new_ipconfig); address_updated(service, type); - __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); + do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); } DBG("err %d ipconfig %p type %d method %d state %s", err, @@ -4614,14 +5909,6 @@ 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) { @@ -4629,14 +5916,17 @@ void __connman_service_wispr_start(struct connman_service *service, if (type == CONNMAN_IPCONFIG_TYPE_IPV4) service->online_check_interval_ipv4 = - ONLINE_CHECK_INITIAL_INTERVAL; + online_check_initial_interval; else service->online_check_interval_ipv6 = - ONLINE_CHECK_INITIAL_INTERVAL; + online_check_initial_interval; __connman_wispr_start(service, type); } +static void set_error(struct connman_service *service, + enum connman_service_error error); + static DBusMessage *set_property(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -4674,17 +5964,26 @@ static DBusMessage *set_property(DBusConnection *conn, dbus_message_iter_get_basic(&value, &autoconnect); - if (service->autoconnect == autoconnect) - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); - - service->autoconnect = autoconnect; - - autoconnect_changed(service); + if (autoconnect && service->type == CONNMAN_SERVICE_TYPE_VPN) { + /* + * Changing the autoconnect flag on VPN to "on" should + * have the same effect as user connecting the VPN = + * clear previous error and change state to idle. + */ + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - if (autoconnect) - __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); + if (service->state == CONNMAN_SERVICE_STATE_FAILURE) { + service->state = CONNMAN_SERVICE_STATE_IDLE; + state_changed(service); + } + } - service_save(service); + if (connman_service_set_autoconnect(service, autoconnect)) { + service_save(service); + if (autoconnect) + do_auto_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + } } else if (g_str_equal(name, "Nameservers.Configuration")) { DBusMessageIter entry; GString *str; @@ -4875,9 +6174,7 @@ static DBusMessage *set_property(DBusConnection *conn, service_save(service); timeservers_configuration_changed(service); - - if (service == connman_service_get_default()) - __connman_timeserver_sync(service); + __connman_timeserver_conf_update(service); } else if (g_str_equal(name, "Domains.Configuration")) { DBusMessageIter entry; @@ -5031,6 +6328,15 @@ static DBusMessage *set_property(DBusConnection *conn, __connman_service_set_passphrase(service, passphrase); #endif +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + } else if (g_str_equal(name, "EapOverEthernet")) { + int err = connman_service_set_eapol_property(service, &value); + if (err < 0) + return __connman_error_failed(msg, -err); + + service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_USER; + service_save(service); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ } else return __connman_error_invalid_property(msg); @@ -5094,9 +6400,9 @@ 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); + do_auto_connect(service, service->connect_reason); - g_get_current_time(&service->modified); + gettimeofday(&service->modified, NULL); service_save(service); } @@ -5239,6 +6545,9 @@ static void preferred_tech_add_by_type(gpointer data, gpointer user_data) tech_data->preferred_list = g_list_append(tech_data->preferred_list, service); +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("type %d service %p %s", tech_data->type, service, service->name); } @@ -5300,6 +6609,7 @@ static void set_always_connecting_technologies() always_connect[always_connected_techs[i]] = 1; } +#if !defined TIZEN_EXT static bool autoconnect_no_session_active(struct connman_service *service) { /* @@ -5312,6 +6622,7 @@ static bool autoconnect_no_session_active(struct connman_service *service) return false; } +#endif static bool autoconnect_already_connecting(struct connman_service *service, bool autoconnecting) @@ -5328,6 +6639,8 @@ static bool autoconnect_already_connecting(struct connman_service *service, return false; } +static int service_indicate_state(struct connman_service *service); + static bool auto_connect_service(GList *services, enum connman_service_connect_reason reason, bool preferred) @@ -5336,6 +6649,9 @@ static bool auto_connect_service(GList *services, bool ignore[MAX_CONNMAN_SERVICE_TYPES] = { }; bool autoconnecting = false; GList *list; +#if defined TIZEN_EXT + GSList *wifi_ignore = NULL; +#endif DBG("preferred %d sessions %d reason %s", preferred, active_count, reason2string(reason)); @@ -5351,6 +6667,13 @@ static bool auto_connect_service(GList *services, for (list = services; list; list = list->next) { service = list->data; +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) { + int index = connman_network_get_index(service->network); + if (g_slist_find(wifi_ignore, GINT_TO_POINTER(index)) != NULL) + continue; + } else +#endif if (ignore[service->type]) { DBG("service %p type %s ignore", service, __connman_service_type2string(service->type)); @@ -5371,12 +6694,27 @@ static bool auto_connect_service(GList *services, continue; #endif + if (service->connect_reason == + CONNMAN_SERVICE_CONNECT_REASON_NATIVE) { + DBG("service %p uses native autonnect, skip", service); + continue; + } + if (service->pending || is_connecting(service->state) || is_connected(service->state)) { +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) { + int index = connman_network_get_index(service->network); + wifi_ignore = g_slist_prepend(wifi_ignore, GINT_TO_POINTER(index)); + + autoconnecting = true; + continue; + } +#else if (autoconnect_no_session_active(service)) return true; - +#endif ignore[service->type] = true; autoconnecting = true; @@ -5393,6 +6731,7 @@ static bool auto_connect_service(GList *services, #if defined TIZEN_EXT DBG("Service is not favorite, autoconnecting %d", autoconnecting); + g_slist_free(wifi_ignore); #endif return autoconnecting; } @@ -5408,7 +6747,9 @@ static bool auto_connect_service(GList *services, if (is_ignore(service) || service->state != CONNMAN_SERVICE_STATE_IDLE) continue; - +#if defined TIZEN_EXT + if (service->type != CONNMAN_SERVICE_TYPE_WIFI) +#endif if (autoconnect_already_connecting(service, autoconnecting)) { DBG("service %p type %s has no users", service, __connman_service_type2string(service->type)); @@ -5418,14 +6759,27 @@ static bool auto_connect_service(GList *services, DBG("service %p %s %s", service, service->name, (preferred) ? "preferred" : reason2string(reason)); +#if defined TIZEN_EXT __connman_service_connect(service, reason); +#else + if (__connman_service_connect(service, reason) == 0) + service_indicate_state(service); if (autoconnect_no_session_active(service)) return true; - +#endif +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) { + int index = connman_network_get_index(service->network); + wifi_ignore = g_slist_prepend(wifi_ignore, GINT_TO_POINTER(index)); + autoconnecting = true; + } +#endif ignore[service->type] = true; } - +#if defined TIZEN_EXT + g_slist_free(wifi_ignore); +#endif return autoconnecting; } @@ -5507,8 +6861,28 @@ void __connman_service_auto_connect(enum connman_service_connect_reason reason) static gboolean run_vpn_auto_connect(gpointer data) { GList *list; bool need_split = false; + bool autoconnectable_vpns = false; + int attempts = 0; + int timeout = VPN_AUTOCONNECT_TIMEOUT_DEFAULT; + struct connman_service *def_service; - vpn_autoconnect_id = 0; + attempts = GPOINTER_TO_INT(data); + def_service = connman_service_get_default(); + + /* + * Stop auto connecting VPN if there is no transport service or the + * transport service is not connected or if the current default service + * is a connected VPN (in ready state). + */ + if (!def_service || !is_connected(def_service->state) || + (def_service->type == CONNMAN_SERVICE_TYPE_VPN && + is_connected(def_service->state))) { + + DBG("stopped, default service %s connected %d", + def_service ? def_service->identifier : "NULL", + def_service ? is_connected(def_service->state) : -1); + goto out; + } for (list = service_list; list; list = list->next) { struct connman_service *service = list->data; @@ -5518,9 +6892,17 @@ static gboolean run_vpn_auto_connect(gpointer data) { continue; if (is_connected(service->state) || - is_connecting(service->state)) { + is_connecting(service->state)) { if (!service->do_split_routing) need_split = true; + + /* + * If the service is connecting it must be accounted + * for to keep the autoconnection in main loop. + */ + if (is_connecting(service->state)) + autoconnectable_vpns = true; + continue; } @@ -5538,20 +6920,64 @@ static gboolean run_vpn_auto_connect(gpointer data) { res = __connman_service_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); - if (res < 0 && res != -EINPROGRESS) + + switch (res) { + case 0: + service_indicate_state(service); + /* fall through */ + case -EINPROGRESS: + autoconnectable_vpns = true; + break; + default: continue; + } if (!service->do_split_routing) need_split = true; } - return FALSE; + /* Stop if there is no VPN to automatically connect.*/ + if (!autoconnectable_vpns) { + DBG("stopping, no autoconnectable VPNs found"); + goto out; + } + + /* Increase the attempt count up to the threshold.*/ + if (attempts < VPN_AUTOCONNECT_TIMEOUT_ATTEMPTS_THRESHOLD) + attempts++; + + /* + * Timeout increases with 1s after VPN_AUTOCONNECT_TIMEOUT_STEP amount + * of attempts made. After VPN_AUTOCONNECT_TIMEOUT_ATTEMPTS_THRESHOLD is + * reached the delay does not increase. + */ + timeout = timeout + (int)(attempts / VPN_AUTOCONNECT_TIMEOUT_STEP); + + /* Re add this to main loop */ + vpn_autoconnect_id = + g_timeout_add_seconds(timeout, run_vpn_auto_connect, + GINT_TO_POINTER(attempts)); + + DBG("re-added to main loop, next VPN autoconnect in %d seconds (#%d)", + timeout, attempts); + + return G_SOURCE_REMOVE; + +out: + vpn_autoconnect_id = 0; + return G_SOURCE_REMOVE; } static void vpn_auto_connect(void) { - if (vpn_autoconnect_id) - return; + /* + * Remove existing autoconnect from main loop to reset the attempt + * counter in order to get VPN connected when there is a network change. + */ + if (vpn_autoconnect_id) { + if (!g_source_remove(vpn_autoconnect_id)) + return; + } vpn_autoconnect_id = g_idle_add(run_vpn_auto_connect, NULL); @@ -5654,7 +7080,7 @@ static gboolean connect_timeout(gpointer user_data) if (autoconnect && service->connect_reason != CONNMAN_SERVICE_CONNECT_REASON_USER) - __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); + do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); return FALSE; } @@ -5703,7 +7129,7 @@ static DBusMessage *connect_service(DBusConnection *conn, break; #endif if (!is_connecting(temp->state) && !is_connected(temp->state)) - break; + continue; if (service == temp) continue; @@ -6009,6 +7435,9 @@ static void service_append_added_foreach(gpointer data, gpointer user_data) append_struct(service, iter); g_hash_table_remove(services_notify->add, service->path); } else { +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("changed %s", service->path); append_struct_service(iter, NULL, service); @@ -6069,27 +7498,22 @@ static void service_schedule_changed(void) services_notify->id = g_timeout_add(100, service_send_changed, NULL); } -static DBusMessage *move_service(DBusConnection *conn, - DBusMessage *msg, void *user_data, - bool before) +int __connman_service_move(struct connman_service *service, + struct connman_service *target, bool before) { - struct connman_service *service = user_data; - struct connman_service *target; - const char *path; enum connman_ipconfig_method target4, target6; enum connman_ipconfig_method service4, service6; DBG("service %p", service); - dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path, - DBUS_TYPE_INVALID); + if (!service) + return -EINVAL; if (!service->favorite) - return __connman_error_not_supported(msg); + return -EOPNOTSUPP; - target = find_service(path); if (!target || !target->favorite || target == service) - return __connman_error_invalid_service(msg); + return -EINVAL; if (target->type == CONNMAN_SERVICE_TYPE_VPN) { /* @@ -6100,14 +7524,14 @@ static DBusMessage *move_service(DBusConnection *conn, connman_info("Cannot move service. " "No routes defined for provider %s", __connman_provider_get_ident(target->provider)); - return __connman_error_invalid_service(msg); + return -EINVAL; } - set_split_routing(target, true); + __connman_service_set_split_routing(target, true); } else - set_split_routing(target, false); + __connman_service_set_split_routing(target, false); - set_split_routing(service, false); + __connman_service_set_split_routing(service, false); target4 = __connman_ipconfig_get_method(target->ipconfig_ipv4); target6 = __connman_ipconfig_get_method(target->ipconfig_ipv6); @@ -6130,7 +7554,7 @@ static DBusMessage *move_service(DBusConnection *conn, if (service6 != CONNMAN_IPCONFIG_METHOD_OFF) { if (!check_suitable_state(target->state_ipv6, service->state_ipv6)) - return __connman_error_invalid_service(msg); + return -EINVAL; } } @@ -6138,7 +7562,7 @@ static DBusMessage *move_service(DBusConnection *conn, if (service4 != CONNMAN_IPCONFIG_METHOD_OFF) { if (!check_suitable_state(target->state_ipv4, service->state_ipv4)) - return __connman_error_invalid_service(msg); + return -EINVAL; } } @@ -6146,7 +7570,7 @@ static DBusMessage *move_service(DBusConnection *conn, if (target6 != CONNMAN_IPCONFIG_METHOD_OFF) { if (!check_suitable_state(target->state_ipv6, service->state_ipv6)) - return __connman_error_invalid_service(msg); + return -EINVAL; } } @@ -6154,11 +7578,11 @@ static DBusMessage *move_service(DBusConnection *conn, if (target4 != CONNMAN_IPCONFIG_METHOD_OFF) { if (!check_suitable_state(target->state_ipv4, service->state_ipv4)) - return __connman_error_invalid_service(msg); + return -EINVAL; } } - g_get_current_time(&service->modified); + gettimeofday(&service->modified, NULL); service_save(service); service_save(target); @@ -6177,6 +7601,39 @@ static DBusMessage *move_service(DBusConnection *conn, service_schedule_changed(); + return 0; +} + +static DBusMessage *move_service(DBusConnection *conn, + DBusMessage *msg, void *user_data, + bool before) +{ + struct connman_service *service = user_data; + struct connman_service *target; + const char *path; + int err; + + DBG("service %p", service); + + dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path, + DBUS_TYPE_INVALID); + + target = find_service(path); + + err = __connman_service_move(service, target, before); + switch (err) { + case 0: + break; + case -EINVAL: + return __connman_error_invalid_service(msg); + case -EOPNOTSUPP: + return __connman_error_not_supported(msg); + default: + connman_warn("unsupported error code %d in move_service()", + err); + break; + } + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } @@ -6202,7 +7659,27 @@ static DBusMessage *reset_counters(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -#if defined TIZEN_MAINTAIN_ONLINE +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +static DBusMessage *is_eapol_enabled(DBusConnection *conn, + DBusMessage *msg, void *user_data) +{ + struct connman_service *service = user_data; + DBG("service: %p path: %s UseEapol: %d", service, service->path, service->use_eapol); + + dbus_bool_t eapol_status = service->use_eapol; + + DBusMessage *reply = dbus_message_new_method_return(msg); + if (!reply) { + DBG("Failed to initialize reply"); + return NULL; + } + + dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &eapol_status, DBUS_TYPE_INVALID); + return reply; +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ + +#if defined TIZEN_EXT static DBusMessage *downgrade_service(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -6210,6 +7687,7 @@ static DBusMessage *downgrade_service(DBusConnection *conn, downgrade_state(service); __connman_connection_update_gateway(); + start_online_check(service, CONNMAN_IPCONFIG_TYPE_IPV4); return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } @@ -6217,6 +7695,9 @@ static DBusMessage *downgrade_service(DBusConnection *conn, static void service_schedule_added(struct connman_service *service) { +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); g_hash_table_remove(services_notify->remove, service->path); @@ -6276,7 +7757,10 @@ static const GDBusMethodTable service_methods[] = { GDBUS_ARGS({ "service", "o" }), NULL, move_after) }, { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) }, -#if defined TIZEN_MAINTAIN_ONLINE +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + { GDBUS_METHOD("IsEapolEnabled", NULL, GDBUS_ARGS({ "eapol", "b" }), is_eapol_enabled) }, +#endif +#if defined TIZEN_EXT { GDBUS_METHOD("Downgrade", NULL, NULL, downgrade_service) }, #endif { }, @@ -6285,6 +7769,10 @@ static const GDBusMethodTable service_methods[] = { static const GDBusSignalTable service_signals[] = { { GDBUS_SIGNAL("PropertyChanged", GDBUS_ARGS({ "name", "s" }, { "value", "v" })) }, +#if defined TIZEN_EXT + { GDBUS_SIGNAL("StateChangedProperties", + GDBUS_ARGS({ "properties", "a{sv}" })) }, +#endif { }, }; @@ -6373,6 +7861,11 @@ static void service_free(gpointer user_data) g_free(service->phase2); g_free(service->config_file); g_free(service->config_entry); +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + g_free(service->pac_file); + g_free(service->phase1); +#endif + #if defined TIZEN_EXT g_free(service->connector); g_free(service->c_sign_key); @@ -6405,6 +7898,9 @@ static void stats_init(struct connman_service *service) static void service_initialize(struct connman_service *service) { +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); service->refcount = 1; @@ -6435,6 +7931,10 @@ static void service_initialize(struct connman_service *service) service->wps = false; service->wps_advertizing = false; #if defined TIZEN_EXT + memset(service->last_connected_bssid, 0, WIFI_BSSID_LEN_MAX); + service->is_internet_connection = false; + service->assoc_reject_count = 0; + service->disconnection_requested = false; service->storage_reload = false; /* @@ -6443,6 +7943,9 @@ static void service_initialize(struct connman_service *service) service->user_pdn_connection_refcount = 0; __sync_synchronize(); #endif +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + service->use_eapol = false; +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ } /** @@ -6500,35 +8003,249 @@ struct connman_service * connman_service_ref_debug(struct connman_service *service, const char *file, int line, const char *caller) { - DBG("%p ref %d by %s:%d:%s()", service, service->refcount + 1, - file, line, caller); + DBG("%p ref %d by %s:%d:%s()", service, service->refcount + 1, + file, line, caller); + + __sync_fetch_and_add(&service->refcount, 1); + + return service; +} + +/** + * connman_service_unref: + * @service: service structure + * + * Decrease reference counter of service and release service if no + * longer needed. + */ +void connman_service_unref_debug(struct connman_service *service, + const char *file, int line, const char *caller) +{ + DBG("%p ref %d by %s:%d:%s()", service, service->refcount - 1, + file, line, caller); + + if (__sync_fetch_and_sub(&service->refcount, 1) != 1) + return; + + service_list = g_list_remove(service_list, service); + + __connman_service_disconnect(service); + + g_hash_table_remove(service_hash, service->identifier); +} + +#if defined TIZEN_EXT && defined TIZEN_EXT_INS +static int calculate_score_last_user_selection(struct connman_service *service) +{ + int score = 0; + struct connman_device *device; + const char *last_user_selection_ident; + time_t last_user_selection_time; + unsigned int frequency; + time_t curr_time; + time_t ref_time; + struct tm* ref_timeinfo; + + device = connman_network_get_device(service->network); + if (!device) + return 0; + + last_user_selection_time = connman_device_get_last_user_selection_time(device); + last_user_selection_ident = connman_device_get_last_user_selection_ident(device); + frequency = connman_network_get_frequency(service->network); + + if (ins_settings.last_user_selection) { + if (g_strcmp0(last_user_selection_ident, service->identifier) == 0 && + (((frequency >= FREQ_RANGE_24GHZ_CHANNEL_1 && + frequency <= FREQ_RANGE_24GHZ_CHANNEL_14) && + service->strength >= ins_settings.signal_level3_24ghz) || + ((frequency >= FREQ_RANGE_5GHZ_CHANNEL_32 && + frequency <= FREQ_RANGE_5GHZ_CHANNEL_165) && + service->strength >= ins_settings.signal_level3_5ghz))) { + + /* Only events that occur within 8 hours are counted. */ + curr_time = time(NULL); + ref_timeinfo = localtime(&curr_time); + ref_timeinfo->tm_hour -= 8; + ref_time = mktime(ref_timeinfo); + + if (last_user_selection_time > ref_time) { + int time_diff = (curr_time - last_user_selection_time) / 60; + int denominator = ins_settings.last_user_selection_time - time_diff; + int numerator = ins_settings.last_user_selection_time / + ins_settings.last_user_selection_score; + int last_user_score = denominator / numerator; + + score += (last_user_score > ins_settings.last_user_selection_score ? + ins_settings.last_user_selection_score : last_user_score); + } + } + } + + return score; +} + +static int calculate_score_last_connected(struct connman_service *service) +{ + int score = 0; + struct connman_device *device; + const char *last_connected_ident; + unsigned int frequency; + + device = connman_network_get_device(service->network); + if (!device) + return 0; + + last_connected_ident = connman_device_get_last_connected_ident(device); + frequency = connman_network_get_frequency(service->network); + + if (ins_settings.last_connected) { + if (g_strcmp0(last_connected_ident, service->identifier) == 0 && + (((frequency >= FREQ_RANGE_24GHZ_CHANNEL_1 && + frequency <= FREQ_RANGE_24GHZ_CHANNEL_14) && + service->strength >= ins_settings.signal_level3_24ghz) || + ((frequency >= FREQ_RANGE_5GHZ_CHANNEL_32 && + frequency <= FREQ_RANGE_5GHZ_CHANNEL_165) && + service->strength >= ins_settings.signal_level3_5ghz))) { + score += ins_settings.last_connected_score; + } + } + + return score; +} + +static int calculate_score_frequency(struct connman_service *service) +{ + int score = 0; + unsigned int frequency; + + frequency = connman_network_get_frequency(service->network); + + switch (ins_settings.preferred_freq) { + case CONNMAN_INS_PREFERRED_FREQ_24GHZ: + if ((frequency >= FREQ_RANGE_24GHZ_CHANNEL_1 && + frequency <= FREQ_RANGE_24GHZ_CHANNEL_14) && + (service->strength >= ins_settings.signal_level3_24ghz)) + score += ins_settings.preferred_freq_score; + + break; + case CONNMAN_INS_PREFERRED_FREQ_5GHZ: + if ((frequency >= FREQ_RANGE_5GHZ_CHANNEL_32 && + frequency <= FREQ_RANGE_5GHZ_CHANNEL_165) && + (service->strength >= ins_settings.signal_level3_5ghz)) + score += ins_settings.preferred_freq_score; + + break; + default: + break; + } + + return score; +} + +static int calculate_score_security_priority(struct connman_service *service) +{ + int score = 0; + + if (ins_settings.security_priority_count) + score += ins_settings.security_priority[service->security]; + + return score; +} + +static int calculate_score_internet_connection(struct connman_service *service) +{ + int score = 0; + + if (ins_settings.internet) { + if (service->is_internet_connection) + score += ins_settings.internet_score; + } + + return score; +} + +static int calculate_score_strength(struct connman_service *service) +{ + int score = 0; - __sync_fetch_and_add(&service->refcount, 1); + if (ins_settings.signal) + score += (((service->strength > 60) ? 60 : service->strength) - 35); - return service; + return score; } -/** - * connman_service_unref: - * @service: service structure - * - * Decrease reference counter of service and release service if no - * longer needed. - */ -void connman_service_unref_debug(struct connman_service *service, - const char *file, int line, const char *caller) +static int calculate_score(struct connman_service *service) { - DBG("%p ref %d by %s:%d:%s()", service, service->refcount - 1, - file, line, caller); + int score_last_user_selection; + int score_last_connected; + int score_frequency; + int score_security_priority; + int score_internet_connection; + int score_strength; + int score = 0; - if (__sync_fetch_and_sub(&service->refcount, 1) != 1) - return; + if (service->type != CONNMAN_SERVICE_TYPE_WIFI) { + score += calculate_score_internet_connection(service); + service->ins_score = score; + return score; + } - service_list = g_list_remove(service_list, service); + score_last_user_selection = calculate_score_last_user_selection(service); + score_last_connected = calculate_score_last_connected(service); + score_frequency = calculate_score_frequency(service); + score_security_priority = calculate_score_security_priority(service); + score_internet_connection = calculate_score_internet_connection(service); + score_strength = calculate_score_strength(service); - __connman_service_disconnect(service); + score = score_last_user_selection + score_last_connected + + score_frequency + score_security_priority + + score_internet_connection + score_strength; - g_hash_table_remove(service_hash, service->identifier); + service->score_last_user_selection = score_last_user_selection; + service->score_last_connected = score_last_connected; + service->score_frequency = score_frequency; + service->score_security_priority = score_security_priority; + service->score_internet_connection = score_internet_connection; + service->score_strength = score_strength; + + service->ins_score = score; + return score; +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + +static gint service_compare(gconstpointer a, gconstpointer b); + +static gint service_compare_vpn(struct connman_service *a, + struct connman_service *b) +{ + struct connman_provider *provider; + struct connman_service *service; + struct connman_service *transport; + const char *ident; + bool reverse; + + if (a->provider) { + provider = a->provider; + service = b; + reverse = false; + } else if (b->provider) { + provider = b->provider; + service = a; + reverse = true; + } else { + return 0; + } + + ident = __connman_provider_get_transport_ident(provider); + transport = connman_service_lookup_from_identifier(ident); + if (!transport) + return 0; + + if (reverse) + return service_compare(service, transport); + + return service_compare(transport, service); } static gint service_compare(gconstpointer a, gconstpointer b) @@ -6537,14 +8254,49 @@ static gint service_compare(gconstpointer a, gconstpointer b) struct connman_service *service_b = (void *) b; enum connman_service_state state_a, state_b; bool a_connected, b_connected; +#if defined TIZEN_EXT && defined TIZEN_EXT_INS + int score_a; + int score_b; +#else /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ gint strength; +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ state_a = service_a->state; state_b = service_b->state; a_connected = is_connected(state_a); b_connected = is_connected(state_b); +#if defined TIZEN_EXT + if ((a_connected && b_connected) && + state_a == state_b && + service_a->type == CONNMAN_SERVICE_TYPE_WIFI && + service_b->type == CONNMAN_SERVICE_TYPE_WIFI) { + const char *default_interface = + connman_setting_get_string("DefaultWifiInterface"); + const char *ifname_a = connman_device_get_string( + connman_network_get_device(service_a->network), "Interface"); + const char *ifname_b = connman_device_get_string( + connman_network_get_device(service_b->network), "Interface"); + + if (g_strcmp0(default_interface, ifname_a) == 0) + return -1; + else if (g_strcmp0(default_interface, ifname_b) == 0) + return 1; + } +#endif + if (a_connected && b_connected) { + int rval; + + /* Compare the VPN transport and the service */ + if ((service_a->type == CONNMAN_SERVICE_TYPE_VPN || + service_b->type == CONNMAN_SERVICE_TYPE_VPN) && + service_b->type != service_a->type) { + rval = service_compare_vpn(service_a, service_b); + if (rval) + return rval; + } + if (service_a->order > service_b->order) return -1; @@ -6626,17 +8378,44 @@ static gint service_compare(gconstpointer a, gconstpointer b) return 1; } +#if defined TIZEN_EXT && defined TIZEN_EXT_INS + score_a = calculate_score(service_a); + score_b = calculate_score(service_b); + if (score_b != score_a) + return score_b - score_a; +#else /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ strength = (gint) service_b->strength - (gint) service_a->strength; if (strength) return strength; +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ return g_strcmp0(service_a->name, service_b->name); } +#if defined TIZEN_EXT && defined TIZEN_EXT_INS +static void print_service_sort(gpointer data, gpointer user_data) +{ + struct connman_service *service = data; + + if (service->type != CONNMAN_SERVICE_TYPE_WIFI) + return; + + DBG("name[%-20s] total[%2d] last_usr[%2d] last_conn[%2d] " + "freq[%2d] sec[%2d] internet[%2d] strength[%2d]", + service->name, service->ins_score, service->score_last_user_selection, + service->score_last_connected, service->score_frequency, + service->score_security_priority, service->score_internet_connection, + service->score_strength); +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + static void service_list_sort(void) { if (service_list && service_list->next) { service_list = g_list_sort(service_list, service_compare); +#if defined TIZEN_EXT && defined TIZEN_EXT_INS + g_list_foreach(service_list, print_service_sort, NULL); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ service_schedule_changed(); } } @@ -6951,6 +8730,15 @@ 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 && defined TIZEN_EXT_EAP_ON_ETHERNET + else if (g_str_equal(key, "Phase1")) { + g_free(service->phase1); + service->phase1 = g_strdup(value); + } else if (g_str_equal(key, "PacFile")) { + g_free(service->pac_file); + service->pac_file = g_strdup(value); + } +#endif #if defined TIZEN_EXT else if (g_str_equal(key, "Connector")) { g_free(service->connector); @@ -7004,10 +8792,12 @@ static void report_error_cb(void *user_context, bool retry, service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE; - if (service->error != CONNMAN_SERVICE_ERROR_AUTH_FAILED) + if (service->error != CONNMAN_SERVICE_ERROR_AUTH_FAILED && + service->error != CONNMAN_SERVICE_ERROR_ASSOC_FAILED) set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); #endif service_complete(service); + service_list_sort(); __connman_connection_update_gateway(); } } @@ -7068,22 +8858,29 @@ static void request_input_cb(struct connman_service *service, __connman_service_return_error(service, ECONNABORTED, user_data); - goto done; } else { + err = -ETIMEDOUT; + if (service->hidden) __connman_service_return_error(service, ETIMEDOUT, user_data); } + + goto done; } - if (service->hidden && name_len > 0 && name_len <= 32) { - device = connman_network_get_device(service->network); - security = connman_network_get_string(service->network, - "WiFi.Security"); - err = __connman_device_request_hidden_scan(device, - name, name_len, - identity, passphrase, - security, user_data); + if (service->hidden) { + if (name_len > 0 && name_len <= 32) { + device = connman_network_get_device(service->network); + security = connman_network_get_string(service->network, + "WiFi.Security"); + err = __connman_device_request_hidden_scan(device, + name, name_len, + identity, passphrase, + security, user_data); + } else { + err = -EINVAL; + } if (err < 0) __connman_service_return_error(service, -err, user_data); @@ -7205,12 +9002,15 @@ static struct connman_device *default_connecting_device = NULL; static void __connman_service_disconnect_default(struct connman_service *service) { struct connman_device *default_device = NULL; + struct connman_network *network = __connman_service_get_network(service); + + if (!network) + return; if (default_connecting_device == NULL) return; - default_device = connman_network_get_device( - __connman_service_get_network(service)); + default_device = connman_network_get_device(network); DBG("Disconnecting service %p %s", service, service->path); DBG("Disconnecting device %p %p %s", @@ -7388,6 +9188,50 @@ static void set_priority_connected_service(void) #endif } } + +static void emit_wifi_roaming_failure(struct connman_service *service, + enum connman_service_state new_state) +{ + if (connman_setting_get_bool("WifiRoaming") && + connman_network_get_bool(service->network, "WiFi.Roaming")) { + const char *cur_bssid; + const char *dst_bssid; + const char *ifname; + struct connman_device *device; + + device = connman_network_get_device(service->network); + if (device) { + ifname = connman_device_get_string(device, "Interface"); + cur_bssid = connman_network_get_string(service->network, + "WiFi.RoamingCurBSSID"); + dst_bssid = connman_network_get_string(service->network, + "WiFi.RoamingDstBSSID"); + } + + if (device && ifname && cur_bssid && dst_bssid) { + switch(new_state) { + case CONNMAN_SERVICE_STATE_UNKNOWN: + case CONNMAN_SERVICE_STATE_ASSOCIATION: + case CONNMAN_SERVICE_STATE_CONFIGURATION: + case CONNMAN_SERVICE_STATE_READY: + case CONNMAN_SERVICE_STATE_ONLINE: + break; + case CONNMAN_SERVICE_STATE_DISCONNECT: + case CONNMAN_SERVICE_STATE_FAILURE: + case CONNMAN_SERVICE_STATE_IDLE: + __connman_technology_notify_roaming_state(ifname, + "failure", cur_bssid, dst_bssid); + connman_network_set_bool(service->network, + "WiFi.Roaming", false); + connman_network_set_string(service->network, + "WiFi.RoamingCurBSSID", NULL); + connman_network_set_string(service->network, + "WiFi.RoamingDstBSSID", NULL); + break; + } + } + } +} #endif static const char *get_dbus_sender(struct connman_service *service) @@ -7437,6 +9281,14 @@ static int service_indicate_state(struct connman_service *service) searchdomain_remove_all(service); service->state = new_state; +#if defined TIZEN_EXT + if (!is_connected(old_state) && is_connected(new_state)) + connman_device_send_connected_signal( + connman_network_get_device(service->network), true); + else if (is_connected(old_state) && !is_connected(new_state)) + connman_device_send_connected_signal( + connman_network_get_device(service->network), false); +#endif state_changed(service); if (!is_connected(old_state) && is_connected(new_state)) @@ -7514,7 +9366,7 @@ static int service_indicate_state(struct connman_service *service) "WiFi.UseWPS", false); } - g_get_current_time(&service->modified); + gettimeofday(&service->modified, NULL); service_save(service); domain_changed(service); @@ -7556,6 +9408,10 @@ static int service_indicate_state(struct connman_service *service) single_connected_tech(service); #endif +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) + connman_service_set_internet_connection(service, true); +#endif break; case CONNMAN_SERVICE_STATE_DISCONNECT: @@ -7582,6 +9438,8 @@ static int service_indicate_state(struct connman_service *service) proxy_changed(service); #if defined TIZEN_EXT } + + emit_wifi_roaming_failure(service, new_state); #endif /* @@ -7591,7 +9449,7 @@ static int service_indicate_state(struct connman_service *service) */ downgrade_connected_services(); - __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); + do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); break; case CONNMAN_SERVICE_STATE_FAILURE: @@ -7606,6 +9464,9 @@ static int service_indicate_state(struct connman_service *service) report_error_cb, get_dbus_sender(service), NULL); +#if !defined TIZEN_EXT + goto notifier; +#endif } service_complete(service); break; @@ -7619,10 +9480,14 @@ static int service_indicate_state(struct connman_service *service) #else __connman_service_connect_default(service); #endif + emit_wifi_roaming_failure(service, new_state); #endif __connman_connection_update_gateway(); +#if !defined TIZEN_EXT +notifier: +#endif if ((old_state == CONNMAN_SERVICE_STATE_ONLINE && new_state != CONNMAN_SERVICE_STATE_READY) || (old_state == CONNMAN_SERVICE_STATE_READY && @@ -7742,34 +9607,6 @@ enum connman_service_state __connman_service_ipconfig_get_state( return CONNMAN_SERVICE_STATE_UNKNOWN; } -static void check_proxy_setup(struct connman_service *service) -{ - /* - * We start WPAD if we haven't got a PAC URL from DHCP and - * if our proxy manual configuration is either empty or set - * to AUTO with an empty URL. - */ - - if (service->proxy != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) - goto done; - - if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN && - (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_AUTO || - service->pac)) - goto done; - - if (__connman_wpad_start(service) < 0) { - service->proxy = CONNMAN_SERVICE_PROXY_METHOD_DIRECT; - __connman_notifier_proxy_changed(service); - goto done; - } - - return; - -done: - __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); -} - #if defined TIZEN_EXT void connman_check_proxy_setup_and_wispr_start(struct connman_service *service){ @@ -7849,7 +9686,13 @@ static gboolean redo_wispr_ipv4(gpointer user_data) { struct connman_service *service = user_data; +#if defined TIZEN_MAINTAIN_ONLINE + DBG(""); + + __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); +#else redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV4); +#endif return FALSE; } @@ -7863,24 +9706,13 @@ static gboolean redo_wispr_ipv6(gpointer user_data) 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) +void __connman_service_online_check(struct connman_service *service, + enum connman_ipconfig_type type, + bool success) { GSourceFunc redo_func; - int *interval; + unsigned int *interval; + enum connman_service_state current_state; if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { interval = &service->online_check_interval_ipv4; @@ -7890,6 +9722,22 @@ int __connman_service_online_check_failed(struct connman_service *service, redo_func = redo_wispr_ipv6; } + if(!enable_online_to_ready_transition) + goto redo_func; + + if (success) { + *interval = online_check_max_interval; + } else { + current_state = service->state; + downgrade_state(service); + if (current_state != service->state) + *interval = online_check_initial_interval; + if (service != connman_service_get_default()) { + return; + } + } + +redo_func: DBG("service %p type %s interval %d", service, __connman_ipconfig_type2string(type), *interval); @@ -7897,22 +9745,10 @@ int __connman_service_online_check_failed(struct connman_service *service, 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. + * online_check_max_interval seconds * online_check_max_interval seconds. */ - if (*interval < ONLINE_CHECK_MAX_INTERVAL) + 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, @@ -8173,8 +10009,8 @@ static void prepare_8021x(struct connman_service *service) service->phase1); #endif } -#if defined TIZEN_EXT +#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; @@ -8425,6 +10261,12 @@ int __connman_service_connect(struct connman_service *service, __connman_service_clear_error(service); + if (service->network && service->autoconnect && + __connman_network_native_autoconnect(service->network)) { + DBG("service %p switch connecting reason to native", service); + reason = CONNMAN_SERVICE_CONNECT_REASON_NATIVE; + } + err = service_connect(service); DBG("service %p err %d", service, err); @@ -8657,7 +10499,9 @@ static struct connman_service *service_get(const char *identifier) service = connman_service_create(); if (!service) return NULL; - +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); service->identifier = g_strdup(identifier); @@ -8672,6 +10516,9 @@ static struct connman_service *service_get(const char *identifier) static int service_register(struct connman_service *service) { +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); if (service->path) @@ -8683,9 +10530,13 @@ static int service_register(struct connman_service *service) DBG("path %s", service->path); #if defined TIZEN_EXT + int ret; service_load(service); - int ret = __connman_config_provision_service(service); - if (ret < 0) + ret = service_ext_load(service); + if (ret == -ERANGE) + service_ext_save(service); + ret = __connman_config_provision_service(service); + if (ret < 0 && !simplified_log) DBG("Failed to provision service"); #else if (__connman_config_provision_service(service) < 0) @@ -8697,6 +10548,9 @@ static int service_register(struct connman_service *service) service_methods, service_signals, NULL, service, NULL); + if (__connman_config_provision_service(service) < 0) + service_load(service); + service_list_sort(); __connman_connection_update_gateway(); @@ -9139,6 +10993,75 @@ static void update_from_network(struct connman_service *service, service_list_sort(); } +static void trigger_autoconnect(struct connman_service *service) +{ + struct connman_device *device; + bool native; + + if (!service->favorite) + return; + + native = __connman_network_native_autoconnect(service->network); + if (native && service->autoconnect) { + DBG("trigger native autoconnect"); + connman_network_set_autoconnect(service->network, true); + return; + } + + device = connman_network_get_device(service->network); + if (device && connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_UNKNOWN)) + return; + + 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: + case CONNMAN_SERVICE_TYPE_ETHERNET: + if (service->autoconnect) { + __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + break; + } + + /* fall through */ + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_WIFI: + case CONNMAN_SERVICE_TYPE_CELLULAR: + do_auto_connect(service, CONNMAN_SERVICE_CONNECT_REASON_AUTO); + break; + } + +#if defined TIZEN_EXT + /* TIZEN synchronizes below information when the service creates */ + if (service->eap != NULL) + connman_network_set_string(service->network, "WiFi.EAP", + service->eap); + if (service->identity != NULL) + connman_network_set_string(service->network, "WiFi.Identity", + service->identity); + 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_service_create_from_network: * @network: network structure @@ -9148,7 +11071,6 @@ static void update_from_network(struct connman_service *service, struct connman_service * __connman_service_create_from_network(struct connman_network *network) { struct connman_service *service; - struct connman_device *device; const char *ident, *group; char *name; unsigned int *auto_connect_types, *favorite_types; @@ -9222,61 +11144,7 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne service_register(service); service_schedule_added(service); - if (service->favorite) { - device = connman_network_get_device(service->network); - 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: - case CONNMAN_SERVICE_TYPE_ETHERNET: - if (service->autoconnect) { - __connman_service_connect(service, - CONNMAN_SERVICE_CONNECT_REASON_AUTO); - break; - } - - /* fall through */ - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_VPN: - case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_CELLULAR: - __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); - break; - } - } - -#if defined TIZEN_EXT - /* TIZEN synchronizes below information when the service creates */ - if (service->eap != NULL) - connman_network_set_string(service->network, "WiFi.EAP", - service->eap); - if (service->identity != NULL) - connman_network_set_string(service->network, "WiFi.Identity", - service->identity); - 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 - } + trigger_autoconnect(service); __connman_notifier_service_add(service, service->name); @@ -9301,7 +11169,8 @@ void __connman_service_notify_strength_changed(struct connman_network *network) return; service->strength = strength; - DBG("Strength %d", strength); + if (!simplified_log) + DBG("Strength %d", strength); strength_changed(service); service_list_sort(); } @@ -9315,6 +11184,9 @@ void __connman_service_update_from_network(struct connman_network *network) bool roaming; const char *name; bool stats_enable; +#if defined TIZEN_EXT + bool need_save = false; +#endif service = connman_service_lookup_from_network(network); if (!service) @@ -9371,6 +11243,16 @@ roaming: roaming_changed(service); sorting: +#if defined TIZEN_EXT + need_save |= update_last_connected_bssid(service); + need_save |= update_assoc_reject(service); + if (need_save) { + g_get_current_time(&service->modified); + service_ext_save(service); + need_sort = true; + } +#endif + if (need_sort) { service_list_sort(); } @@ -9553,6 +11435,99 @@ static struct connman_agent_driver agent_driver = { .context_unref = agent_context_unref, }; +#if defined TIZEN_EXT && defined TIZEN_EXT_INS +static void ins_setting_init(void) +{ + int i; + const char *string; + char **string_list; + unsigned int string_count; + + ins_settings.last_user_selection = connman_setting_get_bool("INSLastUserSelection"); + ins_settings.last_user_selection_time = connman_setting_get_uint("INSLastUserSelectionTime"); + ins_settings.last_connected = connman_setting_get_bool("INSLastConnected"); + + string = connman_setting_get_string("INSPreferredFreq"); + if (g_strcmp0(string, "5GHz") == 0) + ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_5GHZ; + else if (g_strcmp0(string, "2.4GHz") == 0) + ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_24GHZ; + else + ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_UNKNOWN; + + ins_settings.security_priority_count = connman_setting_get_uint("INSSecurityPriorityCount"); + ins_settings.security_priority_score = connman_setting_get_uint("INSSecurityPriorityScore"); + string_count = ins_settings.security_priority_count; + + memset(ins_settings.security_priority, 0, sizeof(ins_settings.security_priority)); + string_list = connman_setting_get_string_list("INSSecurityPriority"); + for (i = 0; string_list && string_list[i]; i++) { + unsigned int security_score = string_count * ins_settings.security_priority_score; + + if (g_strcmp0(string_list[i], "WEP") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WEP] = security_score; + else if (g_strcmp0(string_list[i], "PSK") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_PSK] = security_score; + else if (g_strcmp0(string_list[i], "8021X") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_8021X] = security_score; + else if (g_strcmp0(string_list[i], "WPA") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WPA] = security_score; + else if (g_strcmp0(string_list[i], "RSN") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_RSN] = security_score; + else if (g_strcmp0(string_list[i], "SAE") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_SAE] = security_score; + else if (g_strcmp0(string_list[i], "OWE") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_OWE] = security_score; + else if (g_strcmp0(string_list[i], "DPP") == 0) + ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_DPP] = security_score; + + string_count--; + } + + ins_settings.signal = connman_setting_get_bool("INSSignal"); + ins_settings.internet = connman_setting_get_bool("INSInternet"); + + ins_settings.last_user_selection_score = connman_setting_get_uint("INSLastUserSelectionScore"); + ins_settings.last_connected_score = connman_setting_get_uint("INSLastConnectedScore"); + ins_settings.preferred_freq_score = connman_setting_get_uint("INSPreferredFreqScore"); + ins_settings.internet_score = connman_setting_get_uint("INSInternetScore"); + + /* + * In ConnMan, signal strength is used after being converted + * to positive value(signal strength + 120). + * So the value for comparison should also be converted to the same. + */ + ins_settings.signal_level3_5ghz = connman_setting_get_int("INSSignalLevel3_5GHz") + 120; + ins_settings.signal_level3_24ghz = connman_setting_get_int("INSSignalLevel3_24GHz") + 120; + + DBG("last_user_selection [%s]", ins_settings.last_user_selection ? "true" : "false"); + DBG("last_user_selection_time [%d]", ins_settings.last_user_selection_time); + DBG("last_user_selection_score [%d]", ins_settings.last_user_selection_score); + + DBG("last_connected [%s]", ins_settings.last_connected ? "true" : "false"); + DBG("last_connected_score [%d]", ins_settings.last_connected_score); + + DBG("preferred_freq [%s]", ins_settings.preferred_freq ? "true" : "false"); + DBG("preferred_freq_score [%d]", ins_settings.preferred_freq_score); + + DBG("security_priority_count [%d]", ins_settings.security_priority_count); + for (i = 0; i < CONNMAN_SERVICE_SECURITY_MAX; i++) { + if (ins_settings.security_priority[i]) + DBG("security_priority %s [%d]", security2string(i), + ins_settings.security_priority[i]); + } + DBG("security_priority_score [%d]", ins_settings.security_priority_score); + + DBG("signal [%s]", ins_settings.signal ? "true" : "false"); + + DBG("internet [%s]", ins_settings.internet ? "true" : "false"); + DBG("internet_score [%d]", ins_settings.internet_score); + + DBG("signal_level3_5ghz [%d]", ins_settings.signal_level3_5ghz); + DBG("signal_level3_24ghz [%d]", ins_settings.signal_level3_24ghz); +} +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + int __connman_service_init(void) { int err; @@ -9580,6 +11555,10 @@ int __connman_service_init(void) remove_unprovisioned_services(); +#if defined TIZEN_EXT && defined TIZEN_EXT_INS + ins_setting_init(); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + return 0; }