Refactor set_property's Domains.Configuration to a separate function.
---
src/connman.h | 2 ++
src/service.c | 44 +++++++++++++++++++++++++++++++-------------
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/connman.h b/src/connman.h
index 9f9f665..914c623 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -765,6 +765,8 @@ bool __connman_service_set_nameservers_conf(struct
connman_service *service,
char **nameservers);
bool __connman_service_set_timeservers_conf(struct connman_service *service,
char **nameservers);
+bool __connman_service_set_domains_conf(struct connman_service *service,
+ char **domains);
void __connman_service_set_hidden(struct connman_service *service);
void __connman_service_set_hostname(struct connman_service *service,
const char *hostname);
diff --git a/src/service.c b/src/service.c
index 8fefe6a..7929113 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2563,6 +2563,32 @@ bool __connman_service_set_timeservers_conf(struct
connman_service *service,
return true;
}
+bool __connman_service_set_domains_conf(struct connman_service *service,
+ char **domains)
+{
+ if (service->immutable) {
+ g_strfreev(domains);
+ return false;
+ }
+
+ searchdomain_remove_all(service);
+ g_strfreev(service->domains);
+ service->domains = NULL;
+
+ if (domains) {
+ domains = remove_empty_strings(domains);
+ service->domains = domains;
+ }
+
+ searchdomain_add_all(service);
+ domain_configuration_changed(service);
+ domain_changed(service);
+
+ service_save(service);
+
+ return true;
+}
+
void __connman_service_set_hidden(struct connman_service *service)
{
if (!service || service->hidden)
@@ -3405,6 +3431,7 @@ static DBusMessage *set_property(DBusConnection *conn,
} else if (g_str_equal(name, "Domains.Configuration")) {
DBusMessageIter entry;
GString *str;
+ char **domains = NULL;
if (service->immutable)
return __connman_error_not_supported(msg);
@@ -3432,23 +3459,14 @@ static DBusMessage *set_property(DBusConnection *conn,
g_string_append(str, val);
}
- searchdomain_remove_all(service);
- g_strfreev(service->domains);
-
- if (str->len > 0) {
- char **domains = g_strsplit_set(str->str, " ", 0);
- domains = remove_empty_strings(domains);
- service->domains = domains;
- } else
- service->domains = NULL;
+ if (str->len > 0)
+ domains = g_strsplit_set(str->str, " ", 0);
g_string_free(str, TRUE);
- searchdomain_add_all(service);
- domain_configuration_changed(service);
- domain_changed(service);
+ if (!__connman_service_set_domains_conf(service, domains))
+ return __connman_error_invalid_arguments(msg);
- service_save(service);
} else if (g_str_equal(name, "Proxy.Configuration")) {
int err;
--
2.5.3
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
