apply some APIs from aulsubmit/tizen/20151110.025318submit/tizen/20151109.110451accepted/tizen/wearable/20151110.070513accepted/tizen/tv/20151110.070449accepted/tizen/mobile/20151110.070428

- modify cmakefile
- apply preinit window
- apply preinit pkgid/appid

Change-Id: I8d8a7ff0b5f6dcbd8c6c9c1fdabec89a9afc76b9
Signed-off-by: Junghoon, Park <jh9216.park@samsung.com>

1 files changed, 2 insertions, 126 deletions

diff --git a/src/launchpad_common.c b/src/launchpad_common.c
index 984cc5c..6b86b45 100644
--- a/src/launchpad_common.c
+++ b/src/launchpad_common.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <sys/xattr.h>
 #include <errno.h>
-#include <systemd/sd-daemon.h>
 
 #include "launchpad_common.h"
 #include "key.h"
@@ -40,8 +39,6 @@
 #define OPTION_VALGRIND_SIZE    8
 #define MAX_CMD_BUFSZ 1024
 
-#define SOCKET_PATH "/run/user"
-#define LAUNCHPAD_TYPE ".launchpad-type"
 #define MAX_PENDING_CONNECTIONS 10
 #define CONNECT_RETRY_TIME 100 * 1000
 #define CONNECT_RETRY_COUNT 3
@@ -411,6 +408,7 @@ void _modify_bundle(bundle * kb, int caller_pid, app_info_from_db * menu_info, i
 	bundle_del(kb, AUL_K_PACKAGETYPE);
 	bundle_del(kb, AUL_K_HWACC);
 	bundle_del(kb, AUL_K_TASKMANAGE);
+	bundle_del(kb, AUL_K_PKGID);
 
 	/* Parse app_path to retrieve default bundle*/
 	if (cmd == APP_START || cmd == APP_START_RES || cmd == APP_OPEN
@@ -450,70 +448,6 @@ void _modify_bundle(bundle * kb, int caller_pid, app_info_from_db * menu_info, i
 	}
 }
 
-int _listen_candidate_process(int type)
-{
-	struct sockaddr_un addr;
-	int fd = -1;
-	int listen_fds = 0;
-	int i;
-
-	_D("[launchpad] enter, type: %d", type);
-
-	memset(&addr, 0x00, sizeof(struct sockaddr_un));
-	addr.sun_family = AF_UNIX;
-	snprintf(addr.sun_path, UNIX_PATH_MAX, "%s/%d/%s%d", SOCKET_PATH, getuid(),
-		LAUNCHPAD_TYPE, type);
-
-	listen_fds = sd_listen_fds(0);
-	if (listen_fds < 0) {
-		_E("Invalid systemd environment");
-		return -1;
-	} else if (listen_fds > 0) {
-		for (i = 0; i < listen_fds; i++) {
-			fd = SD_LISTEN_FDS_START + i;
-			if (sd_is_socket_unix(fd, SOCK_STREAM, 1, addr.sun_path, 0))
-				return fd;
-		}
-		_E("Socket not found: %s", addr.sun_path);
-		return -1;
-	}
-
-	fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
-	if (fd < 0) {
-		_E("Socket error");
-		goto error;
-	}
-
-	unlink(addr.sun_path);
-
-	_D("bind to %s", addr.sun_path);
-	if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-		_E("bind error");
-		goto error;
-	}
-
-	_D("chmod %s", addr.sun_path);
-	if (chmod(addr.sun_path, (S_IRWXU | S_IRWXG | S_IRWXO)) < 0) {
-		_E("chmod error");
-		goto error;
-	}
-
-	_D("listen to %s", addr.sun_path);
-	if (listen(fd, MAX_PENDING_CONNECTIONS) == -1) {
-		_E("listen error");
-		goto error;
-	}
-
-	SECURE_LOGD("[launchpad] done, listen fd: %d", fd);
-	return fd;
-
-error:
-	if (fd != -1)
-		close(fd);
-
-	return -1;
-}
-
 int _connect_to_launchpad(int type)
 {
 	struct sockaddr_un addr;
@@ -533,7 +467,7 @@ int _connect_to_launchpad(int type)
 	memset(&addr, 0x00, sizeof(struct sockaddr_un));
 	addr.sun_family = AF_UNIX;
 	snprintf(addr.sun_path, UNIX_PATH_MAX, "%s/%d/%s%d", SOCKET_PATH, getuid(),
-		LAUNCHPAD_TYPE, type);
+		LAUNCHPAD_LOADER_SOCKET_NAME, type);
 
 	_D("connect to %s", addr.sun_path);
 	while (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
@@ -565,64 +499,6 @@ error:
 	return -1;
 }
 
-int _accept_candidate_process(int server_fd, int* out_client_fd,
-                              int* out_client_pid)
-{
-	int client_fd = -1, client_pid = 0, recv_ret = 0;
-
-	if (server_fd == -1 || out_client_fd == NULL || out_client_pid == NULL) {
-		_E("arguments error!");
-		goto error;
-	}
-
-	client_fd = accept(server_fd, NULL, NULL);
-
-	if (client_fd == -1) {
-		_E("accept error!");
-		goto error;
-	}
-
-	recv_ret = recv(client_fd, &client_pid, sizeof(client_pid), MSG_WAITALL);
-
-	if (recv_ret == -1) {
-		_E("recv error!");
-		goto error;
-	}
-
-	*out_client_fd = client_fd;
-	*out_client_pid = client_pid;
-
-	return *out_client_fd;
-
-error:
-	if (client_fd != -1)
-		close(client_fd);
-
-	return -1;
-}
-
-void _refuse_candidate_process(int server_fd)
-{
-	int client_fd = -1;
-
-	if (server_fd == -1) {
-		_E("arguments error!");
-		goto error;
-	}
-
-	client_fd = accept(server_fd, NULL, NULL);
-	if (client_fd == -1) {
-		_E("accept error!");
-		goto error;
-	}
-
-	close(client_fd);
-	_D("refuse connection!");
-
-error:
-	return;
-}
-
 void _set_oom(void)
 {
 	char buf[MAX_LOCAL_BUFSZ];