service: Implement service Timeservers property

Fixes BMC#25054.

diff --git a/src/connman.h b/src/connman.h
index 6246791..317af70 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -632,6 +632,8 @@ int __connman_service_timeserver_append(struct connman_service *service,
                                                const char *timeserver);
 int __connman_service_timeserver_remove(struct connman_service *service,
                                                const char *timeserver);
+void __connman_service_timeserver_changed(struct connman_service *service,
+               GSList *ts_list);
 void __connman_service_set_pac(struct connman_service *service,
                                        const char *pac);
 connman_bool_t __connman_service_is_hidden(struct connman_service *service);

diff --git a/src/service.c b/src/service.c
index c9ec6b3..5ff92b6 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1475,6 +1475,21 @@ static void append_dnsconfig(DBusMessageIter *iter, void *user_data)
        }
 }
 
+static void append_ts(DBusMessageIter *iter, void *user_data)
+{
+       GSList *list = user_data;
+
+       while (list != NULL) {
+               char *timeserver = list->data;
+
+               if (timeserver != NULL)
+                       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+                                       &timeserver);
+
+               list = g_slist_next(list);
+       }
+}
+
 static void append_tsconfig(DBusMessageIter *iter, void *user_data)
 {
        struct connman_service *service = user_data;
@@ -2040,6 +2055,7 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                                        struct connman_service *service)
 {
        const char *str;
+       GSList *list;
 
        str = __connman_service_type2string(service->type);
        if (str != NULL)
@@ -2119,6 +2135,17 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
        connman_dbus_dict_append_array(dict, "Nameservers.Configuration",
                                DBUS_TYPE_STRING, append_dnsconfig, service);
 
+       if (service->state == CONNMAN_SERVICE_STATE_READY ||
+                       service->state == CONNMAN_SERVICE_STATE_ONLINE)
+               list = __connman_timeserver_get_all(service);
+       else
+               list = NULL;
+
+       connman_dbus_dict_append_array(dict, "Timeservers",
+                               DBUS_TYPE_STRING, append_ts, list);
+
+       g_slist_free_full(list, g_free);
+
        connman_dbus_dict_append_array(dict, "Timeservers.Configuration",
                                DBUS_TYPE_STRING, append_tsconfig, service);
 
@@ -2453,6 +2480,17 @@ int __connman_service_timeserver_remove(struct connman_service *service,
        return 0;
 }
 
+void __connman_service_timeserver_changed(struct connman_service *service,
+               GSList *ts_list)
+{
+       if (service == NULL)
+               return;
+
+       connman_dbus_property_changed_array(service->path,
+                       CONNMAN_SERVICE_INTERFACE, "Timeservers",
+                       DBUS_TYPE_STRING, append_ts, ts_list);
+}
+
 void __connman_service_set_pac(struct connman_service *service,
                                        const char *pac)
 {