Hi Alok,
Stay consistent with previous code: no need to use GString at all. See
below:
From: Alok Barsode<[email protected]>
This property helps to add service specific
timeservers. These are set by the user and
are per service.
---
include/service.h | 1 +
src/service.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/include/service.h b/include/service.h
index d7aaca5..b55ea51 100644
--- a/include/service.h
+++ b/include/service.h
@@ -107,6 +107,7 @@ char *connman_service_get_interface(struct connman_service
*service);
const char *connman_service_get_domainname(struct connman_service *service);
char **connman_service_get_nameservers(struct connman_service *service);
+char **connman_service_get_timeservers_config(struct connman_service *service);
char **connman_service_get_timeservers(struct connman_service *service);
void connman_service_set_proxy_method(struct connman_service *service, enum
connman_service_proxy_method method);
enum connman_service_proxy_method connman_service_get_proxy_method(struct
connman_service *service);
diff --git a/src/service.c b/src/service.c
index 88a14f8..01c385f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -89,6 +89,7 @@ struct connman_service {
char **domains;
char *domainname;
char **timeservers;
+ char **timeservers_config;
/* 802.1x settings from the config files */
char *eap;
char *identity;
@@ -404,6 +405,13 @@ static int service_load(struct connman_service *service)
service->nameservers_config = NULL;
}
+ 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;
+ }
+
service->domains = g_key_file_get_string_list(keyfile,
service->identifier, "Domains",&length, NULL);
if (service->domains != NULL&& length == 0) {
@@ -563,6 +571,16 @@ static int service_save(struct connman_service *service)
g_key_file_remove_key(keyfile, service->identifier,
"Nameservers", NULL);
+ if (service->timeservers_config != NULL) {
+ guint len = g_strv_length(service->timeservers_config);
+
+ g_key_file_set_string_list(keyfile, service->identifier,
+ "Timeservers",
+ (const gchar **) service->timeservers_config,
len);
+ } else
+ g_key_file_remove_key(keyfile, service->identifier,
+ "Timeservers", NULL);
+
if (service->domains != NULL) {
guint len = g_strv_length(service->domains);
@@ -1392,6 +1410,21 @@ static void append_dnsconfig(DBusMessageIter *iter, void
*user_data)
}
}
+static void append_tsconfig(DBusMessageIter *iter, void *user_data)
+{
+ struct connman_service *service = user_data;
+ int i;
+
+ if (service->timeservers_config == NULL)
+ return;
+
+ for (i = 0; service->timeservers_config[i]; i++) {
+ dbus_message_iter_append_basic(iter,
+ DBUS_TYPE_STRING,
+ &service->timeservers_config[i]);
+ }
+}
+
static void append_domain(DBusMessageIter *iter, void *user_data)
{
struct connman_service *service = user_data;
@@ -2012,6 +2045,9 @@ static void append_properties(DBusMessageIter *dict,
dbus_bool_t limited,
connman_dbus_dict_append_array(dict, "Nameservers.Configuration",
DBUS_TYPE_STRING, append_dnsconfig, service);
+ 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);
@@ -2144,6 +2180,14 @@ char **connman_service_get_nameservers(struct
connman_service *service)
return NULL;
}
+char **connman_service_get_timeservers_config(struct connman_service *service)
+{
+ if (service == NULL)
+ return NULL;
+
+ return service->timeservers_config;
+}
+
char **connman_service_get_timeservers(struct connman_service *service)
{
if (service == NULL)
@@ -2736,6 +2780,41 @@ static DBusMessage *set_property(DBusConnection *conn,
dns_configuration_changed(service);
service_save(service);
+ } else if (g_str_equal(name, "Timeservers.Configuration") == TRUE) {
+ DBusMessageIter entry;
+ GString *str;
Here, just use a char *str;
As you did in your patch 1 for "Timeservers" key. (plus the
modifications I gave in my comments).
+
+ if (type != DBUS_TYPE_ARRAY)
+ return __connman_error_invalid_arguments(msg);
+
+ str = g_string_new(NULL);
+ if (str == NULL)
+ 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;
+ dbus_message_iter_get_basic(&entry,&val);
+ dbus_message_iter_next(&entry);
+ if (str->len> 0)
+ g_string_append_printf(str, " %s", val);
+ else
+ g_string_append(str, val);
Just use the same piece of code you did for "Timeservers" key, in your
patch 1.
+ }
+
+ g_strfreev(service->timeservers_config);
+
+ if (str->len> 0) {
if (str == NULL)
+ service->timeservers_config =
+ g_strsplit_set(str->str, " ", 0);
g_strsplit_set(str, " ", 0);
+ } else {
+ service->timeservers_config = NULL;
+ }
+
+ g_string_free(str, TRUE);
g_free(str);
And that's it.
+
+ service_save(service);
} else if (g_str_equal(name, "Domains.Configuration") == TRUE) {
DBusMessageIter entry;
GString *str;
Seems that we forgot that one in a previous patch which finally went
upstream.
@@ -3515,6 +3594,7 @@ static void service_free(gpointer user_data)
}
g_strfreev(service->timeservers);
+ g_strfreev(service->timeservers_config);
g_strfreev(service->nameservers);
g_strfreev(service->nameservers_config);
g_strfreev(service->nameservers_auto);
Or then, if your patch 1 is the only one not using GString, use GString
in patch 1 instead, but don't mix 2 different technique for the same
exact parsing (and if there 2+ exact parsing: maybe you can factorize
the code?)
Cheers,
Tomasz
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
