Merge "Add os upgrade file for database" into tizen

diff --git a/packaging/stc-manager.spec b/packaging/stc-manager.spec
index 2ed5dc0..2dc6918 100644 (file)
--- a/packaging/stc-manager.spec
+++ b/packaging/stc-manager.spec
@@ -1,6 +1,6 @@
 Name:       stc-manager
 Summary:    STC(Smart Traffic Control) manager
-Version:    0.0.93
+Version:    0.0.95
 Release:    0
 Group:      Network & Connectivity/Other
 License:    Apache-2.0

diff --git a/plugin/pcap/stc-plugin-pcap.c b/plugin/pcap/stc-plugin-pcap.c
index 0859700..862a0be 100755 (executable)
--- a/plugin/pcap/stc-plugin-pcap.c
+++ b/plugin/pcap/stc-plugin-pcap.c
@@ -1441,8 +1441,8 @@ static gpointer __pcap_thread_func(gpointer data)
        pcap_loop(pcap_data->handle, 0, __pcap_handler, (u_char *)pcap_data);
        STC_LOGD("Pcap loop end [%s]", name);
 
+       STC_LOGD("Pcap before closing [%p]", pcap_data->handle);
        pcap_close(pcap_data->handle);
-       STC_LOGD("Pcap closed [%p]", pcap_data->handle);
 
 thread_exit:
        FREE(name);

diff --git a/resources/systemd/stc-manager.service b/resources/systemd/stc-manager.service
index e3bce9f..e20402f 100644 (file)
--- a/resources/systemd/stc-manager.service
+++ b/resources/systemd/stc-manager.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Smart Traffic Control Manager
-Requires=dbus.socket
-After=dbus.socket
 
 [Service]
 Type=dbus

diff --git a/src/database/include/table-statistics.h b/src/database/include/table-statistics.h
index 284fb48..a510f32 100755 (executable)
--- a/src/database/include/table-statistics.h
+++ b/src/database/include/table-statistics.h
@@ -37,6 +37,7 @@ typedef struct {
 } table_statistics_reset_rule;
 
 typedef struct {
+       char *app_id;
        time_t from;
        time_t to;
        stc_iface_type_e iftype;
@@ -55,7 +56,7 @@ stc_error_e table_statistics_foreach_app(const table_statistics_select_rule *rul
                                         void *user_data);
 
 stc_error_e table_statistics_per_app(const char *app_id,
-                                    table_statistics_select_rule *rule,
+                                    const table_statistics_select_rule *rule,
                                     table_statistics_info_cb info_cb,
                                     void *user_data);
 

diff --git a/src/database/tables/table-statistics.c b/src/database/tables/table-statistics.c
index 719b9a2..7d13a3f 100755 (executable)
--- a/src/database/tables/table-statistics.c
+++ b/src/database/tables/table-statistics.c
@@ -440,13 +440,19 @@ stc_error_e table_statistics_foreach_app(const table_statistics_select_rule *rul
                       bind parameters in the query */
        stc_db_tm_interval_s interval;
 
-       memset(&data, 0, sizeof(data));
-
        if (!rule || !info_cb) {
                __STC_LOG_FUNC_EXIT__; //LCOV_EXCL_LINE
                return STC_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
 
+       memset(&data, 0, sizeof(data));
+
+       if (rule->app_id) {
+               int ret = table_statistics_per_app(rule->app_id, rule, info_cb, user_data);
+               __STC_LOG_FUNC_EXIT__;
+               return ret;
+       }
+
        /* pick a statement depending on parameters */
        if (rule->granularity) {
                stmt = __is_iftype_defined(rule->iftype) ?
@@ -508,7 +514,7 @@ handle_error:
 }
 
 API stc_error_e table_statistics_per_app(const char *app_id,
-                                    table_statistics_select_rule *rule,
+                                    const table_statistics_select_rule *rule,
                                     table_statistics_info_cb info_cb,
                                     void *user_data)
 {

diff --git a/src/stc-statistics.c b/src/stc-statistics.c
index 0d5a761..a0b5a07 100755 (executable)
--- a/src/stc-statistics.c
+++ b/src/stc-statistics.c
@@ -76,6 +76,15 @@ void __stc_extract_select_rule(const char *key, GVariant *value,
                rule->iftype = g_variant_get_uint16(value);
                STC_LOGD("iftype: [%u]", (unsigned int) rule->iftype);
 
+       } else if (!g_strcmp0(key, "app_id")) {
+               gsize length = 0;
+               rule->app_id = g_variant_dup_string(value, &length);
+               STC_LOGD("app_id: [%s]", rule->app_id);
+
+       } else if (!g_strcmp0(key, "granularity")) {
+               rule->granularity = g_variant_get_int32(value);
+               STC_LOGD("granularity: [%d]", rule->granularity);
+
        } else {
                STC_LOGD("Unknown select rule"); //LCOV_EXCL_LINE
        }
@@ -277,6 +286,7 @@ gboolean handle_statistics_get_all(StcStatistics *object,
        if (ret < STC_ERROR_NONE) {
                g_variant_builder_unref(builder); //LCOV_EXCL_LINE
                STC_STATISTICS_DBUS_REPLY_ERROR(invocation, ret); //LCOV_EXCL_LINE
+               g_free(rule.app_id);
                __STC_LOG_FUNC_EXIT__; //LCOV_EXCL_LINE
                return TRUE; //LCOV_EXCL_LINE
        }
@@ -287,12 +297,13 @@ gboolean handle_statistics_get_all(StcStatistics *object,
        DEBUG_GDBUS_VARIANT("Return parameters: ", return_parameters);
        STC_DBUS_REPLY(invocation, return_parameters);
 
+       g_free(rule.app_id);
        __STC_LOG_FUNC_EXIT__;
        return TRUE;
 }
 
 gboolean handle_statistics_init(StcStatistics *object,
-                              GDBusMethodInvocation *invocation)
+                               GDBusMethodInvocation *invocation)
 {
        __STC_LOG_FUNC_ENTER__;