X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fconfig.c;h=d9907a1cb30b37cbbc8296090342137dfdbc7251;hb=5bf80017321e03103f588306d2888d22f3f67ffa;hp=7e6b8a2b65bd369077bd4eb029c335e85f06597b;hpb=fd7df6fc7ec20c060277cd479616db4fab4972b5;p=platform%2Fupstream%2Fconnman.git diff --git a/src/config.c b/src/config.c index 7e6b8a2..d9907a1 100644 --- a/src/config.c +++ b/src/config.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2013 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 @@ -45,17 +45,25 @@ struct connman_config_service { unsigned int ssid_len; char *eap; char *identity; + char *anonymous_identity; char *ca_cert_file; + char *subject_match; + char *altsubject_match; + char *domain_suffix_match; + char *domain_match; char *client_cert_file; char *private_key_file; char *private_key_passphrase; char *private_key_passphrase_type; char *phase2; char *passphrase; + enum connman_service_security security; GSList *service_identifiers; char *config_ident; /* file prefix */ char *config_entry; /* entry name */ - connman_bool_t hidden; + bool hidden; + bool virtual; + char *virtual_file; char *ipv4_address; char *ipv4_netmask; char *ipv4_gateway; @@ -64,29 +72,32 @@ struct connman_config_service { char *ipv6_gateway; char *ipv6_privacy; char *mac; + bool mdns; char **nameservers; char **search_domains; char **timeservers; char *domain_name; +#if defined TIZEN_EXT + char *connector; + char *c_sign_key; + char *net_access_key; +#endif }; struct connman_config { char *ident; char *name; char *description; - connman_bool_t protected; GHashTable *service_table; }; static GHashTable *config_table = NULL; -static GSList *protected_services = NULL; -static connman_bool_t cleanup = FALSE; +static bool cleanup = false; /* Definition of possible strings in the .config files */ #define CONFIG_KEY_NAME "Name" #define CONFIG_KEY_DESC "Description" -#define CONFIG_KEY_PROT "Protected" #define SERVICE_KEY_TYPE "Type" #define SERVICE_KEY_NAME "Name" @@ -98,9 +109,16 @@ static connman_bool_t cleanup = FALSE; #define SERVICE_KEY_PRV_KEY_PASS "PrivateKeyPassphrase" #define SERVICE_KEY_PRV_KEY_PASS_TYPE "PrivateKeyPassphraseType" #define SERVICE_KEY_IDENTITY "Identity" +#define SERVICE_KEY_ANONYMOUS_IDENTITY "AnonymousIdentity" +#define SERVICE_KEY_SUBJECT_MATCH "SubjectMatch" +#define SERVICE_KEY_ALT_SUBJECT_MATCH "AltSubjectMatch" +#define SERVICE_KEY_DOMAIN_SUFF_MATCH "DomainSuffixMatch" +#define SERVICE_KEY_DOMAIN_MATCH "DomainMatch" #define SERVICE_KEY_PHASE2 "Phase2" #define SERVICE_KEY_PASSPHRASE "Passphrase" +#define SERVICE_KEY_SECURITY "Security" #define SERVICE_KEY_HIDDEN "Hidden" +#define SERVICE_KEY_MDNS "mDNS" #define SERVICE_KEY_IPv4 "IPv4" #define SERVICE_KEY_IPv6 "IPv6" @@ -110,11 +128,15 @@ static connman_bool_t cleanup = FALSE; #define SERVICE_KEY_SEARCH_DOMAINS "SearchDomains" #define SERVICE_KEY_TIMESERVERS "Timeservers" #define SERVICE_KEY_DOMAIN "Domain" +#if defined TIZEN_EXT +#define SERVICE_KEY_CONNECTOR "Connector" +#define SERVICE_KEY_C_SIGN_KEY "CSignKey" +#define SERVICE_KEY_NET_ACCESS_KEY "NetAccessKey" +#endif static const char *config_possible_keys[] = { CONFIG_KEY_NAME, CONFIG_KEY_DESC, - CONFIG_KEY_PROT, NULL, }; @@ -129,17 +151,29 @@ static const char *service_possible_keys[] = { SERVICE_KEY_PRV_KEY_PASS, SERVICE_KEY_PRV_KEY_PASS_TYPE, SERVICE_KEY_IDENTITY, + SERVICE_KEY_ANONYMOUS_IDENTITY, + SERVICE_KEY_SUBJECT_MATCH, + SERVICE_KEY_ALT_SUBJECT_MATCH, + SERVICE_KEY_DOMAIN_SUFF_MATCH, + SERVICE_KEY_DOMAIN_MATCH, SERVICE_KEY_PHASE2, SERVICE_KEY_PASSPHRASE, + SERVICE_KEY_SECURITY, SERVICE_KEY_HIDDEN, SERVICE_KEY_IPv4, SERVICE_KEY_IPv6, SERVICE_KEY_IPv6_PRIVACY, SERVICE_KEY_MAC, + SERVICE_KEY_MDNS, SERVICE_KEY_NAMESERVERS, SERVICE_KEY_SEARCH_DOMAINS, SERVICE_KEY_TIMESERVERS, SERVICE_KEY_DOMAIN, +#if defined TIZEN_EXT + SERVICE_KEY_CONNECTOR, + SERVICE_KEY_C_SIGN_KEY, + SERVICE_KEY_NET_ACCESS_KEY, +#endif NULL, }; @@ -164,38 +198,40 @@ static void unregister_service(gpointer data) char *service_id; GSList *list; - if (cleanup == TRUE) + if (cleanup) goto free_only; connman_info("Removing service configuration %s", config_service->ident); - protected_services = g_slist_remove(protected_services, - config_service); + if (config_service->virtual) + goto free_only; - for (list = config_service->service_identifiers; list != NULL; + for (list = config_service->service_identifiers; list; list = list->next) { service_id = list->data; - service = __connman_service_lookup_from_ident(service_id); - if (service != NULL) { - __connman_service_set_immutable(service, FALSE); + service = connman_service_lookup_from_identifier(service_id); + if (service) { + __connman_service_set_immutable(service, false); __connman_service_set_config(service, NULL, NULL); __connman_service_remove(service); /* - * Ethernet service cannot be removed by + * Ethernet or gadget service cannot be removed by * __connman_service_remove() so reset the ipconfig * here. */ if (connman_service_get_type(service) == - CONNMAN_SERVICE_TYPE_ETHERNET) { + CONNMAN_SERVICE_TYPE_ETHERNET || + connman_service_get_type(service) == + CONNMAN_SERVICE_TYPE_GADGET) { __connman_service_disconnect(service); __connman_service_reset_ipconfig(service, CONNMAN_IPCONFIG_TYPE_IPV4, NULL, NULL); __connman_service_reset_ipconfig(service, CONNMAN_IPCONFIG_TYPE_IPV6, NULL, NULL); - __connman_service_set_ignore(service, TRUE); + __connman_service_set_ignore(service, true); /* * After these operations, user needs to @@ -205,7 +241,7 @@ static void unregister_service(gpointer data) } } - if (__connman_storage_remove_service(service_id) == FALSE) + if (!__connman_storage_remove_service(service_id)) DBG("Could not remove all files for service %s", service_id); } @@ -217,7 +253,12 @@ free_only: g_free(config_service->ssid); g_free(config_service->eap); g_free(config_service->identity); + g_free(config_service->anonymous_identity); g_free(config_service->ca_cert_file); + g_free(config_service->subject_match); + g_free(config_service->altsubject_match); + g_free(config_service->domain_suffix_match); + g_free(config_service->domain_match); g_free(config_service->client_cert_file); g_free(config_service->private_key_file); g_free(config_service->private_key_passphrase); @@ -238,6 +279,12 @@ free_only: g_slist_free_full(config_service->service_identifiers, g_free); g_free(config_service->config_ident); g_free(config_service->config_entry); + g_free(config_service->virtual_file); +#if defined TIZEN_EXT + g_free(config_service->connector); + g_free(config_service->c_sign_key); + g_free(config_service->net_access_key); +#endif g_free(config_service); } @@ -248,7 +295,7 @@ static void check_keys(GKeyFile *keyfile, const char *group, gsize nb_avail_keys, i, j; avail_keys = g_key_file_get_keys(keyfile, group, &nb_avail_keys, NULL); - if (avail_keys == NULL) + if (!avail_keys) return; /* @@ -260,7 +307,7 @@ static void check_keys(GKeyFile *keyfile, const char *group, if (g_strcmp0(avail_keys[i], possible_keys[j]) == 0) break; - if (possible_keys[j] == NULL) + if (!possible_keys[j]) connman_warn("Unknown configuration key %s in [%s]", avail_keys[i], group); } @@ -268,34 +315,6 @@ static void check_keys(GKeyFile *keyfile, const char *group, g_strfreev(avail_keys); } -static connman_bool_t -is_protected_service(struct connman_config_service *service) -{ - GSList *list; - - DBG("ident %s", service->ident); - - for (list = protected_services; list; list = list->next) { - struct connman_config_service *s = list->data; - - if (g_strcmp0(s->type, service->type) != 0) - continue; - - if (s->ssid == NULL || service->ssid == NULL) - continue; - - if (s->ssid_len != service->ssid_len) - continue; - - if (g_strcmp0(service->type, "wifi") == 0 && - strncmp(s->ssid, service->ssid, s->ssid_len) == 0) { - return TRUE; - } - } - - return FALSE; -} - static int check_family(const char *address, int expected_family) { int family; @@ -342,11 +361,11 @@ static int parse_address(const char *address_str, int address_family, char **route; route = g_strsplit(address_str, "/", 0); - if (route == NULL) + if (!route) return -EINVAL; addr_str = route[0]; - if (addr_str == NULL || addr_str[0] == '\0') { + if (!addr_str || addr_str[0] == '\0') { err = -EINVAL; goto out; } @@ -355,20 +374,17 @@ static int parse_address(const char *address_str, int address_family, goto out; mask_str = route[1]; - if (mask_str == NULL || mask_str[0] == '\0') { + if (!mask_str || mask_str[0] == '\0') { err = -EINVAL; goto out; } gw_str = route[2]; - if (gw_str == NULL || gw_str[0] == '\0') { - err = -EINVAL; - goto out; + if (gw_str && gw_str[0]) { + if ((err = check_family(gw_str, address_family)) < 0) + goto out; } - if ((err = check_family(gw_str, address_family)) < 0) - goto out; - g_free(*address); *address = g_strdup(addr_str); @@ -378,7 +394,10 @@ static int parse_address(const char *address_str, int address_family, g_free(*gateway); *gateway = g_strdup(gw_str); - DBG("address %s/%s via %s", *address, *netmask, *gateway); + if (*gateway) + DBG("address %s/%s via %s", *address, *netmask, *gateway); + else + DBG("address %s/%s", *address, *netmask); out: g_strfreev(route); @@ -386,16 +405,28 @@ out: return err; } -static int load_service_generic(GKeyFile *keyfile, const char *group, - struct connman_config *config, - struct connman_config_service *service) +static bool check_address(char *address_str, char **address) +{ + if (g_ascii_strcasecmp(address_str, "auto") == 0 || + g_ascii_strcasecmp(address_str, "dhcp") == 0 || + g_ascii_strcasecmp(address_str, "off") == 0) { + *address = address_str; + return false; + } + + return true; +} + +static bool load_service_generic(GKeyFile *keyfile, + const char *group, struct connman_config *config, + struct connman_config_service *service) { char *str, *mask; char **strlist; gsize length; - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_IPv4, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_IPv4, NULL); + if (str && check_address(str, &service->ipv4_address)) { mask = NULL; if (parse_address(str, AF_INET, &service->ipv4_address, @@ -406,7 +437,7 @@ static int load_service_generic(GKeyFile *keyfile, const char *group, goto err; } - if (g_strrstr(mask, ".") == NULL) { + if (!g_strrstr(mask, ".")) { /* We have netmask length */ in_addr_t addr; struct in_addr netmask_in; @@ -414,7 +445,7 @@ static int load_service_generic(GKeyFile *keyfile, const char *group, char *ptr; long int value = strtol(mask, &ptr, 10); - if (ptr != mask && *ptr == '\0' && value <= 32) + if (ptr != mask && *ptr == '\0' && value && value <= 32) prefix_len = value; addr = 0xffffffff << (32 - prefix_len); @@ -429,8 +460,8 @@ static int load_service_generic(GKeyFile *keyfile, const char *group, g_free(str); } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_IPv6, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_IPv6, NULL); + if (str && check_address(str, &service->ipv6_address)) { long int value; char *ptr; @@ -454,29 +485,29 @@ static int load_service_generic(GKeyFile *keyfile, const char *group, g_free(str); } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_IPv6_PRIVACY, + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_IPv6_PRIVACY, NULL); - if (str != NULL) { + if (str) { g_free(service->ipv6_privacy); service->ipv6_privacy = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_MAC, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_MAC, NULL); + if (str) { g_free(service->mac); service->mac = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_DOMAIN, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_DOMAIN, NULL); + if (str) { g_free(service->domain_name); service->domain_name = str; } - strlist = g_key_file_get_string_list(keyfile, group, + strlist = __connman_config_get_string_list(keyfile, group, SERVICE_KEY_NAMESERVERS, &length, NULL); - if (strlist != NULL) { + if (strlist) { if (length != 0) { g_strfreev(service->nameservers); service->nameservers = strlist; @@ -484,10 +515,10 @@ static int load_service_generic(GKeyFile *keyfile, const char *group, g_strfreev(strlist); } - strlist = g_key_file_get_string_list(keyfile, group, + strlist = __connman_config_get_string_list(keyfile, group, SERVICE_KEY_SEARCH_DOMAINS, &length, NULL); - if (strlist != NULL) { + if (strlist) { if (length != 0) { g_strfreev(service->search_domains); service->search_domains = strlist; @@ -495,10 +526,10 @@ static int load_service_generic(GKeyFile *keyfile, const char *group, g_strfreev(strlist); } - strlist = g_key_file_get_string_list(keyfile, group, + strlist = __connman_config_get_string_list(keyfile, group, SERVICE_KEY_TIMESERVERS, &length, NULL); - if (strlist != NULL) { + if (strlist) { if (length != 0) { g_strfreev(service->timeservers); service->timeservers = strlist; @@ -506,7 +537,10 @@ static int load_service_generic(GKeyFile *keyfile, const char *group, g_strfreev(strlist); } - return 0; + service->mdns = __connman_config_get_bool(keyfile, group, + SERVICE_KEY_MDNS, NULL); + + return true; err: g_free(service->ident); @@ -519,52 +553,50 @@ err: g_free(service->mac); g_free(service); - return -EINVAL; + return false; } -static int load_service(GKeyFile *keyfile, const char *group, +static bool load_service(GKeyFile *keyfile, const char *group, struct connman_config *config) { struct connman_config_service *service; const char *ident; char *str, *hex_ssid; - gboolean service_created = FALSE; - int err; + enum connman_service_security security; + bool service_created = false; /* Strip off "service_" prefix */ ident = group + 8; if (strlen(ident) < 1) - return -EINVAL; + return false; /* Verify that provided keys are good */ check_keys(keyfile, group, service_possible_keys); service = g_hash_table_lookup(config->service_table, ident); - if (service == NULL) { + if (!service) { service = g_try_new0(struct connman_config_service, 1); - if (service == NULL) - return -ENOMEM; + if (!service) + return false; service->ident = g_strdup(ident); - service_created = TRUE; + service_created = true; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_TYPE, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_TYPE, NULL); + if (str) { g_free(service->type); service->type = str; } else { - DBG("Type of the configured service is missing for group %s", - group); - err = -EINVAL; + connman_warn("Type of the configured service is missing " + "for group %s", group); goto err; } - err = load_service_generic(keyfile, group, config, service); - if (err != 0) - return err; + if (!load_service_generic(keyfile, group, config, service)) + return false; if (g_strcmp0(str, "ethernet") == 0) { service->config_ident = g_strdup(config->ident); @@ -573,25 +605,24 @@ static int load_service(GKeyFile *keyfile, const char *group, g_hash_table_insert(config->service_table, service->ident, service); - return 0; + return true; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_NAME, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_NAME, NULL); + if (str) { g_free(service->name); service->name = str; } - hex_ssid = g_key_file_get_string(keyfile, group, SERVICE_KEY_SSID, + hex_ssid = __connman_config_get_string(keyfile, group, SERVICE_KEY_SSID, NULL); - if (hex_ssid != NULL) { + if (hex_ssid) { char *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) { - err = -ENOMEM; + if (!ssid) { g_free(hex_ssid); goto err; } @@ -601,7 +632,6 @@ static int load_service(GKeyFile *keyfile, const char *group, connman_warn("Invalid SSID %s", hex_ssid); g_free(ssid); g_free(hex_ssid); - err = -EILSEQ; goto err; } ssid[j++] = hex; @@ -612,16 +642,18 @@ static int load_service(GKeyFile *keyfile, const char *group, g_free(service->ssid); service->ssid = ssid; service->ssid_len = hex_ssid_len / 2; - } else if (service->name != NULL) { + } else if (service->name) { char *ssid; unsigned int ssid_len; ssid_len = strlen(service->name); +#if defined TIZEN_EXT + ssid = g_try_malloc0(ssid_len + 1); +#else ssid = g_try_malloc0(ssid_len); - if (ssid == NULL) { - err = -ENOMEM; +#endif + if (!ssid) goto err; - } memcpy(ssid, service->name, ssid_len); g_free(service->ssid); @@ -629,89 +661,194 @@ static int load_service(GKeyFile *keyfile, const char *group, service->ssid_len = ssid_len; } - if (is_protected_service(service) == TRUE) { - connman_error("Trying to provision a protected service"); - err = -EACCES; - goto err; - } - - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_EAP, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_EAP, NULL); + if (str) { g_free(service->eap); service->eap = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_CA_CERT, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_CA_CERT, NULL); + if (str) { g_free(service->ca_cert_file); service->ca_cert_file = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_CL_CERT, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_CL_CERT, NULL); + if (str) { g_free(service->client_cert_file); service->client_cert_file = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_PRV_KEY, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_PRV_KEY, NULL); + if (str) { g_free(service->private_key_file); service->private_key_file = str; } - str = g_key_file_get_string(keyfile, group, + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_PRV_KEY_PASS, NULL); - if (str != NULL) { + if (str) { g_free(service->private_key_passphrase); service->private_key_passphrase = str; } - str = g_key_file_get_string(keyfile, group, + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_PRV_KEY_PASS_TYPE, NULL); - if (str != NULL) { + if (str) { g_free(service->private_key_passphrase_type); service->private_key_passphrase_type = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_IDENTITY, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_IDENTITY, NULL); + if (str) { g_free(service->identity); service->identity = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_PHASE2, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, group, + SERVICE_KEY_ANONYMOUS_IDENTITY, NULL); + if (str) { + g_free(service->anonymous_identity); + service->anonymous_identity = str; + } + + str = __connman_config_get_string(keyfile, group, + SERVICE_KEY_SUBJECT_MATCH, NULL); + if (str) { + g_free(service->subject_match); + service->subject_match = str; + } + + str = __connman_config_get_string(keyfile, group, + SERVICE_KEY_ALT_SUBJECT_MATCH, NULL); + if (str) { + g_free(service->altsubject_match); + service->altsubject_match = str; + } + + str = __connman_config_get_string(keyfile, group, + SERVICE_KEY_DOMAIN_SUFF_MATCH, NULL); + if (str) { + g_free(service->domain_suffix_match); + service->domain_suffix_match = str; + } + + str = __connman_config_get_string(keyfile, group, + SERVICE_KEY_DOMAIN_MATCH, NULL); + if (str) { + g_free(service->domain_match); + service->domain_match = str; + } + + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_PHASE2, NULL); + if (str) { g_free(service->phase2); service->phase2 = str; } - str = g_key_file_get_string(keyfile, group, SERVICE_KEY_PASSPHRASE, + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_PASSPHRASE, NULL); - if (str != NULL) { + if (str) { g_free(service->passphrase); service->passphrase = str; } +#if defined TIZEN_EXT + + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_CONNECTOR, + NULL); + if (str) { + g_free(service->connector); + service->connector = str; + } + + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_C_SIGN_KEY, + NULL); + if (str) { + g_free(service->c_sign_key); + service->c_sign_key = str; + } + + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_NET_ACCESS_KEY, + NULL); + if (str) { + g_free(service->net_access_key); + service->net_access_key = str; + } +#endif + + str = __connman_config_get_string(keyfile, group, SERVICE_KEY_SECURITY, + NULL); + security = __connman_service_string2security(str); + + if (service->eap) { + + if (str && security != CONNMAN_SERVICE_SECURITY_8021X) + connman_info("Mismatch between EAP configuration and " + "setting %s = %s", + SERVICE_KEY_SECURITY, str); + + service->security = CONNMAN_SERVICE_SECURITY_8021X; + + } else if (service->passphrase) { + + if (str) { + if (security == CONNMAN_SERVICE_SECURITY_PSK || +#if defined TIZEN_EXT + security == CONNMAN_SERVICE_SECURITY_RSN || + security == CONNMAN_SERVICE_SECURITY_SAE || +#endif + security == CONNMAN_SERVICE_SECURITY_WEP) { + service->security = security; + } else { + connman_info("Mismatch with passphrase and " + "setting %s = %s", + SERVICE_KEY_SECURITY, str); + + service->security = + CONNMAN_SERVICE_SECURITY_PSK; + } + + } else + service->security = CONNMAN_SERVICE_SECURITY_PSK; +#if defined TIZEN_EXT + } else if (service->connector) { + + if (str && security != CONNMAN_SERVICE_SECURITY_DPP) + connman_info("Mismatch between DPP configuration and " + "setting %s = %s", + SERVICE_KEY_SECURITY, str); + + service->security = CONNMAN_SERVICE_SECURITY_DPP; +#endif + } else if (str) { + + if (security != CONNMAN_SERVICE_SECURITY_NONE) + connman_info("Mismatch no security and " + "setting %s = %s", + SERVICE_KEY_SECURITY, str); + + service->security = CONNMAN_SERVICE_SECURITY_NONE; + } else + service->security = CONNMAN_SERVICE_SECURITY_NONE; + + g_free(str); service->config_ident = g_strdup(config->ident); service->config_entry = g_strdup_printf("service_%s", service->ident); - service->hidden = g_key_file_get_boolean(keyfile, group, + service->hidden = __connman_config_get_bool(keyfile, group, SERVICE_KEY_HIDDEN, NULL); if (service_created) g_hash_table_insert(config->service_table, service->ident, service); - if (config->protected == TRUE) - protected_services = - g_slist_prepend(protected_services, service); - connman_info("Adding service configuration %s", service->ident); - return 0; + return true; err: - if (service_created == TRUE) { + if (service_created) { g_free(service->ident); g_free(service->type); g_free(service->name); @@ -719,64 +856,66 @@ err: g_free(service); } - return err; + return false; +} + +static bool load_service_from_keyfile(GKeyFile *keyfile, + struct connman_config *config) +{ + bool found = false; + char **groups; + int i; + + groups = g_key_file_get_groups(keyfile, NULL); + + for (i = 0; groups[i]; i++) { + if (!g_str_has_prefix(groups[i], "service_")) { + connman_warn("Ignore group named '%s' because prefix " + "is not 'service_'", groups[i]); + continue; + } + if (load_service(keyfile, groups[i], config)) + found = true; + } + + g_strfreev(groups); + + return found; } static int load_config(struct connman_config *config) { GKeyFile *keyfile; - GError *error = NULL; - gsize length; - char **groups; char *str; - gboolean protected, found = FALSE; - int i; DBG("config %p", config); keyfile = __connman_storage_load_config(config->ident); - if (keyfile == NULL) + if (!keyfile) return -EIO; + g_key_file_set_list_separator(keyfile, ','); + /* Verify keys validity of the global section */ check_keys(keyfile, "global", config_possible_keys); - str = g_key_file_get_string(keyfile, "global", CONFIG_KEY_NAME, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, "global", CONFIG_KEY_NAME, NULL); + if (str) { g_free(config->name); config->name = str; } - str = g_key_file_get_string(keyfile, "global", CONFIG_KEY_DESC, NULL); - if (str != NULL) { + str = __connman_config_get_string(keyfile, "global", CONFIG_KEY_DESC, NULL); + if (str) { g_free(config->description); config->description = str; } - protected = g_key_file_get_boolean(keyfile, "global", - CONFIG_KEY_PROT, &error); - if (error == NULL) - config->protected = protected; - else - config->protected = TRUE; - g_clear_error(&error); - - groups = g_key_file_get_groups(keyfile, &length); - - for (i = 0; groups[i] != NULL; i++) { - if (g_str_has_prefix(groups[i], "service_") == TRUE) { - if (load_service(keyfile, groups[i], config) == 0) - found = TRUE; - } - } - - if (found == FALSE) + if (!load_service_from_keyfile(keyfile, config)) connman_warn("Config file %s/%s.config does not contain any " "configuration that can be provisioned!", STORAGEDIR, config->ident); - g_strfreev(groups); - g_key_file_free(keyfile); return 0; @@ -788,11 +927,11 @@ static struct connman_config *create_config(const char *ident) DBG("ident %s", ident); - if (g_hash_table_lookup(config_table, ident) != NULL) + if (g_hash_table_lookup(config_table, ident)) return NULL; config = g_try_new0(struct connman_config, 1); - if (config == NULL) + if (!config) return NULL; config->ident = g_strdup(ident); @@ -807,18 +946,18 @@ static struct connman_config *create_config(const char *ident) return config; } -static connman_bool_t validate_ident(const char *ident) +static bool validate_ident(const char *ident) { unsigned int i; - if (ident == NULL) - return FALSE; + if (!ident) + return false; for (i = 0; i < strlen(ident); i++) - if (g_ascii_isprint(ident[i]) == FALSE) - return FALSE; + if (!g_ascii_isprint(ident[i])) + return false; - return TRUE; + return true; } static int read_configs(void) @@ -828,31 +967,31 @@ static int read_configs(void) DBG(""); dir = g_dir_open(STORAGEDIR, 0, NULL); - if (dir != NULL) { + if (dir) { const gchar *file; - while ((file = g_dir_read_name(dir)) != NULL) { + while ((file = g_dir_read_name(dir))) { GString *str; gchar *ident; - if (g_str_has_suffix(file, ".config") == FALSE) + if (!g_str_has_suffix(file, ".config")) continue; ident = g_strrstr(file, ".config"); - if (ident == NULL) + if (!ident) continue; str = g_string_new_len(file, ident - file); - if (str == NULL) + if (!str) continue; ident = g_string_free(str, FALSE); - if (validate_ident(ident) == TRUE) { + if (validate_ident(ident)) { struct connman_config *config; config = create_config(ident); - if (config != NULL) + if (config) load_config(config); } else { connman_error("Invalid config ident %s", ident); @@ -871,31 +1010,31 @@ static void config_notify_handler(struct inotify_event *event, { char *ext; - if (ident == NULL) + if (!ident) return; - if (g_str_has_suffix(ident, ".config") == FALSE) + if (!g_str_has_suffix(ident, ".config")) return; ext = g_strrstr(ident, ".config"); - if (ext == NULL) + if (!ext) return; *ext = '\0'; - if (validate_ident(ident) == FALSE) { + if (!validate_ident(ident)) { connman_error("Invalid config ident %s", ident); return; } - if (event->mask & IN_CREATE) + if (event->mask & (IN_CREATE | IN_MOVED_TO)) create_config(ident); - if (event->mask & IN_MODIFY) { + if (event->mask & (IN_MODIFY | IN_MOVED_TO)) { struct connman_config *config; config = g_hash_table_lookup(config_table, ident); - if (config != NULL) { + if (config) { int ret; g_hash_table_remove_all(config->service_table); @@ -913,7 +1052,7 @@ static void config_notify_handler(struct inotify_event *event, } } - if (event->mask & IN_DELETE) + if (event->mask & (IN_DELETE | IN_MOVED_FROM)) g_hash_table_remove(config_table, ident); } @@ -933,14 +1072,66 @@ void __connman_config_cleanup(void) { DBG(""); - cleanup = TRUE; + cleanup = true; connman_inotify_unregister(STORAGEDIR, config_notify_handler); g_hash_table_destroy(config_table); config_table = NULL; - cleanup = FALSE; + cleanup = false; +} + +char *__connman_config_get_string(GKeyFile *key_file, + const char *group_name, const char *key, GError **error) +{ + char *str = g_key_file_get_string(key_file, group_name, key, error); + if (!str) + return NULL; + + /* passphrases can have spaces in the end */ + if (!g_strcmp0(key, SERVICE_KEY_PASSPHRASE) || + !g_strcmp0(key, SERVICE_KEY_PRV_KEY_PASS)) + return str; + + return g_strchomp(str); +} + +char **__connman_config_get_string_list(GKeyFile *key_file, + const char *group_name, const char *key, gsize *length, GError **error) +{ + char **p; + char **strlist = g_key_file_get_string_list(key_file, group_name, key, + length, error); + if (!strlist) + return NULL; + + p = strlist; + while (*p) { + *p = g_strstrip(*p); + p++; + } + + return strlist; +} + +bool __connman_config_get_bool(GKeyFile *key_file, + const char *group_name, const char *key, GError **error) +{ + char *valstr; + bool val = false; + + valstr = g_key_file_get_value(key_file, group_name, key, error); + if (!valstr) + return false; + + valstr = g_strchomp(valstr); + if (strcmp(valstr, "true") == 0 || strcmp(valstr, "1") == 0) + val = true; + + g_free(valstr); + + return val; } static char *config_pem_fsid(const char *pem_file) @@ -949,7 +1140,7 @@ static char *config_pem_fsid(const char *pem_file) unsigned *fsid = (unsigned *) &buf.f_fsid; unsigned long long fsid64; - if (pem_file == NULL) + if (!pem_file) return NULL; if (statfs(pem_file, &buf) < 0) { @@ -963,44 +1154,63 @@ static char *config_pem_fsid(const char *pem_file) return g_strdup_printf("%llx", fsid64); } -static void provision_service_wifi(gpointer key, - struct connman_config_service *config, +static void provision_service_wifi(struct connman_config_service *config, struct connman_service *service, struct connman_network *network, const void *ssid, unsigned int ssid_len) { - if (config->eap != NULL) + if (config->eap) __connman_service_set_string(service, "EAP", config->eap); - if (config->identity != NULL) + if (config->identity) __connman_service_set_string(service, "Identity", config->identity); - if (config->ca_cert_file != NULL) + if (config->anonymous_identity) + __connman_service_set_string(service, "AnonymousIdentity", + config->anonymous_identity); + + if (config->ca_cert_file) __connman_service_set_string(service, "CACertFile", config->ca_cert_file); - if (config->client_cert_file != NULL) + if (config->subject_match) + __connman_service_set_string(service, "SubjectMatch", + config->subject_match); + + if (config->altsubject_match) + __connman_service_set_string(service, "AltSubjectMatch", + config->altsubject_match); + + if (config->domain_suffix_match) + __connman_service_set_string(service, "DomainSuffixMatch", + config->domain_suffix_match); + + if (config->domain_match) + __connman_service_set_string(service, "DomainMatch", + config->domain_match); + + if (config->client_cert_file) __connman_service_set_string(service, "ClientCertFile", config->client_cert_file); - if (config->private_key_file != NULL) + if (config->private_key_file) __connman_service_set_string(service, "PrivateKeyFile", config->private_key_file); if (g_strcmp0(config->private_key_passphrase_type, "fsid") == 0 && - config->private_key_file != NULL) { + config->private_key_file) { char *fsid; fsid = config_pem_fsid(config->private_key_file); - if (fsid == NULL) + if (!fsid) return; g_free(config->private_key_passphrase); config->private_key_passphrase = fsid; } - if (config->private_key_passphrase != NULL) { + if (config->private_key_passphrase) { __connman_service_set_string(service, "PrivateKeyPassphrase", config->private_key_passphrase); /* @@ -1012,56 +1222,141 @@ static void provision_service_wifi(gpointer key, */ } - if (config->phase2 != NULL) + if (config->phase2) __connman_service_set_string(service, "Phase2", config->phase2); +#if defined TIZEN_EXT + else + __connman_service_set_string(service, "Phase2", NULL); +#endif - if (config->passphrase != NULL) - __connman_service_set_string(service, "Passphrase", config->passphrase); + if (config->passphrase) + __connman_service_set_string(service, "Passphrase", + config->passphrase); - if (config->hidden == TRUE) + if (config->hidden) __connman_service_set_hidden(service); + +#if defined TIZEN_EXT + if (config->connector) + __connman_service_set_string(service, "Connector", + config->connector); + if (config->c_sign_key) + __connman_service_set_string(service, "CSignKey", + config->c_sign_key); + if (config->net_access_key) + __connman_service_set_string(service, "NetAccessKey", + config->net_access_key); +#endif +} + +struct connect_virtual { + struct connman_service *service; + const char *vfile; +}; + +static gboolean remove_virtual_config(gpointer user_data) +{ + struct connect_virtual *virtual = user_data; + + __connman_service_connect(virtual->service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); + g_hash_table_remove(config_table, virtual->vfile); + + g_free(virtual); + + return FALSE; +} + +#if defined TIZEN_EXT +static bool __check_address_type(int address_family, const char *address) +{ + unsigned char buf[sizeof(struct in6_addr)] = {0, }; + int err = 0; + + err = inet_pton(address_family, address, buf); + if(err > 0) + return TRUE; + + return FALSE; } +#endif -static void provision_service(gpointer key, gpointer value, - gpointer user_data) +static int try_provision_service(struct connman_config_service *config, + struct connman_service *service) { - struct connman_service *service = user_data; - struct connman_config_service *config = value; struct connman_network *network; const void *service_id; enum connman_service_type type; const void *ssid; unsigned int ssid_len; - - type = connman_service_get_type(service); - if (type == CONNMAN_SERVICE_TYPE_WIFI && - g_strcmp0(config->type, "wifi") != 0) - return; - - if (type == CONNMAN_SERVICE_TYPE_ETHERNET && - g_strcmp0(config->type, "ethernet") != 0) - return; - - DBG("service %p ident %s", service, - __connman_service_get_ident(service)); + const char *str; network = __connman_service_get_network(service); - if (network == NULL) { + if (!network) { connman_error("Service has no network set"); - return; + return -EINVAL; } DBG("network %p ident %s", network, connman_network_get_identifier(network)); - if (config->mac != NULL) { + type = connman_service_get_type(service); + + switch(type) { + case CONNMAN_SERVICE_TYPE_WIFI: + if (__connman_service_string2type(config->type) != type) + return -ENOENT; + + ssid = connman_network_get_blob(network, "WiFi.SSID", + &ssid_len); + if (!ssid) + return -ENOENT; + + if (!config->ssid || ssid_len != config->ssid_len) + return -ENOENT; + + if (memcmp(config->ssid, ssid, ssid_len)) + return -ENOENT; + + str = connman_network_get_string(network, "WiFi.Security"); + if (config->security != __connman_service_string2security(str)) + return -ENOENT; + + break; + + case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: + + if (__connman_service_string2type(config->type) != type) + return -ENOENT; + + break; + + case CONNMAN_SERVICE_TYPE_UNKNOWN: + case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_CELLULAR: + 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 + + return -ENOENT; + } + + DBG("service %p ident %s", service, + connman_service_get_identifier(service)); + + if (config->mac) { struct connman_device *device; const char *device_addr; device = connman_network_get_device(network); - if (device == NULL) { + if (!device) { connman_error("Network device is missing"); - return; + return -ENODEV; } device_addr = connman_device_get_string(device, "Address"); @@ -1069,37 +1364,36 @@ static void provision_service(gpointer key, gpointer value, DBG("wants %s has %s", config->mac, device_addr); if (g_ascii_strcasecmp(device_addr, config->mac) != 0) - return; + return -ENOENT; } - if (g_strcmp0(config->type, "wifi") == 0 && - type == CONNMAN_SERVICE_TYPE_WIFI) { - ssid = connman_network_get_blob(network, "WiFi.SSID", - &ssid_len); - if (ssid == NULL) { - connman_error("Network SSID not set"); - return; - } - - if (config->ssid == NULL || ssid_len != config->ssid_len) - return; - - if (memcmp(config->ssid, ssid, ssid_len) != 0) - return; - } - - if (config->ipv6_address != NULL) { +#if defined TIZEN_EXT + struct connman_ipconfig *ip6config = __connman_service_get_ip6config(service); + enum connman_ipconfig_method ipv6_method = __connman_ipconfig_get_method(ip6config); + if (ipv6_method == CONNMAN_IPCONFIG_METHOD_MANUAL) + goto ipv6_out; +#endif + if (!config->ipv6_address) { + connman_network_set_ipv6_method(network, + CONNMAN_IPCONFIG_METHOD_AUTO); + } else if (g_ascii_strcasecmp(config->ipv6_address, "off") == 0) { + connman_network_set_ipv6_method(network, + CONNMAN_IPCONFIG_METHOD_OFF); + } else if (g_ascii_strcasecmp(config->ipv6_address, "auto") == 0 || + g_ascii_strcasecmp(config->ipv6_address, "dhcp") == 0) { + connman_network_set_ipv6_method(network, + CONNMAN_IPCONFIG_METHOD_AUTO); + } else { struct connman_ipaddress *address; - if (config->ipv6_prefix_length == 0 || - config->ipv6_gateway == NULL) { - DBG("IPv6 prefix or gateway missing"); - return; + if (config->ipv6_prefix_length == 0) { + DBG("IPv6 prefix missing"); + return -EINVAL; } address = connman_ipaddress_alloc(AF_INET6); - if (address == NULL) - return; + if (!address) + return -ENOENT; connman_ipaddress_set_ipv6(address, config->ipv6_address, config->ipv6_prefix_length, @@ -1115,27 +1409,45 @@ static void provision_service(gpointer key, gpointer value, connman_ipaddress_free(address); } - if (config->ipv6_privacy != NULL) { +#if defined TIZEN_EXT +ipv6_out: +#endif + if (config->ipv6_privacy) { struct connman_ipconfig *ipconfig; ipconfig = __connman_service_get_ip6config(service); - if (ipconfig != NULL) + if (ipconfig) __connman_ipconfig_ipv6_set_privacy(ipconfig, config->ipv6_privacy); } - if (config->ipv4_address != NULL) { +#if defined TIZEN_EXT + struct connman_ipconfig *ip4config = __connman_service_get_ip4config(service); + enum connman_ipconfig_method ipv4_method = __connman_ipconfig_get_method(ip4config); + if (ipv4_method == CONNMAN_IPCONFIG_METHOD_MANUAL) + goto ipv4_out; +#endif + if (!config->ipv4_address) { + connman_network_set_ipv4_method(network, + CONNMAN_IPCONFIG_METHOD_DHCP); + } else if (g_ascii_strcasecmp(config->ipv4_address, "off") == 0) { + connman_network_set_ipv4_method(network, + CONNMAN_IPCONFIG_METHOD_OFF); + } else if (g_ascii_strcasecmp(config->ipv4_address, "auto") == 0 || + g_ascii_strcasecmp(config->ipv4_address, "dhcp") == 0) { + connman_network_set_ipv4_method(network, + CONNMAN_IPCONFIG_METHOD_DHCP); + } else { struct connman_ipaddress *address; - if (config->ipv4_netmask == 0 || - config->ipv4_gateway == NULL) { - DBG("IPv4 netmask or gateway missing"); - return; + if (!config->ipv4_netmask) { + DBG("IPv4 netmask missing"); + return -EINVAL; } address = connman_ipaddress_alloc(AF_INET); - if (address == NULL) - return; + if (!address) + return -ENOENT; connman_ipaddress_set_ipv4(address, config->ipv4_address, config->ipv4_netmask, @@ -1151,81 +1463,152 @@ static void provision_service(gpointer key, gpointer value, connman_ipaddress_free(address); } +#if defined TIZEN_EXT +ipv4_out: +#endif __connman_service_disconnect(service); - service_id = __connman_service_get_ident(service); + service_id = connman_service_get_identifier(service); config->service_identifiers = g_slist_prepend(config->service_identifiers, g_strdup(service_id)); - __connman_service_set_immutable(service, TRUE); - - __connman_service_set_favorite_delayed(service, TRUE, TRUE); + __connman_service_set_favorite_delayed(service, true, true); __connman_service_set_config(service, config->config_ident, config->config_entry); - if (config->domain_name != NULL) + if (config->domain_name) __connman_service_set_domainname(service, config->domain_name); - if (config->nameservers != NULL) { + if (config->nameservers) { int i; __connman_service_nameserver_clear(service); - for (i = 0; config->nameservers[i] != NULL; i++) { + for (i = 0; config->nameservers[i]; i++) { +#if defined TIZEN_EXT + if (__check_address_type(AF_INET, config->nameservers[i])) + __connman_service_nameserver_append(service, + config->nameservers[i], false, + CONNMAN_IPCONFIG_TYPE_IPV4); + else if (__check_address_type(AF_INET6, config->nameservers[i])) + __connman_service_nameserver_append(service, + config->nameservers[i], false, + CONNMAN_IPCONFIG_TYPE_IPV6); +#else __connman_service_nameserver_append(service, - config->nameservers[i], FALSE); + config->nameservers[i], false); +#endif } } - if (config->search_domains != NULL) + if (config->search_domains) __connman_service_set_search_domains(service, config->search_domains); - if (config->timeservers != NULL) + __connman_service_set_mdns(service, config->mdns); + + if (config->timeservers) __connman_service_set_timeservers(service, config->timeservers); - if (g_strcmp0(config->type, "wifi") == 0 && - type == CONNMAN_SERVICE_TYPE_WIFI) { - provision_service_wifi(key, config, service, network, + if (type == CONNMAN_SERVICE_TYPE_WIFI) { + provision_service_wifi(config, service, network, ssid, ssid_len); - } else - __connman_service_connect(service); + } __connman_service_mark_dirty(); - __connman_service_save(service); + __connman_service_load_modifiable(service); + + if (config->virtual) { + struct connect_virtual *virtual; + + virtual = g_malloc0(sizeof(struct connect_virtual)); + virtual->service = service; + virtual->vfile = config->virtual_file; + + g_idle_add(remove_virtual_config, virtual); + + return 0; + } + +#if !defined TIZEN_EXT + __connman_service_set_immutable(service, true); +#endif + + if (type == CONNMAN_SERVICE_TYPE_ETHERNET || + type == CONNMAN_SERVICE_TYPE_GADGET) { + __connman_service_connect(service, + CONNMAN_SERVICE_CONNECT_REASON_AUTO); - __connman_service_auto_connect(); + return 0; + } + + __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO); + + return 0; } -int __connman_config_provision_service(struct connman_service *service) +static int +find_and_provision_service_from_config(struct connman_service *service, + struct connman_config *config) { - enum connman_service_type type; GHashTableIter iter; gpointer value, key; - /* For now only WiFi and Ethernet services are supported */ - type = connman_service_get_type(service); + g_hash_table_iter_init(&iter, config->service_table); + while (g_hash_table_iter_next(&iter, &key, + &value)) { + if (!try_provision_service(value, service)) + return 0; + } - DBG("service %p type %d", service, type); + return -ENOENT; +} - if (type != CONNMAN_SERVICE_TYPE_WIFI && - type != CONNMAN_SERVICE_TYPE_ETHERNET) - return -ENOSYS; +static int find_and_provision_service(struct connman_service *service) +{ + GHashTableIter iter; + gpointer value, key; g_hash_table_iter_init(&iter, config_table); - while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) { + while (g_hash_table_iter_next(&iter, &key, &value)) { struct connman_config *config = value; - g_hash_table_foreach(config->service_table, - provision_service, service); + if (!find_and_provision_service_from_config(service, config)) + return 0; } - return 0; + return -ENOENT; +} + +int __connman_config_provision_service(struct connman_service *service) +{ + enum connman_service_type type; + + /* For now only WiFi, Gadget and Ethernet services are supported */ + type = connman_service_get_type(service); +#if defined TIZEN_EXT + if (!simplified_log) +#endif + DBG("service %p type %d", service, type); + + if (type != CONNMAN_SERVICE_TYPE_WIFI && + type != CONNMAN_SERVICE_TYPE_ETHERNET && + type != CONNMAN_SERVICE_TYPE_GADGET) + return -ENOSYS; + +#if defined TIZEN_EXT + if(type == CONNMAN_SERVICE_TYPE_WIFI && + __connman_service_get_security(service) == + CONNMAN_SERVICE_SECURITY_NONE) + return -ENOSYS; +#endif + + return find_and_provision_service(service); } int __connman_config_provision_service_ident(struct connman_service *service, @@ -1235,20 +1618,21 @@ int __connman_config_provision_service_ident(struct connman_service *service, struct connman_config *config; int ret = 0; - /* For now only WiFi and Ethernet services are supported */ + /* For now only WiFi, Gadget and Ethernet services are supported */ type = connman_service_get_type(service); DBG("service %p type %d", service, type); if (type != CONNMAN_SERVICE_TYPE_WIFI && - type != CONNMAN_SERVICE_TYPE_ETHERNET) + type != CONNMAN_SERVICE_TYPE_ETHERNET && + type != CONNMAN_SERVICE_TYPE_GADGET) return -ENOSYS; config = g_hash_table_lookup(config_table, ident); - if (config != NULL) { + if (config) { GHashTableIter iter; gpointer value, key; - gboolean found = FALSE; + bool found = false; g_hash_table_iter_init(&iter, config->service_table); @@ -1256,9 +1640,9 @@ int __connman_config_provision_service_ident(struct connman_service *service, * Check if we need to remove individual service if it * is missing from config file. */ - if (file != NULL && entry != NULL) { + if (file && entry) { while (g_hash_table_iter_next(&iter, &key, - &value) == TRUE) { + &value)) { struct connman_config_service *config_service; config_service = value; @@ -1271,14 +1655,14 @@ int __connman_config_provision_service_ident(struct connman_service *service, entry) != 0) continue; - found = TRUE; + found = true; break; } DBG("found %d ident %s file %s entry %s", found, ident, file, entry); - if (found == FALSE) { + if (!found) { /* * The entry+8 will skip "service_" prefix */ @@ -1288,13 +1672,83 @@ int __connman_config_provision_service_ident(struct connman_service *service, } } - g_hash_table_foreach(config->service_table, - provision_service, service); + find_and_provision_service_from_config(service, config); } return ret; } +static void generate_random_string(char *str, int length) +{ + uint8_t val; + int i; + uint64_t rand; + + memset(str, '\0', length); + + for (i = 0; i < length-1; i++) { + do { + __connman_util_get_random(&rand); + val = (uint8_t)(rand % 122); + if (val < 48) + val += 48; + } while((val > 57 && val < 65) || (val > 90 && val < 97)); + + str[i] = val; + } +} + +int connman_config_provision_mutable_service(GKeyFile *keyfile) +{ + struct connman_config_service *service_config; + struct connman_config *config; + char *vfile, *group = NULL; + char rstr[11]; + + DBG(""); + + generate_random_string(rstr, 11); + + vfile = g_strdup_printf("service_mutable_%s.config", rstr); + + config = create_config(vfile); + if (!config) + return -ENOMEM; + + if (!load_service_from_keyfile(keyfile, config)) + goto error; + + group = g_key_file_get_start_group(keyfile); + + service_config = g_hash_table_lookup(config->service_table, group+8); + if (!service_config) + goto error; + + /* Specific to non file based config: */ + g_free(service_config->config_ident); + service_config->config_ident = NULL; + g_free(service_config->config_entry); + service_config->config_entry = NULL; + + service_config->virtual = true; + service_config->virtual_file = vfile; + + __connman_service_provision_changed(vfile); + + if (g_strcmp0(service_config->type, "wifi") == 0) + __connman_device_request_scan(CONNMAN_SERVICE_TYPE_WIFI); + + g_free(group); + return 0; + +error: + DBG("Could not proceed"); + g_hash_table_remove(config_table, vfile); + g_free(vfile); + g_free(group); + return -EINVAL; +} + struct connman_config_entry **connman_config_get_entries(const char *type) { GHashTableIter iter_file, iter_config; @@ -1303,35 +1757,38 @@ struct connman_config_entry **connman_config_get_entries(const char *type) int i = 0, count; g_hash_table_iter_init(&iter_file, config_table); - while (g_hash_table_iter_next(&iter_file, &key, &value) == TRUE) { + while (g_hash_table_iter_next(&iter_file, &key, &value)) { struct connman_config *config_file = value; + struct connman_config_entry **tmp_entries = entries; count = g_hash_table_size(config_file->service_table); entries = g_try_realloc(entries, (i + count + 1) * sizeof(struct connman_config_entry *)); - if (entries == NULL) + if (!entries) { + g_free(tmp_entries); return NULL; + } g_hash_table_iter_init(&iter_config, config_file->service_table); while (g_hash_table_iter_next(&iter_config, &key, - &value) == TRUE) { + &value)) { struct connman_config_service *config = value; - if (type != NULL && + if (type && g_strcmp0(config->type, type) != 0) continue; entries[i] = g_try_new0(struct connman_config_entry, 1); - if (entries[i] == NULL) + if (!entries[i]) goto cleanup; entries[i]->ident = g_strdup(config->ident); entries[i]->name = g_strdup(config->name); entries[i]->ssid = g_try_malloc0(config->ssid_len + 1); - if (entries[i]->ssid == NULL) + if (!entries[i]->ssid) goto cleanup; memcpy(entries[i]->ssid, config->ssid, @@ -1343,11 +1800,15 @@ struct connman_config_entry **connman_config_get_entries(const char *type) } } - if (entries != NULL) { + if (entries) { + struct connman_config_entry **tmp_entries = entries; + entries = g_try_realloc(entries, (i + 1) * sizeof(struct connman_config_entry *)); - if (entries == NULL) + if (!entries) { + g_free(tmp_entries); return NULL; + } entries[i] = NULL; @@ -1365,7 +1826,7 @@ void connman_config_free_entries(struct connman_config_entry **entries) { int i; - if (entries == NULL) + if (!entries) return; for (i = 0; entries[i]; i++) { @@ -1376,5 +1837,32 @@ void connman_config_free_entries(struct connman_config_entry **entries) } g_free(entries); - return; +} + +bool __connman_config_address_provisioned(const char *address, + const char *netmask) +{ + GHashTableIter iter, siter; + gpointer value, key, svalue, skey; + + if (!address || !netmask) + return false; + + g_hash_table_iter_init(&iter, config_table); + + while (g_hash_table_iter_next(&iter, &key, &value)) { + struct connman_config *config = value; + + g_hash_table_iter_init(&siter, config->service_table); + while (g_hash_table_iter_next(&siter, &skey, &svalue)) { + struct connman_config_service *service = svalue; + + if (!g_strcmp0(address, service->ipv4_address) && + !g_strcmp0(netmask, + service->ipv4_netmask)) + return true; + } + } + + return false; }