X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=035930bf6d9a643accb040055e1ae81051600282;hb=5269bd59e8100c6883b3f6e5609f57f8034e3140;hp=dfa56b7877fc82b0076bdc1b570c1d867a21bb05;hpb=e62c767da96f4b31206d2c7ad5fd04dde50036e7;p=platform%2Fupstream%2Fconnman.git diff --git a/src/service.c b/src/service.c old mode 100644 new mode 100755 index dfa56b7..f77c8a5 --- a/src/service.c +++ b/src/service.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2014 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -38,32 +39,89 @@ #define CONNECT_TIMEOUT 120 +#if defined TIZEN_EXT +#define WIFI_BSSID_STR_LEN 18 +#define MAX_WIFI_PROFILES 200 +#endif + +#if defined TIZEN_EXT +#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 + static DBusConnection *connection = NULL; -static GSequence *service_list = NULL; +static GList *service_list = NULL; static GHashTable *service_hash = NULL; static GSList *counter_list = NULL; -static unsigned int autoconnect_timeout = 0; +static unsigned int autoconnect_id = 0; +static unsigned int vpn_autoconnect_id = 0; static struct connman_service *current_default = NULL; -static connman_bool_t services_dirty = FALSE; +static bool services_dirty = false; + +#if defined TIZEN_EXT +static bool auto_connect_mode = TRUE; + +struct saved_profiles { + GTimeVal modified; + gchar *profile_name; +}; + +#endif + +#if defined TIZEN_EXT +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; + +static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; +#endif struct connman_stats { - connman_bool_t valid; - connman_bool_t enabled; + bool valid; + bool enabled; struct connman_stats_data data_last; struct connman_stats_data data; GTimer *timer; }; struct connman_stats_counter { - connman_bool_t append_all; + bool append_all; struct connman_stats stats; struct connman_stats stats_roaming; }; struct connman_service { int refcount; - int session_usage_count; char *identifier; char *path; enum connman_service_type type; @@ -72,19 +130,18 @@ struct connman_service { enum connman_service_state state_ipv4; enum connman_service_state state_ipv6; enum connman_service_error error; - connman_uint8_t strength; - connman_bool_t favorite; - connman_bool_t immutable; - connman_bool_t hidden; - connman_bool_t ignore; - connman_bool_t autoconnect; - connman_bool_t userconnect; + enum connman_service_connect_reason connect_reason; + uint8_t strength; + bool favorite; + bool immutable; + bool hidden; + bool ignore; + bool autoconnect; GTimeVal modified; unsigned int order; char *name; char *passphrase; - char *agent_passphrase; - connman_bool_t roaming; + bool roaming; struct connman_ipconfig *ipconfig_ipv4; struct connman_ipconfig *ipconfig_ipv6; struct connman_network *network; @@ -92,15 +149,24 @@ struct connman_service { char **nameservers; char **nameservers_config; char **nameservers_auto; + int nameservers_timeout; char **domains; + bool mdns; + bool mdns_config; + char *hostname; char *domainname; char **timeservers; char **timeservers_config; /* 802.1x settings from the config files */ char *eap; char *identity; + char *anonymous_identity; char *agent_identity; char *ca_cert_file; + char *subject_match; + char *altsubject_match; + char *domain_suffix_match; + char *domain_match; char *client_cert_file; char *private_key_file; char *private_key_passphrase; @@ -116,28 +182,148 @@ struct connman_service { char **proxies; char **excludes; char *pac; - connman_bool_t wps; - int online_check_count; - connman_bool_t do_split_routing; - connman_bool_t new_service; - connman_bool_t hidden_service; + bool wps; + bool wps_advertizing; + guint online_timeout; + int online_check_interval_ipv4; + int online_check_interval_ipv6; + bool do_split_routing; + bool new_service; + bool hidden_service; char *config_file; char *config_entry; +#if defined TIZEN_EXT + /* + * Description: TIZEN implements system global connection management. + * It's only for PDP (cellular) bearer. Wi-Fi is managed + * by ConnMan automatically. Reference count can help to + * manage open/close connection requests by each application. + */ + int user_pdn_connection_refcount; + bool storage_reload; + /* + * Description: In case of EAP security type, + * user can select the keymgmt type for roaming(802.11r). + * - FT, CCKM, OKC, ... + */ + char *keymgmt_type; + int disconnect_reason; + int assoc_status_code; + /* + * 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. + */ + bool disconnection_requested; + + enum connman_dnsconfig_method dns_config_method_ipv4; + enum connman_dnsconfig_method dns_config_method_ipv6; +#endif +#if defined TIZEN_EXT + char *connector; + char *c_sign_key; + char *net_access_key; +#endif +#if defined TIZEN_EXT + 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 connman_bool_t allow_property_changed(struct connman_service *service); +static bool allow_property_changed(struct connman_service *service); + +static struct connman_ipconfig *create_ip4config(struct connman_service *service, + int index, enum connman_ipconfig_method method); +static struct connman_ipconfig *create_ip6config(struct connman_service *service, + int index); +static void dns_changed(struct connman_service *service); struct find_data { const char *path; struct connman_service *service; }; +#if defined TIZEN_EXT +struct assoc_reject_data { + char *bssid; + GSList *reject_time_list; +}; +#endif + +#if defined TIZEN_EXT +/* + * Public APIs to use user_pdn_connection_refcount + */ +void connman_service_user_pdn_connection_ref(struct connman_service *service) +{ + __sync_fetch_and_add(&service->user_pdn_connection_refcount, 1); + + DBG("User made PDN connection referenced: %d", + service->user_pdn_connection_refcount); +} + +gboolean connman_service_user_pdn_connection_unref_and_test( + struct connman_service *service) +{ + __sync_synchronize(); + + DBG("User made PDN connection referenced: %d, which will be decreased", + service->user_pdn_connection_refcount); + + if (service->user_pdn_connection_refcount < 1) + return TRUE; + + if (__sync_sub_and_fetch(&service->user_pdn_connection_refcount, 1) == 0) + return TRUE; + + return FALSE; +} + +gboolean connman_service_is_no_ref_user_pdn_connection( + struct connman_service *cellular) +{ + if (cellular == NULL) + return TRUE; + + __sync_synchronize(); + if (cellular->type == CONNMAN_SERVICE_TYPE_CELLULAR && + cellular->user_pdn_connection_refcount == 0) + return TRUE; + + return FALSE; +} +#endif + static void compare_path(gpointer value, gpointer user_data) { struct connman_service *service = value; struct find_data *data = user_data; - if (data->service != NULL) + if (data->service) return; if (g_strcmp0(service->path, data->path) == 0) @@ -150,11 +336,28 @@ static struct connman_service *find_service(const char *path) DBG("path %s", path); - g_sequence_foreach(service_list, compare_path, &data); + g_list_foreach(service_list, compare_path, &data); return data.service; } +static const char *reason2string(enum connman_service_connect_reason reason) +{ + + switch (reason) { + case CONNMAN_SERVICE_CONNECT_REASON_NONE: + return "none"; + case CONNMAN_SERVICE_CONNECT_REASON_USER: + return "user"; + case CONNMAN_SERVICE_CONNECT_REASON_AUTO: + return "auto"; + case CONNMAN_SERVICE_CONNECT_REASON_SESSION: + return "session"; + } + + return "unknown"; +} + const char *__connman_service_type2string(enum connman_service_type type) { switch (type) { @@ -176,6 +379,12 @@ const char *__connman_service_type2string(enum connman_service_type type) return "vpn"; case CONNMAN_SERVICE_TYPE_GADGET: return "gadget"; + case CONNMAN_SERVICE_TYPE_P2P: + return "p2p"; +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: + return "mesh"; +#endif } return NULL; @@ -183,7 +392,7 @@ const char *__connman_service_type2string(enum connman_service_type type) enum connman_service_type __connman_service_string2type(const char *str) { - if (str == NULL) + if (!str) return CONNMAN_SERVICE_TYPE_UNKNOWN; if (strcmp(str, "ethernet") == 0) @@ -202,10 +411,39 @@ enum connman_service_type __connman_service_string2type(const char *str) return CONNMAN_SERVICE_TYPE_GPS; if (strcmp(str, "system") == 0) return CONNMAN_SERVICE_TYPE_SYSTEM; + if (strcmp(str, "p2p") == 0) + return CONNMAN_SERVICE_TYPE_P2P; return CONNMAN_SERVICE_TYPE_UNKNOWN; } +enum connman_service_security __connman_service_string2security(const char *str) +{ + if (!str) + return CONNMAN_SERVICE_SECURITY_UNKNOWN; + + if (!strcmp(str, "psk")) + return CONNMAN_SERVICE_SECURITY_PSK; + if (!strcmp(str, "ieee8021x") || !strcmp(str, "8021x")) + return CONNMAN_SERVICE_SECURITY_8021X; + if (!strcmp(str, "none") || !strcmp(str, "open")) + return CONNMAN_SERVICE_SECURITY_NONE; + if (!strcmp(str, "wep")) + return CONNMAN_SERVICE_SECURITY_WEP; +#if defined TIZEN_EXT + if (!strcmp(str, "rsn")) + return CONNMAN_SERVICE_SECURITY_RSN; + if (!strcmp(str, "sae")) + return CONNMAN_SERVICE_SECURITY_SAE; + if (!strcmp(str, "owe")) + return CONNMAN_SERVICE_SECURITY_OWE; + if (!strcmp(str, "dpp")) + return CONNMAN_SERVICE_SECURITY_DPP; +#endif + + return CONNMAN_SERVICE_SECURITY_UNKNOWN; +} + static const char *security2string(enum connman_service_security security) { switch (security) { @@ -217,8 +455,20 @@ static const char *security2string(enum connman_service_security security) return "wep"; case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: +#if defined TIZEN_EXT + return "psk"; + case CONNMAN_SERVICE_SECURITY_RSN: + return "rsn"; + case CONNMAN_SERVICE_SECURITY_SAE: + return "sae"; + case CONNMAN_SERVICE_SECURITY_OWE: + return "owe"; + case CONNMAN_SERVICE_SECURITY_DPP: + return "dpp"; +#else case CONNMAN_SERVICE_SECURITY_RSN: return "psk"; +#endif case CONNMAN_SERVICE_SECURITY_8021X: return "ieee8021x"; } @@ -269,23 +519,13 @@ static const char *error2string(enum connman_service_error error) return "auth-failed"; case CONNMAN_SERVICE_ERROR_INVALID_KEY: return "invalid-key"; + case CONNMAN_SERVICE_ERROR_BLOCKED: + return "blocked"; } return NULL; } -static enum connman_service_error string2error(const char *error) -{ - if (g_strcmp0(error, "dhcp-failed") == 0) - return CONNMAN_SERVICE_ERROR_DHCP_FAILED; - else if (g_strcmp0(error, "pin-missing") == 0) - return CONNMAN_SERVICE_ERROR_PIN_MISSING; - else if (g_strcmp0(error, "invalid-key") == 0) - return CONNMAN_SERVICE_ERROR_INVALID_KEY; - - return CONNMAN_SERVICE_ERROR_UNKNOWN; -} - static const char *proxymethod2string(enum connman_service_proxy_method method) { switch (method) { @@ -314,105 +554,82 @@ static enum connman_service_proxy_method string2proxymethod(const char *method) return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN; } -static int service_load(struct connman_service *service) +#ifdef TIZEN_EXT +static const char *__connman_dnsconfig_method2string(enum connman_dnsconfig_method method) +{ + switch (method) { + case CONNMAN_DNSCONFIG_METHOD_UNKNOWN: + return "unknown"; + case CONNMAN_DNSCONFIG_METHOD_MANUAL: + return "manual"; + case CONNMAN_DNSCONFIG_METHOD_DHCP: + return "dhcp"; + } + + return NULL; +} + +static enum connman_dnsconfig_method __connman_dnsconfig_string2method( + const char *method) +{ + if (g_strcmp0(method, "manual") == 0) + return CONNMAN_DNSCONFIG_METHOD_MANUAL; + else if (g_strcmp0(method, "dhcp") == 0) + return CONNMAN_DNSCONFIG_METHOD_DHCP; + else + return CONNMAN_DNSCONFIG_METHOD_UNKNOWN; +} +#endif + +static void set_split_routing(struct connman_service *service, bool value) +{ + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + return; + + service->do_split_routing = value; + + if (service->do_split_routing) + service->order = 0; + else + service->order = 10; +} + +int __connman_service_load_modifiable(struct connman_service *service) { GKeyFile *keyfile; GError *error = NULL; - gsize length; gchar *str; - connman_bool_t autoconnect; - unsigned int ssid_len; - int err = 0; + bool autoconnect; DBG("service %p", service); keyfile = connman_storage_load_service(service->identifier); - if (keyfile == NULL) { - service->new_service = TRUE; + if (!keyfile) return -EIO; - } else - service->new_service = FALSE; switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; case CONNMAN_SERVICE_TYPE_VPN: - service->do_split_routing = g_key_file_get_boolean(keyfile, - service->identifier, "SplitRouting", NULL); - break; - case CONNMAN_SERVICE_TYPE_WIFI: - if (service->name == NULL) { - gchar *name; - - name = g_key_file_get_string(keyfile, - service->identifier, "Name", NULL); - if (name != NULL) { - g_free(service->name); - service->name = name; - } - - if (service->network != NULL) - connman_network_set_name(service->network, - name); - } - - if (service->network && - connman_network_get_blob(service->network, - "WiFi.SSID", &ssid_len) == NULL) { - gchar *hex_ssid; - - hex_ssid = g_key_file_get_string(keyfile, + set_split_routing(service, g_key_file_get_boolean(keyfile, service->identifier, - "SSID", NULL); - - if (hex_ssid != NULL) { - gchar *ssid; - unsigned int i, j = 0, hex; - size_t hex_ssid_len = strlen(hex_ssid); - - ssid = g_try_malloc0(hex_ssid_len / 2); - if (ssid == NULL) { - g_free(hex_ssid); - err = -ENOMEM; - goto done; - } - - for (i = 0; i < hex_ssid_len; i += 2) { - sscanf(hex_ssid + i, "%02x", &hex); - ssid[j++] = hex; - } - - connman_network_set_blob(service->network, - "WiFi.SSID", ssid, hex_ssid_len / 2); - } + "SplitRouting", NULL)); - g_free(hex_ssid); - } /* fall through */ - + case CONNMAN_SERVICE_TYPE_WIFI: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: - service->favorite = g_key_file_get_boolean(keyfile, - service->identifier, "Favorite", NULL); - - str = g_key_file_get_string(keyfile, - service->identifier, "Failure", NULL); - if (str != NULL) { - if (service->favorite == FALSE) - service->state_ipv4 = service->state_ipv6 = - CONNMAN_SERVICE_STATE_FAILURE; - service->error = string2error(str); - g_free(str); - } - /* fall through */ - case CONNMAN_SERVICE_TYPE_ETHERNET: autoconnect = g_key_file_get_boolean(keyfile, service->identifier, "AutoConnect", &error); - if (error == NULL) + if (!error) service->autoconnect = autoconnect; g_clear_error(&error); break; @@ -420,102 +637,781 @@ static int service_load(struct connman_service *service) str = g_key_file_get_string(keyfile, service->identifier, "Modified", NULL); - if (str != NULL) { + if (str) { g_time_val_from_iso8601(str, &service->modified); g_free(str); } - str = g_key_file_get_string(keyfile, - service->identifier, "Passphrase", NULL); - if (str != NULL) { - g_free(service->passphrase); - service->passphrase = str; - } + g_key_file_free(keyfile); - if (service->ipconfig_ipv4 != NULL) - __connman_ipconfig_load(service->ipconfig_ipv4, keyfile, - service->identifier, "IPv4."); + return 0; +} - if (service->ipconfig_ipv6 != NULL) - __connman_ipconfig_load(service->ipconfig_ipv6, keyfile, - service->identifier, "IPv6."); +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +static void __connman_service_cleanup_8021x(struct connman_service *service) +{ + if (service == NULL) + return; - service->nameservers_config = g_key_file_get_string_list(keyfile, - service->identifier, "Nameservers", &length, NULL); - if (service->nameservers_config != NULL && length == 0) { - g_strfreev(service->nameservers_config); - service->nameservers_config = NULL; - } + DBG("service %p ", service); - service->timeservers_config = g_key_file_get_string_list(keyfile, - service->identifier, "Timeservers", &length, NULL); - if (service->timeservers_config != NULL && length == 0) { - g_strfreev(service->timeservers_config); - service->timeservers_config = NULL; - } + __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); +} - service->domains = g_key_file_get_string_list(keyfile, - service->identifier, "Domains", &length, NULL); - if (service->domains != NULL && length == 0) { - g_strfreev(service->domains); - service->domains = NULL; - } +static int connman_service_set_eapol_property(struct connman_service *service, + DBusMessageIter *array) +{ + DBusMessageIter dict; + char *str = NULL; - str = g_key_file_get_string(keyfile, - service->identifier, "Proxy.Method", NULL); - if (str != NULL) - service->proxy_config = string2proxymethod(str); + __connman_service_cleanup_8021x(service); - g_free(str); + if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY) + return -EINVAL; - service->proxies = g_key_file_get_string_list(keyfile, - service->identifier, "Proxy.Servers", &length, NULL); - if (service->proxies != NULL && length == 0) { - g_strfreev(service->proxies); - service->proxies = NULL; - } + dbus_message_iter_recurse(array, &dict); - service->excludes = g_key_file_get_string_list(keyfile, - service->identifier, "Proxy.Excludes", &length, NULL); - if (service->excludes != NULL && length == 0) { - g_strfreev(service->excludes); - service->excludes = NULL; - } + while(dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter entry, value; + const char *key; + int type; - str = g_key_file_get_string(keyfile, - service->identifier, "Proxy.URL", NULL); - if (str != NULL) { - g_free(service->pac); - service->pac = str; - } + dbus_message_iter_recurse(&dict, &entry); - service->hidden_service = g_key_file_get_boolean(keyfile, - service->identifier, "Hidden", NULL); + if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) + return -EINVAL; -done: - g_key_file_free(keyfile); + dbus_message_iter_get_basic(&entry, &key); + dbus_message_iter_next(&entry); - return err; -} + if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_VARIANT) + return -EINVAL; -static int service_save(struct connman_service *service) -{ - GKeyFile *keyfile; - gchar *str; - guint freq; - const char *cst_str = NULL; - int err = 0; + dbus_message_iter_recurse(&entry, &value); - DBG("service %p new %d", service, service->new_service); + type = dbus_message_iter_get_arg_type(&value); - if (service->new_service == TRUE) - return -ESRCH; + if (g_str_equal(key, "UseEapol")) { + dbus_bool_t use_eapol; - keyfile = __connman_storage_open_service(service->identifier); - if (keyfile == NULL) - return -EIO; + if (type != DBUS_TYPE_BOOLEAN) + return -EINVAL; - if (service->name != NULL) + 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; + + *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 defined TIZEN_EXT + if (!simplified_log) +#endif + 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 = __connman_storage_open_service(service->identifier); + 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; + GError *error = NULL; + gsize length; + gchar *str; + 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); + if (!keyfile) { + service->new_service = true; + return -EIO; + } else + service->new_service = false; + + switch (service->type) { + case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif + break; + case CONNMAN_SERVICE_TYPE_VPN: + set_split_routing(service, g_key_file_get_boolean(keyfile, + service->identifier, + "SplitRouting", NULL)); + + autoconnect = g_key_file_get_boolean(keyfile, + service->identifier, "AutoConnect", &error); + if (!error) + service->autoconnect = autoconnect; + g_clear_error(&error); + break; + case CONNMAN_SERVICE_TYPE_WIFI: + if (!service->name) { + gchar *name; + + name = g_key_file_get_string(keyfile, + service->identifier, "Name", NULL); + if (name) { + g_free(service->name); + service->name = name; + } + + if (service->network) + connman_network_set_name(service->network, + name); + } + + if (service->network && + !connman_network_get_blob(service->network, + "WiFi.SSID", &ssid_len)) { + gchar *hex_ssid; + + hex_ssid = g_key_file_get_string(keyfile, + service->identifier, + "SSID", NULL); + + if (hex_ssid) { + gchar *ssid; + unsigned int i, j = 0, hex; + size_t hex_ssid_len = strlen(hex_ssid); + + ssid = g_try_malloc0(hex_ssid_len / 2); + if (!ssid) { + g_free(hex_ssid); + err = -ENOMEM; + goto done; + } + + for (i = 0; i < hex_ssid_len; i += 2) { + sscanf(hex_ssid + i, "%02x", &hex); + ssid[j++] = hex; + } + + connman_network_set_blob(service->network, + "WiFi.SSID", ssid, hex_ssid_len / 2); + + g_free(ssid); + } + + 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: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: + service->favorite = g_key_file_get_boolean(keyfile, + service->identifier, "Favorite", NULL); + + /* fall through */ + + case CONNMAN_SERVICE_TYPE_ETHERNET: + autoconnect = g_key_file_get_boolean(keyfile, + service->identifier, "AutoConnect", &error); + if (!error) + service->autoconnect = autoconnect; + g_clear_error(&error); + +#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); + g_free(str); + } + + str = g_key_file_get_string(keyfile, + service->identifier, "Passphrase", NULL); + if (str) { + g_free(service->passphrase); + service->passphrase = str; + } + + if (service->ipconfig_ipv4) + __connman_ipconfig_load(service->ipconfig_ipv4, keyfile, + service->identifier, "IPv4."); + + if (service->ipconfig_ipv6) + __connman_ipconfig_load(service->ipconfig_ipv6, keyfile, + service->identifier, "IPv6."); + + service->nameservers_config = g_key_file_get_string_list(keyfile, + service->identifier, "Nameservers", &length, NULL); + if (service->nameservers_config && length == 0) { + g_strfreev(service->nameservers_config); + service->nameservers_config = NULL; + } + +#ifdef TIZEN_EXT + char *dns_method; + + dns_method = g_key_file_get_string(keyfile, service->identifier, + "Nameservers.IPv4method", NULL); + if (dns_method) { + service->dns_config_method_ipv4 = __connman_dnsconfig_string2method(dns_method); + g_free(dns_method); + } + + dns_method = g_key_file_get_string(keyfile, service->identifier, + "Nameservers.IPv6method", NULL); + if (dns_method) { + service->dns_config_method_ipv6 = __connman_dnsconfig_string2method(dns_method); + g_free(dns_method); + } +#endif + + service->timeservers_config = g_key_file_get_string_list(keyfile, + service->identifier, "Timeservers", &length, NULL); + if (service->timeservers_config && length == 0) { + g_strfreev(service->timeservers_config); + service->timeservers_config = NULL; + } + + service->domains = g_key_file_get_string_list(keyfile, + service->identifier, "Domains", &length, NULL); + if (service->domains && length == 0) { + g_strfreev(service->domains); + service->domains = NULL; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "Proxy.Method", NULL); + if (str) + service->proxy_config = string2proxymethod(str); + + g_free(str); + + service->proxies = g_key_file_get_string_list(keyfile, + service->identifier, "Proxy.Servers", &length, NULL); + if (service->proxies && length == 0) { + g_strfreev(service->proxies); + service->proxies = NULL; + } + + service->excludes = g_key_file_get_string_list(keyfile, + service->identifier, "Proxy.Excludes", &length, NULL); + if (service->excludes && length == 0) { + g_strfreev(service->excludes); + service->excludes = NULL; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "Proxy.URL", NULL); + if (str) { + g_free(service->pac); + service->pac = str; + } + + service->mdns_config = g_key_file_get_boolean(keyfile, + service->identifier, "mDNS", NULL); + + service->hidden_service = g_key_file_get_boolean(keyfile, + service->identifier, "Hidden", NULL); + +#if defined TIZEN_EXT + 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) { + g_free(service->eap); + service->eap = str; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "Phase2", NULL); + if (str != NULL) { + g_free(service->phase2); + service->phase2 = str; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "Identity", NULL); + if (str != NULL) { + g_free(service->identity); + 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) { + g_free(service->ca_cert_file); + service->ca_cert_file = str; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "ClientCertFile", NULL); + if (str != NULL) { + g_free(service->client_cert_file); + service->client_cert_file = str; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "PrivateKeyFile", NULL); + if (str != NULL) { + g_free(service->private_key_file); + service->private_key_file = str; + } + + str = g_key_file_get_string(keyfile, + service->identifier, "PrivateKeyPassphrase", NULL); + if (str != NULL) { + 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 + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->security == CONNMAN_SERVICE_SECURITY_DPP) { + str = g_key_file_get_string(keyfile, + service->identifier, "Connector", NULL); + if (str != NULL) { + g_free(service->connector); + service->connector = str; + } + str = g_key_file_get_string(keyfile, + service->identifier, "CSignKey", NULL); + if (str != NULL) { + g_free(service->c_sign_key); + service->c_sign_key = str; + } + str = g_key_file_get_string(keyfile, + service->identifier, "NetAccessKey", NULL); + if (str != NULL) { + g_free(service->net_access_key); + service->net_access_key = str; + } + } +#endif + +done: + g_key_file_free(keyfile); + + return err; +} + +static int service_save(struct connman_service *service) +{ + GKeyFile *keyfile; + gchar *str; + guint freq; + const char *cst_str = NULL; + int err = 0; + + DBG("service %p new %d", service, service->new_service); + + if (service->new_service) + return -ESRCH; + + keyfile = __connman_storage_open_service(service->identifier); + if (!keyfile) + return -EIO; + + if (service->name) g_key_file_set_string(keyfile, service->identifier, "Name", service->name); @@ -523,27 +1419,36 @@ static int service_save(struct connman_service *service) case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; case CONNMAN_SERVICE_TYPE_VPN: g_key_file_set_boolean(keyfile, service->identifier, "SplitRouting", service->do_split_routing); + if (service->favorite) + g_key_file_set_boolean(keyfile, service->identifier, + "AutoConnect", service->autoconnect); break; case CONNMAN_SERVICE_TYPE_WIFI: if (service->network) { 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); - if (ssid != NULL && ssid_len > 0 && ssid[0] != '\0') { + if (ssid && ssid_len > 0 && ssid[0] != '\0') { char *identifier = service->identifier; GString *ssid_str; unsigned int i; ssid_str = g_string_sized_new(ssid_len * 2); - if (ssid_str == NULL) { + if (!ssid_str) { err = -ENOMEM; goto done; } @@ -561,57 +1466,122 @@ 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 */ + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: g_key_file_set_boolean(keyfile, service->identifier, "Favorite", service->favorite); - if (service->state_ipv4 == CONNMAN_SERVICE_STATE_FAILURE || - service->state_ipv6 == CONNMAN_SERVICE_STATE_FAILURE) { - const char *failure = error2string(service->error); - if (failure != NULL) - g_key_file_set_string(keyfile, - service->identifier, - "Failure", failure); - } else { - g_key_file_remove_key(keyfile, service->identifier, - "Failure", NULL); - } + g_key_file_remove_key(keyfile, service->identifier, + "Failure", NULL); + /* fall through */ case CONNMAN_SERVICE_TYPE_ETHERNET: - if (service->favorite == TRUE) + if (service->favorite) g_key_file_set_boolean(keyfile, service->identifier, "AutoConnect", service->autoconnect); +#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); - if (str != NULL) { + if (str) { g_key_file_set_string(keyfile, service->identifier, "Modified", str); g_free(str); } - if (service->passphrase != NULL && strlen(service->passphrase) > 0) + if (service->passphrase && strlen(service->passphrase) > 0) g_key_file_set_string(keyfile, service->identifier, "Passphrase", service->passphrase); else g_key_file_remove_key(keyfile, service->identifier, "Passphrase", NULL); - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_save(service->ipconfig_ipv4, keyfile, service->identifier, "IPv4."); - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) __connman_ipconfig_save(service->ipconfig_ipv6, keyfile, service->identifier, "IPv6."); - if (service->nameservers_config != NULL) { + if (service->nameservers_config) { guint len = g_strv_length(service->nameservers_config); g_key_file_set_string_list(keyfile, service->identifier, @@ -621,7 +1591,29 @@ static int service_save(struct connman_service *service) g_key_file_remove_key(keyfile, service->identifier, "Nameservers", NULL); - if (service->timeservers_config != NULL) { +#if defined TIZEN_EXT + if(service->dns_config_method_ipv4 != 0) { + const char *method; + method = __connman_dnsconfig_method2string( + service->dns_config_method_ipv4); + g_key_file_set_string(keyfile, service->identifier, + "Nameservers.IPv4method", method); + } else + g_key_file_remove_key(keyfile, service->identifier, + "Nameservers.IPv4method", NULL); + + if(service->dns_config_method_ipv6 != 0) { + const char *method; + method = __connman_dnsconfig_method2string( + service->dns_config_method_ipv6); + g_key_file_set_string(keyfile, service->identifier, + "Nameservers.IPv6method", method); + } else + g_key_file_remove_key(keyfile, service->identifier, + "Nameservers.IPv6method", NULL); +#endif + + if (service->timeservers_config) { guint len = g_strv_length(service->timeservers_config); g_key_file_set_string_list(keyfile, service->identifier, @@ -631,7 +1623,7 @@ static int service_save(struct connman_service *service) g_key_file_remove_key(keyfile, service->identifier, "Timeservers", NULL); - if (service->domains != NULL) { + if (service->domains) { guint len = g_strv_length(service->domains); g_key_file_set_string_list(keyfile, service->identifier, @@ -642,11 +1634,11 @@ static int service_save(struct connman_service *service) "Domains", NULL); cst_str = proxymethod2string(service->proxy_config); - if (cst_str != NULL) + if (cst_str) g_key_file_set_string(keyfile, service->identifier, "Proxy.Method", cst_str); - if (service->proxies != NULL) { + if (service->proxies) { guint len = g_strv_length(service->proxies); g_key_file_set_string_list(keyfile, service->identifier, @@ -656,7 +1648,7 @@ static int service_save(struct connman_service *service) g_key_file_remove_key(keyfile, service->identifier, "Proxy.Servers", NULL); - if (service->excludes != NULL) { + if (service->excludes) { guint len = g_strv_length(service->excludes); g_key_file_set_string_list(keyfile, service->identifier, @@ -666,26 +1658,137 @@ static int service_save(struct connman_service *service) g_key_file_remove_key(keyfile, service->identifier, "Proxy.Excludes", NULL); - if (service->pac != NULL && strlen(service->pac) > 0) + if (service->pac && strlen(service->pac) > 0) g_key_file_set_string(keyfile, service->identifier, "Proxy.URL", service->pac); else g_key_file_remove_key(keyfile, service->identifier, "Proxy.URL", NULL); - if (service->hidden_service == TRUE) + if (service->mdns_config) + g_key_file_set_boolean(keyfile, service->identifier, + "mDNS", TRUE); + else + g_key_file_remove_key(keyfile, service->identifier, + "mDNS", NULL); + + if (service->hidden_service) g_key_file_set_boolean(keyfile, service->identifier, "Hidden", TRUE); - if (service->config_file != NULL && strlen(service->config_file) > 0) + if (service->config_file && strlen(service->config_file) > 0) g_key_file_set_string(keyfile, service->identifier, "Config.file", service->config_file); - if (service->config_entry != NULL && + 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 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); + else + g_key_file_remove_key(keyfile, service->identifier, + "EAP", NULL); + + if (service->phase2 != NULL && strlen(service->phase2) > 0) + g_key_file_set_string(keyfile, service->identifier, + "Phase2", service->phase2); + else + g_key_file_remove_key(keyfile, service->identifier, + "Phase2", NULL); + + if (service->identity != NULL && strlen(service->identity) > 0) + g_key_file_set_string(keyfile, service->identifier, + "Identity", service->identity); + 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, + "CACertFile", service->ca_cert_file); + else + g_key_file_remove_key(keyfile, service->identifier, + "CACertFile", NULL); + + if (service->client_cert_file != NULL && strlen(service->client_cert_file) > 0) + g_key_file_set_string(keyfile, service->identifier, + "ClientCertFile", service->client_cert_file); + else + g_key_file_remove_key(keyfile, service->identifier, + "ClientCertFile", NULL); + + if (service->private_key_file != NULL && strlen(service->private_key_file) > 0) + g_key_file_set_string(keyfile, service->identifier, + "PrivateKeyFile", service->private_key_file); + else + g_key_file_remove_key(keyfile, service->identifier, + "PrivateKeyFile", NULL); + + if (service->private_key_passphrase != NULL && strlen(service->private_key_passphrase) > 0) + g_key_file_set_string(keyfile, service->identifier, + "PrivateKeyPassphrase", service->private_key_passphrase); + 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) + g_key_file_set_string(keyfile, service->identifier, + "Connector", service->connector); + else + g_key_file_remove_key(keyfile, service->identifier, + "Connector", NULL); + + if (service->c_sign_key != NULL && strlen(service->c_sign_key) > 0) + g_key_file_set_string(keyfile, service->identifier, + "CSignKey", service->c_sign_key); + else + g_key_file_remove_key(keyfile, service->identifier, + "CSignKey", NULL); + + if (service->net_access_key != NULL && strlen(service->net_access_key) > 0) + g_key_file_set_string(keyfile, service->identifier, + "NetAccessKey", service->net_access_key); + else + g_key_file_remove_key(keyfile, service->identifier, + "NetAccessKey", NULL); + } +#endif + done: __connman_storage_save_service(keyfile, service->identifier); @@ -694,9 +1797,108 @@ done: return err; } +#if defined TIZEN_EXT +static gint sort_entry(gconstpointer a, gconstpointer b, gpointer user_data) +{ + GTimeVal *aval = (GTimeVal *)a; + GTimeVal *bval = (GTimeVal *)b; + + /* Note that the sort order is ascending */ + if (aval->tv_sec > bval->tv_sec) + return 1; + + if (aval->tv_sec < bval->tv_sec) + return -1; + + return 0; +} + +static void free_entry(gpointer data) +{ + struct saved_profiles *entry = data; + g_free(entry->profile_name); + g_free(entry); +} + +static void __connman_manage_saved_profiles() +{ + GKeyFile *keyfile; + gchar **services = NULL; + GTimeVal modified; + int i, num_profiles = 0; + GSequenceIter *iter; + GSequence *profile_list; + struct saved_profiles *entry; + + profile_list = g_sequence_new(free_entry); + if (!profile_list) + return; + + services = connman_storage_get_services(); + + /* Check the count of saved profiles */ + for (i = 0; services && services[i]; i++) { + if (strncmp(services[i], "wifi_", 5) != 0) + continue; + + keyfile = connman_storage_load_service(services[i]); + if (!keyfile) + continue; + + gchar *str = g_key_file_get_string(keyfile, + services[i], "Modified", NULL); + if (!str) { + g_key_file_free(keyfile); + continue; + } + + g_time_val_from_iso8601(str, &modified); + g_free(str); + + entry = g_try_new(struct saved_profiles, 1); + if (!entry) { + g_sequence_free(profile_list); + g_key_file_free(keyfile); + return; + } + + entry->modified = modified; + entry->profile_name = g_strdup(services[i]); + + g_sequence_insert_sorted(profile_list, entry, + sort_entry, NULL); + + num_profiles++; + } + DBG("number of profiles: %d", num_profiles); + + if (num_profiles > MAX_WIFI_PROFILES) { + iter = g_sequence_get_begin_iter(profile_list); + + entry = g_sequence_get(iter); + + if (__connman_storage_remove_service(entry->profile_name) == false) + DBG("Failed to remove service profile: %s", entry->profile_name); + } + + g_sequence_free(profile_list); +} +#endif + void __connman_service_save(struct connman_service *service) { + if (!service) + return; + service_save(service); +#if defined TIZEN_EXT + /* + * Description: Manage the wireless profiles saved in connman. + * If the number of saved profiles is more than 200, remove the + * profile that is not updated for longer duration. + */ + __connman_manage_saved_profiles(); +#endif } static enum connman_service_state combine_state( @@ -786,29 +1988,25 @@ done: return result; } -static connman_bool_t is_connecting_state(struct connman_service *service, - enum connman_service_state state) +static bool is_connecting(enum connman_service_state state) { switch (state) { case CONNMAN_SERVICE_STATE_UNKNOWN: case CONNMAN_SERVICE_STATE_IDLE: case CONNMAN_SERVICE_STATE_FAILURE: - if (service->network != NULL) - return connman_network_get_connecting(service->network); case CONNMAN_SERVICE_STATE_DISCONNECT: case CONNMAN_SERVICE_STATE_READY: case CONNMAN_SERVICE_STATE_ONLINE: break; case CONNMAN_SERVICE_STATE_ASSOCIATION: case CONNMAN_SERVICE_STATE_CONFIGURATION: - return TRUE; + return true; } - return FALSE; + return false; } -static connman_bool_t is_connected_state(const struct connman_service *service, - enum connman_service_state state) +static bool is_connected(enum connman_service_state state) { switch (state) { case CONNMAN_SERVICE_STATE_UNKNOWN: @@ -820,164 +2018,455 @@ static connman_bool_t is_connected_state(const struct connman_service *service, break; case CONNMAN_SERVICE_STATE_READY: case CONNMAN_SERVICE_STATE_ONLINE: - return TRUE; + return true; } - return FALSE; + return false; } -static connman_bool_t is_idle_state(const struct connman_service *service, - enum connman_service_state state) +static bool is_idle(enum connman_service_state state) { switch (state) { + case CONNMAN_SERVICE_STATE_IDLE: + case CONNMAN_SERVICE_STATE_DISCONNECT: + case CONNMAN_SERVICE_STATE_FAILURE: + return true; case CONNMAN_SERVICE_STATE_UNKNOWN: case CONNMAN_SERVICE_STATE_ASSOCIATION: case CONNMAN_SERVICE_STATE_CONFIGURATION: case CONNMAN_SERVICE_STATE_READY: case CONNMAN_SERVICE_STATE_ONLINE: - case CONNMAN_SERVICE_STATE_DISCONNECT: - case CONNMAN_SERVICE_STATE_FAILURE: break; - case CONNMAN_SERVICE_STATE_IDLE: - return TRUE; } + return false; +} + +static int nameservers_changed_cb(void *user_data) +{ + struct connman_service *service = user_data; + + DBG("service %p", service); + + service->nameservers_timeout = 0; + if ((is_idle(service->state) && !service->nameservers) || + is_connected(service->state)) + dns_changed(service); + return FALSE; } -static connman_bool_t is_connecting(struct connman_service *service) +static void nameservers_changed(struct connman_service *service) { - return is_connecting_state(service, service->state); + if (!service->nameservers_timeout) + service->nameservers_timeout = g_idle_add(nameservers_changed_cb, + service); } -static connman_bool_t is_connected(struct connman_service *service) +static bool nameserver_available(struct connman_service *service, + enum connman_ipconfig_type type, + const char *ns) { - return is_connected_state(service, service->state); + int family; + + family = connman_inet_check_ipaddress(ns); + + if (family == AF_INET) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + return false; + + return is_connected(service->state_ipv4); + } + + if (family == AF_INET6) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + return false; + + return is_connected(service->state_ipv6); + } + + return false; } -static int nameserver_get_index(struct connman_service *service) +static int searchdomain_add_all(struct connman_service *service) { - int index; + int index, i = 0; - index = __connman_service_get_index(service); + if (!is_connected(service->state)) + return -ENOTCONN; + index = __connman_service_get_index(service); if (index < 0) - return -1; + return -ENXIO; - switch (combine_state(service->state_ipv4, service->state_ipv6)) { - case CONNMAN_SERVICE_STATE_UNKNOWN: - case CONNMAN_SERVICE_STATE_IDLE: - case CONNMAN_SERVICE_STATE_ASSOCIATION: - case CONNMAN_SERVICE_STATE_CONFIGURATION: - case CONNMAN_SERVICE_STATE_FAILURE: - case CONNMAN_SERVICE_STATE_DISCONNECT: - return -1; - case CONNMAN_SERVICE_STATE_READY: - case CONNMAN_SERVICE_STATE_ONLINE: - break; + if (service->domains) { + while (service->domains[i]) { + connman_resolver_append(index, service->domains[i], + NULL); + i++; + } + + return 0; + } + + if (service->domainname) + connman_resolver_append(index, service->domainname, NULL); + + return 0; + +} + +static int searchdomain_remove_all(struct connman_service *service) +{ + int index, i = 0; + + if (!is_connected(service->state)) + return -ENOTCONN; + + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; + + while (service->domains && service->domains[i]) { + connman_resolver_remove(index, service->domains[i], NULL); + i++; } - return index; + if (service->domainname) + connman_resolver_remove(index, service->domainname, NULL); + + return 0; } -static void remove_nameservers(struct connman_service *service, - int index, char **ns) +static int nameserver_add(struct connman_service *service, + enum connman_ipconfig_type type, + const char *nameserver) { - int i; + int index, ret; - if (ns == NULL) - return; + if (!nameserver_available(service, type, nameserver)) + return 0; + index = __connman_service_get_index(service); if (index < 0) - index = nameserver_get_index(service); + return -ENXIO; - if (index < 0) - return; +#if defined TIZEN_EXT + DBG("Resolver append nameserver: %s", nameserver); +#endif + ret = connman_resolver_append(index, NULL, nameserver); + if (ret >= 0) + nameservers_changed(service); - for (i = 0; ns[i] != NULL; i++) - connman_resolver_remove(index, NULL, ns[i]); + return ret; } -static void remove_searchdomains(struct connman_service *service, - int index, char **sd) +static int nameserver_add_all(struct connman_service *service, + enum connman_ipconfig_type type) { - int i; + int i = 0; - if (sd == NULL) - return; + if (service->nameservers_config) { + while (service->nameservers_config[i]) { +#if defined TIZEN_EXT + DBG("type %d add service->nameservers_config[%d]:%s",type, + i, service->nameservers_config[i]); + if(strncmp(service->nameservers_config[i], "::", 2) == 0) { + DBG("Invalid nameserver"); + i++; + continue; + } - if (index < 0) - index = nameserver_get_index(service); + switch(type) { + case CONNMAN_IPCONFIG_TYPE_IPV4: + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET && + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_MANUAL) { + nameserver_add(service, type, + service->nameservers_config[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_IPV6: + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET6 && + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_MANUAL) { + nameserver_add(service, type, + service->nameservers_config[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_ALL: + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET && + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_MANUAL) { + nameserver_add(service, type, + service->nameservers_config[i]); + } + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET6 && + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_MANUAL) { + nameserver_add(service, type, + service->nameservers_config[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_UNKNOWN: + DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing"); + break; + default: + DBG("default case do nothing"); + break; + } +#else + nameserver_add(service, type, + service->nameservers_config[i]); +#endif + i++; + } + } else if (service->nameservers) { + while (service->nameservers[i]) { +#if defined TIZEN_EXT + DBG("type %d service->nameservers[%d]: %s",type, + i, service->nameservers[i]); + + switch(type) { + case CONNMAN_IPCONFIG_TYPE_IPV4: + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET && + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + nameserver_add(service, type, + service->nameservers[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_IPV6: + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET6 && + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + nameserver_add(service, type, + service->nameservers[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_ALL: + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET && + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + nameserver_add(service, type, + service->nameservers[i]); + } + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET6 && + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + nameserver_add(service, type, + service->nameservers[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_UNKNOWN: + DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing"); + break; + default: + DBG("default case do nothing"); + break; + } +#else + nameserver_add(service, type, + service->nameservers[i]); +#endif + i++; + } + } - if (index < 0) - return; + if (!i) + __connman_resolver_append_fallback_nameservers(); + +#if defined TIZEN_EXT + const char *global_dns = connman_option_get_string("GlobalNameserver"); + if (global_dns) + nameserver_add(service, type, global_dns); +#endif - for (i = 0; sd[i] != NULL; i++) - connman_resolver_remove(index, sd[i], NULL); + searchdomain_add_all(service); + + return 0; } -static void update_nameservers(struct connman_service *service) +static int nameserver_remove(struct connman_service *service, + enum connman_ipconfig_type type, + const char *nameserver) { - int index; + int index, ret; + + if (!nameserver_available(service, type, nameserver)) + return 0; index = __connman_service_get_index(service); if (index < 0) - return; + return -ENXIO; - switch (combine_state(service->state_ipv4, service->state_ipv6)) { - case CONNMAN_SERVICE_STATE_UNKNOWN: - case CONNMAN_SERVICE_STATE_IDLE: - case CONNMAN_SERVICE_STATE_ASSOCIATION: - case CONNMAN_SERVICE_STATE_CONFIGURATION: - return; - case CONNMAN_SERVICE_STATE_FAILURE: - case CONNMAN_SERVICE_STATE_DISCONNECT: - connman_resolver_remove_all(index); - return; - case CONNMAN_SERVICE_STATE_READY: - case CONNMAN_SERVICE_STATE_ONLINE: - break; - } +#if defined TIZEN_EXT + DBG("Resolver remove nameserver: %s", nameserver); +#endif + ret = connman_resolver_remove(index, NULL, nameserver); + if (ret >= 0) + nameservers_changed(service); - if (service->nameservers_config != NULL) { - int i; + return ret; +} - remove_nameservers(service, index, service->nameservers); +static int nameserver_remove_all(struct connman_service *service, + enum connman_ipconfig_type type) +{ +#if defined TIZEN_EXT + /** + * Skip this function if there is any connected profiles + * that use same interface + */ + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && + __connman_service_get_connected_count_of_iface(service) > 0) + return 0; +#endif + int index, i = 0; - i = g_strv_length(service->nameservers_config); - while (i != 0) { - i--; - connman_resolver_append(index, NULL, - service->nameservers_config[i]); + index = __connman_service_get_index(service); + if (index < 0) + return -ENXIO; + + while (service->nameservers_config && service->nameservers_config[i]) { + +#if defined TIZEN_EXT + DBG("type %d Remove service->nameservers_config[%d]: %s", + type, i, service->nameservers_config[i]); + switch(type) { + case CONNMAN_IPCONFIG_TYPE_IPV4: + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET && + (service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP || + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_MANUAL)) { + nameserver_remove(service, type, + service->nameservers_config[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_IPV6: + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET6 && + (service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP || + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_MANUAL)) { + nameserver_remove(service, type, + service->nameservers_config[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_ALL: + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET && + (service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP || + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_MANUAL)) { + nameserver_remove(service, type, + service->nameservers_config[i]); + } + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET6 && + (service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP || + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_MANUAL)) { + nameserver_remove(service, type, + service->nameservers_config[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_UNKNOWN: + DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing"); + break; + default: + DBG("default case do nothing"); + break; } - } else if (service->nameservers != NULL) { - int i; - - i = g_strv_length(service->nameservers); - while (i != 0) { - i--; - connman_resolver_append(index, NULL, - service->nameservers[i]); +#else + nameserver_remove(service, type, + service->nameservers_config[i]); +#endif + i++; + } + + i = 0; + while (service->nameservers && service->nameservers[i]) { +#if defined TIZEN_EXT + DBG("type %d Remove service->nameservers[%d]: %s",type, i, + service->nameservers[i]); + switch(type) { + case CONNMAN_IPCONFIG_TYPE_IPV4: + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET && + (service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_MANUAL || + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP)) { + nameserver_remove(service, type, + service->nameservers[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_IPV6: + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET6 && + (service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_MANUAL || + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP)) { + nameserver_remove(service, type, + service->nameservers[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_ALL: + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET && + (service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_MANUAL || + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP)) { + nameserver_remove(service, type, + service->nameservers[i]); + } + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET6 && + (service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_MANUAL || + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP)) { + nameserver_remove(service, type, + service->nameservers[i]); + } + break; + case CONNMAN_IPCONFIG_TYPE_UNKNOWN: + DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing"); + break; + default: + DBG("default case do nothing"); + break; } +#else + nameserver_remove(service, type, service->nameservers[i]); +#endif + i++; } - if (service->domains != NULL) { - char *searchdomains[2] = {NULL, NULL}; - int i; - - searchdomains[0] = service->domainname; - remove_searchdomains(service, index, searchdomains); - - i = g_strv_length(service->domains); - while (i != 0) { - i--; - connman_resolver_append(index, service->domains[i], - NULL); - } - } else if (service->domainname != NULL) - connman_resolver_append(index, service->domainname, NULL); +#if defined TIZEN_EXT + const char *global_dns = connman_option_get_string("GlobalNameserver"); + if (global_dns) + nameserver_remove(service, type, global_dns); +#endif + searchdomain_remove_all(service); - connman_resolver_flush(); + return 0; } /* @@ -985,27 +2474,40 @@ static void update_nameservers(struct connman_service *service) * inserted to resolver via netlink message (see rtnl.c:rtnl_newnduseropt() * for details) and not through service.c */ +#if defined TIZEN_EXT +int __connman_service_nameserver_append(struct connman_service *service, + const char *nameserver, bool is_auto, + enum connman_ipconfig_type type) +#else int __connman_service_nameserver_append(struct connman_service *service, - const char *nameserver, gboolean is_auto) + const char *nameserver, bool is_auto) +#endif { char **nameservers; int len, i; DBG("service %p nameserver %s auto %d", service, nameserver, is_auto); - if (nameserver == NULL) + if (!nameserver) return -EINVAL; - if (is_auto == TRUE) + if (is_auto) nameservers = service->nameservers_auto; else nameservers = service->nameservers; - for (i = 0; nameservers != NULL && nameservers[i] != NULL; i++) + 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 defined TIZEN_EXT + } +#endif - if (nameservers != NULL) { + if (nameservers) { len = g_strv_length(nameservers); nameservers = g_try_renew(char *, nameservers, len + 2); } else { @@ -1013,88 +2515,109 @@ int __connman_service_nameserver_append(struct connman_service *service, nameservers = g_try_new0(char *, len + 2); } - if (nameservers == NULL) + if (!nameservers) return -ENOMEM; nameservers[len] = g_strdup(nameserver); - if (nameservers[len] == NULL) - return -ENOMEM; - nameservers[len + 1] = NULL; - if (is_auto == TRUE) { +#ifdef TIZEN_EXT + if(type == CONNMAN_IPCONFIG_TYPE_IPV4 && + service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_UNKNOWN) + service->dns_config_method_ipv4 = CONNMAN_DNSCONFIG_METHOD_DHCP; + + if(type == CONNMAN_IPCONFIG_TYPE_IPV6 && + service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_UNKNOWN) + service->dns_config_method_ipv6 = CONNMAN_DNSCONFIG_METHOD_DHCP; +#endif + + if (is_auto) { service->nameservers_auto = nameservers; } else { service->nameservers = nameservers; - update_nameservers(service); + nameserver_add(service, CONNMAN_IPCONFIG_TYPE_ALL, nameserver); } + nameservers_changed(service); + + searchdomain_add_all(service); + return 0; } +#if defined TIZEN_EXT int __connman_service_nameserver_remove(struct connman_service *service, - const char *nameserver, gboolean is_auto) + const char *nameserver, bool is_auto, + enum connman_ipconfig_type type) +#else +int __connman_service_nameserver_remove(struct connman_service *service, + const char *nameserver, bool is_auto) +#endif { char **servers, **nameservers; - gboolean found = FALSE; + bool found = false; int len, i, j; DBG("service %p nameserver %s auto %d", service, nameserver, is_auto); - if (nameserver == NULL) + if (!nameserver) return -EINVAL; - if (is_auto == TRUE) + if (is_auto) nameservers = service->nameservers_auto; else nameservers = service->nameservers; - if (nameservers == NULL) + if (!nameservers) return 0; - for (i = 0; nameservers != NULL && nameservers[i] != NULL; i++) + for (i = 0; nameservers[i]; i++) if (g_strcmp0(nameservers[i], nameserver) == 0) { - found = TRUE; + found = true; break; } - if (found == FALSE) + if (!found) return 0; len = g_strv_length(nameservers); if (len == 1) { - g_strfreev(nameservers); - if (is_auto == TRUE) - service->nameservers_auto = NULL; - else - service->nameservers = NULL; - - return 0; + servers = NULL; + goto set_servers; } servers = g_try_new0(char *, len); - if (servers == NULL) + if (!servers) return -ENOMEM; for (i = 0, j = 0; i < len; i++) { - if (g_strcmp0(nameservers[i], nameserver) != 0) { - servers[j] = g_strdup(nameservers[i]); - if (servers[j] == NULL) - return -ENOMEM; + if (g_strcmp0(nameservers[i], nameserver)) { + servers[j] = nameservers[i]; j++; - } + } else + g_free(nameservers[i]); + + nameservers[i] = NULL; } servers[len - 1] = NULL; +set_servers: g_strfreev(nameservers); nameservers = servers; - if (is_auto == TRUE) { + if (is_auto) { service->nameservers_auto = nameservers; } else { service->nameservers = nameservers; - update_nameservers(service); +#if defined TIZEN_EXT + DBG("nameserver remove ip_type: %d", type); + nameserver_remove(service, type, + nameserver); +#else + nameserver_remove(service, CONNMAN_IPCONFIG_TYPE_ALL, + nameserver); +#endif } return 0; @@ -1102,10 +2625,12 @@ int __connman_service_nameserver_remove(struct connman_service *service, void __connman_service_nameserver_clear(struct connman_service *service) { + nameserver_remove_all(service, CONNMAN_IPCONFIG_TYPE_ALL); + g_strfreev(service->nameservers); service->nameservers = NULL; - update_nameservers(service); + nameserver_add_all(service, CONNMAN_IPCONFIG_TYPE_ALL); } static void add_nameserver_route(int family, int index, char *nameserver, @@ -1113,7 +2638,7 @@ static void add_nameserver_route(int family, int index, char *nameserver, { switch (family) { case AF_INET: - if (connman_inet_compare_subnet(index, nameserver) == TRUE) + if (connman_inet_compare_subnet(index, nameserver)) break; if (connman_inet_add_host_route(index, nameserver, gw) < 0) @@ -1133,14 +2658,18 @@ static void add_nameserver_route(int family, int index, char *nameserver, static void nameserver_add_routes(int index, char **nameservers, const char *gw) { - int i, family; + int i, ns_family, gw_family; - for (i = 0; nameservers[i] != NULL; i++) { - family = connman_inet_check_ipaddress(nameservers[i]); - if (family < 0) + gw_family = connman_inet_check_ipaddress(gw); + if (gw_family < 0) + return; + + for (i = 0; nameservers[i]; i++) { + ns_family = connman_inet_check_ipaddress(nameservers[i]); + if (ns_family < 0 || ns_family != gw_family) continue; - add_nameserver_route(family, index, nameservers[i], gw); + add_nameserver_route(ns_family, index, nameservers[i], gw); } } @@ -1149,7 +2678,7 @@ static void nameserver_del_routes(int index, char **nameservers, { int i, family; - for (i = 0; nameservers[i] != NULL; i++) { + for (i = 0; nameservers[i]; i++) { family = connman_inet_check_ipaddress(nameservers[i]); if (family < 0) continue; @@ -1172,23 +2701,20 @@ static void nameserver_del_routes(int index, char **nameservers, void __connman_service_nameserver_add_routes(struct connman_service *service, const char *gw) { - int index = -1; + int index; - if (service == NULL) + if (!service) return; - if (service->network != NULL) - index = connman_network_get_index(service->network); - else if (service->provider != NULL) - index = connman_provider_get_index(service->provider); + index = __connman_service_get_index(service); - if (service->nameservers_config != NULL) { + if (service->nameservers_config) { /* * Configured nameserver takes preference over the * discoverd nameserver gathered from DHCP, VPN, etc. */ nameserver_add_routes(index, service->nameservers_config, gw); - } else if (service->nameservers != NULL) { + } else if (service->nameservers) { /* * We add nameservers host routes for nameservers that * are not on our subnet. For those who are, the subnet @@ -1203,32 +2729,41 @@ void __connman_service_nameserver_add_routes(struct connman_service *service, void __connman_service_nameserver_del_routes(struct connman_service *service, enum connman_ipconfig_type type) { - int index = -1; + int index; - if (service == NULL) + if (!service) return; - if (service->network != NULL) - index = connman_network_get_index(service->network); - else if (service->provider != NULL) - index = connman_provider_get_index(service->provider); + index = __connman_service_get_index(service); - if (service->nameservers_config != NULL) + if (service->nameservers_config) nameserver_del_routes(index, service->nameservers_config, type); - else if (service->nameservers != NULL) + else if (service->nameservers) nameserver_del_routes(index, service->nameservers, type); } +static void address_updated(struct connman_service *service, + enum connman_ipconfig_type type) +{ + if (is_connected(service->state) && + service == connman_service_get_default()) { + nameserver_remove_all(service, type); + nameserver_add_all(service, type); + + __connman_timeserver_sync(service); + } +} + static struct connman_stats *stats_get(struct connman_service *service) { - if (service->roaming == TRUE) + if (service->roaming) return &service->stats_roaming; else return &service->stats; } -static connman_bool_t stats_enabled(struct connman_service *service) +static bool stats_enabled(struct connman_service *service) { struct connman_stats *stats = stats_get(service); @@ -1241,10 +2776,10 @@ static void stats_start(struct connman_service *service) DBG("service %p", service); - if (stats->timer == NULL) + if (!stats->timer) return; - stats->enabled = TRUE; + stats->enabled = true; stats->data_last.time = stats->data.time; g_timer_start(stats->timer); @@ -1257,10 +2792,10 @@ static void stats_stop(struct connman_service *service) DBG("service %p", service); - if (stats->timer == NULL) + if (!stats->timer) return; - if (stats->enabled == FALSE) + if (!stats->enabled) return; g_timer_stop(stats->timer); @@ -1268,7 +2803,7 @@ static void stats_stop(struct connman_service *service) seconds = g_timer_elapsed(stats->timer, NULL); stats->data.time = stats->data_last.time + seconds; - stats->enabled = FALSE; + stats->enabled = false; } static void reset_stats(struct connman_service *service) @@ -1276,7 +2811,7 @@ static void reset_stats(struct connman_service *service) DBG("service %p", service); /* home */ - service->stats.valid = FALSE; + service->stats.valid = false; service->stats.data.rx_packets = 0; service->stats.data.tx_packets = 0; @@ -1292,7 +2827,7 @@ static void reset_stats(struct connman_service *service) g_timer_reset(service->stats.timer); /* roaming */ - service->stats_roaming.valid = FALSE; + service->stats_roaming.valid = false; service->stats_roaming.data.rx_packets = 0; service->stats_roaming.data.tx_packets = 0; @@ -1308,38 +2843,157 @@ static void reset_stats(struct connman_service *service) g_timer_reset(service->stats_roaming.timer); } -struct connman_service *__connman_service_get_default(void) +#if defined TIZEN_EXT +static gboolean __connman_service_is_internet_profile( + struct connman_service *cellular) +{ + const char internet_suffix[] = "_1"; + + DBG("Service path: %s", cellular->path); + + if (g_str_has_suffix(cellular->path, internet_suffix) == TRUE) + return TRUE; + + return FALSE; +} + +struct connman_service *connman_service_get_default_connection(void) { + GList *list; struct connman_service *service; - GSequenceIter *iter; + struct connman_service *default_service = NULL; + + for (list = service_list; list; list = list->next) { + service = list->data; + + DBG("service: %p %s %s %s", service, service->name, + state2string(service->state), + __connman_service_type2string(service->type)); + +#if defined TIZEN_MAINTAIN_ONLINE + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->state == CONNMAN_SERVICE_STATE_ONLINE) { +#else + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + is_connected(service->state) == TRUE) { +#endif + return service; + } else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && + __connman_service_is_internet_profile(service) == TRUE) { + if (default_service == NULL) + default_service = service; + else if (is_connected(service->state) == TRUE && + is_connected(default_service->state) == FALSE) + default_service = service; + } else if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET && + is_connected(service->state) == TRUE) { + if (default_service == NULL) + default_service = service; + } else if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH && + is_connected(service->state) == TRUE) { + if (default_service == NULL) + default_service = service; + } + } + + return default_service; +} +#endif - iter = g_sequence_get_begin_iter(service_list); +struct connman_service *connman_service_get_default(void) +{ +#if defined TIZEN_MAINTAIN_ONLINE + return connman_service_get_default_connection(); +#else + struct connman_service *service; - if (g_sequence_iter_is_end(iter) == TRUE) + if (!service_list) return NULL; - service = g_sequence_get(iter); + service = service_list->data; - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return NULL; return service; +#endif +} + +bool __connman_service_index_is_default(int index) +{ + struct connman_service *service; + + if (index < 0) + return false; + + service = connman_service_get_default(); + + return __connman_service_get_index(service) == index; } static void default_changed(void) { - struct connman_service *service = __connman_service_get_default(); +#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; + DBG("current default %p %s", current_default, + current_default ? current_default->identifier : ""); + DBG("new default %p %s", service, service ? service->identifier : ""); + +#if defined TIZEN_EXT + current_default = service; + + __connman_service_timeserver_changed(service, NULL); +#else __connman_service_timeserver_changed(current_default, NULL); current_default = service; +#endif + + if (service) { + if (service->hostname && + connman_setting_get_bool("AllowHostnameUpdates")) + __connman_utsname_set_hostname(service->hostname); + + if (service->domainname && + connman_setting_get_bool("AllowDomainnameUpdates")) + __connman_utsname_set_domainname(service->domainname); + } __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; @@ -1347,23 +3001,95 @@ static void state_changed(struct connman_service *service) __connman_notifier_service_state_changed(service, service->state); str = state2string(service->state); - if (str == NULL) + if (!str) return; - if (allow_property_changed(service) == FALSE) +#if !defined TIZEN_EXT + if (!allow_property_changed(service)) return; +#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) +{ + struct connman_device *device; + + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + 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); + } + } + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, + "ConnectReason", + DBUS_TYPE_INT32, + &service->connect_reason); +} + +static void disconnection_requested_changed(struct connman_service *service) +{ + dbus_bool_t disconnection_requested; + + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + disconnection_requested = service->disconnection_requested; + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, + "DisconnectionRequested", + DBUS_TYPE_BOOLEAN, + &disconnection_requested); } +void connman_service_set_disconnection_requested(struct connman_service *service, + bool disconnection_requested) +{ + if (service == NULL) + return; + + service->disconnection_requested = disconnection_requested; + disconnection_requested_changed(service); +} +#endif + static void strength_changed(struct connman_service *service) { if (service->strength == 0) return; - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_basic(service->path, @@ -1371,56 +3097,89 @@ 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) { - if (service->path == NULL) + dbus_bool_t favorite; + + if (!service->path) return; - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; + favorite = service->favorite; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Favorite", - DBUS_TYPE_BOOLEAN, &service->favorite); + DBUS_TYPE_BOOLEAN, &favorite); } static void immutable_changed(struct connman_service *service) { - if (service->path == NULL) + dbus_bool_t immutable; + + if (!service->path) return; - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; + immutable = service->immutable; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Immutable", - DBUS_TYPE_BOOLEAN, &service->immutable); + DBUS_TYPE_BOOLEAN, &immutable); } static void roaming_changed(struct connman_service *service) { - if (service->path == NULL) + dbus_bool_t roaming; + + if (!service->path) return; - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; + roaming = service->roaming; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Roaming", - DBUS_TYPE_BOOLEAN, &service->roaming); + DBUS_TYPE_BOOLEAN, &roaming); } static void autoconnect_changed(struct connman_service *service) { - if (service->path == NULL) + dbus_bool_t autoconnect; + + if (!service->path) return; - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; + autoconnect = service->autoconnect; connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "AutoConnect", - DBUS_TYPE_BOOLEAN, &service->autoconnect); + DBUS_TYPE_BOOLEAN, &autoconnect); } static void append_security(DBusMessageIter *iter, void *user_data) @@ -1429,7 +3188,7 @@ static void append_security(DBusMessageIter *iter, void *user_data) const char *str; str = security2string(service->security); - if (str != NULL) + if (str) dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str); @@ -1438,47 +3197,120 @@ static void append_security(DBusMessageIter *iter, void *user_data) * are configured as open or no security, so filter * appropriately. */ - if (service->wps == TRUE) { + if (service->wps) { switch (service->security) { case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_SAE: +#endif str = "wps"; dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &str); + DBUS_TYPE_STRING, &str); break; +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_OWE: +#endif case CONNMAN_SERVICE_SECURITY_UNKNOWN: case CONNMAN_SERVICE_SECURITY_NONE: case CONNMAN_SERVICE_SECURITY_WEP: case CONNMAN_SERVICE_SECURITY_8021X: break; } + + if (service->wps_advertizing) { + str = "wps_advertising"; + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &str); + } } } +static void security_changed(struct connman_service *service) +{ + if (!service->path) + return; + + if (!allow_property_changed(service)) + return; + + connman_dbus_property_changed_array(service->path, + CONNMAN_SERVICE_INTERFACE, "Security", + DBUS_TYPE_STRING, append_security, service); +} + static void append_ethernet(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_append_ethernet(service->ipconfig_ipv4, iter); - else if (service->ipconfig_ipv6 != NULL) + else if (service->ipconfig_ipv6) __connman_ipconfig_append_ethernet(service->ipconfig_ipv6, iter); } -static void append_ipv4(DBusMessageIter *iter, void *user_data) +#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 */ - DBG("ipv4 %p state %s", service->ipconfig_ipv4, - state2string(service->state_ipv4)); +static void append_ipv4(DBusMessageIter *iter, void *user_data) +{ + struct connman_service *service = user_data; - if (is_connected_state(service, service->state_ipv4) == FALSE) + if (!is_connected(service->state_ipv4)) return; - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_append_ipv4(service->ipconfig_ipv4, iter); } @@ -1486,13 +3318,10 @@ static void append_ipv6(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - DBG("ipv6 %p state %s", service->ipconfig_ipv6, - state2string(service->state_ipv6)); - - if (is_connected_state(service, service->state_ipv6) == FALSE) + if (!is_connected(service->state_ipv6)) return; - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) __connman_ipconfig_append_ipv6(service->ipconfig_ipv6, iter, service->ipconfig_ipv4); } @@ -1501,7 +3330,7 @@ static void append_ipv4config(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) __connman_ipconfig_append_ipv4config(service->ipconfig_ipv4, iter); } @@ -1510,40 +3339,180 @@ static void append_ipv6config(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) __connman_ipconfig_append_ipv6config(service->ipconfig_ipv6, iter); } -static void append_nameservers(DBusMessageIter *iter, char **servers) +static void append_nameservers(DBusMessageIter *iter, + struct connman_service *service, char **servers) { int i; + bool available = true; - DBG("%p", servers); + for (i = 0; servers[i]; i++) { + if (service) + available = nameserver_available(service, + CONNMAN_IPCONFIG_TYPE_ALL, + servers[i]); - for (i = 0; servers[i] != NULL; i++) { - DBG("servers[%d] %s", i, servers[i]); - dbus_message_iter_append_basic(iter, + if (available) + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &servers[i]); } } +#if defined TIZEN_EXT +static void append_nameserver_manual(DBusMessageIter *iter, + struct connman_service *service, const char *server) +{ + bool available = true; + + if (service) + available = nameserver_available(service, + CONNMAN_IPCONFIG_TYPE_ALL, server); + + if (available) + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &server); +} + +static void append_nameserver_dhcp(DBusMessageIter *iter, + struct connman_service *service, const char *server) +{ + bool available = true; + + if (service) + available = nameserver_available(service, + CONNMAN_IPCONFIG_TYPE_ALL, server); + + if (available) + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &server); +} +#endif + static void append_dns(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; +#if defined TIZEN_EXT + int i; +#endif - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; - if (service->nameservers_config != NULL) { - append_nameservers(iter, service->nameservers_config); +#ifdef TIZEN_EXT + const char *str; + + str = __connman_dnsconfig_method2string(service->dns_config_method_ipv4); + if(str != NULL) { + char *str1 = g_strdup_printf("ipv4.%s", str); + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &str1); + g_free(str1); + } + + str = __connman_dnsconfig_method2string(service->dns_config_method_ipv6); + if(str != NULL) { + char *str1 = g_strdup_printf("ipv6.%s", str); + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &str1); + g_free(str1); + } +#endif + + if (service->nameservers_config) { +#if defined TIZEN_EXT + i = 0; + while (service->nameservers_config[i]) { + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET && + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_MANUAL) { + append_nameserver_manual(iter, service, + service->nameservers_config[i]); + } + + if (connman_inet_check_ipaddress( + service->nameservers_config[i]) == AF_INET6 && + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_MANUAL) { + append_nameserver_manual(iter, service, + service->nameservers_config[i]); + } + i++; + } + /* In case of mixed DNS Config Type one of IPv4/IPv6 can be + * dynamic while other is static so try to append the DNS + * Address which is dynamic also */ + if (service->nameservers != NULL) { + i = 0; + while (service->nameservers[i]) { + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET && + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + append_nameserver_dhcp(iter, service, + service->nameservers[i]); + } + + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET6 && + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + append_nameserver_dhcp(iter, service, + service->nameservers[i]); + } + i++; + } + } +#else + append_nameservers(iter, service, service->nameservers_config); +#endif return; } else { - if (service->nameservers != NULL) - append_nameservers(iter, service->nameservers); + if (service->nameservers) +#if defined TIZEN_EXT + { + i = 0; + while (service->nameservers[i]) { + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET && + service->dns_config_method_ipv4 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + append_nameserver_dhcp(iter, service, + service->nameservers[i]); + } + + if (connman_inet_check_ipaddress( + service->nameservers[i]) == AF_INET6 && + service->dns_config_method_ipv6 == + CONNMAN_DNSCONFIG_METHOD_DHCP) { + append_nameserver_dhcp(iter, service, + service->nameservers[i]); + } + i++; + } + } +#else + append_nameservers(iter, service, + service->nameservers); +#endif - if (service->nameservers_auto != NULL) - append_nameservers(iter, service->nameservers_auto); + if (service->nameservers_auto) + append_nameservers(iter, service, + service->nameservers_auto); + + if (!service->nameservers && !service->nameservers_auto) { + char **ns; + + DBG("append fallback nameservers"); + + ns = connman_setting_get_string_list("FallbackNameservers"); + if (ns) + append_nameservers(iter, service, ns); + } } } @@ -1551,20 +3520,56 @@ static void append_dnsconfig(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (service->nameservers_config == NULL) +#ifdef TIZEN_EXT + /* Append DNS Config Type */ + const char *str; + str = __connman_dnsconfig_method2string(service->dns_config_method_ipv4); + if(str != NULL) { + char *str1 = g_strdup_printf("ipv4.%s", str); + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &str1); + g_free(str1); + } + + str = __connman_dnsconfig_method2string(service->dns_config_method_ipv6); + if(str != NULL) { + char *str1 = g_strdup_printf("ipv6.%s", str); + dbus_message_iter_append_basic(iter, + DBUS_TYPE_STRING, &str1); + g_free(str1); + } +#endif + + if (!service->nameservers_config) return; - append_nameservers(iter, service->nameservers_config); +#if defined TIZEN_EXT + int i = 0; + while (service->nameservers_config[i]) { + if (connman_inet_check_ipaddress(service->nameservers_config[i]) == AF_INET && + service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL) { + append_nameserver_manual(iter, NULL, service->nameservers_config[i]); + } + + if (connman_inet_check_ipaddress(service->nameservers_config[i]) == AF_INET6 && + service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL) { + append_nameserver_manual(iter, NULL, service->nameservers_config[i]); + } + i++; + } +#else + append_nameservers(iter, NULL, service->nameservers_config); +#endif } static void append_ts(DBusMessageIter *iter, void *user_data) { GSList *list = user_data; - while (list != NULL) { + while (list) { char *timeserver = list->data; - if (timeserver != NULL) + if (timeserver) dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, ×erver); @@ -1577,7 +3582,7 @@ static void append_tsconfig(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->timeservers_config == NULL) + if (!service->timeservers_config) return; for (i = 0; service->timeservers_config[i]; i++) { @@ -1592,7 +3597,7 @@ static void append_domainconfig(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->domains == NULL) + if (!service->domains) return; for (i = 0; service->domains[i]; i++) @@ -1604,13 +3609,13 @@ static void append_domain(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - if (is_connected(service) == FALSE && - is_connecting(service) == FALSE) + if (!is_connected(service->state) && + !is_connecting(service->state)) return; - if (service->domains != NULL) + if (service->domains) append_domainconfig(iter, user_data); - else if (service->domainname != NULL) + else if (service->domainname) dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &service->domainname); } @@ -1620,7 +3625,7 @@ static void append_proxies(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->proxies == NULL) + if (!service->proxies) return; for (i = 0; service->proxies[i]; i++) @@ -1633,7 +3638,7 @@ static void append_excludes(DBusMessageIter *iter, void *user_data) struct connman_service *service = user_data; int i; - if (service->excludes == NULL) + if (!service->excludes) return; for (i = 0; service->excludes[i]; i++) @@ -1649,9 +3654,7 @@ static void append_proxy(DBusMessageIter *iter, void *user_data) const char *method = proxymethod2string( CONNMAN_SERVICE_PROXY_METHOD_DIRECT); - DBG(""); - - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; proxy = connman_service_get_proxy_method(service); @@ -1672,17 +3675,17 @@ static void append_proxy(DBusMessageIter *iter, void *user_data) break; case CONNMAN_SERVICE_PROXY_METHOD_AUTO: /* Maybe DHCP, or WPAD, has provided an url for a pac file */ - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) pac = __connman_ipconfig_get_proxy_autoconfig( service->ipconfig_ipv4); - else if (service->ipconfig_ipv6 != NULL) + else if (service->ipconfig_ipv6) pac = __connman_ipconfig_get_proxy_autoconfig( service->ipconfig_ipv6); - if (service->pac == NULL && pac == NULL) + if (!service->pac && !pac) goto done; - if (service->pac != NULL) + if (service->pac) pac = service->pac; connman_dbus_dict_append_basic(iter, "URL", @@ -1711,18 +3714,18 @@ static void append_proxyconfig(DBusMessageIter *iter, void *user_data) case CONNMAN_SERVICE_PROXY_METHOD_DIRECT: break; case CONNMAN_SERVICE_PROXY_METHOD_MANUAL: - if (service->proxies != NULL) + if (service->proxies) connman_dbus_dict_append_array(iter, "Servers", DBUS_TYPE_STRING, append_proxies, service); - if (service->excludes != NULL) + if (service->excludes) connman_dbus_dict_append_array(iter, "Excludes", DBUS_TYPE_STRING, append_excludes, service); break; case CONNMAN_SERVICE_PROXY_METHOD_AUTO: - if (service->pac != NULL) + if (service->pac) connman_dbus_dict_append_basic(iter, "URL", DBUS_TYPE_STRING, &service->pac); break; @@ -1738,12 +3741,10 @@ static void append_provider(DBusMessageIter *iter, void *user_data) { struct connman_service *service = user_data; - DBG("%p %p", service, service->provider); - - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; - if (service->provider != NULL) + if (service->provider) __connman_provider_append_properties(service->provider, iter); } @@ -1751,23 +3752,28 @@ static void append_provider(DBusMessageIter *iter, void *user_data) static void settings_changed(struct connman_service *service, struct connman_ipconfig *ipconfig) { - if (allow_property_changed(service) == FALSE) + enum connman_ipconfig_type type; + + type = __connman_ipconfig_get_config_type(ipconfig); + + __connman_notifier_ipconfig_changed(service, ipconfig); + + if (!allow_property_changed(service)) return; - connman_dbus_property_changed_dict(service->path, + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "IPv4", - append_ipv4, service); - - connman_dbus_property_changed_dict(service->path, + append_ipv4, service); + else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + connman_dbus_property_changed_dict(service->path, CONNMAN_SERVICE_INTERFACE, "IPv6", - append_ipv6, service); - - __connman_notifier_ipconfig_changed(service, ipconfig); + append_ipv6, service); } static void ipv4_configuration_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_dict(service->path, @@ -1777,9 +3783,18 @@ static void ipv4_configuration_changed(struct connman_service *service) service); } +void __connman_service_notify_ipv4_configuration( + struct connman_service *service) +{ + if (!service) + return; + + ipv4_configuration_changed(service); +} + static void ipv6_configuration_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_dict(service->path, @@ -1791,7 +3806,7 @@ static void ipv6_configuration_changed(struct connman_service *service) static void dns_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_array(service->path, @@ -1801,7 +3816,7 @@ static void dns_changed(struct connman_service *service) static void dns_configuration_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_array(service->path, @@ -1814,7 +3829,7 @@ static void dns_configuration_changed(struct connman_service *service) static void domain_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_array(service->path, @@ -1824,7 +3839,7 @@ static void domain_changed(struct connman_service *service) static void domain_configuration_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_array(service->path, @@ -1835,7 +3850,7 @@ static void domain_configuration_changed(struct connman_service *service) static void proxy_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_dict(service->path, @@ -1845,7 +3860,7 @@ static void proxy_changed(struct connman_service *service) static void proxy_configuration_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_dict(service->path, @@ -1855,9 +3870,51 @@ static void proxy_configuration_changed(struct connman_service *service) proxy_changed(service); } +static void mdns_changed(struct connman_service *service) +{ + dbus_bool_t mdns = service->mdns; + + if (!allow_property_changed(service)) + return; + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "mDNS", DBUS_TYPE_BOOLEAN, + &mdns); +} + +static void mdns_configuration_changed(struct connman_service *service) +{ + dbus_bool_t mdns_config = service->mdns_config; + + if (!allow_property_changed(service)) + return; + + connman_dbus_property_changed_basic(service->path, + CONNMAN_SERVICE_INTERFACE, "mDNS.Configuration", + DBUS_TYPE_BOOLEAN, &mdns_config); +} + +static int set_mdns(struct connman_service *service, + bool enabled) +{ + int result; + + result = __connman_resolver_set_mdns( + __connman_service_get_index(service), enabled); + + if (result == 0) { + if (service->mdns != enabled) { + service->mdns = enabled; + mdns_changed(service); + } + } + + return result; +} + static void timeservers_configuration_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_array(service->path, @@ -1869,7 +3926,7 @@ static void timeservers_configuration_changed(struct connman_service *service) static void link_changed(struct connman_service *service) { - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_dict(service->path, @@ -1880,7 +3937,7 @@ static void link_changed(struct connman_service *service) static void stats_append_counters(DBusMessageIter *dict, struct connman_stats_data *stats, struct connman_stats_data *counters, - connman_bool_t append_all) + bool append_all) { if (counters->rx_packets != stats->rx_packets || append_all) { counters->rx_packets = stats->rx_packets; @@ -1940,7 +3997,7 @@ static void stats_append_counters(DBusMessageIter *dict, static void stats_append(struct connman_service *service, const char *counter, struct connman_stats_counter *counters, - connman_bool_t append_all) + bool append_all) { DBusMessageIter array, dict; DBusMessage *msg; @@ -1948,7 +4005,7 @@ static void stats_append(struct connman_service *service, DBG("service %p counter %s", service, counter); msg = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_CALL); - if (msg == NULL) + if (!msg) return; dbus_message_append_args(msg, DBUS_TYPE_OBJECT_PATH, @@ -1988,7 +4045,7 @@ static void stats_update(struct connman_service *service, DBG("service %p", service); - if (stats->valid == TRUE) { + if (stats->valid) { data->rx_packets += rx_packets - data_last->rx_packets; data->tx_packets += @@ -2006,7 +4063,7 @@ static void stats_update(struct connman_service *service, data->tx_dropped += tx_dropped - data_last->tx_dropped; } else { - stats->valid = TRUE; + stats->valid = true; } data_last->rx_packets = rx_packets; @@ -2035,10 +4092,10 @@ void __connman_service_notify(struct connman_service *service, struct connman_stats_data *data; int err; - if (service == NULL) + if (!service) return; - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) return; stats_update(service, @@ -2059,35 +4116,31 @@ void __connman_service_notify(struct connman_service *service, counters = value; stats_append(service, counter, counters, counters->append_all); - counters->append_all = FALSE; + counters->append_all = false; } } int __connman_service_counter_register(const char *counter) { struct connman_service *service; - GSequenceIter *iter; + GList *list; struct connman_stats_counter *counters; DBG("counter %s", counter); counter_list = g_slist_prepend(counter_list, (gpointer)counter); - iter = g_sequence_get_begin_iter(service_list); - - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + service = list->data; counters = g_try_new0(struct connman_stats_counter, 1); - if (counters == NULL) + if (!counters) return -ENOMEM; - counters->append_all = TRUE; + counters->append_all = true; g_hash_table_replace(service->counter_table, (gpointer)counter, counters); - - iter = g_sequence_iter_next(iter); } return 0; @@ -2096,84 +4149,188 @@ int __connman_service_counter_register(const char *counter) void __connman_service_counter_unregister(const char *counter) { struct connman_service *service; - GSequenceIter *iter; + GList *list; DBG("counter %s", counter); - iter = g_sequence_get_begin_iter(service_list); - - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + service = list->data; g_hash_table_remove(service->counter_table, counter); - - iter = g_sequence_iter_next(iter); } counter_list = g_slist_remove(counter_list, counter); } -GSequence *__connman_service_get_list(struct connman_session *session, - service_match_cb service_match, - create_service_entry_cb create_service_entry, - GDestroyNotify destroy_service_entry) +int connman_service_iterate_services(connman_service_iterate_cb cb, + void *user_data) { - GSequence *list; - GSequenceIter *iter; - struct connman_service *service; - struct service_entry *entry; - - list = g_sequence_new(destroy_service_entry); - if (list == NULL) - return NULL; - - iter = g_sequence_get_begin_iter(service_list); - - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + GList *list; + int ret = 0; - if (service_match(session, service) == TRUE) { - entry = create_service_entry(service, service->name, - service->state); - if (entry == NULL) - return list; + for (list = service_list; list && ret == 0; list = list->next) + ret = cb((struct connman_service *)list->data, user_data); - g_sequence_append(list, entry); - } - - iter = g_sequence_iter_next(iter); - } - - return list; -} - -void __connman_service_session_inc(struct connman_service *service) -{ - DBG("service %p ref count %d", service, - service->session_usage_count + 1); - - __sync_fetch_and_add(&service->session_usage_count, 1); + return ret; } -connman_bool_t __connman_service_session_dec(struct connman_service *service) +#if defined TIZEN_EXT +static void append_wifi_ext_info(DBusMessageIter *dict, + struct connman_network *network) { - DBG("service %p ref count %d", service, - service->session_usage_count - 1); - - if (__sync_fetch_and_sub(&service->session_usage_count, 1) != 1) - return FALSE; + char bssid_buff[WIFI_BSSID_STR_LEN] = {0,}; + char *bssid_str = bssid_buff; + const void *ssid; + unsigned int ssid_len; + unsigned char *bssid; + unsigned int maxrate; + int maxspeed; + unsigned int keymgmt; + uint16_t frequency; + const char *enc_mode; + const char *str; + gboolean passpoint; + char country_code_buff[WIFI_COUNTRY_CODE_LEN + 1] = {0,}; + char *country_code_str = country_code_buff; + unsigned char *country_code; + uint16_t connection_mode; + + ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len); + bssid = connman_network_get_bssid(network); + maxrate = connman_network_get_maxrate(network); + maxspeed = connman_network_get_maxspeed(network); + frequency = connman_network_get_frequency(network); + enc_mode = connman_network_get_enc_mode(network); + passpoint = connman_network_get_bool(network, "WiFi.HS20AP"); + keymgmt = connman_network_get_keymgmt(network); + country_code = connman_network_get_countrycode(network); + connection_mode = connman_network_get_connection_mode(network); + + snprintf(bssid_str, WIFI_BSSID_STR_LEN, MACSTR, MAC2STR(bssid)); + + snprintf(country_code_str, (WIFI_COUNTRY_CODE_LEN + 1), "%c%c", + country_code[0], country_code[1]); + + + connman_dbus_dict_append_fixed_array(dict, "SSID", + DBUS_TYPE_BYTE, &ssid, ssid_len); + connman_dbus_dict_append_basic(dict, "BSSID", + DBUS_TYPE_STRING, &bssid_str); + connman_dbus_dict_append_basic(dict, "MaxRate", + DBUS_TYPE_UINT32, &maxrate); + connman_dbus_dict_append_basic(dict, "MaxSpeed", + DBUS_TYPE_INT32, &maxspeed); + connman_dbus_dict_append_basic(dict, "Frequency", + DBUS_TYPE_UINT16, &frequency); + connman_dbus_dict_append_basic(dict, "EncryptionMode", + DBUS_TYPE_STRING, &enc_mode); + connman_dbus_dict_append_basic(dict, "Passpoint", + DBUS_TYPE_BOOLEAN, &passpoint); + connman_dbus_dict_append_basic(dict, "Keymgmt", + DBUS_TYPE_UINT32, &keymgmt); + connman_dbus_dict_append_basic(dict, "Country", DBUS_TYPE_STRING, + &country_code_str); + connman_dbus_dict_append_basic(dict, "ConnMode", + DBUS_TYPE_UINT16, &connection_mode); - return TRUE; + str = connman_network_get_string(network, "WiFi.Security"); + if (str != NULL && g_str_equal(str, "ieee8021x") == TRUE) { + str = connman_network_get_string(network, "WiFi.EAP"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "EAP", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.Phase2"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "Phase2", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.Identity"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "Identity", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, "WiFi.CACertFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "CACertFile", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, + "WiFi.ClientCertFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "ClientCertFile", + DBUS_TYPE_STRING, &str); + + str = connman_network_get_string(network, + "WiFi.PrivateKeyFile"); + if (str != NULL) + connman_dbus_dict_append_basic(dict, "PrivateKeyFile", + DBUS_TYPE_STRING, &str); + } +} + +static void append_bssid_info(DBusMessageIter *iter, void *user_data) +{ + GSList *bssid_list = NULL; + struct connman_network *network = user_data; + struct connman_bssids *bssids; + char bssid_buf[MAC_ADDRESS_LENGTH] = {0,}; + char *bssid_str = bssid_buf; + + bssid_list = (GSList *)connman_network_get_bssid_list(network); + if(bssid_list) { + GSList *list; + for (list = bssid_list; list; list = list->next) { + bssids = (struct connman_bssids *)list->data; + g_snprintf(bssid_buf, MAC_ADDRESS_LENGTH, MACSTR, MAC2STR(bssids->bssid)); + + connman_dbus_dict_append_basic(iter, "BSSID", + DBUS_TYPE_STRING, &bssid_str); + + connman_dbus_dict_append_basic(iter, "Strength", + DBUS_TYPE_UINT16, &bssids->strength); + + connman_dbus_dict_append_basic(iter, "Frequency", + DBUS_TYPE_UINT16, &bssids->frequency); + } + } } +#endif static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, struct connman_service *service) { + dbus_bool_t val; const char *str; GSList *list; +#if defined TIZEN_EXT + unsigned int frequency = 0U; + unsigned char *wifi_vsie; + unsigned int wifi_vsie_len; + GSList *vsie_list = NULL; + + if (service->network) { + frequency = connman_network_get_frequency(service->network); + connman_dbus_dict_append_basic(dict, "Frequency", + DBUS_TYPE_UINT16, &frequency); + vsie_list = (GSList *)connman_network_get_vsie_list(service->network); + } + + if (vsie_list) { + GSList *list; + for (list = vsie_list; list; list = list->next) { + wifi_vsie = (unsigned char *)list->data; + wifi_vsie_len = wifi_vsie[1] + 2; + + connman_dbus_dict_append_fixed_array(dict, "Vsie", DBUS_TYPE_BYTE, + &wifi_vsie, wifi_vsie_len); + } + } +#endif + str = __connman_service_type2string(service->type); - if (str != NULL) + if (str) connman_dbus_dict_append_basic(dict, "Type", DBUS_TYPE_STRING, &str); @@ -2181,12 +4338,19 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, DBUS_TYPE_STRING, append_security, service); str = state2string(service->state); - if (str != NULL) + if (str) connman_dbus_dict_append_basic(dict, "State", DBUS_TYPE_STRING, &str); - str = error2string(service->error); +#ifdef TIZEN_EXT + str = state2string(service->state_ipv6); if (str != NULL) + connman_dbus_dict_append_basic(dict, "StateIPv6", + DBUS_TYPE_STRING, &str); +#endif + + str = error2string(service->error); + if (str) connman_dbus_dict_append_basic(dict, "Error", DBUS_TYPE_STRING, &str); @@ -2194,20 +4358,23 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, connman_dbus_dict_append_basic(dict, "Strength", DBUS_TYPE_BYTE, &service->strength); + val = service->favorite; connman_dbus_dict_append_basic(dict, "Favorite", - DBUS_TYPE_BOOLEAN, &service->favorite); + DBUS_TYPE_BOOLEAN, &val); + val = service->immutable; connman_dbus_dict_append_basic(dict, "Immutable", - DBUS_TYPE_BOOLEAN, &service->immutable); + DBUS_TYPE_BOOLEAN, &val); - if (service->favorite == TRUE) - connman_dbus_dict_append_basic(dict, "AutoConnect", - DBUS_TYPE_BOOLEAN, &service->autoconnect); + if (service->favorite) + val = service->autoconnect; else - connman_dbus_dict_append_basic(dict, "AutoConnect", - DBUS_TYPE_BOOLEAN, &service->favorite); + val = service->favorite; + + connman_dbus_dict_append_basic(dict, "AutoConnect", + DBUS_TYPE_BOOLEAN, &val); - if (service->name != NULL) + if (service->name) connman_dbus_dict_append_basic(dict, "Name", DBUS_TYPE_STRING, &service->name); @@ -2216,18 +4383,51 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif break; case CONNMAN_SERVICE_TYPE_CELLULAR: + val = service->roaming; connman_dbus_dict_append_basic(dict, "Roaming", - DBUS_TYPE_BOOLEAN, &service->roaming); + DBUS_TYPE_BOOLEAN, &val); connman_dbus_dict_append_dict(dict, "Ethernet", append_ethernet, service); break; case CONNMAN_SERVICE_TYPE_WIFI: +#if defined TIZEN_EXT + if (service->network != NULL) { + append_wifi_ext_info(dict, service->network); + connman_dbus_dict_append_dict(dict, "BSSID.List", + append_bssid_info, service->network); + } + + connman_dbus_dict_append_dict(dict, "Ethernet", + append_ethernet, service); + + service->disconnect_reason = connman_network_get_disconnect_reason(service->network); + connman_dbus_dict_append_basic(dict, "DisconnectReason", + DBUS_TYPE_INT32, &service->disconnect_reason); + + connman_dbus_dict_append_basic(dict, "AssocStatusCode", + DBUS_TYPE_INT32, &service->assoc_status_code); + + val = service->hidden_service; + connman_dbus_dict_append_basic(dict, "Hidden", + 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", append_ethernet, service); break; @@ -2258,25 +4458,129 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, connman_dbus_dict_append_array(dict, "Timeservers", DBUS_TYPE_STRING, append_ts, list); - g_slist_free_full(list, g_free); + g_slist_free_full(list, g_free); + + connman_dbus_dict_append_array(dict, "Timeservers.Configuration", + DBUS_TYPE_STRING, append_tsconfig, service); + + connman_dbus_dict_append_array(dict, "Domains", + DBUS_TYPE_STRING, append_domain, service); + + connman_dbus_dict_append_array(dict, "Domains.Configuration", + DBUS_TYPE_STRING, append_domainconfig, service); + + connman_dbus_dict_append_dict(dict, "Proxy", append_proxy, service); + + connman_dbus_dict_append_dict(dict, "Proxy.Configuration", + append_proxyconfig, service); + + val = service->mdns; + connman_dbus_dict_append_basic(dict, "mDNS", DBUS_TYPE_BOOLEAN, + &val); + + val = service->mdns_config; + connman_dbus_dict_append_basic(dict, "mDNS.Configuration", + DBUS_TYPE_BOOLEAN, &val); + + connman_dbus_dict_append_dict(dict, "Provider", + append_provider, service); + + if (service->network) + connman_network_append_acddbus(dict, service->network); +} + +#if 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_array(dict, "Timeservers.Configuration", - DBUS_TYPE_STRING, append_tsconfig, service); + connman_dbus_dict_append_basic(dict, "Strength", + DBUS_TYPE_BYTE, &service->strength); - connman_dbus_dict_append_array(dict, "Domains", - DBUS_TYPE_STRING, append_domain, service); + connman_dbus_dict_append_basic(dict, "ScoreStrength", + DBUS_TYPE_INT32, &service->score_strength); - connman_dbus_dict_append_array(dict, "Domains.Configuration", - DBUS_TYPE_STRING, append_domainconfig, service); + connman_dbus_dict_append_basic(dict, "ScoreInternetConnection", + DBUS_TYPE_INT32, &service->score_internet_connection); - connman_dbus_dict_append_dict(dict, "Proxy", append_proxy, service); + 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_dict(dict, "Proxy.Configuration", - append_proxyconfig, service); + connman_dbus_dict_append_basic(dict, "ScoreFrequency", + DBUS_TYPE_INT32, &service->score_frequency); - connman_dbus_dict_append_dict(dict, "Provider", - append_provider, service); + connman_dbus_dict_append_dict(dict, "BSSID.List", + append_ins_bssid_info, service->network); + } } +#endif static void append_struct_service(DBusMessageIter *iter, connman_dbus_append_cb_t function, @@ -2290,7 +4594,7 @@ static void append_struct_service(DBusMessageIter *iter, &service->path); connman_dbus_dict_open(&entry, &dict); - if (function != NULL) + if (function) function(&dict, service); connman_dbus_dict_close(&entry, &dict); @@ -2309,7 +4613,7 @@ static void append_struct(gpointer value, gpointer user_data) struct connman_service *service = value; DBusMessageIter *iter = user_data; - if (service->path == NULL) + if (!service->path) return; append_struct_service(iter, append_dict_properties, service); @@ -2317,28 +4621,70 @@ static void append_struct(gpointer value, gpointer user_data) void __connman_service_list_struct(DBusMessageIter *iter) { - g_sequence_foreach(service_list, append_struct, iter); + g_list_foreach(service_list, append_struct, iter); +} + +#if 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 -connman_bool_t __connman_service_is_hidden(struct connman_service *service) +bool __connman_service_is_hidden(struct connman_service *service) { return service->hidden; } -connman_bool_t +bool __connman_service_is_split_routing(struct connman_service *service) { return service->do_split_routing; } +bool __connman_service_index_is_split_routing(int index) +{ + struct connman_service *service; + + if (index < 0) + return false; + + service = __connman_service_lookup_from_index(index); + if (!service) + return false; + + return __connman_service_is_split_routing(service); +} + int __connman_service_get_index(struct connman_service *service) { - if (service == NULL) + if (!service) return -1; - if (service->network != NULL) + if (service->network) return connman_network_get_index(service->network); - else if (service->provider != NULL) + else if (service->provider) return connman_provider_get_index(service->provider); return -1; @@ -2346,54 +4692,86 @@ int __connman_service_get_index(struct connman_service *service) void __connman_service_set_hidden(struct connman_service *service) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) + return; + + service->hidden_service = true; +} + +void __connman_service_set_hostname(struct connman_service *service, + const char *hostname) +{ + if (!service || service->hidden) return; - service->hidden_service = TRUE; + g_free(service->hostname); + service->hostname = NULL; + + if (hostname && g_str_is_ascii(hostname)) + service->hostname = g_strdup(hostname); +} + +const char *__connman_service_get_hostname(struct connman_service *service) +{ + if (!service) + return NULL; + + return service->hostname; } void __connman_service_set_domainname(struct connman_service *service, const char *domainname) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) return; g_free(service->domainname); - service->domainname = g_strdup(domainname); + service->domainname = NULL; + + if (domainname && g_str_is_ascii(domainname)) + service->domainname = g_strdup(domainname); domain_changed(service); } const char *connman_service_get_domainname(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; - if (service->domains != NULL) + if (service->domains) return service->domains[0]; else return service->domainname; } +const char *connman_service_get_dbuspath(struct connman_service *service) +{ + if (!service) + return NULL; + + return service->path; +} + char **connman_service_get_nameservers(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; - if (service->nameservers_config != NULL) + if (service->nameservers_config) return g_strdupv(service->nameservers_config); - else if (service->nameservers != NULL || - service->nameservers_auto != NULL) { + else if (service->nameservers || + service->nameservers_auto) { int len = 0, len_auto = 0, i; char **nameservers; - if (service->nameservers != NULL) + if (service->nameservers) len = g_strv_length(service->nameservers); - if (service->nameservers_auto != NULL) + if (service->nameservers_auto) len_auto = g_strv_length(service->nameservers_auto); nameservers = g_try_new0(char *, len + len_auto + 1); - if (nameservers == NULL) + if (!nameservers) return NULL; for (i = 0; i < len; i++) @@ -2406,12 +4784,12 @@ char **connman_service_get_nameservers(struct connman_service *service) return nameservers; } - return NULL; + return g_strdupv(connman_setting_get_string_list("FallbackNameservers")); } char **connman_service_get_timeservers_config(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->timeservers_config; @@ -2419,19 +4797,64 @@ char **connman_service_get_timeservers_config(struct connman_service *service) char **connman_service_get_timeservers(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; - if (service->timeservers != NULL) - return service->timeservers; + return service->timeservers; +} - return NULL; +#if defined TIZEN_EXT +/* + * Description: Telephony plug-in requires manual PROXY setting function + */ +int connman_service_set_proxy(struct connman_service *service, + const char *proxy, gboolean active) +{ + char **proxies_array = NULL; + + if (service == NULL) + return -EINVAL; + + switch (service->type) { + case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_WIFI: + break; + + default: + return -EINVAL; + } + + g_strfreev(service->proxies); + service->proxies = NULL; + + if (proxy != NULL) + proxies_array = g_strsplit(proxy, " ", 0); + + service->proxies = proxies_array; + + if (proxy == NULL) { + service->proxy_config = CONNMAN_SERVICE_PROXY_METHOD_DIRECT; + DBG("proxy changed (%d)", active); + } else { + service->proxy_config = CONNMAN_SERVICE_PROXY_METHOD_MANUAL; + DBG("proxy chagned %s (%d)", proxy, active); + } + + if (active == TRUE) { + proxy_changed(service); + + __connman_notifier_proxy_changed(service); + } + + return 0; } +#endif void connman_service_set_proxy_method(struct connman_service *service, enum connman_service_proxy_method method) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) return; service->proxy = method; @@ -2445,12 +4868,12 @@ void connman_service_set_proxy_method(struct connman_service *service, enum connman_service_proxy_method connman_service_get_proxy_method( struct connman_service *service) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN; if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) { if (service->proxy_config == CONNMAN_SERVICE_PROXY_METHOD_AUTO && - service->pac == NULL) + !service->pac) return service->proxy; return service->proxy_config; @@ -2471,16 +4894,64 @@ char **connman_service_get_proxy_excludes(struct connman_service *service) const char *connman_service_get_proxy_url(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->pac; } +#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_get_defaut_info(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) { - if (service == NULL || service->hidden == TRUE) + if (!service || service->hidden) return; service->proxy = CONNMAN_SERVICE_PROXY_METHOD_AUTO; @@ -2503,7 +4974,7 @@ void __connman_service_set_proxy_autoconfig(struct connman_service *service, const char *connman_service_get_proxy_autoconfig(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; if (service->ipconfig_ipv4) @@ -2515,6 +4986,33 @@ const char *connman_service_get_proxy_autoconfig(struct connman_service *service return NULL; } +#if defined TIZEN_EXT +int connman_service_get_ipv6_dns_method(struct connman_service *service) +{ + if (!service) { + DBG("Service is NULL"); + return -1; + } + + return service->dns_config_method_ipv6; +} +#endif + +void __connman_service_set_timeservers(struct connman_service *service, + char **timeservers) +{ + int i; + + if (!service) + return; + + g_strfreev(service->timeservers); + service->timeservers = NULL; + + for (i = 0; timeservers && timeservers[i]; i++) + __connman_service_timeserver_append(service, timeservers[i]); +} + int __connman_service_timeserver_append(struct connman_service *service, const char *timeserver) { @@ -2522,13 +5020,13 @@ int __connman_service_timeserver_append(struct connman_service *service, DBG("service %p timeserver %s", service, timeserver); - if (timeserver == NULL) + if (!timeserver) return -EINVAL; - if (service->timeservers != NULL) { + if (service->timeservers) { int i; - for (i = 0; service->timeservers[i] != NULL; i++) + for (i = 0; service->timeservers[i]; i++) if (g_strcmp0(service->timeservers[i], timeserver) == 0) return -EEXIST; @@ -2540,7 +5038,7 @@ int __connman_service_timeserver_append(struct connman_service *service, service->timeservers = g_try_new0(char *, len + 2); } - if (service->timeservers == NULL) + if (!service->timeservers) return -ENOMEM; service->timeservers[len] = g_strdup(timeserver); @@ -2557,14 +5055,14 @@ int __connman_service_timeserver_remove(struct connman_service *service, DBG("service %p timeserver %s", service, timeserver); - if (timeserver == NULL) + if (!timeserver) return -EINVAL; - if (service->timeservers == NULL) + if (!service->timeservers) return 0; - for (i = 0; service->timeservers != NULL && - service->timeservers[i] != NULL; i++) + for (i = 0; service->timeservers && + service->timeservers[i]; i++) if (g_strcmp0(service->timeservers[i], timeserver) == 0) { found = 1; break; @@ -2583,13 +5081,13 @@ int __connman_service_timeserver_remove(struct connman_service *service, } servers = g_try_new0(char *, len); - if (servers == NULL) + if (!servers) return -ENOMEM; for (i = 0, j = 0; i < len; i++) { if (g_strcmp0(service->timeservers[i], timeserver) != 0) { servers[j] = g_strdup(service->timeservers[i]); - if (servers[j] == NULL) + if (!servers[j]) return -ENOMEM; j++; } @@ -2605,10 +5103,10 @@ int __connman_service_timeserver_remove(struct connman_service *service, void __connman_service_timeserver_changed(struct connman_service *service, GSList *ts_list) { - if (service == NULL) + if (!service) return; - if (allow_property_changed(service) == FALSE) + if (!allow_property_changed(service)) return; connman_dbus_property_changed_array(service->path, @@ -2619,7 +5117,7 @@ void __connman_service_timeserver_changed(struct connman_service *service, void __connman_service_set_pac(struct connman_service *service, const char *pac) { - if (service->hidden == TRUE) + if (service->hidden) return; g_free(service->pac); service->pac = g_strdup(pac); @@ -2627,59 +5125,156 @@ void __connman_service_set_pac(struct connman_service *service, proxy_changed(service); } +#if defined TIZEN_EXT +void __connman_service_set_proxy(struct connman_service *service, + const char *proxies) +{ + char **proxies_array = NULL; + + g_strfreev(service->proxies); + service->proxies = NULL; + + if (proxies != NULL) + proxies_array = g_strsplit(proxies, " ", 0); + + service->proxies = proxies_array; +} +#endif + void __connman_service_set_identity(struct connman_service *service, const char *identity) { - if (service->immutable || service->hidden == TRUE) + if (service->immutable || service->hidden) return; g_free(service->identity); service->identity = g_strdup(identity); - if (service->network != NULL) + if (service->network) connman_network_set_string(service->network, "WiFi.Identity", service->identity); } +void __connman_service_set_anonymous_identity(struct connman_service *service, + const char *anonymous_identity) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->anonymous_identity); + service->anonymous_identity = g_strdup(anonymous_identity); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.AnonymousIdentity", + service->anonymous_identity); +} + +void __connman_service_set_subject_match(struct connman_service *service, + const char *subject_match) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->subject_match); + service->subject_match = g_strdup(subject_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.SubjectMatch", + service->subject_match); +} + +void __connman_service_set_altsubject_match(struct connman_service *service, + const char *altsubject_match) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->altsubject_match); + service->altsubject_match = g_strdup(altsubject_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.AltSubjectMatch", + service->altsubject_match); +} + +void __connman_service_set_domain_suffix_match(struct connman_service *service, + const char *domain_suffix_match) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->domain_suffix_match); + service->domain_suffix_match = g_strdup(domain_suffix_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.DomainSuffixMatch", + service->domain_suffix_match); +} + +void __connman_service_set_domain_match(struct connman_service *service, + const char *domain_match) +{ + if (service->immutable || service->hidden) + return; + + g_free(service->domain_match); + service->domain_match = g_strdup(domain_match); + + if (service->network) + connman_network_set_string(service->network, + "WiFi.DomainMatch", + service->domain_match); +} + void __connman_service_set_agent_identity(struct connman_service *service, const char *agent_identity) { - if (service->hidden == TRUE) + if (service->hidden) return; g_free(service->agent_identity); service->agent_identity = g_strdup(agent_identity); - if (service->network != NULL) + if (service->network) connman_network_set_string(service->network, "WiFi.AgentIdentity", service->agent_identity); } -static int check_passphrase(struct connman_service *service, - enum connman_service_security security, - const char *passphrase) +int __connman_service_check_passphrase(enum connman_service_security security, + const char *passphrase) { guint i; gsize length; - if (passphrase == NULL) { - /* - * This will prevent __connman_service_set_passphrase() to - * wipe the passphrase out in case of -ENOKEY error for a - * favorite service. */ - if (service->favorite == TRUE) - return 1; - else - return 0; - } + if (!passphrase) + return 0; length = strlen(passphrase); switch (security) { - case CONNMAN_SERVICE_SECURITY_PSK: + case CONNMAN_SERVICE_SECURITY_UNKNOWN: + case CONNMAN_SERVICE_SECURITY_NONE: case CONNMAN_SERVICE_SECURITY_WPA: +#if !defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_RSN: +#endif + + DBG("service security '%s' (%d) not handled", + security2string(security), security); + + return -EOPNOTSUPP; + + case CONNMAN_SERVICE_SECURITY_PSK: +#if defined TIZEN_EXT case CONNMAN_SERVICE_SECURITY_RSN: + /* TO CHECK: We need to check the key length supported by SAE */ + case CONNMAN_SERVICE_SECURITY_SAE: +#endif /* A raw key is always 64 bytes length, * its content is in hex representation. * A PSK key must be between [8..63]. @@ -2704,9 +5299,12 @@ static int check_passphrase(struct connman_service *service, } else if (length != 5 && length != 13) return -ENOKEY; break; - case CONNMAN_SERVICE_SECURITY_UNKNOWN: - case CONNMAN_SERVICE_SECURITY_NONE: + case CONNMAN_SERVICE_SECURITY_8021X: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_OWE: + case CONNMAN_SERVICE_SECURITY_DPP: +#endif break; } @@ -2716,48 +5314,62 @@ static int check_passphrase(struct connman_service *service, int __connman_service_set_passphrase(struct connman_service *service, const char *passphrase) { - int err = 0; + int err; - if (service->immutable == TRUE || service->hidden == TRUE) + if (service->hidden) return -EINVAL; - err = check_passphrase(service, service->security, passphrase); + if (service->immutable && + service->security != CONNMAN_SERVICE_SECURITY_8021X) + return -EINVAL; - if (err == 0) { - g_free(service->passphrase); - service->passphrase = g_strdup(passphrase); +#if defined TIZEN_EXT + if (service->immutable && + service->security != CONNMAN_SERVICE_SECURITY_DPP) + return -EINVAL; + /* The encrypted passphrase is used here + * and validation is done by net-config before being encrypted. + */ + err = 0; + if (service->security != CONNMAN_SERVICE_SECURITY_PSK && + service->security != CONNMAN_SERVICE_SECURITY_RSN && + service->security != CONNMAN_SERVICE_SECURITY_SAE && + service->security != CONNMAN_SERVICE_SECURITY_WEP) +#endif + err = __connman_service_check_passphrase(service->security, passphrase); - if (service->network != NULL) - connman_network_set_string(service->network, - "WiFi.Passphrase", - service->passphrase); - service_save(service); - } + if (err < 0) + return err; - return err; + g_free(service->passphrase); + service->passphrase = g_strdup(passphrase); + + if (service->network) + connman_network_set_string(service->network, "WiFi.Passphrase", + service->passphrase); + + return 0; } const char *__connman_service_get_passphrase(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->passphrase; } -void __connman_service_set_agent_passphrase(struct connman_service *service, - const char *agent_passphrase) +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +int __connman_service_get_use_eapol(struct connman_service *service) { - if (service->hidden == TRUE) - return; - g_free(service->agent_passphrase); - service->agent_passphrase = g_strdup(agent_passphrase); + if (!service) { + DBG("Service is NULL"); + return -1; + } - if (service->network != NULL) - connman_network_set_string(service->network, - "WiFi.AgentPassphrase", - service->agent_passphrase); + return service->use_eapol; } +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *msg, void *user_data) @@ -2766,10 +5378,8 @@ static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *reply; DBusMessageIter array, dict; - DBG("service %p", service); - reply = dbus_message_new_method_return(msg); - if (reply == NULL) + if (!reply) return NULL; dbus_message_iter_init_append(reply, &array); @@ -2781,6 +5391,23 @@ static DBusMessage *get_properties(DBusConnection *conn, return reply; } +static char **remove_empty_strings(char **strv) +{ + int index = 0; + char **iter = strv; + + while (*iter) { + if (**iter) + strv[index++] = *iter; + else + g_free(*iter); + iter++; + } + + strv[index] = NULL; + return strv; +} + static int update_proxy_configuration(struct connman_service *service, DBusMessageIter *array) { @@ -2814,7 +5441,7 @@ static int update_proxy_configuration(struct connman_service *service, type = dbus_message_iter_get_arg_type(&variant); - if (g_str_equal(key, "Method") == TRUE) { + if (g_str_equal(key, "Method")) { const char *val; if (type != DBUS_TYPE_STRING) @@ -2822,19 +5449,19 @@ static int update_proxy_configuration(struct connman_service *service, dbus_message_iter_get_basic(&variant, &val); method = string2proxymethod(val); - } else if (g_str_equal(key, "URL") == TRUE) { + } else if (g_str_equal(key, "URL")) { if (type != DBUS_TYPE_STRING) goto error; dbus_message_iter_get_basic(&variant, &url); - } else if (g_str_equal(key, "Servers") == TRUE) { + } else if (g_str_equal(key, "Servers")) { DBusMessageIter str_array; if (type != DBUS_TYPE_ARRAY) goto error; servers_str = g_string_new(NULL); - if (servers_str == NULL) + if (!servers_str) goto error; dbus_message_iter_recurse(&variant, &str_array); @@ -2853,14 +5480,14 @@ static int update_proxy_configuration(struct connman_service *service, dbus_message_iter_next(&str_array); } - } else if (g_str_equal(key, "Excludes") == TRUE) { + } else if (g_str_equal(key, "Excludes")) { DBusMessageIter str_array; if (type != DBUS_TYPE_ARRAY) goto error; excludes_str = g_string_new(NULL); - if (excludes_str == NULL) + if (!excludes_str) goto error; dbus_message_iter_recurse(&variant, &str_array); @@ -2888,38 +5515,42 @@ static int update_proxy_configuration(struct connman_service *service, case CONNMAN_SERVICE_PROXY_METHOD_DIRECT: break; case CONNMAN_SERVICE_PROXY_METHOD_MANUAL: - if (servers_str == NULL && service->proxies == NULL) + if (!servers_str && !service->proxies) goto error; - if (servers_str != NULL) { + if (servers_str) { g_strfreev(service->proxies); - if (servers_str->len > 0) - service->proxies = g_strsplit_set( + if (servers_str->len > 0) { + char **proxies = g_strsplit_set( servers_str->str, " ", 0); - else + proxies = remove_empty_strings(proxies); + service->proxies = proxies; + } else service->proxies = NULL; } - if (excludes_str != NULL) { + if (excludes_str) { g_strfreev(service->excludes); - if (excludes_str->len > 0) - service->excludes = g_strsplit_set( + if (excludes_str->len > 0) { + char **excludes = g_strsplit_set( excludes_str->str, " ", 0); - else + excludes = remove_empty_strings(excludes); + service->excludes = excludes; + } else service->excludes = NULL; } - if (service->proxies == NULL) + if (!service->proxies) method = CONNMAN_SERVICE_PROXY_METHOD_DIRECT; break; case CONNMAN_SERVICE_PROXY_METHOD_AUTO: g_free(service->pac); - if (url != NULL && strlen(url) > 0) - service->pac = g_strdup(url); + if (url && strlen(url) > 0) + service->pac = g_strstrip(g_strdup(url)); else service->pac = NULL; @@ -2934,10 +5565,10 @@ static int update_proxy_configuration(struct connman_service *service, goto error; } - if (servers_str != NULL) + if (servers_str) g_string_free(servers_str, TRUE); - if (excludes_str != NULL) + if (excludes_str) g_string_free(excludes_str, TRUE); service->proxy_config = method; @@ -2945,62 +5576,112 @@ static int update_proxy_configuration(struct connman_service *service, return 0; error: - if (servers_str != NULL) + if (servers_str) g_string_free(servers_str, TRUE); - if (excludes_str != NULL) + if (excludes_str) g_string_free(excludes_str, TRUE); return -EINVAL; } -static int set_ipconfig(struct connman_service *service, - struct connman_ipconfig *ipconfig, - DBusMessageIter *array, - enum connman_service_state state, - enum connman_service_state *new_state) +int __connman_service_reset_ipconfig(struct connman_service *service, + enum connman_ipconfig_type type, DBusMessageIter *array, + enum connman_service_state *new_state) { - enum connman_ipconfig_method old_method; - enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; - enum connman_ipconfig_type type; - int err; + struct connman_ipconfig *ipconfig, *new_ipconfig; + enum connman_ipconfig_method old_method, new_method; + enum connman_service_state state; + int err = 0, index; - if (ipconfig == NULL) + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { + ipconfig = service->ipconfig_ipv4; + state = service->state_ipv4; + new_method = CONNMAN_IPCONFIG_METHOD_DHCP; + } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { + ipconfig = service->ipconfig_ipv6; + state = service->state_ipv6; + new_method = CONNMAN_IPCONFIG_METHOD_AUTO; + } else return -EINVAL; + if (!ipconfig) + return -ENXIO; + old_method = __connman_ipconfig_get_method(ipconfig); + index = __connman_ipconfig_get_index(ipconfig); - if (is_connecting_state(service, state) || - is_connected_state(service, state)) + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + new_ipconfig = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_UNKNOWN); + else + new_ipconfig = create_ip6config(service, index); + + if (array) { + err = __connman_ipconfig_set_config(new_ipconfig, array); + if (err < 0) { + __connman_ipconfig_unref(new_ipconfig); + return err; + } + + new_method = __connman_ipconfig_get_method(new_ipconfig); + } + + if (is_connecting(state) || is_connected(state)) __connman_network_clear_ipconfig(service->network, ipconfig); - err = __connman_ipconfig_set_config(ipconfig, array); - method = __connman_ipconfig_get_method(ipconfig); - type = __connman_ipconfig_get_config_type(ipconfig); + __connman_ipconfig_unref(ipconfig); - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { - if (err == 0 && old_method == CONNMAN_IPCONFIG_METHOD_OFF && - method == CONNMAN_IPCONFIG_METHOD_DHCP) { - *new_state = service->state_ipv4; - __connman_ipconfig_enable(ipconfig); - __connman_service_auto_connect(); - } + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + service->ipconfig_ipv4 = new_ipconfig; + else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + service->ipconfig_ipv6 = new_ipconfig; - } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { - if (err == 0 && old_method == CONNMAN_IPCONFIG_METHOD_OFF && - method == CONNMAN_IPCONFIG_METHOD_AUTO) { + if (is_connecting(state) || is_connected(state)) + __connman_ipconfig_enable(new_ipconfig); + + if (new_state && new_method != old_method) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + *new_state = service->state_ipv4; + else *new_state = service->state_ipv6; - __connman_ipconfig_enable(ipconfig); - __connman_service_auto_connect(); - } + + settings_changed(service, new_ipconfig); + address_updated(service, type); + + __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); } - DBG("err %d ipconfig %p type %d method %d state %s", err, ipconfig, - type, method, state2string(*new_state)); + DBG("err %d ipconfig %p type %d method %d state %s", err, + new_ipconfig, type, new_method, + !new_state ? "-" : state2string(*new_state)); return err; } +/* + * We set the timeout to 1 sec so that we have a chance to get + * necessary IPv6 router advertisement messages that might have + * DNS data etc. + */ +#define ONLINE_CHECK_INITIAL_INTERVAL 1 +#define ONLINE_CHECK_MAX_INTERVAL 12 + +void __connman_service_wispr_start(struct connman_service *service, + enum connman_ipconfig_type type) +{ + DBG("service %p type %s", service, __connman_ipconfig_type2string(type)); + + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + service->online_check_interval_ipv4 = + ONLINE_CHECK_INITIAL_INTERVAL; + else + service->online_check_interval_ipv6 = + ONLINE_CHECK_INITIAL_INTERVAL; + + __connman_wispr_start(service, type); +} + static DBusMessage *set_property(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -3011,7 +5692,7 @@ static DBusMessage *set_property(DBusConnection *conn, DBG("service %p", service); - if (dbus_message_iter_init(msg, &iter) == FALSE) + if (!dbus_message_iter_init(msg, &iter)) return __connman_error_invalid_arguments(msg); if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) @@ -3027,13 +5708,13 @@ static DBusMessage *set_property(DBusConnection *conn, type = dbus_message_iter_get_arg_type(&value); - if (g_str_equal(name, "AutoConnect") == TRUE) { - connman_bool_t autoconnect; + if (g_str_equal(name, "AutoConnect")) { + dbus_bool_t autoconnect; if (type != DBUS_TYPE_BOOLEAN) return __connman_error_invalid_arguments(msg); - if (service->favorite == FALSE) + if (!service->favorite) return __connman_error_invalid_service(msg); dbus_message_iter_get_basic(&value, &autoconnect); @@ -3045,51 +5726,131 @@ static DBusMessage *set_property(DBusConnection *conn, autoconnect_changed(service); - if (autoconnect == TRUE) - __connman_service_auto_connect(); + if (autoconnect) + __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); service_save(service); - } else if (g_str_equal(name, "Nameservers.Configuration") == TRUE) { + } else if (g_str_equal(name, "Nameservers.Configuration")) { DBusMessageIter entry; GString *str; int index; const char *gw; +#if defined TIZEN_EXT + enum connman_ipconfig_type ip_type = CONNMAN_IPCONFIG_TYPE_ALL; + DBG("%s", name); +#endif + + if (__connman_provider_is_immutable(service->provider) || + service->immutable) + return __connman_error_not_supported(msg); if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); str = g_string_new(NULL); - if (str == NULL) + if (!str) return __connman_error_invalid_arguments(msg); - index = connman_network_get_index(service->network); + index = __connman_service_get_index(service); gw = __connman_ipconfig_get_gateway_from_index(index, CONNMAN_IPCONFIG_TYPE_ALL); +#if !defined TIZEN_EXT if (gw && strlen(gw)) __connman_service_nameserver_del_routes(service, CONNMAN_IPCONFIG_TYPE_ALL); +#endif dbus_message_iter_recurse(&value, &entry); +#if defined TIZEN_EXT + /* IPv4/IPv6 Last DNS config method */ + int last_dns_ipv4 = service->dns_config_method_ipv4; + int last_dns_ipv6 = service->dns_config_method_ipv6; + DBG("Last DNS Config Method IPv4: %d IPv6: %d", last_dns_ipv4, last_dns_ipv6); +#endif + while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) { const char *val; dbus_message_iter_get_basic(&entry, &val); dbus_message_iter_next(&entry); - if (connman_inet_check_ipaddress(val) > 0) { - if (str->len > 0) - g_string_append_printf(str, " %s", val); - else - g_string_append(str, val); +#ifdef TIZEN_EXT + /* First unpack the DNS Config Method */ + DBG("DNS Config Method: %s", val); + if((g_strcmp0(val, "ipv4.manual") == 0)) { + service->dns_config_method_ipv4 = + CONNMAN_DNSCONFIG_METHOD_MANUAL; + + if(last_dns_ipv4 != CONNMAN_DNSCONFIG_METHOD_MANUAL) { + if(ip_type == CONNMAN_IPCONFIG_TYPE_UNKNOWN) + ip_type = CONNMAN_IPCONFIG_TYPE_IPV4; + else + ip_type = CONNMAN_IPCONFIG_TYPE_ALL; + } + continue; + } else if(g_strcmp0(val, "ipv4.dhcp") == 0) { + service->dns_config_method_ipv4 = + CONNMAN_DNSCONFIG_METHOD_DHCP; + if(last_dns_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL) + ip_type = CONNMAN_IPCONFIG_TYPE_IPV4; + + continue; + } else if(g_strcmp0(val, "ipv6.manual") == 0) { + service->dns_config_method_ipv6 = + CONNMAN_DNSCONFIG_METHOD_MANUAL; + if(last_dns_ipv6 != CONNMAN_DNSCONFIG_METHOD_MANUAL) { + if(ip_type == CONNMAN_IPCONFIG_TYPE_UNKNOWN) + ip_type = CONNMAN_IPCONFIG_TYPE_IPV6; + else + ip_type = CONNMAN_IPCONFIG_TYPE_ALL; + } + continue; + } else if(g_strcmp0(val, "ipv6.dhcp") == 0) { + service->dns_config_method_ipv6 = + CONNMAN_DNSCONFIG_METHOD_DHCP; + if(last_dns_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL) + ip_type = CONNMAN_IPCONFIG_TYPE_IPV6; + + continue; } +#endif + if (!val[0]) + continue; + + if (str->len > 0) + g_string_append_printf(str, " %s", val); + else + g_string_append(str, val); + } + +#if defined TIZEN_EXT + if (service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_DHCP && + service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_DHCP) { + DBG("Both IPv4 and IPv6 DNS Method DHCP"); + ip_type = CONNMAN_IPCONFIG_TYPE_ALL; } + if (gw && strlen(gw)) + __connman_service_nameserver_del_routes(service, + ip_type); - remove_nameservers(service, -1, service->nameservers_config); + DBG("%s ip_type: %d nameserver remove all", name, ip_type); + nameserver_remove_all(service, ip_type); +#else + nameserver_remove_all(service, CONNMAN_IPCONFIG_TYPE_ALL); +#endif g_strfreev(service->nameservers_config); if (str->len > 0) { - service->nameservers_config = - g_strsplit_set(str->str, " ", 0); + char **nameservers, **iter; + + nameservers = g_strsplit_set(str->str, " ", 0); + + for (iter = nameservers; *iter; iter++) + if (connman_inet_check_ipaddress(*iter) <= 0) + *iter[0] = '\0'; + + nameservers = remove_empty_strings(nameservers); + service->nameservers_config = nameservers; } else { service->nameservers_config = NULL; } @@ -3099,61 +5860,82 @@ static DBusMessage *set_property(DBusConnection *conn, if (gw && strlen(gw)) __connman_service_nameserver_add_routes(service, gw); - update_nameservers(service); +#if defined TIZEN_EXT + DBG("%s ip_type: %d nameserver add all", name, ip_type); + nameserver_add_all(service, ip_type); +#else + nameserver_add_all(service, CONNMAN_IPCONFIG_TYPE_ALL); +#endif dns_configuration_changed(service); + if (__connman_service_is_connected_state(service, + CONNMAN_IPCONFIG_TYPE_IPV4)) + __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); + + if (__connman_service_is_connected_state(service, + CONNMAN_IPCONFIG_TYPE_IPV6)) + __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); + service_save(service); - } else if (g_str_equal(name, "Timeservers.Configuration") == TRUE) { + } else if (g_str_equal(name, "Timeservers.Configuration")) { DBusMessageIter entry; - GSList *list = NULL; - int count = 0; + GString *str; + + if (service->immutable) + return __connman_error_not_supported(msg); if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); + str = g_string_new(NULL); + if (!str) + return __connman_error_invalid_arguments(msg); + dbus_message_iter_recurse(&value, &entry); while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) { const char *val; - GSList *new_head; - dbus_message_iter_get_basic(&entry, &val); + dbus_message_iter_next(&entry); - new_head = __connman_timeserver_add_list(list, val); - if (list != new_head) { - count++; - list = new_head; - } + if (!val[0]) + continue; - dbus_message_iter_next(&entry); + if (str->len > 0) + g_string_append_printf(str, " %s", val); + else + g_string_append(str, val); } g_strfreev(service->timeservers_config); service->timeservers_config = NULL; - if (list != NULL) { - service->timeservers_config = g_new0(char *, count+1); - - while (list != NULL) { - count--; - service->timeservers_config[count] = list->data; - list = g_slist_delete_link(list, list); - }; + if (str->len > 0) { + char **timeservers = g_strsplit_set(str->str, " ", 0); + timeservers = remove_empty_strings(timeservers); + service->timeservers_config = timeservers; } + g_string_free(str, TRUE); + service_save(service); timeservers_configuration_changed(service); - __connman_timeserver_sync(service); - } else if (g_str_equal(name, "Domains.Configuration") == TRUE) { + if (service == connman_service_get_default()) + __connman_timeserver_sync(service); + + } else if (g_str_equal(name, "Domains.Configuration")) { DBusMessageIter entry; GString *str; + if (service->immutable) + return __connman_error_not_supported(msg); + if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); str = g_string_new(NULL); - if (str == NULL) + if (!str) return __connman_error_invalid_arguments(msg); dbus_message_iter_recurse(&value, &entry); @@ -3162,29 +5944,39 @@ static DBusMessage *set_property(DBusConnection *conn, const char *val; dbus_message_iter_get_basic(&entry, &val); dbus_message_iter_next(&entry); + + if (!val[0]) + continue; + if (str->len > 0) g_string_append_printf(str, " %s", val); else g_string_append(str, val); } - remove_searchdomains(service, -1, service->domains); + searchdomain_remove_all(service); g_strfreev(service->domains); - if (str->len > 0) - service->domains = g_strsplit_set(str->str, " ", 0); - else + if (str->len > 0) { + char **domains = g_strsplit_set(str->str, " ", 0); + domains = remove_empty_strings(domains); + service->domains = domains; + } else service->domains = NULL; g_string_free(str, TRUE); - update_nameservers(service); + searchdomain_add_all(service); domain_configuration_changed(service); + domain_changed(service); service_save(service); - } else if (g_str_equal(name, "Proxy.Configuration") == TRUE) { + } else if (g_str_equal(name, "Proxy.Configuration")) { int err; + if (service->immutable) + return __connman_error_not_supported(msg); + if (type != DBUS_TYPE_ARRAY) return __connman_error_invalid_arguments(msg); @@ -3198,49 +5990,100 @@ static DBusMessage *set_property(DBusConnection *conn, __connman_notifier_proxy_changed(service); service_save(service); - } else if (g_str_equal(name, "IPv4.Configuration") == TRUE || + } else if (g_str_equal(name, "mDNS.Configuration")) { + dbus_bool_t val; + + if (service->immutable) + return __connman_error_not_supported(msg); + + if (type != DBUS_TYPE_BOOLEAN) + return __connman_error_invalid_arguments(msg); + + dbus_message_iter_get_basic(&value, &val); + service->mdns_config = val; + + mdns_configuration_changed(service); + + set_mdns(service, service->mdns_config); + + service_save(service); + } else if (g_str_equal(name, "IPv4.Configuration") || g_str_equal(name, "IPv6.Configuration")) { - struct connman_ipconfig *ipv4 = NULL, *ipv6 = NULL; enum connman_service_state state = CONNMAN_SERVICE_STATE_UNKNOWN; + enum connman_ipconfig_type type = + CONNMAN_IPCONFIG_TYPE_UNKNOWN; int err = 0; + if (service->type == CONNMAN_SERVICE_TYPE_VPN || + service->immutable) + return __connman_error_not_supported(msg); + DBG("%s", name); - if (service->ipconfig_ipv4 == NULL && - service->ipconfig_ipv6 == NULL) + if (!service->ipconfig_ipv4 && + !service->ipconfig_ipv6) return __connman_error_invalid_property(msg); - if (g_str_equal(name, "IPv4.Configuration") == TRUE) { - ipv4 = service->ipconfig_ipv4; - err = set_ipconfig(service, ipv4, &value, - service->state_ipv4, &state); + if (g_str_equal(name, "IPv4.Configuration")) + type = CONNMAN_IPCONFIG_TYPE_IPV4; + else + type = CONNMAN_IPCONFIG_TYPE_IPV6; - } else if (g_str_equal(name, "IPv6.Configuration") == TRUE) { - ipv6 = service->ipconfig_ipv6; - err = set_ipconfig(service, ipv6, &value, - service->state_ipv6, &state); - } + err = __connman_service_reset_ipconfig(service, type, &value, + &state); if (err < 0) { - if (is_connected_state(service, state) || - is_connecting_state(service, state)) - __connman_network_set_ipconfig(service->network, - ipv4, ipv6); + if (is_connected(state) || is_connecting(state)) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv4); + else + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv6); + } + return __connman_error_failed(msg, -err); } - if (ipv4) + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) ipv4_configuration_changed(service); - else if (ipv6) + else ipv6_configuration_changed(service); - if (is_connecting(service) || is_connected(service)) - __connman_network_set_ipconfig(service->network, - ipv4, ipv6); + if (is_connecting(service->state) || + is_connected(service->state)) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv4); + else + __connman_network_enable_ipconfig(service->network, + service->ipconfig_ipv6); + } + + service_save(service); +#if defined TIZEN_EXT + /* When AP is connected using WPS without SSID then its password needs + * to be saved for autoconnection */ + } else if (g_str_equal(name, "Passphrase")) { + char *passphrase; + + if (type != DBUS_TYPE_STRING) + return __connman_error_invalid_arguments(msg); + + dbus_message_iter_get_basic(&value, &passphrase); + + __connman_service_set_passphrase(service, passphrase); +#endif +#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_save(service); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ } else return __connman_error_invalid_property(msg); @@ -3257,28 +6100,57 @@ static void set_error(struct connman_service *service, service->error = error; - if (service->path == NULL) + if (!service->path) return; +#if !defined TIZEN_EXT + if (!allow_property_changed(service)) + return; +#endif + str = error2string(service->error); - if (str == NULL) + if (!str) str = ""; - if (allow_property_changed(service) == FALSE) - return; - connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Error", DBUS_TYPE_STRING, &str); } -static void set_idle(struct connman_service *service) +static void remove_timeout(struct connman_service *service) { - service->state = service->state_ipv4 = service->state_ipv6 = - CONNMAN_SERVICE_STATE_IDLE; - set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - state_changed(service); + if (service->timeout > 0) { + g_source_remove(service->timeout); + service->timeout = 0; + } +} + +static void reply_pending(struct connman_service *service, int error) +{ + remove_timeout(service); + + if (service->pending) { + connman_dbus_reply_pending(service->pending, error, NULL); + service->pending = NULL; + } + + if (service->provider_pending) { + connman_dbus_reply_pending(service->provider_pending, + error, service->path); + service->provider_pending = NULL; + } +} + +static void service_complete(struct connman_service *service) +{ + reply_pending(service, EIO); + + if (service->connect_reason != CONNMAN_SERVICE_CONNECT_REASON_USER) + __connman_service_auto_connect(service->connect_reason); + + g_get_current_time(&service->modified); + service_save(service); } static DBusMessage *clear_property(DBusConnection *conn, @@ -3292,49 +6164,122 @@ static DBusMessage *clear_property(DBusConnection *conn, dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - if (g_str_equal(name, "Error") == TRUE) { - set_idle(service); + if (g_str_equal(name, "Error")) { + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - g_get_current_time(&service->modified); - service_save(service); + __connman_service_clear_error(service); + service_complete(service); } else return __connman_error_invalid_property(msg); return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static connman_bool_t is_ipconfig_usable(struct connman_service *service) +static bool is_ipconfig_usable(struct connman_service *service) { - if (__connman_ipconfig_is_usable(service->ipconfig_ipv4) == FALSE && - __connman_ipconfig_is_usable(service->ipconfig_ipv6) - == FALSE) - return FALSE; + if (!__connman_ipconfig_is_usable(service->ipconfig_ipv4) && + !__connman_ipconfig_is_usable(service->ipconfig_ipv6)) + return false; - return TRUE; + return true; } -static connman_bool_t is_ignore(struct connman_service *service) +static bool is_ignore(struct connman_service *service) { - if (service->autoconnect == FALSE) - return TRUE; + if (!service->autoconnect) + return true; - if (service->roaming == TRUE) - return TRUE; + if (service->roaming && + !connman_setting_get_bool("AutoConnectRoamingServices")) + return true; - if (service->ignore == TRUE) - return TRUE; + if (service->ignore) + return true; if (service->state == CONNMAN_SERVICE_STATE_FAILURE) - return TRUE; + return true; - if (is_ipconfig_usable(service) == FALSE) - return TRUE; + if (!is_ipconfig_usable(service)) + return true; - return FALSE; + return false; +} + +static void disconnect_on_last_session(enum connman_service_type type) +{ + GList *list; + + for (list = service_list; list; list = list->next) { + struct connman_service *service = list->data; + + if (service->type != type) + continue; + + if (service->connect_reason != CONNMAN_SERVICE_CONNECT_REASON_SESSION) + continue; + + __connman_service_disconnect(service); + return; + } +} + +static int active_sessions[MAX_CONNMAN_SERVICE_TYPES] = {}; +static int always_connect[MAX_CONNMAN_SERVICE_TYPES] = {}; +static int active_count = 0; + +void __connman_service_set_active_session(bool enable, GSList *list) +{ + if (!list) + return; + + if (enable) + active_count++; + else + active_count--; + + while (list) { + enum connman_service_type type = GPOINTER_TO_INT(list->data); + + switch (type) { + case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_WIFI: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_GADGET: + if (enable) + active_sessions[type]++; + else + active_sessions[type]--; + break; + + case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif + break; + } + + if (active_sessions[type] == 0) + disconnect_on_last_session(type); + + list = g_slist_next(list); + } + + DBG("eth %d wifi %d bt %d cellular %d gadget %d sessions %d", + active_sessions[CONNMAN_SERVICE_TYPE_ETHERNET], + active_sessions[CONNMAN_SERVICE_TYPE_WIFI], + active_sessions[CONNMAN_SERVICE_TYPE_BLUETOOTH], + active_sessions[CONNMAN_SERVICE_TYPE_CELLULAR], + active_sessions[CONNMAN_SERVICE_TYPE_GADGET], + active_count); } struct preferred_tech_data { - GSequence *preferred_list; + GList *preferred_list; enum connman_service_type type; }; @@ -3344,224 +6289,388 @@ static void preferred_tech_add_by_type(gpointer data, gpointer user_data) struct preferred_tech_data *tech_data = user_data; if (service->type == tech_data->type) { - g_sequence_append(tech_data->preferred_list, service); + tech_data->preferred_list = + g_list_append(tech_data->preferred_list, service); +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("type %d service %p %s", tech_data->type, service, service->name); } } -static GSequence* preferred_tech_list_get(GSequence *list) +static GList *preferred_tech_list_get(void) { unsigned int *tech_array; - struct preferred_tech_data tech_data; + struct preferred_tech_data tech_data = { 0, }; int i; tech_array = connman_setting_get_uint_list("PreferredTechnologies"); - if (tech_array == NULL) + if (!tech_array) return NULL; - if (connman_setting_get_bool("SingleConnectedTechnology") == TRUE) { - GSequenceIter *iter = g_sequence_get_begin_iter(service_list); - while (g_sequence_iter_is_end(iter) == FALSE) { - struct connman_service *service; + if (connman_setting_get_bool("SingleConnectedTechnology")) { + GList *list; + for (list = service_list; list; list = list->next) { + struct connman_service *service = list->data; - service = g_sequence_get(iter); - - if (is_connected(service) == FALSE) + if (!is_connected(service->state)) break; - if (service->userconnect == TRUE) { + if (service->connect_reason == + CONNMAN_SERVICE_CONNECT_REASON_USER) { DBG("service %p name %s is user connected", service, service->name); +#if defined TIZEN_EXT + /* We can connect to a favorite service like + * wifi even we have a userconnect for cellular + * because we have refount for cellular service + */ + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) + break; + + if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH) + break; +#endif return NULL; } - - iter = g_sequence_iter_next(iter); } } - tech_data.preferred_list = g_sequence_new(NULL); - for (i = 0; tech_array[i] != 0; i += 1) { tech_data.type = tech_array[i]; - g_sequence_foreach(service_list, preferred_tech_add_by_type, + g_list_foreach(service_list, preferred_tech_add_by_type, &tech_data); } return tech_data.preferred_list; } -static connman_bool_t auto_connect_service(GSequenceIter* iter, - connman_bool_t preferred) +static void set_always_connecting_technologies() +{ + unsigned int *always_connected_techs = + connman_setting_get_uint_list("AlwaysConnectedTechnologies"); + int i; + for (i = 0; always_connected_techs && always_connected_techs[i]; i++) + always_connect[always_connected_techs[i]] = 1; +} + +static bool autoconnect_no_session_active(struct connman_service *service) +{ + /* + * Test active_count to see if there are no sessions set up and + * stop autoconnecting, but continue connecting if the service + * belongs to a technology which should always autoconnect. + */ + if (!active_count && !always_connect[service->type]) + return true; + + return false; +} + +static bool autoconnect_already_connecting(struct connman_service *service, + bool autoconnecting) +{ + /* + * If another service is already connecting and this service type has + * not been marked as always connecting, stop the connecting procedure. + */ + if (autoconnecting && + !active_sessions[service->type] && + !always_connect[service->type]) + return true; + + return false; +} + +static bool auto_connect_service(GList *services, + enum connman_service_connect_reason reason, + bool preferred) { struct connman_service *service = NULL; + bool ignore[MAX_CONNMAN_SERVICE_TYPES] = { }; + bool autoconnecting = false; + GList *list; +#if defined TIZEN_EXT + GSList *wifi_ignore = NULL; +#endif - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + DBG("preferred %d sessions %d reason %s", preferred, active_count, + reason2string(reason)); - if (service->pending != NULL) - return TRUE; + ignore[CONNMAN_SERVICE_TYPE_VPN] = true; - if (is_connecting(service) == TRUE) - return TRUE; +#if defined TIZEN_EXT_WIFI_MESH + /* Don't auto connect wifi if mesh interface is created */ + if (connman_mesh_is_interface_created()) + ignore[CONNMAN_SERVICE_TYPE_WIFI] = true; +#endif - if (service->favorite == FALSE) { - if (preferred == TRUE) - goto next_service; - return FALSE; + 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)); + continue; } - if (is_connected(service) == TRUE) - return TRUE; +#if defined TIZEN_EXT + DBG("service %p %s %s %s, favorite(%d), ignore(%d), hidden(%d, %d)", + service, service->name, + state2string(service->state), + __connman_service_type2string(service->type), + service->favorite, is_ignore(service), + service->hidden, service->hidden_service); + + /* Tizen takes Wi-Fi as the highest priority into consideration. */ + if (service->type != CONNMAN_SERVICE_TYPE_WIFI) + if (is_connecting(service->state) == TRUE || is_connected(service->state) == TRUE) + continue; +#endif - if (is_ignore(service) == FALSE && service->state == - CONNMAN_SERVICE_STATE_IDLE) - break; + 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; - next_service: - service = NULL; + DBG("service %p type %s busy", service, + __connman_service_type2string(service->type)); - iter = g_sequence_iter_next(iter); - } + continue; + } + + if (!service->favorite) { + if (preferred) + continue; + +#if defined TIZEN_EXT + DBG("Service is not favorite, autoconnecting %d", + autoconnecting); + g_slist_free(wifi_ignore); +#endif + return autoconnecting; + } - if (service != NULL) { +#if defined TIZEN_EXT + DBG("service %p identifier %s roaming %d ignore %d " + "ipconfig_usable %d autoconnect %d state %d", + service, + service->identifier, service->roaming, + service->ignore, is_ipconfig_usable(service), + service->autoconnect, service->state); +#endif + 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)); + continue; + } DBG("service %p %s %s", service, service->name, - (preferred == TRUE)? "preferred": "auto"); + (preferred) ? "preferred" : reason2string(reason)); - service->userconnect = FALSE; - __connman_service_connect(service); - return TRUE; + __connman_service_connect(service, reason); +#if !defined TIZEN_EXT + 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; } - return FALSE; +#if defined TIZEN_EXT + g_slist_free(wifi_ignore); +#endif + return autoconnecting; } static gboolean run_auto_connect(gpointer data) { - GSequenceIter *iter = NULL; - GSequence *preferred_tech; + enum connman_service_connect_reason reason = GPOINTER_TO_UINT(data); + bool autoconnecting = false; + GList *preferred_tech; - autoconnect_timeout = 0; + autoconnect_id = 0; DBG(""); - preferred_tech = preferred_tech_list_get(service_list); - if (preferred_tech != NULL) - iter = g_sequence_get_begin_iter(preferred_tech); + preferred_tech = preferred_tech_list_get(); + if (preferred_tech) { + autoconnecting = auto_connect_service(preferred_tech, reason, + true); + g_list_free(preferred_tech); + } + + if (!autoconnecting || active_count) + auto_connect_service(service_list, reason, false); - if (iter == NULL || auto_connect_service(iter, TRUE) == FALSE) - iter = g_sequence_get_begin_iter(service_list); + return FALSE; +} - if (iter != NULL) - auto_connect_service(iter, FALSE); +#if defined TIZEN_EXT +bool __connman_service_get_auto_connect_mode(void) +{ + return auto_connect_mode; +} - if (preferred_tech != NULL) - g_sequence_free(preferred_tech); +void __connman_service_set_auto_connect_mode(bool enable) +{ + DBG("set auto_connect_mode = %d", enable); - return FALSE; + if (auto_connect_mode != enable) + auto_connect_mode = enable; } +#endif -void __connman_service_auto_connect(void) +void __connman_service_auto_connect(enum connman_service_connect_reason reason) { DBG(""); - if (__connman_session_mode() == TRUE) { - DBG("Session mode enabled: auto connect disabled"); + if (autoconnect_id != 0) + return; + +#if defined TIZEN_EXT + if (auto_connect_mode == FALSE) { + DBG("Currently, not auto connection mode"); return; } +#endif - if (autoconnect_timeout != 0) + if (!__connman_session_policy_autoconnect(reason)) return; - autoconnect_timeout = g_timeout_add_seconds(0, run_auto_connect, NULL); +#if defined TIZEN_EXT + /* Adding Timeout of 500ms before trying to auto connect. + * This is done because of below scenario + * 1. Device is connected to AP1 + * 2. WPS Connection request is initiated for AP2 + * 3. Immediately WPS Connection is Cancelled + * When WPS Connection Connection is initiated for AP2 then + * sometimes there is a scenario where connman gets in ASSOCIATED + * state with AP1 due to autoconnect and subsequently the connection + * initiated by AP1 fails and connman service for AP1 comes in + * FAILURE state due to this when connection with AP2 is cancelled + * then autoconnect with AP1 doesn't works because its autoconnection + * is ignored as its last state was FAILURE rather than IDLE */ + autoconnect_id = g_timeout_add(500, run_auto_connect, +#else + autoconnect_id = g_idle_add(run_auto_connect, +#endif + GUINT_TO_POINTER(reason)); } -static void remove_timeout(struct connman_service *service) -{ - if (service->timeout > 0) { - g_source_remove(service->timeout); - service->timeout = 0; - } -} +static gboolean run_vpn_auto_connect(gpointer data) { + GList *list; + bool need_split = false; -void __connman_service_reply_dbus_pending(DBusMessage *pending, int error, - const char *path) -{ - if (pending != NULL) { - if (error > 0) { - DBusMessage *reply; + vpn_autoconnect_id = 0; - reply = __connman_error_failed(pending, error); - if (reply != NULL) - g_dbus_send_message(connection, reply); - } else { - const char *sender; + for (list = service_list; list; list = list->next) { + struct connman_service *service = list->data; + int res; - sender = dbus_message_get_interface(pending); - if (path == NULL) - path = dbus_message_get_path(pending); + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + continue; - DBG("sender %s path %s", sender, path); + if (is_connected(service->state) || + is_connecting(service->state)) { + if (!service->do_split_routing) + need_split = true; + continue; + } - if (g_strcmp0(sender, CONNMAN_MANAGER_INTERFACE) == 0) - g_dbus_send_reply(connection, pending, - DBUS_TYPE_OBJECT_PATH, &path, - DBUS_TYPE_INVALID); - else - g_dbus_send_reply(connection, pending, - DBUS_TYPE_INVALID); + if (is_ignore(service) || !service->favorite) + continue; + + if (need_split && !service->do_split_routing) { + DBG("service %p no split routing", service); + continue; } - dbus_message_unref(pending); + DBG("service %p %s %s", service, service->name, + service->do_split_routing ? + "split routing" : ""); + + res = __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + if (res < 0 && res != -EINPROGRESS) + continue; + + if (!service->do_split_routing) + need_split = true; } + + return FALSE; } -static void reply_pending(struct connman_service *service, int error) +static void vpn_auto_connect(void) { - remove_timeout(service); - - if (service->pending != NULL) { - __connman_service_reply_dbus_pending(service->pending, error, - NULL); - service->pending = NULL; - } + if (vpn_autoconnect_id) + return; - if (service->provider_pending != NULL) { - __connman_service_reply_dbus_pending(service->provider_pending, - error, service->path); - service->provider_pending = NULL; - } + vpn_autoconnect_id = + g_idle_add(run_vpn_auto_connect, NULL); } -connman_bool_t +bool __connman_service_is_provider_pending(struct connman_service *service) { - if (service == NULL) - return FALSE; + if (!service) + return false; - if (service->provider_pending != NULL) - return TRUE; + if (service->provider_pending) + return true; - return FALSE; + return false; } void __connman_service_set_provider_pending(struct connman_service *service, DBusMessage *msg) { - if (service->provider_pending != NULL) { + if (service->provider_pending) { DBG("service %p provider pending msg %p already exists", service, service->provider_pending); return; } service->provider_pending = msg; - return; } static void check_pending_msg(struct connman_service *service) { - if (service->pending == NULL) + if (!service->pending) return; DBG("service %p pending msg %p already exists", service, @@ -3576,7 +6685,7 @@ void __connman_service_set_hidden_data(struct connman_service *service, DBG("service %p pending %p", service, pending); - if (pending == NULL) + if (!pending) return; check_pending_msg(service); @@ -3597,33 +6706,30 @@ void __connman_service_return_error(struct connman_service *service, static gboolean connect_timeout(gpointer user_data) { struct connman_service *service = user_data; - connman_bool_t autoconnect = FALSE; + bool autoconnect = false; DBG("service %p", service); service->timeout = 0; - if (service->network != NULL) + if (service->network) __connman_network_disconnect(service->network); - else if (service->provider != NULL) + else if (service->provider) connman_provider_disconnect(service->provider); - __connman_ipconfig_disable(service->ipconfig_ipv4); - __connman_ipconfig_disable(service->ipconfig_ipv6); - __connman_stats_service_unregister(service); - if (service->pending != NULL) { + if (service->pending) { DBusMessage *reply; reply = __connman_error_operation_timeout(service->pending); - if (reply != NULL) + if (reply) g_dbus_send_message(connection, reply); dbus_message_unref(service->pending); service->pending = NULL; } else - autoconnect = TRUE; + autoconnect = true; __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_FAILURE, @@ -3632,262 +6738,430 @@ static gboolean connect_timeout(gpointer user_data) CONNMAN_SERVICE_STATE_FAILURE, CONNMAN_IPCONFIG_TYPE_IPV6); - if (autoconnect == TRUE && service->userconnect == FALSE) - __connman_service_auto_connect(); + if (autoconnect && + service->connect_reason != + CONNMAN_SERVICE_CONNECT_REASON_USER) + __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); return FALSE; } -static void set_reconnect_state(struct connman_service *service, - connman_bool_t reconnect) +static DBusMessage *connect_service(DBusConnection *conn, + DBusMessage *msg, void *user_data) { - struct connman_device *device; + struct connman_service *service = user_data; +#if defined TIZEN_EXT + int err = 0; +#else + int index, err = 0; + GList *list; +#endif - if (service->network == NULL) - return; + DBG("service %p", service); - device = connman_network_get_device(service->network); - if (device == NULL) - return; +#if defined TIZEN_EXT + /* + * Description: TIZEN implements system global connection management. + */ + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) + connman_service_user_pdn_connection_ref(service); - __connman_device_set_reconnect(device, reconnect); -} + /*Reset the Disconnect Reason while issue connect request*/ + service->disconnect_reason = 0; -static connman_bool_t get_reconnect_state(struct connman_service *service) -{ - struct connman_device *device; + /*Reset the association status code while issue connect request*/ + service->assoc_status_code = 0; - if (service->network == NULL) - return FALSE; + /* Reset the disconnection_requested while issue connect request*/ + connman_service_set_disconnection_requested(service, false); +#endif - device = connman_network_get_device(service->network); - if (device == NULL) - return FALSE; + if (service->pending) + return __connman_error_in_progress(msg); - return __connman_device_get_reconnect(device); -} +#if !defined TIZEN_EXT + index = __connman_service_get_index(service); -static connman_bool_t is_interface_available(struct connman_service *service, - struct connman_service *other_service) -{ - unsigned int index = 0, other_index = 0; + for (list = service_list; list; list = list->next) { + struct connman_service *temp = list->data; - if (service->ipconfig_ipv4 != NULL) - index = __connman_ipconfig_get_index(service->ipconfig_ipv4); - else if (service->ipconfig_ipv6 != NULL) - index = __connman_ipconfig_get_index(service->ipconfig_ipv6); +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) + break; +#endif + if (!is_connecting(temp->state) && !is_connected(temp->state)) + break; - if (other_service->ipconfig_ipv4 != NULL) - other_index = __connman_ipconfig_get_index( - other_service->ipconfig_ipv4); - else if (other_service->ipconfig_ipv6 != NULL) - other_index = __connman_ipconfig_get_index( - other_service->ipconfig_ipv6); + if (service == temp) + continue; - if (index > 0 && other_index != index) - return TRUE; + if (service->type != temp->type) + continue; - return FALSE; + if (__connman_service_get_index(temp) == index && + __connman_service_disconnect(temp) == -EINPROGRESS) + err = -EINPROGRESS; + + } + if (err == -EINPROGRESS) + return __connman_error_operation_timeout(msg); +#endif + + service->ignore = false; + + service->pending = dbus_message_ref(msg); + + err = __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_USER); + + if (err != -EINPROGRESS) + reply_pending(service, -err); + + return NULL; } -static DBusMessage *connect_service(DBusConnection *conn, +static DBusMessage *disconnect_service(DBusConnection *conn, DBusMessage *msg, void *user_data) { struct connman_service *service = user_data; - GSequenceIter *iter; int err; DBG("service %p", service); - if (service->pending != NULL) - return __connman_error_in_progress(msg); +#if defined TIZEN_EXT + /* + * Description: TIZEN implements system global connection management. + */ + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) { + if (connman_service_user_pdn_connection_unref_and_test(service) != TRUE) + return __connman_error_failed(msg, EISCONN); - iter = g_sequence_get_begin_iter(service_list); + if (is_connected(service->state) == TRUE && + service == connman_service_get_default_connection()) + return __connman_error_failed(msg, EISCONN); + } +#endif - while (g_sequence_iter_is_end(iter) == FALSE) { - struct connman_service *temp = g_sequence_get(iter); + service->ignore = true; - /* - * We should allow connection if there are available - * interfaces for a given technology type (like having - * more than one wifi card). - */ - if (service->type == temp->type && - is_connecting(temp) == TRUE && - is_interface_available(service, - temp) == FALSE) - return __connman_error_in_progress(msg); + err = __connman_service_disconnect(service); + if (err < 0 && err != -EINPROGRESS) + return __connman_error_failed(msg, -err); - iter = g_sequence_iter_next(iter); - } + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); +} - service->ignore = FALSE; +#if defined TIZEN_EXT +static void __connman_service_cleanup_network_8021x(struct connman_service *service) +{ + if (service == NULL) + return; - service->userconnect = TRUE; + DBG("service %p ", service); - service->pending = dbus_message_ref(msg); + connman_network_set_string(service->network, "WiFi.EAP", NULL); + connman_network_set_string(service->network, "WiFi.Identity", NULL); + connman_network_set_string(service->network, "WiFi.CACertFile", NULL); + connman_network_set_string(service->network, "WiFi.ClientCertFile", NULL); + connman_network_set_string(service->network, "WiFi.PrivateKeyFile", NULL); + connman_network_set_string(service->network, "WiFi.PrivateKeyPassphrase", NULL); + connman_network_set_string(service->network, "WiFi.Phase2", NULL); + connman_network_set_string(service->network, "WiFi.AnonymousIdentity", NULL); +} +static void __connman_service_cleanup_network_dpp(struct connman_service *service) +{ + if (service == NULL) + return; - set_reconnect_state(service, FALSE); + DBG("service %p ", service); - err = __connman_service_connect(service); - if (err < 0) { - if (service->pending == NULL) - return NULL; + connman_network_set_string(service->network, "WiFi.Connector", NULL); + connman_network_set_string(service->network, "WiFi.CSignKey", NULL); + connman_network_set_string(service->network, "WiFi.NetAccessKey", NULL); +} +#endif - if (err != -EINPROGRESS) { - dbus_message_unref(service->pending); - service->pending = NULL; +bool __connman_service_remove(struct connman_service *service) +{ + if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET || + service->type == CONNMAN_SERVICE_TYPE_GADGET) + return false; - return __connman_error_failed(msg, -err); - } + if (service->immutable || service->hidden || + __connman_provider_is_immutable(service->provider)) + return false; - return NULL; - } +#if !defined TIZEN_EXT + if (!service->favorite && !is_idle(service->state)) + return false; +#endif - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); + __connman_service_disconnect(service); + + g_free(service->passphrase); + service->passphrase = NULL; + + g_free(service->identity); + service->identity = NULL; + + g_free(service->anonymous_identity); + service->anonymous_identity = NULL; + + g_free(service->subject_match); + service->subject_match = NULL; + + g_free(service->altsubject_match); + service->altsubject_match = NULL; + + g_free(service->domain_suffix_match); + service->domain_suffix_match = NULL; + + g_free(service->domain_match); + service->domain_match = NULL; + + g_free(service->agent_identity); + service->agent_identity = NULL; + + g_free(service->eap); + service->eap = NULL; + +#if defined TIZEN_EXT + g_free(service->ca_cert_file); + service->ca_cert_file = NULL; + + g_free(service->client_cert_file); + service->client_cert_file = NULL; + + g_free(service->private_key_file); + service->private_key_file = NULL; + + g_free(service->private_key_passphrase); + service->private_key_passphrase = NULL; + + g_free(service->phase2); + service->phase2 = NULL; + + __connman_service_cleanup_network_8021x(service); + + __connman_ipconfig_set_method(service->ipconfig_ipv4, CONNMAN_IPCONFIG_METHOD_DHCP); + __connman_ipconfig_set_method(service->ipconfig_ipv6, CONNMAN_IPCONFIG_METHOD_AUTO); + connman_service_set_proxy(service, NULL, false); + + __connman_service_nameserver_clear(service); + + g_strfreev(service->nameservers_config); + service->nameservers_config = NULL; + + g_free(service->connector); + service->connector = NULL; + + g_free(service->c_sign_key); + service->c_sign_key = NULL; + + g_free(service->net_access_key); + service->net_access_key = NULL; + + __connman_service_cleanup_network_dpp(service); +#endif + + service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; + + __connman_service_set_favorite(service, false); + + __connman_ipconfig_ipv6_reset_privacy(service->ipconfig_ipv6); + +#if defined TIZEN_EXT + /* Reset IP Method and DNS Method to DHCP */ + __connman_ipconfig_set_method(service->ipconfig_ipv4, + CONNMAN_IPCONFIG_METHOD_DHCP); + service->dns_config_method_ipv4 = CONNMAN_DNSCONFIG_METHOD_DHCP; + g_strfreev(service->nameservers_config); + service->nameservers_config = NULL; +#endif + +#if defined TIZEN_EXT + __connman_storage_remove_service(service->identifier); +#else + service_save(service); +#endif + + return true; } -static DBusMessage *disconnect_service(DBusConnection *conn, +static DBusMessage *remove_service(DBusConnection *conn, DBusMessage *msg, void *user_data) { struct connman_service *service = user_data; - int err; DBG("service %p", service); - reply_pending(service, ECONNABORTED); + if (!__connman_service_remove(service)) + return __connman_error_not_supported(msg); + + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); +} + +static bool check_suitable_state(enum connman_service_state a, + enum connman_service_state b) +{ + /* + * Special check so that "ready" service can be moved before + * "online" one. + */ + if ((a == CONNMAN_SERVICE_STATE_ONLINE && + b == CONNMAN_SERVICE_STATE_READY) || + (b == CONNMAN_SERVICE_STATE_ONLINE && + a == CONNMAN_SERVICE_STATE_READY)) + return true; - service->ignore = TRUE; + return a == b; +} - set_reconnect_state(service, FALSE); +static void downgrade_state(struct connman_service *service) +{ + if (!service) + return; - err = __connman_service_disconnect(service); - if (err < 0) { - if (err != -EINPROGRESS) - return __connman_error_failed(msg, -err); + DBG("service %p state4 %d state6 %d", service, service->state_ipv4, + service->state_ipv6); - return NULL; - } + if (service->state_ipv4 == CONNMAN_SERVICE_STATE_ONLINE) + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_READY, + CONNMAN_IPCONFIG_TYPE_IPV4); - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); + if (service->state_ipv6 == CONNMAN_SERVICE_STATE_ONLINE) + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_READY, + CONNMAN_IPCONFIG_TYPE_IPV6); } -gboolean __connman_service_remove(struct connman_service *service) +static void apply_relevant_default_downgrade(struct connman_service *service) { - if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET) - return FALSE; + struct connman_service *def_service; - if (service->immutable == TRUE || service->hidden == TRUE) - return FALSE; + def_service = connman_service_get_default(); + if (!def_service) + return; - if (service->favorite == FALSE && service->state != - CONNMAN_SERVICE_STATE_FAILURE) - return FALSE; + if (def_service == service && + def_service->state == CONNMAN_SERVICE_STATE_ONLINE) { + def_service->state = CONNMAN_SERVICE_STATE_READY; + __connman_notifier_leave_online(def_service->type); + state_changed(def_service); + } +} - set_reconnect_state(service, FALSE); +static void switch_default_service(struct connman_service *default_service, + struct connman_service *downgrade_service) +{ + struct connman_service *service; + GList *src, *dst; - __connman_service_disconnect(service); + apply_relevant_default_downgrade(default_service); + src = g_list_find(service_list, downgrade_service); + dst = g_list_find(service_list, default_service); - g_free(service->passphrase); - service->passphrase = NULL; + /* Nothing to do */ + if (src == dst || src->next == dst) + return; - g_free(service->agent_passphrase); - service->agent_passphrase = NULL; + service = src->data; + service_list = g_list_delete_link(service_list, src); + service_list = g_list_insert_before(service_list, dst, service); - g_free(service->identity); - service->identity = NULL; + downgrade_state(downgrade_service); +} - g_free(service->agent_identity); - service->agent_identity = NULL; +static struct _services_notify { + int id; + GHashTable *add; + GHashTable *remove; +} *services_notify; - g_free(service->eap); - service->eap = NULL; - set_idle(service); +static void service_append_added_foreach(gpointer data, gpointer user_data) +{ + struct connman_service *service = data; + DBusMessageIter *iter = user_data; + + if (!service || !service->path) { + DBG("service %p or path is NULL", service); + return; + } - __connman_service_set_favorite(service, FALSE); + if (g_hash_table_lookup(services_notify->add, service->path)) { + DBG("new %s", service->path); - service_save(service); + 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); - return TRUE; + append_struct_service(iter, NULL, service); + } } -static DBusMessage *remove_service(DBusConnection *conn, - DBusMessage *msg, void *user_data) +static void service_append_ordered(DBusMessageIter *iter, void *user_data) { - struct connman_service *service = user_data; - - DBG("service %p", service); + g_list_foreach(service_list, service_append_added_foreach, iter); +} - if (__connman_service_remove(service) == FALSE) - return __connman_error_not_supported(msg); +static void append_removed(gpointer key, gpointer value, gpointer user_data) +{ + char *objpath = key; + DBusMessageIter *iter = user_data; - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); + DBG("removed %s", objpath); + dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &objpath); } -static gboolean check_suitable_state(enum connman_service_state a, - enum connman_service_state b) +static void service_append_removed(DBusMessageIter *iter, void *user_data) { - /* - * Special check so that "ready" service can be moved before - * "online" one. - */ - if ((a == CONNMAN_SERVICE_STATE_ONLINE && - b == CONNMAN_SERVICE_STATE_READY) || - (b == CONNMAN_SERVICE_STATE_ONLINE && - a == CONNMAN_SERVICE_STATE_READY)) - return TRUE; - - return a == b; + g_hash_table_foreach(services_notify->remove, append_removed, iter); } -static void downgrade_state(struct connman_service *service) +static gboolean service_send_changed(gpointer data) { - if (service == NULL) - return; + DBusMessage *signal; - DBG("service %p state4 %d state6 %d", service, service->state_ipv4, - service->state_ipv6); + DBG(""); - if (service->state_ipv4 == CONNMAN_SERVICE_STATE_ONLINE) - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV4); + services_notify->id = 0; - if (service->state_ipv6 == CONNMAN_SERVICE_STATE_ONLINE) - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_READY, - CONNMAN_IPCONFIG_TYPE_IPV6); -} + signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, "ServicesChanged"); + if (!signal) + return FALSE; -static void apply_relevant_default_downgrade(struct connman_service *service) -{ - struct connman_service *def_service; + __connman_dbus_append_objpath_dict_array(signal, + service_append_ordered, NULL); + __connman_dbus_append_objpath_array(signal, + service_append_removed, NULL); - def_service = __connman_service_get_default(); - if (def_service == NULL) - return; + dbus_connection_send(connection, signal, NULL); + dbus_message_unref(signal); - if (def_service == service && - def_service->state == CONNMAN_SERVICE_STATE_ONLINE) - def_service->state = CONNMAN_SERVICE_STATE_READY; + g_hash_table_remove_all(services_notify->remove); + g_hash_table_remove_all(services_notify->add); + + return FALSE; } -static void switch_default_service(struct connman_service *default_service, - struct connman_service *downgrade_service) +static void service_schedule_changed(void) { - GSequenceIter *src, *dst; + if (services_notify->id != 0) + return; - apply_relevant_default_downgrade(default_service); - src = g_hash_table_lookup(service_hash, downgrade_service->identifier); - dst = g_hash_table_lookup(service_hash, default_service->identifier); - g_sequence_move(src, dst); - downgrade_state(downgrade_service); + services_notify->id = g_timeout_add(100, service_send_changed, NULL); } static DBusMessage *move_service(DBusConnection *conn, DBusMessage *msg, void *user_data, - gboolean before) + bool before) { struct connman_service *service = user_data; struct connman_service *target; @@ -3900,11 +7174,11 @@ static DBusMessage *move_service(DBusConnection *conn, dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); - if (service->favorite == FALSE) + if (!service->favorite) return __connman_error_not_supported(msg); target = find_service(path); - if (target == NULL || target->favorite == FALSE || target == service) + if (!target || !target->favorite || target == service) return __connman_error_invalid_service(msg); if (target->type == CONNMAN_SERVICE_TYPE_VPN) { @@ -3912,19 +7186,18 @@ static DBusMessage *move_service(DBusConnection *conn, * We only allow VPN route splitting if there are * routes defined for a given VPN. */ - if (__connman_provider_check_routes(target->provider) - == FALSE) { + if (!__connman_provider_check_routes(target->provider)) { connman_info("Cannot move service. " "No routes defined for provider %s", __connman_provider_get_ident(target->provider)); return __connman_error_invalid_service(msg); } - target->do_split_routing = TRUE; + set_split_routing(target, true); } else - target->do_split_routing = FALSE; + set_split_routing(target, false); - service->do_split_routing = FALSE; + set_split_routing(service, false); target4 = __connman_ipconfig_get_method(target->ipconfig_ipv4); target6 = __connman_ipconfig_get_method(target->ipconfig_ipv6); @@ -3945,32 +7218,32 @@ static DBusMessage *move_service(DBusConnection *conn, */ if (target4 == CONNMAN_IPCONFIG_METHOD_OFF) { if (service6 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv6, - service->state_ipv6) == FALSE) + if (!check_suitable_state(target->state_ipv6, + service->state_ipv6)) return __connman_error_invalid_service(msg); } } if (target6 == CONNMAN_IPCONFIG_METHOD_OFF) { if (service4 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv4, - service->state_ipv4) == FALSE) + if (!check_suitable_state(target->state_ipv4, + service->state_ipv4)) return __connman_error_invalid_service(msg); } } if (service4 == CONNMAN_IPCONFIG_METHOD_OFF) { if (target6 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv6, - service->state_ipv6) == FALSE) + if (!check_suitable_state(target->state_ipv6, + service->state_ipv6)) return __connman_error_invalid_service(msg); } } if (service6 == CONNMAN_IPCONFIG_METHOD_OFF) { if (target4 != CONNMAN_IPCONFIG_METHOD_OFF) { - if (check_suitable_state(target->state_ipv4, - service->state_ipv4) == FALSE) + if (!check_suitable_state(target->state_ipv4, + service->state_ipv4)) return __connman_error_invalid_service(msg); } } @@ -3985,26 +7258,28 @@ static DBusMessage *move_service(DBusConnection *conn, * the service which goes up, needs to recompute its state which * is triggered via downgrading it - if relevant - to state ready. */ - if (before == TRUE) + if (before) switch_default_service(target, service); else switch_default_service(service, target); __connman_connection_update_gateway(); + service_schedule_changed(); + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } static DBusMessage *move_before(DBusConnection *conn, DBusMessage *msg, void *user_data) { - return move_service(conn, msg, user_data, TRUE); + return move_service(conn, msg, user_data, true); } static DBusMessage *move_after(DBusConnection *conn, DBusMessage *msg, void *user_data) { - return move_service(conn, msg, user_data, FALSE); + return move_service(conn, msg, user_data, false); } static DBusMessage *reset_counters(DBusConnection *conn, @@ -4017,94 +7292,24 @@ static DBusMessage *reset_counters(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -static struct _services_notify { - int id; - GHashTable *add; - GHashTable *remove; -} *services_notify; - -static void service_append_added_foreach(gpointer data, gpointer user_data) -{ - struct connman_service *service = data; - DBusMessageIter *iter = user_data; - - if (service == NULL || service->path == NULL) { - DBG("service %p or path is NULL", service); - return; - } - - if (g_hash_table_lookup(services_notify->add, service->path) != NULL) { - DBG("new %s", service->path); - - append_struct(service, iter); - g_hash_table_remove(services_notify->add, service->path); - } else { - DBG("changed %s", service->path); - - append_struct_service(iter, NULL, service); - } -} - -static void service_append_ordered(DBusMessageIter *iter, void *user_data) -{ - if (service_list != NULL) - g_sequence_foreach(service_list, - service_append_added_foreach, iter); -} - -static void append_removed(gpointer key, gpointer value, gpointer user_data) -{ - char *objpath = key; - DBusMessageIter *iter = user_data; - - DBG("removed %s", objpath); - dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &objpath); -} - -static gboolean service_send_changed(gpointer data) +#if defined TIZEN_MAINTAIN_ONLINE +static DBusMessage *downgrade_service(DBusConnection *conn, + DBusMessage *msg, void *user_data) { - DBusMessage *signal; - DBusMessageIter iter, array; - - DBG(""); - - services_notify->id = 0; - - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "ServicesChanged"); - if (signal == NULL) - return FALSE; - - __connman_dbus_append_objpath_dict_array(signal, - service_append_ordered, NULL); - - dbus_message_iter_init_append(signal, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, - DBUS_TYPE_OBJECT_PATH_AS_STRING, &array); - - g_hash_table_foreach(services_notify->remove, append_removed, &array); - - dbus_message_iter_close_container(&iter, &array); - - dbus_connection_send(connection, signal, NULL); - dbus_message_unref(signal); - - g_hash_table_remove_all(services_notify->remove); - g_hash_table_remove_all(services_notify->add); - - return FALSE; -} + struct connman_service *service = user_data; -static void service_schedule_changed(void) -{ - if (services_notify->id != 0) - return; + downgrade_state(service); + __connman_connection_update_gateway(); - services_notify->id = g_timeout_add(100, service_send_changed, NULL); + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } +#endif 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); @@ -4115,13 +7320,13 @@ static void service_schedule_added(struct connman_service *service) static void service_schedule_removed(struct connman_service *service) { - DBG("service %p %s", service, service->path); - - if (service == NULL || service->path == NULL) { + if (!service || !service->path) { DBG("service %p or path is NULL", service); return; } + DBG("service %p %s", service, service->path); + g_hash_table_remove(services_notify->add, service->path); g_hash_table_replace(services_notify->remove, g_strdup(service->path), NULL); @@ -4129,15 +7334,17 @@ static void service_schedule_removed(struct connman_service *service) service_schedule_changed(); } -static connman_bool_t allow_property_changed(struct connman_service *service) +static bool allow_property_changed(struct connman_service *service) { - if (g_hash_table_lookup_extended(services_notify->add, service->path, - NULL, NULL) == TRUE) { - DBG("no property updates for service %p", service); +#if defined TIZEN_EXT + if (service->path == NULL) return FALSE; - } +#endif + if (g_hash_table_lookup_extended(services_notify->add, service->path, + NULL, NULL)) + return false; - return TRUE; + return true; } static const GDBusMethodTable service_methods[] = { @@ -4162,12 +7369,19 @@ static const GDBusMethodTable service_methods[] = { GDBUS_ARGS({ "service", "o" }), NULL, move_after) }, { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) }, +#if defined TIZEN_MAINTAIN_ONLINE + { GDBUS_METHOD("Downgrade", NULL, NULL, downgrade_service) }, +#endif { }, }; 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 { }, }; @@ -4180,7 +7394,10 @@ static void service_free(gpointer user_data) reply_pending(service, ENOENT); - g_hash_table_remove(service_hash, service->identifier); + if (service->nameservers_timeout) { + g_source_remove(service->nameservers_timeout); + dns_changed(service); + } __connman_notifier_service_remove(service); service_schedule_removed(service); @@ -4190,7 +7407,7 @@ static void service_free(gpointer user_data) service->path = NULL; - if (path != NULL) { + if (path) { __connman_connection_update_gateway(); g_dbus_unregister_interface(connection, path, @@ -4200,23 +7417,23 @@ static void service_free(gpointer user_data) g_hash_table_destroy(service->counter_table); - if (service->network != NULL) { + if (service->network) { __connman_network_disconnect(service->network); connman_network_unref(service->network); service->network = NULL; } - if (service->provider != NULL) + if (service->provider) connman_provider_unref(service->provider); - if (service->ipconfig_ipv4 != NULL) { + if (service->ipconfig_ipv4) { __connman_ipconfig_set_ops(service->ipconfig_ipv4, NULL); __connman_ipconfig_set_data(service->ipconfig_ipv4, NULL); __connman_ipconfig_unref(service->ipconfig_ipv4); service->ipconfig_ipv4 = NULL; } - if (service->ipconfig_ipv6 != NULL) { + if (service->ipconfig_ipv6) { __connman_ipconfig_set_ops(service->ipconfig_ipv6, NULL); __connman_ipconfig_set_data(service->ipconfig_ipv6, NULL); __connman_ipconfig_unref(service->ipconfig_ipv6); @@ -4232,50 +7449,70 @@ static void service_free(gpointer user_data) g_strfreev(service->proxies); g_strfreev(service->excludes); + g_free(service->hostname); g_free(service->domainname); g_free(service->pac); g_free(service->name); g_free(service->passphrase); - g_free(service->agent_passphrase); g_free(service->identifier); g_free(service->eap); g_free(service->identity); + g_free(service->anonymous_identity); g_free(service->agent_identity); g_free(service->ca_cert_file); + g_free(service->subject_match); + g_free(service->altsubject_match); + g_free(service->domain_suffix_match); + g_free(service->domain_match); g_free(service->client_cert_file); g_free(service->private_key_file); g_free(service->private_key_passphrase); 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); + g_free(service->net_access_key); +#endif - if (service->stats.timer != NULL) + if (service->stats.timer) g_timer_destroy(service->stats.timer); - if (service->stats_roaming.timer != NULL) + if (service->stats_roaming.timer) g_timer_destroy(service->stats_roaming.timer); + if (current_default == service) + current_default = NULL; + g_free(service); } static void stats_init(struct connman_service *service) { /* home */ - service->stats.valid = FALSE; - service->stats.enabled = FALSE; + service->stats.valid = false; + service->stats.enabled = false; service->stats.timer = g_timer_new(); /* roaming */ - service->stats_roaming.valid = FALSE; - service->stats_roaming.enabled = FALSE; + service->stats_roaming.valid = false; + service->stats_roaming.enabled = false; service->stats_roaming.timer = g_timer_new(); } static void service_initialize(struct connman_service *service) { +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); service->refcount = 1; - service->session_usage_count = 0; service->error = CONNMAN_SERVICE_ERROR_UNKNOWN; @@ -4286,13 +7523,13 @@ static void service_initialize(struct connman_service *service) service->state_ipv4 = CONNMAN_SERVICE_STATE_UNKNOWN; service->state_ipv6 = CONNMAN_SERVICE_STATE_UNKNOWN; - service->favorite = FALSE; - service->immutable = FALSE; - service->hidden = FALSE; + service->favorite = false; + service->immutable = false; + service->hidden = false; - service->ignore = FALSE; + service->ignore = false; - service->userconnect = FALSE; + service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_NONE; service->order = 0; @@ -4300,7 +7537,25 @@ static void service_initialize(struct connman_service *service) service->provider = NULL; - service->wps = FALSE; + 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; +#endif +#if defined TIZEN_EXT + service->disconnection_requested = false; + service->storage_reload = false; + /* + * Description: TIZEN implements system global connection management. + */ + 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 */ } /** @@ -4319,7 +7574,7 @@ struct connman_service *connman_service_create(void) struct connman_service *service; service = g_try_new0(struct connman_service, 1); - if (service == NULL) + if (!service) return NULL; DBG("service %p", service); @@ -4331,13 +7586,13 @@ struct connman_service *connman_service_create(void) counter = list->data; counters = g_try_new0(struct connman_stats_counter, 1); - if (counters == NULL) { + if (!counters) { g_hash_table_destroy(service->counter_table); g_free(service); return NULL; } - counters->append_all = TRUE; + counters->append_all = true; g_hash_table_replace(service->counter_table, (gpointer)counter, counters); @@ -4376,41 +7631,240 @@ connman_service_ref_debug(struct connman_service *service, void connman_service_unref_debug(struct connman_service *service, const char *file, int line, const char *caller) { - GSequenceIter *iter; - DBG("%p ref %d by %s:%d:%s()", service, service->refcount - 1, file, line, caller); if (__sync_fetch_and_sub(&service->refcount, 1) != 1) return; - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter != NULL) { - reply_pending(service, ECONNABORTED); + service_list = g_list_remove(service_list, service); - __connman_service_disconnect(service); + __connman_service_disconnect(service); - g_sequence_remove(iter); - } else { - service_free(service); + g_hash_table_remove(service_hash, service->identifier); +} + +#if defined TIZEN_EXT +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); + 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 gint service_compare(gconstpointer a, gconstpointer b, - gpointer user_data) +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); + last_connected_ident = connman_device_get_last_connected_ident(device); + frequency = connman_network_get_frequency(service->network); + + 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_14 && + 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; + + if (ins_settings.signal) + score += (((service->strength > 60) ? 60 : service->strength) - 35); + + return score; +} + +static int calculate_score(struct connman_service *service) +{ + 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 (service->type != CONNMAN_SERVICE_TYPE_WIFI) { + score += calculate_score_internet_connection(service); + service->ins_score = score; + return score; + } + + 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); + + score = score_last_user_selection + score_last_connected + + score_frequency + score_security_priority + + score_internet_connection + score_strength; + +#if defined TIZEN_EXT_INS + 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; +#endif + + service->ins_score = score; + return score; +} +#endif + +static gint service_compare(gconstpointer a, gconstpointer b) { struct connman_service *service_a = (void *) a; struct connman_service *service_b = (void *) b; enum connman_service_state state_a, state_b; + bool a_connected, b_connected; +#if defined TIZEN_EXT + int score_a; + int score_b; +#else + gint strength; +#endif + + 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_option_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) { + if (service_a->order > service_b->order) + return -1; - state_a = service_a->state; - state_b = service_b->state; + if (service_a->order < service_b->order) + return 1; + } if (state_a != state_b) { - gboolean a_connected = is_connected(service_a); - gboolean b_connected = is_connected(service_b); - - if (a_connected == TRUE && b_connected == TRUE) { + if (a_connected && b_connected) { /* We prefer online over ready state */ if (state_a == CONNMAN_SERVICE_STATE_ONLINE) return -1; @@ -4419,47 +7873,116 @@ static gint service_compare(gconstpointer a, gconstpointer b, return 1; } - if (a_connected == TRUE) + if (a_connected) return -1; - if (b_connected == TRUE) + if (b_connected) return 1; - if (is_connecting(service_a) == TRUE) + if (is_connecting(state_a)) return -1; - if (is_connecting(service_b) == TRUE) + if (is_connecting(state_b)) return 1; } - if (service_a->order > service_b->order) + if (service_a->favorite && !service_b->favorite) return -1; - if (service_a->order < service_b->order) + if (!service_a->favorite && service_b->favorite) return 1; - if (service_a->favorite == TRUE && service_b->favorite == FALSE) - return -1; + if (service_a->type != service_b->type) { + unsigned int *tech_array; + int i; - if (service_a->favorite == FALSE && service_b->favorite == TRUE) - return 1; + tech_array = connman_setting_get_uint_list( + "PreferredTechnologies"); + if (tech_array) { + for (i = 0; tech_array[i]; i++) { + if (tech_array[i] == service_a->type) + return -1; - if (service_a->type != service_b->type) { - switch (service_a->type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - case CONNMAN_SERVICE_TYPE_SYSTEM: - case CONNMAN_SERVICE_TYPE_ETHERNET: - case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_VPN: - case CONNMAN_SERVICE_TYPE_GADGET: - break; - case CONNMAN_SERVICE_TYPE_WIFI: + if (tech_array[i] == service_b->type) + return 1; + } + } + + if (service_a->type == CONNMAN_SERVICE_TYPE_ETHERNET) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_ETHERNET) return 1; - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_CELLULAR: + + if (service_a->type == CONNMAN_SERVICE_TYPE_WIFI) return -1; - } + if (service_b->type == CONNMAN_SERVICE_TYPE_WIFI) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_CELLULAR) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_CELLULAR) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_BLUETOOTH) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_BLUETOOTH) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_VPN) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_VPN) + return 1; + + if (service_a->type == CONNMAN_SERVICE_TYPE_GADGET) + return -1; + if (service_b->type == CONNMAN_SERVICE_TYPE_GADGET) + return 1; + } + +#if defined TIZEN_EXT + score_a = calculate_score(service_a); + score_b = calculate_score(service_b); + if (score_b != score_a) + return score_b - score_a; +#else + strength = (gint) service_b->strength - (gint) service_a->strength; + if (strength) + return strength; +#endif + + return g_strcmp0(service_a->name, service_b->name); +} + +#if 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 + +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_INS + g_list_foreach(service_list, print_service_sort, NULL); +#endif + service_schedule_changed(); } +} - return (gint) service_b->strength - (gint) service_a->strength; +int __connman_service_compare(const struct connman_service *a, + const struct connman_service *b) +{ + return service_compare(a, b); } /** @@ -4470,7 +7993,7 @@ static gint service_compare(gconstpointer a, gconstpointer b, */ enum connman_service_type connman_service_get_type(struct connman_service *service) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_TYPE_UNKNOWN; return service->type; @@ -4486,26 +8009,10 @@ char *connman_service_get_interface(struct connman_service *service) { int index; - if (service == NULL) - return NULL; - - if (service->type == CONNMAN_SERVICE_TYPE_VPN) { - if (service->ipconfig_ipv4) - index = __connman_ipconfig_get_index( - service->ipconfig_ipv4); - else if (service->ipconfig_ipv6) - index = __connman_ipconfig_get_index( - service->ipconfig_ipv6); - else - return NULL; - - return connman_inet_ifname(index); - } - - if (service->network == NULL) + if (!service) return NULL; - index = connman_network_get_index(service->network); + index = __connman_service_get_index(service); return connman_inet_ifname(index); } @@ -4519,7 +8026,7 @@ char *connman_service_get_interface(struct connman_service *service) struct connman_network * __connman_service_get_network(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->network; @@ -4528,7 +8035,7 @@ __connman_service_get_network(struct connman_service *service) struct connman_ipconfig * __connman_service_get_ip4config(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->ipconfig_ipv4; @@ -4537,7 +8044,7 @@ __connman_service_get_ip4config(struct connman_service *service) struct connman_ipconfig * __connman_service_get_ip6config(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->ipconfig_ipv6; @@ -4555,26 +8062,30 @@ __connman_service_get_ipconfig(struct connman_service *service, int family) } -connman_bool_t __connman_service_is_connected_state(struct connman_service *service, +bool __connman_service_is_connected_state(struct connman_service *service, enum connman_ipconfig_type type) { - if (service == NULL) - return FALSE; + if (!service) + return false; switch (type) { case CONNMAN_IPCONFIG_TYPE_UNKNOWN: break; case CONNMAN_IPCONFIG_TYPE_IPV4: - return is_connected_state(service, service->state_ipv4); + return is_connected(service->state_ipv4); case CONNMAN_IPCONFIG_TYPE_IPV6: - return is_connected_state(service, service->state_ipv6); + return is_connected(service->state_ipv6); + case CONNMAN_IPCONFIG_TYPE_ALL: + return is_connected(service->state_ipv4) && + is_connected(service->state_ipv6); } - return FALSE; + return false; } -enum connman_service_security __connman_service_get_security(struct connman_service *service) +enum connman_service_security __connman_service_get_security( + struct connman_service *service) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_SECURITY_UNKNOWN; return service->security; @@ -4582,24 +8093,71 @@ enum connman_service_security __connman_service_get_security(struct connman_serv const char *__connman_service_get_phase2(struct connman_service *service) { - if (service == NULL) + if (!service) return NULL; return service->phase2; } -connman_bool_t __connman_service_wps_enabled(struct connman_service *service) +bool __connman_service_wps_enabled(struct connman_service *service) { - if (service == NULL) - return FALSE; + if (!service) + return false; return service->wps; } -void __connman_service_mark_dirty() - { - services_dirty = TRUE; - } +void __connman_service_mark_dirty(void) +{ + services_dirty = true; +} + +#if defined TIZEN_EXT +/** + * Returns profile count if there is any connected profiles + * that use same interface + */ +int __connman_service_get_connected_count_of_iface( + struct connman_service *service) +{ + GList *list; + int count = 0; + int index1 = 0; + int index2 = 0; + + DBG(""); + + index1 = __connman_service_get_index(service); + + if (index1 <= 0) + return 0; + + for (list = service_list; list; list = list->next) { + struct connman_service *service2 = list->data; + + if (service == service2) + continue; + + index2 = __connman_service_get_index(service2); + + if (is_connected(service2->state) && index2 > 0 && index1 == index2) + count++; + + index2 = 0; + } + + DBG("Interface index %d, count %d", index1, count); + + return count; +} + +void __connman_service_set_storage_reload(struct connman_service *service, + bool storage_reload) +{ + if (service != NULL) + service->storage_reload = storage_reload; +} +#endif /** * __connman_service_set_favorite_delayed: @@ -4610,33 +8168,26 @@ void __connman_service_mark_dirty() * Change the favorite setting of service */ int __connman_service_set_favorite_delayed(struct connman_service *service, - connman_bool_t favorite, - gboolean delay_ordering) + bool favorite, + bool delay_ordering) { - GSequenceIter *iter; - - if (service->hidden == TRUE) +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) + return -EIO; +#endif + if (service->hidden) return -EOPNOTSUPP; - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter == NULL) - return -ENOENT; if (service->favorite == favorite) return -EALREADY; service->favorite = favorite; - if (delay_ordering == FALSE) - service->order = __connman_service_get_order(service); - favorite_changed(service); - if (delay_ordering == FALSE) { + if (!delay_ordering) { - if (g_sequence_get_length(service_list) > 1) { - g_sequence_sort_changed(iter, service_compare, NULL); - service_schedule_changed(); - } + service_list_sort(); __connman_connection_update_gateway(); } @@ -4652,22 +8203,31 @@ int __connman_service_set_favorite_delayed(struct connman_service *service, * Change the favorite setting of service */ int __connman_service_set_favorite(struct connman_service *service, - connman_bool_t favorite) + bool favorite) { return __connman_service_set_favorite_delayed(service, favorite, - FALSE); + false); +} + +bool connman_service_get_favorite(struct connman_service *service) +{ + return service->favorite; } -connman_bool_t connman_service_get_favorite(struct connman_service *service) +bool connman_service_get_autoconnect(struct connman_service *service) { - return service->favorite; + return service->autoconnect; } int __connman_service_set_immutable(struct connman_service *service, - connman_bool_t immutable) + bool immutable) { - if (service->hidden == TRUE) + if (service->hidden) return -EOPNOTSUPP; + + if (service->immutable == immutable) + return 0; + service->immutable = immutable; immutable_changed(service); @@ -4675,106 +8235,136 @@ int __connman_service_set_immutable(struct connman_service *service, return 0; } +int __connman_service_set_ignore(struct connman_service *service, + bool ignore) +{ + if (!service) + return -EINVAL; + + service->ignore = ignore; + + return 0; +} + void __connman_service_set_string(struct connman_service *service, const char *key, const char *value) { - if (service->hidden == TRUE) + if (service->hidden) return; - if (g_str_equal(key, "EAP") == TRUE) { + if (g_str_equal(key, "EAP")) { g_free(service->eap); service->eap = g_strdup(value); - } else if (g_str_equal(key, "Identity") == TRUE) { + } else if (g_str_equal(key, "Identity")) { g_free(service->identity); service->identity = g_strdup(value); - } else if (g_str_equal(key, "CACertFile") == TRUE) { + } else if (g_str_equal(key, "AnonymousIdentity")) { + g_free(service->anonymous_identity); + service->anonymous_identity = g_strdup(value); + } else if (g_str_equal(key, "CACertFile")) { g_free(service->ca_cert_file); service->ca_cert_file = g_strdup(value); - } else if (g_str_equal(key, "ClientCertFile") == TRUE) { + } else if (g_str_equal(key, "SubjectMatch")) { + g_free(service->subject_match); + service->subject_match = g_strdup(value); + } else if (g_str_equal(key, "AltSubjectMatch")) { + g_free(service->altsubject_match); + service->altsubject_match = g_strdup(value); + } else if (g_str_equal(key, "DomainSuffixMatch")) { + g_free(service->domain_suffix_match); + service->domain_suffix_match = g_strdup(value); + } else if (g_str_equal(key, "DomainMatch")) { + g_free(service->domain_match); + service->domain_match = g_strdup(value); + } else if (g_str_equal(key, "ClientCertFile")) { g_free(service->client_cert_file); service->client_cert_file = g_strdup(value); - } else if (g_str_equal(key, "PrivateKeyFile") == TRUE) { + } else if (g_str_equal(key, "PrivateKeyFile")) { g_free(service->private_key_file); service->private_key_file = g_strdup(value); - } else if (g_str_equal(key, "PrivateKeyPassphrase") == TRUE) { + } else if (g_str_equal(key, "PrivateKeyPassphrase")) { g_free(service->private_key_passphrase); service->private_key_passphrase = g_strdup(value); - } else if (g_str_equal(key, "Phase2") == TRUE) { + } else if (g_str_equal(key, "Phase2")) { g_free(service->phase2); service->phase2 = g_strdup(value); - } else if (g_str_equal(key, "Passphrase") == TRUE) { - g_free(service->passphrase); - service->passphrase = g_strdup(value); + } else if (g_str_equal(key, "Passphrase")) + __connman_service_set_passphrase(service, value); +#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); + service->connector = g_strdup(value); + } else if (g_str_equal(key, "CSignKey")) { + g_free(service->c_sign_key); + service->c_sign_key = g_strdup(value); + } else if (g_str_equal(key, "NetAccessKey")) { + g_free(service->net_access_key); + service->net_access_key = g_strdup(value); + } else + DBG("Unknown key: %s", key); +#endif } -void __connman_service_set_userconnect(struct connman_service *service, - connman_bool_t userconnect) +void __connman_service_set_search_domains(struct connman_service *service, + char **domains) { - if (service != NULL) - service->userconnect = userconnect; + searchdomain_remove_all(service); + + if (service->domains) + g_strfreev(service->domains); + + service->domains = g_strdupv(domains); + + searchdomain_add_all(service); } -static void service_complete(struct connman_service *service) +int __connman_service_set_mdns(struct connman_service *service, + bool enabled) { - reply_pending(service, EIO); + service->mdns_config = enabled; - if (service->userconnect == FALSE) - __connman_service_auto_connect(); - - g_get_current_time(&service->modified); - service_save(service); + return set_mdns(service, enabled); } -static void report_error_cb(void *user_context, gboolean retry, +static void report_error_cb(void *user_context, bool retry, void *user_data) { struct connman_service *service = user_context; - if (retry == TRUE) - __connman_service_connect(service); + if (retry) + __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_USER); else { /* It is not relevant to stay on Failure state * when failing is due to wrong user input */ - service->state = CONNMAN_SERVICE_STATE_IDLE; - + __connman_service_clear_error(service); +#if defined TIZEN_EXT + /* Reseting the state back in case of failure state */ + service->state_ipv4 = service->state_ipv6 = + CONNMAN_SERVICE_STATE_IDLE; + + if (service->error != CONNMAN_SERVICE_ERROR_AUTH_FAILED) + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); +#endif service_complete(service); __connman_connection_update_gateway(); } } -int __connman_service_add_passphrase(struct connman_service *service, - const gchar *passphrase) -{ - int err = 0; - - switch (service->security) { - case CONNMAN_SERVICE_SECURITY_WEP: - case CONNMAN_SERVICE_SECURITY_PSK: - err = __connman_service_set_passphrase(service, passphrase); - break; - case CONNMAN_SERVICE_SECURITY_8021X: - __connman_service_set_agent_passphrase(service, - passphrase); - break; - case CONNMAN_SERVICE_SECURITY_UNKNOWN: - case CONNMAN_SERVICE_SECURITY_NONE: - case CONNMAN_SERVICE_SECURITY_WPA: - case CONNMAN_SERVICE_SECURITY_RSN: - DBG("service security '%s' (%d) not handled", - security2string(service->security), - service->security); - break; - } - - return err; -} - static int check_wpspin(struct connman_service *service, const char *wpspin) { int length; guint i; - if (wpspin == NULL) + if (!wpspin) return 0; length = strlen(wpspin); @@ -4801,53 +8391,57 @@ static int check_wpspin(struct connman_service *service, const char *wpspin) return 0; } -static void request_input_cb (struct connman_service *service, - connman_bool_t values_received, +static void request_input_cb(struct connman_service *service, + bool values_received, const char *name, int name_len, const char *identity, const char *passphrase, - gboolean wps, const char *wpspin, + bool wps, const char *wpspin, const char *error, void *user_data) { struct connman_device *device; + const char *security; int err = 0; - DBG ("RequestInput return, %p", service); + DBG("RequestInput return, %p", service); - if (error != NULL) { + if (error) { DBG("error: %s", error); if (g_strcmp0(error, "net.connman.Agent.Error.Canceled") == 0) { - err = -EINVAL; + err = -ECONNABORTED; - if (service->hidden == TRUE) + if (service->hidden) __connman_service_return_error(service, - ECANCELED, user_data); + ECONNABORTED, + user_data); goto done; } else { - if (service->hidden == TRUE) + if (service->hidden) __connman_service_return_error(service, ETIMEDOUT, user_data); } } - if (service->hidden == TRUE && name_len > 0 && name_len <= 32) { + if (service->hidden && name_len > 0 && name_len <= 32) { device = connman_network_get_device(service->network); + security = connman_network_get_string(service->network, + "WiFi.Security"); err = __connman_device_request_hidden_scan(device, name, name_len, identity, passphrase, - user_data); + security, user_data); if (err < 0) __connman_service_return_error(service, -err, user_data); } - if (values_received == FALSE || service->hidden == TRUE) { + if (!values_received || service->hidden) { err = -EINVAL; goto done; } - if (wps == TRUE && service->network != NULL) { + if (wps && service->network) { err = check_wpspin(service, wpspin); if (err < 0) goto done; @@ -4855,22 +8449,20 @@ static void request_input_cb (struct connman_service *service, connman_network_set_bool(service->network, "WiFi.UseWPS", wps); } - if (identity != NULL) + if (identity) __connman_service_set_agent_identity(service, identity); - if (passphrase != NULL) - err = __connman_service_add_passphrase(service, passphrase); + if (passphrase) + err = __connman_service_set_passphrase(service, passphrase); done: if (err >= 0) { /* We forget any previous error. */ set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - __connman_service_connect(service); + __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_USER); - /* Never cache agent provided credentials */ - __connman_service_set_agent_identity(service, NULL); - __connman_service_set_agent_passphrase(service, NULL); } else if (err == -ENOKEY) { __connman_service_indicate_error(service, CONNMAN_SERVICE_ERROR_INVALID_KEY); @@ -4879,7 +8471,7 @@ static void request_input_cb (struct connman_service *service, * when failing is due to wrong user input */ service->state = CONNMAN_SERVICE_STATE_IDLE; - if (service->hidden == FALSE) { + if (!service->hidden) { /* * If there was a real error when requesting * hidden scan, then that error is returned already @@ -4898,23 +8490,18 @@ static void request_input_cb (struct connman_service *service, static void downgrade_connected_services(void) { struct connman_service *up_service; - GSequenceIter *iter; + GList *list; - iter = g_sequence_get_begin_iter(service_list); - while (g_sequence_iter_is_end(iter) == FALSE) { - up_service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + up_service = list->data; - if (is_connected(up_service) == FALSE) { - iter = g_sequence_iter_next(iter); + if (!is_connected(up_service->state)) continue; - } if (up_service->state == CONNMAN_SERVICE_STATE_ONLINE) return; downgrade_state(up_service); - - iter = g_sequence_iter_next(iter); } } @@ -4925,12 +8512,12 @@ static int service_update_preferred_order(struct connman_service *default_servic unsigned int *tech_array; int i; - if (default_service == NULL || default_service == new_service || - default_service->state != new_state ) + if (!default_service || default_service == new_service || + default_service->state != new_state) return 0; tech_array = connman_setting_get_uint_list("PreferredTechnologies"); - if (tech_array != NULL) { + if (tech_array) { for (i = 0; tech_array[i] != 0; i += 1) { if (default_service->type == tech_array[i]) @@ -4948,43 +8535,224 @@ static int service_update_preferred_order(struct connman_service *default_servic return -EALREADY; } -static void single_connected_tech(struct connman_service *allowed) +#if defined TIZEN_EXT +static gboolean __connman_service_can_drop(struct connman_service *service) { - GSList *services = NULL; - GSequenceIter *iter; - GSList *list; + if (is_connected(service->state) == TRUE || is_connecting(service->state) == TRUE) { + if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR) + return TRUE; + else if (connman_service_is_no_ref_user_pdn_connection(service) == TRUE) + return TRUE; + } + return FALSE; +} + +static struct connman_device *default_connecting_device = NULL; + +static void __connman_service_disconnect_default(struct connman_service *service) +{ + struct connman_device *default_device = NULL; + + if (default_connecting_device == NULL) + return; + + default_device = connman_network_get_device( + __connman_service_get_network(service)); + + DBG("Disconnecting service %p %s", service, service->path); + DBG("Disconnecting device %p %p %s", + default_connecting_device, + default_device, + connman_device_get_string(default_device, "Name")); + + if (default_connecting_device == default_device) + default_connecting_device = NULL; +} + +#if defined TIZEN_MAINTAIN_ONLINE +static void __connman_service_connect_default(struct connman_service *current, + enum connman_service_state old_state) +#else +static void __connman_service_connect_default(struct connman_service *current) +#endif +{ + int err; + GList *list; + bool default_internet; + struct connman_service *service; + struct connman_service *default_service = NULL; + struct connman_device *default_device = NULL; + + if (current->type == CONNMAN_SERVICE_TYPE_CELLULAR) { + switch (current->state) { + case CONNMAN_SERVICE_STATE_UNKNOWN: + case CONNMAN_SERVICE_STATE_ASSOCIATION: + case CONNMAN_SERVICE_STATE_CONFIGURATION: + return; + default: + break; + } + + if (default_connecting_device && + __connman_service_is_internet_profile(current) == TRUE) { + if (current->network == NULL) + return; + + default_device = connman_network_get_device(current->network); + if (default_connecting_device == default_device) { + DBG("Cellular service[%s] %p %s", + state2string(current->state), current, current->path); + DBG("Cellular device %p %p %s", + default_connecting_device, default_device, + connman_device_get_string(default_device, "Name")); + + default_connecting_device = NULL; + } + } + + return; +#if defined TIZEN_MAINTAIN_ONLINE + } else if (current->state == CONNMAN_SERVICE_STATE_READY && + old_state == CONNMAN_SERVICE_STATE_ONLINE) { + DBG("Device is downgraded: online --> ready"); +#endif + } else if (is_connected(current->state) == TRUE || is_connecting(current->state) == TRUE) + return; + + /* Always-on: keep default cellular connection as possible */ + for (list = service_list; list; list = list->next) { + service = list->data; + + if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR || + __connman_service_is_internet_profile(service) != TRUE || + service->network == NULL) { + continue; + } - iter = g_sequence_get_begin_iter(service_list); + default_internet = + connman_network_get_bool(service->network, "DefaultInternet"); - while (g_sequence_iter_is_end(iter) == FALSE) { - struct connman_service *service = g_sequence_get(iter); + DBG("service: %p %s %s %s (default: %d)", service, service->name, + __connman_service_type2string(service->type), + state2string(service->state), default_internet); - if (service != allowed && is_connected(service)) - services = g_slist_prepend(services, service); + if (default_internet) { + default_service = service; + if (is_connected(default_service->state) == TRUE || + is_connecting(default_service->state) == TRUE) + return; + + default_device = connman_network_get_device(default_service->network); + if (default_connecting_device == default_device) { + DBG("Device is connecting (%p)", default_connecting_device); + return; + } - iter = g_sequence_iter_next(iter); + default_connecting_device = default_device; + default_service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_USER; + + err = __connman_network_connect(default_service->network); + DBG("Connecting default service %p %s [%d]", + default_service, default_service->path, err); + DBG("Connecting device %p %s", default_connecting_device, + connman_device_get_string(default_connecting_device, "Name")); + if (err < 0 && err != -EINPROGRESS) { + default_connecting_device = NULL; + } else + break; + } } +} +#endif + +static void single_connected_tech(struct connman_service *allowed) +{ + struct connman_service *service; + GSList *services = NULL, *list; + GList *iter; DBG("keeping %p %s", allowed, allowed->path); - for (list = services; list != NULL; list = list->next) { - struct connman_service *service = list->data; +#if defined TIZEN_EXT + if (!allowed || allowed->type == CONNMAN_SERVICE_TYPE_CELLULAR) + return; +#endif + + for (iter = service_list; iter; iter = iter->next) { + service = iter->data; + +#if defined TIZEN_EXT + if (service != allowed && service->type != allowed->type && + __connman_service_can_drop(service) == TRUE) +#else + if (!is_connected(service->state)) + break; + + if (service == allowed) + continue; +#endif + + services = g_slist_prepend(services, service); + } + + for (list = services; list; list = list->next) { + service = list->data; DBG("disconnecting %p %s", service, service->path); +#if defined TIZEN_EXT + __connman_service_disconnect_default(service); +#endif __connman_service_disconnect(service); } g_slist_free(services); } +#if defined TIZEN_EXT +static void set_priority_connected_service(void) +{ + struct connman_service *service; + GList *list; + + for (list = service_list; list; list = list->next) { + service = list->data; + + if (is_connected(service->state) == FALSE) + service->order = 5; + else +#if defined TIZEN_MAINTAIN_ONLINE + { + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->state == CONNMAN_SERVICE_STATE_ONLINE) + service->order = 6; + else if (service->type != CONNMAN_SERVICE_TYPE_WIFI) + service->order = 6; + else + service->order = 5; + } +#else + service->order = 6; +#endif + } +} +#endif + +static const char *get_dbus_sender(struct connman_service *service) +{ + if (!service->pending) + return NULL; + + return dbus_message_get_sender(service->pending); +} + static int service_indicate_state(struct connman_service *service) { enum connman_service_state old_state, new_state; struct connman_service *def_service; + enum connman_ipconfig_method method; int result; - GSequenceIter *iter; - if (service == NULL) + if (!service) return -EINVAL; old_state = service->state; @@ -5000,7 +8768,7 @@ static int service_indicate_state(struct connman_service *service) if (old_state == new_state) return -EALREADY; - def_service = __connman_service_get_default(); + def_service = connman_service_get_default(); if (new_state == CONNMAN_SERVICE_STATE_ONLINE) { result = service_update_preferred_order(def_service, @@ -5012,77 +8780,84 @@ static int service_indicate_state(struct connman_service *service) if (old_state == CONNMAN_SERVICE_STATE_ONLINE) __connman_notifier_leave_online(service->type); + if (is_connected(old_state) && !is_connected(new_state)) + 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 (new_state == CONNMAN_SERVICE_STATE_IDLE && - old_state != CONNMAN_SERVICE_STATE_DISCONNECT) { - reply_pending(service, ECONNABORTED); + if (!is_connected(old_state) && is_connected(new_state)) + searchdomain_add_all(service); - __connman_service_disconnect(service); - } + switch(new_state) { + case CONNMAN_SERVICE_STATE_UNKNOWN: + + break; + + case CONNMAN_SERVICE_STATE_IDLE: + if (old_state != CONNMAN_SERVICE_STATE_DISCONNECT) + __connman_service_disconnect(service); + + break; + + case CONNMAN_SERVICE_STATE_ASSOCIATION: + + break; - if (new_state == CONNMAN_SERVICE_STATE_CONFIGURATION) { - if (service->new_service == FALSE && + case CONNMAN_SERVICE_STATE_CONFIGURATION: + if (!service->new_service && __connman_stats_service_register(service) == 0) { /* * For new services the statistics are updated after * we have successfully connected. */ - __connman_stats_get(service, FALSE, + __connman_stats_get(service, false, &service->stats.data); - __connman_stats_get(service, TRUE, + __connman_stats_get(service, true, &service->stats_roaming.data); } - } - - if (new_state == CONNMAN_SERVICE_STATE_IDLE) { - connman_bool_t reconnect; - reconnect = get_reconnect_state(service); - if (reconnect == TRUE) - __connman_service_auto_connect(); - } + break; - if (new_state == CONNMAN_SERVICE_STATE_READY) { - enum connman_ipconfig_method method; + case CONNMAN_SERVICE_STATE_READY: + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - if (service->new_service == TRUE && + if (service->new_service && __connman_stats_service_register(service) == 0) { /* * This is normally done after configuring state * but for new service do this after we have connected * successfully. */ - __connman_stats_get(service, FALSE, + __connman_stats_get(service, false, &service->stats.data); - __connman_stats_get(service, TRUE, + __connman_stats_get(service, true, &service->stats_roaming.data); } - service->new_service = FALSE; - - service_update_preferred_order(def_service, service, new_state); - - set_reconnect_state(service, TRUE); + service->new_service = false; - __connman_service_set_favorite(service, TRUE); + default_changed(); - reply_pending(service, 0); + def_service = connman_service_get_default(); - g_get_current_time(&service->modified); - service_save(service); + service_update_preferred_order(def_service, service, new_state); - update_nameservers(service); - dns_changed(service); - domain_changed(service); + __connman_service_set_favorite(service, true); - if (old_state != CONNMAN_SERVICE_STATE_ONLINE) - __connman_notifier_connect(service->type); + reply_pending(service, 0); if (service->type == CONNMAN_SERVICE_TYPE_WIFI && connman_network_get_bool(service->network, - "WiFi.UseWPS") == TRUE) { + "WiFi.UseWPS")) { const char *pass; pass = connman_network_get_string(service->network, @@ -5091,27 +8866,61 @@ static int service_indicate_state(struct connman_service *service) __connman_service_set_passphrase(service, pass); connman_network_set_bool(service->network, - "WiFi.UseWPS", FALSE); + "WiFi.UseWPS", false); } - default_changed(); + g_get_current_time(&service->modified); + service_save(service); + + domain_changed(service); + proxy_changed(service); + + if (old_state != CONNMAN_SERVICE_STATE_ONLINE) + __connman_notifier_connect(service->type); method = __connman_ipconfig_get_method(service->ipconfig_ipv6); if (method == CONNMAN_IPCONFIG_METHOD_OFF) __connman_ipconfig_disable_ipv6( service->ipconfig_ipv6); - if (connman_setting_get_bool("SingleConnectedTechnology") - == TRUE) +#if !defined TIZEN_MAINTAIN_ONLINE + if (connman_setting_get_bool("SingleConnectedTechnology")) + single_connected_tech(service); + else if (service->type != CONNMAN_SERVICE_TYPE_VPN) + vpn_auto_connect(); +#else + if (service->type != CONNMAN_SERVICE_TYPE_VPN) + vpn_auto_connect(); +#endif + +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) + set_priority_connected_service(); +#endif + + break; + + case CONNMAN_SERVICE_STATE_ONLINE: +#if defined TIZEN_MAINTAIN_ONLINE +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) + set_priority_connected_service(); +#endif + + if (connman_setting_get_bool("SingleConnectedTechnology")) single_connected_tech(service); +#endif + +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) + connman_service_set_internet_connection(service, true); +#endif + break; - } else if (new_state == CONNMAN_SERVICE_STATE_DISCONNECT) { - def_service = __connman_service_get_default(); + case CONNMAN_SERVICE_STATE_DISCONNECT: + set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - if (__connman_notifier_is_connected() == FALSE && - def_service != NULL && - def_service->provider != NULL) - connman_provider_disconnect(def_service->provider); + reply_pending(service, ECONNABORTED); default_changed(); @@ -5119,11 +8928,20 @@ static int service_indicate_state(struct connman_service *service) __connman_wpad_stop(service); - update_nameservers(service); - dns_changed(service); +#if defined TIZEN_EXT + /** + * Skip the functions if there is any connected profiles + * that use same interface + */ + if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR || + __connman_service_get_connected_count_of_iface( + service) <= 0) { +#endif domain_changed(service); - - __connman_notifier_disconnect(service->type); + proxy_changed(service); +#if defined TIZEN_EXT + } +#endif /* * Previous services which are connected and which states @@ -5131,26 +8949,46 @@ static int service_indicate_state(struct connman_service *service) * to ready so wispr/portal will be rerun on those */ downgrade_connected_services(); - } - if (new_state == CONNMAN_SERVICE_STATE_FAILURE) { - if (service->userconnect == TRUE && + __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); + break; + + case CONNMAN_SERVICE_STATE_FAILURE: +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_WIFI) + service->order = 5; + __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); +#endif + if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) { connman_agent_report_error(service, service->path, - error2string(service->error), - report_error_cb, NULL) == -EINPROGRESS) - return 0; + error2string(service->error), + report_error_cb, + get_dbus_sender(service), + NULL); + } service_complete(service); - } else - set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter != NULL && g_sequence_get_length(service_list) > 1) { - g_sequence_sort_changed(iter, service_compare, NULL); - service_schedule_changed(); + break; } + service_list_sort(); + +#if defined TIZEN_EXT +#if defined TIZEN_MAINTAIN_ONLINE + __connman_service_connect_default(service, old_state); +#else + __connman_service_connect_default(service); +#endif +#endif + __connman_connection_update_gateway(); + if ((old_state == CONNMAN_SERVICE_STATE_ONLINE && + new_state != CONNMAN_SERVICE_STATE_READY) || + (old_state == CONNMAN_SERVICE_STATE_READY && + new_state != CONNMAN_SERVICE_STATE_ONLINE)) { + __connman_notifier_disconnect(service->type); + } + if (new_state == CONNMAN_SERVICE_STATE_ONLINE) { __connman_notifier_enter_online(service->type); default_changed(); @@ -5164,13 +9002,30 @@ int __connman_service_indicate_error(struct connman_service *service, { DBG("service %p error %d", service, error); - if (service == NULL) + if (!service) return -EINVAL; + if (service->state == CONNMAN_SERVICE_STATE_FAILURE) + return -EALREADY; + set_error(service, error); - if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) - __connman_service_set_passphrase(service, NULL); +/* default internet service: fix not cleared if pdp activation*/ +#if defined TIZEN_EXT + /* + * If connection failed for default service(DefaultInternet), + * default_connecting_device should be cleared. + */ + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && + service->error == CONNMAN_SERVICE_ERROR_CONNECT_FAILED) + __connman_service_disconnect_default(service); + + if (service->type == CONNMAN_SERVICE_TYPE_WIFI && + service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) { + g_free(service->passphrase); + service->passphrase = NULL; + } +#endif __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_FAILURE, @@ -5183,41 +9038,47 @@ int __connman_service_indicate_error(struct connman_service *service, int __connman_service_clear_error(struct connman_service *service) { + DBusMessage *pending, *provider_pending; + DBG("service %p", service); - if (service == NULL) + if (!service) return -EINVAL; if (service->state != CONNMAN_SERVICE_STATE_FAILURE) return -EINVAL; - service->state_ipv4 = service->state_ipv6 = - CONNMAN_SERVICE_STATE_UNKNOWN; - set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); - - if (service->favorite == TRUE) - set_reconnect_state(service, TRUE); + pending = service->pending; + service->pending = NULL; + provider_pending = service->provider_pending; + service->provider_pending = NULL; __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_IDLE, - CONNMAN_IPCONFIG_TYPE_IPV6); - - /* - * Toggling the IPv6 state to IDLE could trigger the auto connect - * machinery and consequently the IPv4 state. - */ - if (service->state_ipv4 != CONNMAN_SERVICE_STATE_UNKNOWN && - service->state_ipv4 != CONNMAN_SERVICE_STATE_FAILURE) - return 0; + CONNMAN_SERVICE_STATE_IDLE, + CONNMAN_IPCONFIG_TYPE_IPV6); - return __connman_service_ipconfig_indicate_state(service, + __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE, CONNMAN_IPCONFIG_TYPE_IPV4); + + service->pending = pending; + service->provider_pending = provider_pending; + + return 0; } int __connman_service_indicate_default(struct connman_service *service) { - DBG("service %p", service); + DBG("service %p state %s", service, state2string(service->state)); + + if (!is_connected(service->state)) { + /* + * If service is not yet fully connected, then we must not + * change the default yet. The default gw will be changed + * after the service state is in ready. + */ + return -EINPROGRESS; + } default_changed(); @@ -5228,7 +9089,7 @@ enum connman_service_state __connman_service_ipconfig_get_state( struct connman_service *service, enum connman_ipconfig_type type) { - if (service == NULL) + if (!service) return CONNMAN_SERVICE_STATE_UNKNOWN; if (type == CONNMAN_IPCONFIG_TYPE_IPV4) @@ -5253,7 +9114,7 @@ static void check_proxy_setup(struct connman_service *service) if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN && (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_AUTO || - service->pac != NULL)) + service->pac)) goto done; if (__connman_wpad_start(service) < 0) { @@ -5265,8 +9126,17 @@ static void check_proxy_setup(struct connman_service *service) return; done: - __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); + __connman_service_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); +} + +#if defined TIZEN_EXT +void connman_check_proxy_setup_and_wispr_start(struct connman_service *service){ + + DBG("check the proxy and start wispr"); + check_proxy_setup(service); + return; } +#endif /* * How many networks are connected at the same time. If more than 1, @@ -5278,7 +9148,7 @@ static int connected_networks_count; static int original_rp_filter; static void service_rp_filter(struct connman_service *service, - gboolean connected) + bool connected) { enum connman_ipconfig_method method; @@ -5295,7 +9165,7 @@ static void service_rp_filter(struct connman_service *service, break; } - if (connected == TRUE) { + if (connected) { if (connected_networks_count == 1) { int filter_value; filter_value = __connman_ipconfig_set_rp_filter(); @@ -5321,95 +9191,201 @@ static void service_rp_filter(struct connman_service *service, connected_networks_count, original_rp_filter); } -static gboolean redo_wispr(gpointer user_data) +static void redo_wispr(struct connman_service *service, + enum connman_ipconfig_type type) +{ + service->online_timeout = 0; + connman_service_unref(service); + + DBG("Retrying %s WISPr for %p %s", + __connman_ipconfig_type2string(type), + service, service->name); + + __connman_wispr_start(service, type); +} + +static gboolean redo_wispr_ipv4(gpointer user_data) +{ + struct connman_service *service = user_data; + + redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV4); + + return FALSE; +} + +static gboolean redo_wispr_ipv6(gpointer user_data) +{ + struct connman_service *service = user_data; + + redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV6); + + return FALSE; +} + +#if defined TIZEN_MAINTAIN_ONLINE +static gboolean redo_wispr_ipv4(gpointer user_data) { struct connman_service *service = user_data; DBG(""); - __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV6); + __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4); return FALSE; } +#endif int __connman_service_online_check_failed(struct connman_service *service, enum connman_ipconfig_type type) { - DBG("service %p type %d count %d", service, type, - service->online_check_count); + GSourceFunc redo_func; + int *interval; - /* currently we only retry IPv6 stuff */ - if (type == CONNMAN_IPCONFIG_TYPE_IPV4 || - service->online_check_count != 1) { - connman_warn("Online check failed for %p %s", service, - service->name); - return 0; + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { + interval = &service->online_check_interval_ipv4; + redo_func = redo_wispr_ipv4; + } else { + interval = &service->online_check_interval_ipv6; + redo_func = redo_wispr_ipv6; } - service->online_check_count = 0; + DBG("service %p type %s interval %d", service, + __connman_ipconfig_type2string(type), *interval); - /* - * We set the timeout to 1 sec so that we have a chance to get - * necessary IPv6 router advertisement messages that might have - * DNS data etc. + service->online_timeout = g_timeout_add_seconds(*interval * *interval, + redo_func, connman_service_ref(service)); + + /* Increment the interval for the next time, set a maximum timeout of + * ONLINE_CHECK_MAX_INTERVAL * ONLINE_CHECK_MAX_INTERVAL seconds. */ - g_timeout_add_seconds(1, redo_wispr, service); + if (*interval < ONLINE_CHECK_MAX_INTERVAL) + (*interval)++; return EAGAIN; } +static void cancel_online_check(struct connman_service *service) +{ + if (service->online_timeout == 0) + return; + + g_source_remove(service->online_timeout); + service->online_timeout = 0; + connman_service_unref(service); +} + int __connman_service_ipconfig_indicate_state(struct connman_service *service, enum connman_service_state new_state, enum connman_ipconfig_type type) { struct connman_ipconfig *ipconfig = NULL; enum connman_service_state old_state; - int ret; + enum connman_ipconfig_method method; - if (service == NULL) + if (!service) return -EINVAL; - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { + switch (type) { + case CONNMAN_IPCONFIG_TYPE_UNKNOWN: + case CONNMAN_IPCONFIG_TYPE_ALL: + return -EINVAL; + + case CONNMAN_IPCONFIG_TYPE_IPV4: old_state = service->state_ipv4; ipconfig = service->ipconfig_ipv4; - } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { + + break; + + case CONNMAN_IPCONFIG_TYPE_IPV6: old_state = service->state_ipv6; ipconfig = service->ipconfig_ipv6; + + break; } - if (ipconfig == NULL) + if (!ipconfig) return -EINVAL; + method = __connman_ipconfig_get_method(ipconfig); + + switch (method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + if (new_state != CONNMAN_SERVICE_STATE_IDLE) + connman_warn("ipconfig state %d ipconfig method %d", + new_state, method); + +#if defined TIZEN_EXT + if (old_state != CONNMAN_SERVICE_STATE_READY && + old_state != CONNMAN_SERVICE_STATE_ONLINE) +#endif + new_state = CONNMAN_SERVICE_STATE_IDLE; + break; + + case CONNMAN_IPCONFIG_METHOD_FIXED: + case CONNMAN_IPCONFIG_METHOD_MANUAL: + case CONNMAN_IPCONFIG_METHOD_DHCP: + case CONNMAN_IPCONFIG_METHOD_AUTO: + break; + + } + /* Any change? */ if (old_state == new_state) return -EALREADY; - DBG("service %p (%s) state %d (%s) type %d (%s)", +#if defined TIZEN_EXT + __sync_synchronize(); + if (service->user_pdn_connection_refcount > 0 && + service->type == CONNMAN_SERVICE_TYPE_CELLULAR) + if (new_state == CONNMAN_SERVICE_STATE_FAILURE || + new_state == CONNMAN_SERVICE_STATE_DISCONNECT || + new_state == CONNMAN_SERVICE_STATE_IDLE) { + service->user_pdn_connection_refcount = 0; + __sync_synchronize(); + } +#endif + + DBG("service %p (%s) old state %d (%s) new state %d (%s) type %d (%s)", service, service ? service->identifier : NULL, + old_state, state2string(old_state), new_state, state2string(new_state), type, __connman_ipconfig_type2string(type)); switch (new_state) { case CONNMAN_SERVICE_STATE_UNKNOWN: - case CONNMAN_SERVICE_STATE_IDLE: - if (service->state == CONNMAN_SERVICE_STATE_FAILURE) - return -EINVAL; - break; case CONNMAN_SERVICE_STATE_ASSOCIATION: break; case CONNMAN_SERVICE_STATE_CONFIGURATION: - __connman_ipconfig_enable(ipconfig); break; case CONNMAN_SERVICE_STATE_READY: - update_nameservers(service); +#if defined TIZEN_EXT + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && + __connman_service_is_internet_profile(service) != TRUE) { + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + service_rp_filter(service, TRUE); - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { - check_proxy_setup(service); - service_rp_filter(service, TRUE); - } else { - service->online_check_count = 1; - __connman_wispr_start(service, type); + break; } +#endif + if (connman_setting_get_bool("EnableOnlineCheck")) + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { +#if !defined TIZEN_EXT + check_proxy_setup(service); +#endif +#if defined TIZEN_MAINTAIN_ONLINE +/* if (old_state == CONNMAN_SERVICE_STATE_ONLINE) */ + check_proxy_setup(service); +#endif + } else { + __connman_service_wispr_start(service, type); + } + else + connman_info("Online check disabled. " + "Default service remains in READY state."); + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) + service_rp_filter(service, true); + set_mdns(service, service->mdns_config); break; case CONNMAN_SERVICE_STATE_ONLINE: break; @@ -5418,48 +9394,49 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service, return -EINVAL; if (type == CONNMAN_IPCONFIG_TYPE_IPV4) - service_rp_filter(service, FALSE); + service_rp_filter(service, false); break; + + case CONNMAN_SERVICE_STATE_IDLE: case CONNMAN_SERVICE_STATE_FAILURE: + __connman_ipconfig_disable(ipconfig); + break; } - /* We keep that state */ + if (is_connected(old_state) && !is_connected(new_state)) { + nameserver_remove_all(service, type); + cancel_online_check(service); + } + if (type == CONNMAN_IPCONFIG_TYPE_IPV4) service->state_ipv4 = new_state; - else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) + else service->state_ipv6 = new_state; - ret = service_indicate_state(service); + if (!is_connected(old_state) && is_connected(new_state)) + nameserver_add_all(service, type); - /* - * If the ipconfig method is OFF, then we set the state to IDLE - * so that it will not affect the combined state in the future. - */ - if (type == CONNMAN_IPCONFIG_TYPE_IPV4) { - enum connman_ipconfig_method method; - method = __connman_ipconfig_get_method(service->ipconfig_ipv4); - if (method == CONNMAN_IPCONFIG_METHOD_OFF || - method == CONNMAN_IPCONFIG_METHOD_UNKNOWN) { - service->state_ipv4 = CONNMAN_SERVICE_STATE_IDLE; - ret = service_indicate_state(service); - } + __connman_timeserver_sync(service); - } else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) { - enum connman_ipconfig_method method; - method = __connman_ipconfig_get_method(service->ipconfig_ipv6); - if (method == CONNMAN_IPCONFIG_METHOD_OFF || - method == CONNMAN_IPCONFIG_METHOD_UNKNOWN) { - service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE; - ret = service_indicate_state(service); - } +#if defined TIZEN_EXT + int ret = service_indicate_state(service); + /*Sent the Ready changed signal again in case IPv4 IP set + after IPv6 IP set*/ + + if(ret == -EALREADY && type == CONNMAN_IPCONFIG_TYPE_IPV4 + && new_state == CONNMAN_SERVICE_STATE_READY) { + DBG("Notify IPv4 state new/old %d/%d", new_state,old_state); + state_changed(service); } return ret; +#endif + return service_indicate_state(service); } -static connman_bool_t prepare_network(struct connman_service *service) +static bool prepare_network(struct connman_service *service) { enum connman_network_type type; unsigned int ssid_len; @@ -5469,74 +9446,161 @@ static connman_bool_t prepare_network(struct connman_service *service) switch (type) { case CONNMAN_NETWORK_TYPE_UNKNOWN: case CONNMAN_NETWORK_TYPE_VENDOR: - return FALSE; + return false; case CONNMAN_NETWORK_TYPE_WIFI: - if (connman_network_get_blob(service->network, "WiFi.SSID", - &ssid_len) == NULL) - return FALSE; + if (!connman_network_get_blob(service->network, "WiFi.SSID", + &ssid_len)) + return false; - if (service->passphrase != NULL) + if (service->passphrase) connman_network_set_string(service->network, "WiFi.Passphrase", service->passphrase); break; case CONNMAN_NETWORK_TYPE_ETHERNET: + case CONNMAN_NETWORK_TYPE_GADGET: case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: break; } - return TRUE; + return true; } static void prepare_8021x(struct connman_service *service) { - if (service->eap != NULL) + if (service->eap) connman_network_set_string(service->network, "WiFi.EAP", service->eap); - if (service->identity != NULL) + if (service->identity) connman_network_set_string(service->network, "WiFi.Identity", service->identity); - if (service->ca_cert_file != NULL) + if (service->anonymous_identity) + connman_network_set_string(service->network, + "WiFi.AnonymousIdentity", + service->anonymous_identity); + + if (service->ca_cert_file) connman_network_set_string(service->network, "WiFi.CACertFile", service->ca_cert_file); - if (service->client_cert_file != NULL) + if (service->subject_match) + connman_network_set_string(service->network, "WiFi.SubjectMatch", + service->subject_match); + + if (service->altsubject_match) + connman_network_set_string(service->network, "WiFi.AltSubjectMatch", + service->altsubject_match); + + if (service->domain_suffix_match) + connman_network_set_string(service->network, "WiFi.DomainSuffixMatch", + service->domain_suffix_match); + + if (service->domain_match) + connman_network_set_string(service->network, "WiFi.DomainMatch", + service->domain_match); + + if (service->client_cert_file) connman_network_set_string(service->network, "WiFi.ClientCertFile", service->client_cert_file); - if (service->private_key_file != NULL) + if (service->private_key_file) connman_network_set_string(service->network, "WiFi.PrivateKeyFile", service->private_key_file); - if (service->private_key_passphrase != NULL) + if (service->private_key_passphrase) connman_network_set_string(service->network, "WiFi.PrivateKeyPassphrase", service->private_key_passphrase); - if (service->phase2 != NULL) + if (service->phase2) connman_network_set_string(service->network, "WiFi.Phase2", service->phase2); + +#if defined TIZEN_EXT + if (service->keymgmt_type) + connman_network_set_string(service->network, "WiFi.KeymgmtType", + service->keymgmt_type); + + DBG("service->phase1 : %s", service->phase1); + if (service->phase1) + connman_network_set_string(service->network, "WiFi.Phase1", + service->phase1); +#endif +} +#if defined TIZEN_EXT + +static bool has_valid_configuration_object(struct connman_service *service) +{ + return service->connector && service->c_sign_key && service->net_access_key; +} + +static void prepare_dpp(struct connman_service *service) +{ + DBG("prepare dpp"); + if (service->connector) + connman_network_set_string(service->network, "WiFi.Connector", + service->connector); + + if (service->c_sign_key) + connman_network_set_string(service->network, "WiFi.CSignKey", + service->c_sign_key); + + if (service->net_access_key) + connman_network_set_string(service->network, "WiFi.NetAccessKey", + service->net_access_key); } +#endif + +static int service_connect(struct connman_service *service) +{ + int err; + + if (service->hidden) + return -EPERM; + +#if defined TIZEN_EXT + GList *list; + int index; + + index = __connman_service_get_index(service); + + for (list = service_list; list; list = list->next) { + struct connman_service *temp = list->data; + + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) + break; + + if (!is_connecting(temp->state) && !is_connected(temp->state)) + break; -static int service_connect(struct connman_service *service) -{ - int err; + if (service == temp) + continue; - if (service->hidden == TRUE) - return -EPERM; + if (service->type != temp->type) + continue; + + if (__connman_service_get_index(temp) == index && + __connman_service_disconnect(temp) == -EINPROGRESS) + return -EINPROGRESS; + } +#endif switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif return -EINVAL; case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: case CONNMAN_SERVICE_TYPE_VPN: @@ -5545,44 +9609,80 @@ static int service_connect(struct connman_service *service) switch (service->security) { case CONNMAN_SERVICE_SECURITY_UNKNOWN: case CONNMAN_SERVICE_SECURITY_NONE: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_OWE: +#endif break; case CONNMAN_SERVICE_SECURITY_WEP: case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: - if (service->passphrase == NULL) { - if (service->network == NULL) +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_SAE: +#endif + if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) + return -ENOKEY; + + if (!service->passphrase) { + if (!service->network) return -EOPNOTSUPP; - if (service->wps == FALSE || - connman_network_get_bool( - service->network, - "WiFi.UseWPS") == FALSE) + if (!service->wps || + !connman_network_get_bool(service->network, "WiFi.UseWPS")) return -ENOKEY; - } else if (service->error == - CONNMAN_SERVICE_ERROR_INVALID_KEY) - return -ENOKEY; + } + break; + +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_DPP: + if (has_valid_configuration_object(service) && + !service->network) + return -EINVAL; break; +#endif case CONNMAN_SERVICE_SECURITY_8021X: - if (service->eap == NULL) + if (!service->eap) { + connman_warn("EAP type has not been found. " + "Most likely ConnMan is not able to " + "find a configuration for given " + "8021X network. " + "Check SSID or Name match with the " + "network name."); return -EINVAL; + } +#if defined TIZEN_EXT + /* + * never request credentials if using EAP-TLS, EAP-SIM + * or EAP-AKA (EAP-TLS, EAP-SIM and EAP-AKA networks + * need to be fully provisioned) + */ + DBG("service eap: %s", service->eap); + if (g_str_equal(service->eap, "tls") || + g_str_equal(service->eap, "sim") || + g_str_equal(service->eap, "aka") || + g_str_equal(service->eap, "aka'") || + g_str_equal(service->eap, "pwd") || + g_str_equal(service->eap, "fast")) + break; +#else /* * never request credentials if using EAP-TLS * (EAP-TLS networks need to be fully provisioned) */ - if (g_str_equal(service->eap, "tls") == TRUE) + if (g_str_equal(service->eap, "tls")) break; +#endif /* * Return -ENOKEY if either identity or passphrase is * missing. Agent provided credentials can be used as * fallback if needed. */ - if ((service->identity == NULL && - service->agent_identity == NULL) || - (service->passphrase == NULL && - service->agent_passphrase == NULL)) + if (((!service->identity && + !service->agent_identity) || + !service->passphrase) || + service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) return -ENOKEY; break; @@ -5590,8 +9690,8 @@ static int service_connect(struct connman_service *service) break; } - if (service->network != NULL) { - if (prepare_network(service) == FALSE) + if (service->network) { + if (!prepare_network(service)) return -EINVAL; switch (service->security) { @@ -5601,6 +9701,13 @@ static int service_connect(struct connman_service *service) case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: case CONNMAN_SERVICE_SECURITY_RSN: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_SAE: + case CONNMAN_SERVICE_SECURITY_OWE: + break; + case CONNMAN_SERVICE_SECURITY_DPP: + prepare_dpp(service); +#endif break; case CONNMAN_SERVICE_SECURITY_8021X: prepare_8021x(service); @@ -5608,28 +9715,28 @@ static int service_connect(struct connman_service *service) } if (__connman_stats_service_register(service) == 0) { - __connman_stats_get(service, FALSE, + __connman_stats_get(service, false, &service->stats.data); - __connman_stats_get(service, TRUE, + __connman_stats_get(service, true, &service->stats_roaming.data); } - if (service->ipconfig_ipv4) - __connman_ipconfig_enable(service->ipconfig_ipv4); - if (service->ipconfig_ipv6) - __connman_ipconfig_enable(service->ipconfig_ipv6); - err = __connman_network_connect(service->network); } else if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->provider != NULL) - err = __connman_provider_connect(service->provider); + service->provider) + err = __connman_provider_connect(service->provider, + get_dbus_sender(service)); else return -EOPNOTSUPP; if (err < 0) { if (err != -EINPROGRESS) { - __connman_ipconfig_disable(service->ipconfig_ipv4); - __connman_ipconfig_disable(service->ipconfig_ipv6); + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_FAILURE, + CONNMAN_IPCONFIG_TYPE_IPV4); + __connman_service_ipconfig_indicate_state(service, + CONNMAN_SERVICE_STATE_FAILURE, + CONNMAN_IPCONFIG_TYPE_IPV6); __connman_stats_service_unregister(service); } } @@ -5637,54 +9744,76 @@ static int service_connect(struct connman_service *service) return err; } - -int __connman_service_connect(struct connman_service *service) +int __connman_service_connect(struct connman_service *service, + enum connman_service_connect_reason reason) { int err; - DBG("service %p state %s", service, state2string(service->state)); + DBG("service %p state %s connect reason %s -> %s", + service, state2string(service->state), + reason2string(service->connect_reason), + reason2string(reason)); - if (is_connected(service) == TRUE) + if (is_connected(service->state)) return -EISCONN; - if (is_connecting(service) == TRUE) + if (is_connecting(service->state)) return -EALREADY; switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_P2P: +#if defined TIZEN_EXT_WIFI_MESH + case CONNMAN_SERVICE_TYPE_MESH: +#endif return -EINVAL; - default: - if (is_ipconfig_usable(service) == FALSE) - return -ENOLINK; - err = service_connect(service); + case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_VPN: + case CONNMAN_SERVICE_TYPE_WIFI: + break; } - if (err >= 0) { - set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); + if (!is_ipconfig_usable(service)) + return -ENOLINK; + + __connman_service_clear_error(service); + + err = service_connect(service); + + DBG("service %p err %d", service, err); + + service->connect_reason = reason; +#if defined TIZEN_EXT + connect_reason_changed(service); +#endif + + if (err >= 0) return 0; - } if (err == -EINPROGRESS) { if (service->timeout == 0) service->timeout = g_timeout_add_seconds( CONNECT_TIMEOUT, connect_timeout, service); - set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN); + return -EINPROGRESS; } - if (service->network != NULL) + if (service->network) __connman_network_disconnect(service->network); else if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->provider != NULL) + service->provider) connman_provider_disconnect(service->provider); - if (service->userconnect == TRUE) { + if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) { if (err == -ENOKEY || err == -EPERM) { DBusMessage *pending = NULL; + const char *dbus_sender = get_dbus_sender(service); /* * We steal the reply here. The idea is that the @@ -5692,19 +9821,20 @@ int __connman_service_connect(struct connman_service *service) * after the real hidden network is connected or * connection failed. */ - if (service->hidden == TRUE) { + if (service->hidden) { pending = service->pending; service->pending = NULL; } err = __connman_agent_request_passphrase_input(service, - request_input_cb, pending); - if (service->hidden == TRUE && err != -EINPROGRESS) + request_input_cb, + dbus_sender, + pending); + if (service->hidden && err != -EINPROGRESS) service->pending = pending; return err; } - reply_pending(service, -err); } return err; @@ -5716,14 +9846,17 @@ int __connman_service_disconnect(struct connman_service *service) DBG("service %p", service); - service->userconnect = FALSE; + service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_NONE; + service->proxy = CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN; connman_agent_cancel(service); - if (service->network != NULL) { + __connman_stats_service_unregister(service); + + if (service->network) { err = __connman_network_disconnect(service->network); } else if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->provider != NULL) + service->provider) err = connman_provider_disconnect(service->provider); else return -EOPNOTSUPP; @@ -5740,48 +9873,57 @@ int __connman_service_disconnect(struct connman_service *service) __connman_ipconfig_set_proxy_autoconfig(service->ipconfig_ipv6, NULL); +#if defined TIZEN_EXT + /** + * Skip the functions If there is any connected profiles + * that use same interface + */ + if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR || + __connman_service_get_connected_count_of_iface(service) <= 0) { +#endif __connman_ipconfig_address_remove(service->ipconfig_ipv4); + settings_changed(service, service->ipconfig_ipv4); + __connman_ipconfig_address_remove(service->ipconfig_ipv6); + settings_changed(service, service->ipconfig_ipv6); __connman_ipconfig_disable(service->ipconfig_ipv4); __connman_ipconfig_disable(service->ipconfig_ipv6); - - __connman_stats_service_unregister(service); +#if defined TIZEN_EXT + } +#endif return err; } int __connman_service_disconnect_all(void) { - GSequenceIter *iter; + struct connman_service *service; GSList *services = NULL, *list; + GList *iter; DBG(""); - iter = g_sequence_get_begin_iter(service_list); + for (iter = service_list; iter; iter = iter->next) { + service = iter->data; - while (g_sequence_iter_is_end(iter) == FALSE) { - struct connman_service *service = g_sequence_get(iter); + if (!is_connected(service->state)) + break; services = g_slist_prepend(services, service); - - iter = g_sequence_iter_next(iter); } - for (list = services; list != NULL; list = list->next) { + for (list = services; list; list = list->next) { struct connman_service *service = list->data; - service->ignore = TRUE; - - set_reconnect_state(service, FALSE); + service->ignore = true; __connman_service_disconnect(service); } - g_slist_free(list); + g_slist_free(services); return 0; - } /** @@ -5792,13 +9934,12 @@ int __connman_service_disconnect_all(void) */ static struct connman_service *lookup_by_identifier(const char *identifier) { - GSequenceIter *iter; - - iter = g_hash_table_lookup(service_hash, identifier); - if (iter != NULL) - return g_sequence_get(iter); + return g_hash_table_lookup(service_hash, identifier); +} - return NULL; +struct connman_service *connman_service_lookup_from_identifier(const char* identifier) +{ + return identifier ? lookup_by_identifier(identifier) : NULL; } struct provision_user_data { @@ -5826,19 +9967,16 @@ int __connman_service_provision_changed(const char *ident) .ret = 0 }; - g_sequence_foreach(service_list, provision_changed, (void *)&data); + g_list_foreach(service_list, provision_changed, (void *)&data); /* * Because the provision_changed() might have set some services * as favorite, we must sort the sequence now. */ - if (services_dirty == TRUE) { - services_dirty = FALSE; + if (services_dirty) { + services_dirty = false; - if (g_sequence_get_length(service_list) > 1) { - g_sequence_sort(service_list, service_compare, NULL); - service_schedule_changed(); - } + service_list_sort(); __connman_connection_update_gateway(); } @@ -5849,7 +9987,7 @@ int __connman_service_provision_changed(const char *ident) void __connman_service_set_config(struct connman_service *service, const char *file_id, const char *entry) { - if (service == NULL) + if (!service) return; g_free(service->config_file); @@ -5868,39 +10006,39 @@ void __connman_service_set_config(struct connman_service *service, static struct connman_service *service_get(const char *identifier) { struct connman_service *service; - GSequenceIter *iter; - iter = g_hash_table_lookup(service_hash, identifier); - if (iter != NULL) { - service = g_sequence_get(iter); - if (service != NULL) - connman_service_ref(service); + service = g_hash_table_lookup(service_hash, identifier); + if (service) { + connman_service_ref(service); return service; } service = connman_service_create(); - if (service == NULL) + if (!service) return NULL; - +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); service->identifier = g_strdup(identifier); - iter = g_sequence_insert_sorted(service_list, service, - service_compare, NULL); + service_list = g_list_insert_sorted(service_list, service, + service_compare); - g_hash_table_insert(service_hash, service->identifier, iter); + g_hash_table_insert(service_hash, service->identifier, service); return service; } static int service_register(struct connman_service *service) { - GSequenceIter *iter; - +#if defined TIZEN_EXT + if (!simplified_log) +#endif DBG("service %p", service); - if (service->path != NULL) + if (service->path) return -EALREADY; service->path = g_strdup_printf("%s/service/%s", CONNMAN_PATH, @@ -5908,75 +10046,83 @@ static int service_register(struct connman_service *service) DBG("path %s", service->path); - __connman_config_provision_service(service); - +#if defined TIZEN_EXT + int ret; service_load(service); + 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) + service_load(service); +#endif g_dbus_register_interface(connection, service->path, CONNMAN_SERVICE_INTERFACE, service_methods, service_signals, NULL, service, NULL); - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter != NULL && g_sequence_get_length(service_list) > 1) { - g_sequence_sort_changed(iter, service_compare, NULL); - service_schedule_changed(); - } + service_list_sort(); __connman_connection_update_gateway(); return 0; } -static void service_up(struct connman_ipconfig *ipconfig) +static void service_up(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s up", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s up", ifname); link_changed(service); - service->stats.valid = FALSE; - service->stats_roaming.valid = FALSE; + service->stats.valid = false; + service->stats_roaming.valid = false; } -static void service_down(struct connman_ipconfig *ipconfig) +static void service_down(struct connman_ipconfig *ipconfig, + const char *ifname) { - DBG("%s down", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s down", ifname); } -static void service_lower_up(struct connman_ipconfig *ipconfig) +static void service_lower_up(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s lower up", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s lower up", ifname); stats_start(service); } -static void service_lower_down(struct connman_ipconfig *ipconfig) +static void service_lower_down(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s lower down", __connman_ipconfig_get_ifname(ipconfig)); - - if (is_idle_state(service, service->state_ipv4) == FALSE) - __connman_ipconfig_disable(service->ipconfig_ipv4); - - if (is_idle_state(service, service->state_ipv6) == FALSE) - __connman_ipconfig_disable(service->ipconfig_ipv6); + DBG("%s lower down", ifname); stats_stop(service); service_save(service); } -static void service_ip_bound(struct connman_ipconfig *ipconfig) +static void service_ip_bound(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; enum connman_ipconfig_type type = CONNMAN_IPCONFIG_TYPE_UNKNOWN; +#if defined TIZEN_EXT + int err; +#endif - DBG("%s ip bound", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s ip bound", ifname); type = __connman_ipconfig_get_config_type(ipconfig); method = __connman_ipconfig_get_method(ipconfig); @@ -5986,20 +10132,31 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig) if (type == CONNMAN_IPCONFIG_TYPE_IPV6 && method == CONNMAN_IPCONFIG_METHOD_AUTO) +#if defined TIZEN_EXT + { + err = __connman_ipconfig_gateway_add(ipconfig, service); + + if(err < 0) + DBG("Failed to add gateway"); + } +#else __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_READY, CONNMAN_IPCONFIG_TYPE_IPV6); +#endif settings_changed(service, ipconfig); + address_updated(service, type); } -static void service_ip_release(struct connman_ipconfig *ipconfig) +static void service_ip_release(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; enum connman_ipconfig_type type = CONNMAN_IPCONFIG_TYPE_UNKNOWN; - DBG("%s ip release", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s ip release", ifname); type = __connman_ipconfig_get_config_type(ipconfig); method = __connman_ipconfig_get_method(ipconfig); @@ -6022,11 +10179,12 @@ static void service_ip_release(struct connman_ipconfig *ipconfig) settings_changed(service, ipconfig); } -static void service_route_changed(struct connman_ipconfig *ipconfig) +static void service_route_changed(struct connman_ipconfig *ipconfig, + const char *ifname) { struct connman_service *service = __connman_ipconfig_get_data(ipconfig); - DBG("%s route changed", __connman_ipconfig_get_ifname(ipconfig)); + DBG("%s route changed", ifname); settings_changed(service, ipconfig); } @@ -6042,42 +10200,51 @@ static const struct connman_ipconfig_ops service_ops = { .route_unset = service_route_changed, }; -static void setup_ip4config(struct connman_service *service, int index, - enum connman_ipconfig_method method) +static struct connman_ipconfig *create_ip4config(struct connman_service *service, + int index, enum connman_ipconfig_method method) { - service->ipconfig_ipv4 = __connman_ipconfig_create(index, + struct connman_ipconfig *ipconfig_ipv4; + + ipconfig_ipv4 = __connman_ipconfig_create(index, CONNMAN_IPCONFIG_TYPE_IPV4); - if (service->ipconfig_ipv4 == NULL) - return; + if (!ipconfig_ipv4) + return NULL; + + __connman_ipconfig_set_method(ipconfig_ipv4, method); - __connman_ipconfig_set_method(service->ipconfig_ipv4, method); + __connman_ipconfig_set_data(ipconfig_ipv4, service); - __connman_ipconfig_set_data(service->ipconfig_ipv4, service); + __connman_ipconfig_set_ops(ipconfig_ipv4, &service_ops); - __connman_ipconfig_set_ops(service->ipconfig_ipv4, &service_ops); + return ipconfig_ipv4; } -static void setup_ip6config(struct connman_service *service, int index) +static struct connman_ipconfig *create_ip6config(struct connman_service *service, + int index) { - service->ipconfig_ipv6 = __connman_ipconfig_create(index, + struct connman_ipconfig *ipconfig_ipv6; + + ipconfig_ipv6 = __connman_ipconfig_create(index, CONNMAN_IPCONFIG_TYPE_IPV6); - if (service->ipconfig_ipv6 == NULL) - return; + if (!ipconfig_ipv6) + return NULL; - __connman_ipconfig_set_data(service->ipconfig_ipv6, service); + __connman_ipconfig_set_data(ipconfig_ipv6, service); - __connman_ipconfig_set_ops(service->ipconfig_ipv6, &service_ops); + __connman_ipconfig_set_ops(ipconfig_ipv6, &service_ops); + + return ipconfig_ipv6; } void __connman_service_read_ip4config(struct connman_service *service) { GKeyFile *keyfile; - if (service->ipconfig_ipv4 == NULL) + if (!service->ipconfig_ipv4) return; keyfile = connman_storage_load_service(service->identifier); - if (keyfile == NULL) + if (!keyfile) return; __connman_ipconfig_load(service->ipconfig_ipv4, keyfile, @@ -6091,10 +10258,11 @@ void connman_service_create_ip4config(struct connman_service *service, { DBG("ipv4 %p", service->ipconfig_ipv4); - if (service->ipconfig_ipv4 != NULL) + if (service->ipconfig_ipv4) return; - setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_DHCP); + service->ipconfig_ipv4 = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_DHCP); __connman_service_read_ip4config(service); } @@ -6102,11 +10270,11 @@ void __connman_service_read_ip6config(struct connman_service *service) { GKeyFile *keyfile; - if (service->ipconfig_ipv6 == NULL) + if (!service->ipconfig_ipv6) return; keyfile = connman_storage_load_service(service->identifier); - if (keyfile == NULL) + if (!keyfile) return; __connman_ipconfig_load(service->ipconfig_ipv6, keyfile, @@ -6120,10 +10288,10 @@ void connman_service_create_ip6config(struct connman_service *service, { DBG("ipv6 %p", service->ipconfig_ipv6); - if (service->ipconfig_ipv6 != NULL) + if (service->ipconfig_ipv6) return; - setup_ip6config(service, index); + service->ipconfig_ipv6 = create_ip6config(service, index); __connman_service_read_ip6config(service); } @@ -6140,17 +10308,15 @@ struct connman_service *connman_service_lookup_from_network(struct connman_netwo const char *ident, *group; char *name; - DBG("network %p", network); - - if (network == NULL) + if (!network) return NULL; ident = __connman_network_get_ident(network); - if (ident == NULL) + if (!ident) return NULL; group = connman_network_get_group(network); - if (group == NULL) + if (!group) return NULL; name = g_strdup_printf("%s_%s_%s", @@ -6164,12 +10330,10 @@ struct connman_service *connman_service_lookup_from_network(struct connman_netwo struct connman_service *__connman_service_lookup_from_index(int index) { struct connman_service *service; - GSequenceIter *iter; - - iter = g_sequence_get_begin_iter(service_list); + GList *list; - while (g_sequence_iter_is_end(iter) == FALSE) { - service = g_sequence_get(iter); + for (list = service_list; list; list = list->next) { + service = list->data; if (__connman_ipconfig_get_index(service->ipconfig_ipv4) == index) @@ -6178,21 +10342,14 @@ struct connman_service *__connman_service_lookup_from_index(int index) if (__connman_ipconfig_get_index(service->ipconfig_ipv6) == index) return service; - - iter = g_sequence_iter_next(iter); } return NULL; } -struct connman_service *__connman_service_lookup_from_ident(const char *identifier) -{ - return lookup_by_identifier(identifier); -} - -const char *__connman_service_get_ident(struct connman_service *service) +const char *connman_service_get_identifier(struct connman_service *service) { - return service->identifier; + return service ? service->identifier : NULL; } const char *__connman_service_get_path(struct connman_service *service) @@ -6200,43 +10357,14 @@ const char *__connman_service_get_path(struct connman_service *service) return service->path; } -unsigned int __connman_service_get_order(struct connman_service *service) +const char *__connman_service_get_name(struct connman_service *service) { - GSequenceIter *iter; - - if (service == NULL) - return 0; - - if (service->favorite == FALSE) { - service->order = 0; - goto done; - } - - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter != NULL) { - if (g_sequence_iter_get_position(iter) == 0) - service->order = 1; - else if (service->type == CONNMAN_SERVICE_TYPE_VPN && - service->do_split_routing == FALSE) - service->order = 10; - else - service->order = 0; - } - - DBG("service %p name %s order %d split %d", service, service->name, - service->order, service->do_split_routing); - -done: - return service->order; + return service->name; } -void __connman_service_update_ordering(void) +enum connman_service_state connman_service_get_state(struct connman_service *service) { - GSequenceIter *iter; - - iter = g_sequence_get_begin_iter(service_list); - if (iter != NULL && g_sequence_get_length(service_list) > 1) - g_sequence_sort_changed(iter, service_compare, NULL); + return service ? service->state : CONNMAN_SERVICE_STATE_UNKNOWN; } static enum connman_service_type convert_network_type(struct connman_network *network) @@ -6256,6 +10384,8 @@ static enum connman_service_type convert_network_type(struct connman_network *ne return CONNMAN_SERVICE_TYPE_BLUETOOTH; case CONNMAN_NETWORK_TYPE_CELLULAR: return CONNMAN_SERVICE_TYPE_CELLULAR; + case CONNMAN_NETWORK_TYPE_GADGET: + return CONNMAN_SERVICE_TYPE_GADGET; } return CONNMAN_SERVICE_TYPE_UNKNOWN; @@ -6263,48 +10393,88 @@ static enum connman_service_type convert_network_type(struct connman_network *ne static enum connman_service_security convert_wifi_security(const char *security) { - if (security == NULL) + if (!security) return CONNMAN_SERVICE_SECURITY_UNKNOWN; - else if (g_str_equal(security, "none") == TRUE) + else if (g_str_equal(security, "none")) return CONNMAN_SERVICE_SECURITY_NONE; - else if (g_str_equal(security, "wep") == TRUE) + else if (g_str_equal(security, "wep")) return CONNMAN_SERVICE_SECURITY_WEP; - else if (g_str_equal(security, "psk") == TRUE) + else if (g_str_equal(security, "psk")) return CONNMAN_SERVICE_SECURITY_PSK; - else if (g_str_equal(security, "ieee8021x") == TRUE) + else if (g_str_equal(security, "ieee8021x")) return CONNMAN_SERVICE_SECURITY_8021X; - else if (g_str_equal(security, "wpa") == TRUE) + else if (g_str_equal(security, "wpa")) return CONNMAN_SERVICE_SECURITY_WPA; - else if (g_str_equal(security, "rsn") == TRUE) + else if (g_str_equal(security, "rsn")) return CONNMAN_SERVICE_SECURITY_RSN; +#if defined TIZEN_EXT + else if (g_str_equal(security, "sae")) + return CONNMAN_SERVICE_SECURITY_SAE; + else if (g_str_equal(security, "owe")) + return CONNMAN_SERVICE_SECURITY_OWE; + else if (g_str_equal(security, "dpp")) + return CONNMAN_SERVICE_SECURITY_DPP; + else if (g_str_equal(security, "ft_psk") == TRUE) + return CONNMAN_SERVICE_SECURITY_PSK; + else if (g_str_equal(security, "ft_ieee8021x") == TRUE) + return CONNMAN_SERVICE_SECURITY_8021X; +#endif else return CONNMAN_SERVICE_SECURITY_UNKNOWN; } +#if defined TIZEN_EXT +int check_passphrase_ext(struct connman_network *network, + const char *passphrase) +{ + const char *str; + enum connman_service_security security; + + str = connman_network_get_string(network, "WiFi.Security"); + security = convert_wifi_security(str); + + return __connman_service_check_passphrase(security, passphrase); +} +#endif + +static void update_wps_values(struct connman_service *service, + struct connman_network *network) +{ + bool wps = connman_network_get_bool(network, "WiFi.WPS"); + bool wps_advertising = connman_network_get_bool(network, + "WiFi.WPSAdvertising"); + + if (service->wps != wps || + service->wps_advertizing != wps_advertising) { + service->wps = wps; + service->wps_advertizing = wps_advertising; + security_changed(service); + } +} + static void update_from_network(struct connman_service *service, struct connman_network *network) { - connman_uint8_t strength = service->strength; - GSequenceIter *iter; + uint8_t strength = service->strength; const char *str; DBG("service %p network %p", service, network); - if (is_connected(service) == TRUE) + if (is_connected(service->state)) return; - if (is_connecting(service) == TRUE) + if (is_connecting(service->state)) return; str = connman_network_get_string(network, "Name"); - if (str != NULL) { + if (str) { g_free(service->name); service->name = g_strdup(str); - service->hidden = FALSE; + service->hidden = false; } else { g_free(service->name); service->name = NULL; - service->hidden = TRUE; + service->hidden = true; } service->strength = connman_network_get_strength(network); @@ -6322,23 +10492,19 @@ static void update_from_network(struct connman_service *service, service->security = convert_wifi_security(str); if (service->type == CONNMAN_SERVICE_TYPE_WIFI) - service->wps = connman_network_get_bool(network, "WiFi.WPS"); + update_wps_values(service, network); - if (service->strength > strength && service->network != NULL) { + if (service->strength > strength && service->network) { connman_network_unref(service->network); service->network = connman_network_ref(network); strength_changed(service); } - if (service->network == NULL) + if (!service->network) service->network = connman_network_ref(network); - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter != NULL && g_sequence_get_length(service_list) > 1) { - g_sequence_sort_changed(iter, service_compare, NULL); - service_schedule_changed(); - } + service_list_sort(); } /** @@ -6353,20 +10519,20 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne struct connman_device *device; const char *ident, *group; char *name; - unsigned int *auto_connect_types; + unsigned int *auto_connect_types, *favorite_types; int i, index; DBG("network %p", network); - if (network == NULL) + if (!network) return NULL; ident = __connman_network_get_ident(network); - if (ident == NULL) + if (!ident) return NULL; group = connman_network_get_group(network); - if (group == NULL) + if (!group) return NULL; name = g_strdup_printf("%s_%s_%s", @@ -6374,13 +10540,13 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne service = service_get(name); g_free(name); - if (service == NULL) + if (!service) return NULL; - if (__connman_network_get_weakness(network) == TRUE) + if (__connman_network_get_weakness(network)) return service; - if (service->path != NULL) { + if (service->path) { update_from_network(service, network); __connman_connection_update_gateway(); return service; @@ -6389,28 +10555,22 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne service->type = convert_network_type(network); auto_connect_types = connman_setting_get_uint_list("DefaultAutoConnectTechnologies"); - service->autoconnect = FALSE; - for (i = 0; auto_connect_types != NULL && + service->autoconnect = false; + for (i = 0; auto_connect_types && auto_connect_types[i] != 0; i++) { if (service->type == auto_connect_types[i]) { - service->autoconnect = TRUE; + service->autoconnect = true; break; } } - switch (service->type) { - case CONNMAN_SERVICE_TYPE_UNKNOWN: - case CONNMAN_SERVICE_TYPE_SYSTEM: - case CONNMAN_SERVICE_TYPE_BLUETOOTH: - case CONNMAN_SERVICE_TYPE_GPS: - case CONNMAN_SERVICE_TYPE_VPN: - case CONNMAN_SERVICE_TYPE_GADGET: - case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_CELLULAR: - break; - case CONNMAN_SERVICE_TYPE_ETHERNET: - service->favorite = TRUE; - break; + favorite_types = connman_setting_get_uint_list("DefaultFavoriteTechnologies"); + service->favorite = false; + for (i = 0; favorite_types && favorite_types[i] != 0; i++) { + if (service->type == favorite_types[i]) { + service->favorite = true; + break; + } } service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE; @@ -6420,65 +10580,148 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne index = connman_network_get_index(network); - if (service->ipconfig_ipv4 == NULL) - setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_DHCP); + if (!service->ipconfig_ipv4) + service->ipconfig_ipv4 = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_DHCP); - if (service->ipconfig_ipv6 == NULL) - setup_ip6config(service, index); + if (!service->ipconfig_ipv6) + service->ipconfig_ipv6 = create_ip6config(service, index); service_register(service); + service_schedule_added(service); - if (service->favorite == TRUE) { + if (service->favorite) { device = connman_network_get_device(service->network); - if (device && connman_device_get_scanning(device) == FALSE) - __connman_service_auto_connect(); + if (device && !connman_device_get_scanning(device, + CONNMAN_SERVICE_TYPE_UNKNOWN)) { + + switch (service->type) { + case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_P2P: +#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 } __connman_notifier_service_add(service, service->name); - service_schedule_added(service); return service; } +#if defined TIZEN_EXT +void __connman_service_notify_strength_changed(struct connman_network *network) +{ + struct connman_service *service; + uint8_t strength = 0; + + service = connman_service_lookup_from_network(network); + if (!service) + return; + + if (!service->network) + return; + + strength = connman_network_get_strength(service->network); + if (strength == service->strength) + return; + + service->strength = strength; + if (!simplified_log) + DBG("Strength %d", strength); + strength_changed(service); + service_list_sort(); +} +#endif + void __connman_service_update_from_network(struct connman_network *network) { - connman_bool_t need_sort = FALSE; + bool need_sort = false; struct connman_service *service; - connman_uint8_t strength; - connman_bool_t roaming; - GSequenceIter *iter; + uint8_t strength; + bool roaming; const char *name; - connman_bool_t stats_enable; - - DBG("network %p", network); + bool stats_enable; +#if defined TIZEN_EXT + bool need_save = false; +#endif service = connman_service_lookup_from_network(network); - if (service == NULL) + if (!service) return; - if (service->network == NULL) + if (!service->network) return; +#if defined TIZEN_EXT + if (service->storage_reload) { + service_load(service); + __connman_service_set_storage_reload(service, false); + } +#endif + name = connman_network_get_string(service->network, "Name"); if (g_strcmp0(service->name, name) != 0) { g_free(service->name); service->name = g_strdup(name); - if (allow_property_changed(service) == TRUE) + if (allow_property_changed(service)) connman_dbus_property_changed_basic(service->path, CONNMAN_SERVICE_INTERFACE, "Name", DBUS_TYPE_STRING, &service->name); } if (service->type == CONNMAN_SERVICE_TYPE_WIFI) - service->wps = connman_network_get_bool(network, "WiFi.WPS"); + update_wps_values(service, network); strength = connman_network_get_strength(service->network); if (strength == service->strength) goto roaming; service->strength = strength; - need_sort = TRUE; + need_sort = true; strength_changed(service); @@ -6488,24 +10731,30 @@ roaming: goto sorting; stats_enable = stats_enabled(service); - if (stats_enable == TRUE) + if (stats_enable) stats_stop(service); service->roaming = roaming; - need_sort = TRUE; + need_sort = true; - if (stats_enable == TRUE) + if (stats_enable) stats_start(service); roaming_changed(service); sorting: - if (need_sort == TRUE) { - iter = g_hash_table_lookup(service_hash, service->identifier); - if (iter != NULL && g_sequence_get_length(service_list) > 1) { - g_sequence_sort_changed(iter, service_compare, NULL); - service_schedule_changed(); - } +#if 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(); } } @@ -6513,13 +10762,14 @@ void __connman_service_remove_from_network(struct connman_network *network) { struct connman_service *service; - DBG("network %p", network); - service = connman_service_lookup_from_network(network); - if (service == NULL) + + DBG("network %p service %p", network, service); + + if (!service) return; - service->ignore = TRUE; + service->ignore = true; __connman_connection_gateway_remove(service, CONNMAN_IPCONFIG_TYPE_ALL); @@ -6544,42 +10794,44 @@ __connman_service_create_from_provider(struct connman_provider *provider) DBG("provider %p", provider); ident = __connman_provider_get_ident(provider); - if (ident == NULL) + if (!ident) return NULL; name = g_strdup_printf("vpn_%s", ident); service = service_get(name); g_free(name); - if (service == NULL) + if (!service) return NULL; service->type = CONNMAN_SERVICE_TYPE_VPN; + service->order = service->do_split_routing ? 0 : 10; service->provider = connman_provider_ref(provider); - service->autoconnect = FALSE; - service->userconnect = TRUE; + service->autoconnect = false; + service->favorite = true; service->state_ipv4 = service->state_ipv6 = CONNMAN_SERVICE_STATE_IDLE; service->state = combine_state(service->state_ipv4, service->state_ipv6); str = connman_provider_get_string(provider, "Name"); - if (str != NULL) { + if (str) { g_free(service->name); service->name = g_strdup(str); - service->hidden = FALSE; + service->hidden = false; } else { g_free(service->name); service->name = NULL; - service->hidden = TRUE; + service->hidden = true; } service->strength = 0; - if (service->ipconfig_ipv4 == NULL) - setup_ip4config(service, index, CONNMAN_IPCONFIG_METHOD_MANUAL); + if (!service->ipconfig_ipv4) + service->ipconfig_ipv4 = create_ip4config(service, index, + CONNMAN_IPCONFIG_METHOD_MANUAL); - if (service->ipconfig_ipv6 == NULL) - setup_ip6config(service, index); + if (!service->ipconfig_ipv6) + service->ipconfig_ipv6 = create_ip6config(service, index); service_register(service); @@ -6589,7 +10841,7 @@ __connman_service_create_from_provider(struct connman_provider *provider) return service; } -static void remove_unprovisioned_services() +static void remove_unprovisioned_services(void) { gchar **services; GKeyFile *keyfile, *configkeyfile; @@ -6597,29 +10849,29 @@ static void remove_unprovisioned_services() int i = 0; services = connman_storage_get_services(); - if (services == NULL) + if (!services) return; - for (;services[i] != NULL; i++) { + for (; services[i]; i++) { file = section = NULL; keyfile = configkeyfile = NULL; keyfile = connman_storage_load_service(services[i]); - if (keyfile == NULL) + if (!keyfile) continue; file = g_key_file_get_string(keyfile, services[i], "Config.file", NULL); - if (file == NULL) + if (!file) goto next; section = g_key_file_get_string(keyfile, services[i], "Config.ident", NULL); - if (section == NULL) + if (!section) goto next; configkeyfile = __connman_storage_load_config(file); - if (configkeyfile == NULL) { + if (!configkeyfile) { /* * Config file is missing, remove the provisioned * service. @@ -6628,7 +10880,7 @@ static void remove_unprovisioned_services() goto next; } - if (g_key_file_has_group(configkeyfile, section) == FALSE) + if (!g_key_file_has_group(configkeyfile, section)) /* * Config section is missing, remove the provisioned * service. @@ -6636,10 +10888,10 @@ static void remove_unprovisioned_services() __connman_storage_remove_service(services[i]); next: - if (keyfile != NULL) + if (keyfile) g_key_file_free(keyfile); - if (configkeyfile != NULL) + if (configkeyfile) g_key_file_free(configkeyfile); g_free(section); @@ -6683,6 +10935,94 @@ static struct connman_agent_driver agent_driver = { .context_unref = agent_context_unref, }; +#if defined TIZEN_EXT +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_option_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"); + + ins_settings.signal_level3_5ghz = connman_setting_get_int("INSSignalLevel3_5GHz"); + ins_settings.signal_level3_24ghz = connman_setting_get_int("INSSignalLevel3_24GHz"); + + 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 + int __connman_service_init(void) { int err; @@ -6696,12 +11036,12 @@ int __connman_service_init(void) return err; } + set_always_connecting_technologies(); + connection = connman_dbus_get_connection(); service_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - NULL, NULL); - - service_list = g_sequence_new(service_free); + NULL, service_free); services_notify = g_new0(struct _services_notify, 1); services_notify->remove = g_hash_table_new_full(g_str_hash, @@ -6710,23 +11050,31 @@ int __connman_service_init(void) remove_unprovisioned_services(); +#if defined TIZEN_EXT + ins_setting_init(); +#endif + return 0; } void __connman_service_cleanup(void) { - GSequence *list; - DBG(""); - if (autoconnect_timeout != 0) { - g_source_remove(autoconnect_timeout); - autoconnect_timeout = 0; + if (vpn_autoconnect_id) { + g_source_remove(vpn_autoconnect_id); + vpn_autoconnect_id = 0; + } + + if (autoconnect_id != 0) { + g_source_remove(autoconnect_id); + autoconnect_id = 0; } - list = service_list; + connman_agent_driver_unregister(&agent_driver); + + g_list_free(service_list); service_list = NULL; - g_sequence_free(list); g_hash_table_destroy(service_hash); service_hash = NULL; @@ -6737,12 +11085,11 @@ void __connman_service_cleanup(void) if (services_notify->id != 0) { g_source_remove(services_notify->id); service_send_changed(NULL); - g_hash_table_destroy(services_notify->remove); - g_hash_table_destroy(services_notify->add); } - g_free(services_notify); - connman_agent_driver_unregister(&agent_driver); + g_hash_table_destroy(services_notify->remove); + g_hash_table_destroy(services_notify->add); + g_free(services_notify); dbus_connection_unref(connection); }