[REFACTOR] Refactor setting smack attributes to `fd_setup_smack_attributes`

Change-Id: Ib35fb4a320eeeb77a305d4b9dd1c210482049075

diff --git a/daemon/daemon.c b/daemon/daemon.c
index b6a76a6..975376a 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -635,23 +635,11 @@ static int target_event_handler(int epollfd, int index, uint64_t msg)
        return err;
 }
 
-#ifndef LOCALTEST
-static void target_setup_smack_attributes(int target_index)
-{
-       fsetxattr(manager.target[target_index].socket,
-                 "security.SMACK64IPIN", "*", 1, 0);
-       fsetxattr(manager.target[target_index].socket,
-                 "security.SMACK64IPOUT", "*", 1, 0);
-}
-#else
-static void target_setup_smack_attributes(int unused)
-{
-}
-#endif
-
-// return 0 if normal case
-// return plus value if non critical error occur
-// return minus value if critical error occur
+/**
+ * return 0 if normal case
+ * return plus value if non critical error occur
+ * return minus value if critical error occur
+ */
 static int targetServerHandler(int efd)
 {
        msg_target_t log;
@@ -667,10 +655,10 @@ static int targetServerHandler(int efd)
            accept(manager.target_server_socket, NULL, NULL);
 
        if (manager.target[index].socket >= 0) {
-               // accept succeed
-               target_setup_smack_attributes(index);
+               /* accept succeed */
+               fd_setup_smack_attributes(manager.target[index].socket);
 
-               // send config message to target process
+               /* send config message to target process */
                log.type = MSG_OPTION;
                log.length = sprintf(log.data, "%lu",
                                     (unsigned long int)prof_session.conf.use_features0);

diff --git a/daemon/main.c b/daemon/main.c
index 1c85cee..e19dd55 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -154,13 +154,9 @@ static int makeTargetServerSocket()
                return -1;
        }
 
-#ifndef LOCALTEST
-       // set smack attribute for certification
-       fsetxattr(manager.target_server_socket, "security.SMACK64IPIN", "*", 1, 0);
-       fsetxattr(manager.target_server_socket, "security.SMACK64IPOUT", "*", 1, 0);
-#endif /* LOCALTEST */
+       fd_setup_smack_attributes(manager.target_server_socket);
 
-       bzero(&serverAddrUn, sizeof(serverAddrUn));
+       memset(&serverAddrUn, '\0', sizeof(serverAddrUn));
        serverAddrUn.sun_family = AF_UNIX;
        sprintf(serverAddrUn.sun_path, "%s", UDS_NAME);
 

diff --git a/daemon/utils.c b/daemon/utils.c
index 2f9a688..f7461aa 100644 (file)
--- a/daemon/utils.c
+++ b/daemon/utils.c
@@ -734,3 +734,9 @@ char *dereference_tizen_exe_path(const char *path, char *resolved)
 
        return res;
 }
+
+void fd_setup_smack_attributes(int fd)
+{
+       fsetxattr(fd, "security.SMACK64IPIN", "*", 1, 0);
+       fsetxattr(fd, "security.SMACK64IPOUT", "*", 1, 0);
+}

diff --git a/daemon/utils.h b/daemon/utils.h
index ce4a9da..a84f0cc 100644 (file)
--- a/daemon/utils.h
+++ b/daemon/utils.h
@@ -75,6 +75,7 @@ int is_same_app_process(char* appPath, int pid);
 int exec_app_tizen(const char *app_id, const char *exec_path);
 int exec_app_common(const char* exec_path);
 char *dereference_tizen_exe_path(const char *path, char *resolved);
+void fd_setup_smack_attributes(int fd);
 #ifdef __cplusplus
 }
 #endif