Changed the database name and directory.

Signed-off-by: segwon <segwon.han@samsung.com>
Change-Id: I5d507ce03a9166bd5fb87d63434225f62708e92c

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 90c5089..3cba0fa 100755 (executable)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -54,5 +54,4 @@ INSTALL(TARGETS ${DAEMON} DESTINATION ${BIN_INSTALL_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/d2d-conv-manager-iotcon-server.dat DESTINATION
        /usr/share/d2d-conv-manager)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../msf_tizen_client/src/ca_crt.pem DESTINATION /usr/share/d2d-conv-manager)
-#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/d2d-conv-manager-iotcon-server.dat DESTINATION
-#       ${SHARE_INSTALL_PREFIX}/d2d-conv-manager)
+

diff --git a/daemon/access_control/ACLManager.cpp b/daemon/access_control/ACLManager.cpp
index 70bf9c6..84ebef5 100644 (file)
--- a/daemon/access_control/ACLManager.cpp
+++ b/daemon/access_control/ACLManager.cpp
@@ -189,6 +189,7 @@ static int database_initialize(sqlite3 **database, sqlite3_stmt **stmt, const ch
                return ret;
        }
 
+       /*
        const char *create_table_query = "create table if not exists DEVICES_INFO(MAC_ADDRESS text(100) NOT NULL PRIMARY KEY, DEVICE_TYPE text(20) NOT NULL, DEVICE_NAME text(50) NOT NULL, ACL_STATE int NOT NULL);";
        ret = sqlite3_exec(*database, create_table_query, NULL, NULL, NULL);
        if (ret != SQLITE_OK) {
@@ -196,6 +197,7 @@ static int database_initialize(sqlite3 **database, sqlite3_stmt **stmt, const ch
                sqlite3_close(*database);
                return ret;
        }
+       */
 
        while (true) {
                ret = sqlite3_exec(*database, "BEGIN IMMEDIATE TRANSACTION", NULL, NULL, NULL);

diff --git a/daemon/access_control/ACLManager.h b/daemon/access_control/ACLManager.h
index 31f43b0..2ed0c6a 100644 (file)
--- a/daemon/access_control/ACLManager.h
+++ b/daemon/access_control/ACLManager.h
@@ -31,7 +31,7 @@
 #include <app_control.h>
 #include <app_manager.h>
 
-#define DB_FILE_NAME "ACCESS_DEVICES.db"
+#define DB_FILE_NAME tzplatform_mkpath(TZ_SYS_DB, ".convergence.db")
 
 typedef enum ACManagerPolicy {
   ACMANAGER_POLICY_P = 0, /* allowed/permitted */

diff --git a/msf_tizen_client/src/Channel.cpp b/msf_tizen_client/src/Channel.cpp
index b799ffc..f1cd636 100755 (executable)
--- a/msf_tizen_client/src/Channel.cpp
+++ b/msf_tizen_client/src/Channel.cpp
@@ -590,9 +590,7 @@ bool Channel::connect(Result_Base *result1) {
 
 bool Channel::connect(map<string, string> attributes, Result_Base *result1) {
        string uid = getUID();
-
        registerCallback(uid, (void *)result1, Result_Client);
-
        UID = uid;
        if (isWebSocketOpen()) {
                handleError(uid, Error::create("Already Connected"));

diff --git a/packaging/d2d-conv-manager.spec b/packaging/d2d-conv-manager.spec
index aa05b0f..069cdde 100755 (executable)
--- a/packaging/d2d-conv-manager.spec
+++ b/packaging/d2d-conv-manager.spec
@@ -106,6 +106,26 @@ mkdir -p %{_unitdir_user}/default.target.wants
 ln -s ../%{name}.service %{_unitdir_user}/default.target.wants/
 /sbin/ldconfig
 
+%if %{?INTERNAL_ACL} == 1
+
+       mkdir -p %{TZ_SYS_DB}
+       if [ ! -f %{TZ_SYS_DB}/.convergence.db ]
+       then
+           sqlite3 %{TZ_SYS_DB}/.convergence.db 'PRAGMA journal_mode = PERSIST;
+           create table if not exists DEVICES_INFO(MAC_ADDRESS text(100) NOT NULL PRIMARY KEY, DEVICE_TYPE text(20) NOT NULL, DEVICE_NAME text(50) NOT NULL, ACL_STATE int NOT NULL);'
+       fi
+
+       chown owner:users %{TZ_SYS_DB}/.convergence.db
+       chown owner:users %{TZ_SYS_DB}/.convergence.db-journal
+
+       chmod 777 %{TZ_SYS_DB}/.convergence.db
+       chmod 777 %{TZ_SYS_DB}/.convergence.db-journal
+
+       chsmack -a 'User::Home' %{TZ_SYS_DB}/.convergence.db
+       chsmack -a 'User::Home' %{TZ_SYS_DB}/.convergence.db-journal
+
+%endif
+
 #systemctl daemon-reload
 #if [ $1 == 1 ]; then
 #    systemctl restart %{name}.service