Merge "Add support of app_id in GetAll method call on statistics interface" into...

diff --git a/packaging/stc-manager.spec b/packaging/stc-manager.spec
index 4228bd8..59a91cc 100644 (file)
--- a/packaging/stc-manager.spec
+++ b/packaging/stc-manager.spec
@@ -20,7 +20,7 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(vconf)
 BuildRequires:  pkgconfig(capi-system-info)
-BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(openssl1.1)
 
 %if %{?enable_database} == YES
 BuildRequires: pkgconfig(sqlite3)

diff --git a/plugin/monitor/CMakeLists.txt b/plugin/monitor/CMakeLists.txt
index d093f06..63b1b9d 100644 (file)
--- a/plugin/monitor/CMakeLists.txt
+++ b/plugin/monitor/CMakeLists.txt
@@ -9,7 +9,7 @@ PKG_CHECK_MODULES(monitor_plugin REQUIRED
        gio-unix-2.0
        glib-2.0
        vconf
-       openssl
+       openssl1.1
        )
 
 FOREACH(flag ${monitor_plugin_CFLAGS})

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/dbus/net.stc-manager.service b/resources/dbus/net.stc-manager.service
index 13f4097..e5f96c4 100755 (executable)
--- a/resources/dbus/net.stc-manager.service
+++ b/resources/dbus/net.stc-manager.service
@@ -1,5 +1,4 @@
 [D-BUS Service]
 Name=net.stc
 Exec=/bin/false
-User=root
 SystemdService=stc-manager.service

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/CMakeLists.txt b/src/CMakeLists.txt
index fb6a283..35aaafd 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(REQUIRES_LIST ${REQUIRES_LIST}
        dlog
        vconf
        capi-system-info
-       openssl
+       openssl1.1
        )
 
 IF("${ENABLE_DATABASE}" STREQUAL "YES")