From 16323dcc9df15020e368d4324cf1c1d9dceac805 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Mon, 20 Jun 2016 20:57:25 +0200 Subject: build: Change install directories and set correct permissions This sets the correct install directories for all the binaries, library and header files. It also sets the right permissions on the sockets and shared memory so that regular users can also use the ouroboros library. Root privileges are required to run the irmd. Fixes #7 --- include/ouroboros/CMakeLists.txt | 2 +- include/ouroboros/sockets.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt index 245187e9..8347f928 100644 --- a/include/ouroboros/CMakeLists.txt +++ b/include/ouroboros/CMakeLists.txt @@ -14,4 +14,4 @@ set(HEADER_FILES time_utils.h ) -install(FILES ${HEADER_FILES} DESTINATION include/ouroboros) +install(FILES ${HEADER_FILES} DESTINATION usr/include/ouroboros) diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h index be5ae651..b765b55b 100644 --- a/include/ouroboros/sockets.h +++ b/include/ouroboros/sockets.h @@ -36,10 +36,13 @@ typedef IrmMsg irm_msg_t; #include "ipcpd_messages.pb-c.h" typedef IpcpMsg ipcp_msg_t; -#define IRM_SOCK_PATH "/tmp/irm_sock" +#define SOCK_PATH INSTALL_DIR "var/run/ouroboros/" +#define SOCK_PATH_SUFFIX ".sock" + +#define IRM_SOCK_PATH SOCK_PATH "irm" SOCK_PATH_SUFFIX #define IRM_MSG_BUF_SIZE 256 -#define IPCP_SOCK_PATH_PREFIX "/tmp/ipcp_sock" +#define IPCP_SOCK_PATH_PREFIX SOCK_PATH "ipcp" #define IPCP_MSG_BUF_SIZE IRM_MSG_BUF_SIZE /* Returns the full socket path of an IPCP */ -- cgit v1.2.3 From 550cfa775b048abe183c4fdcc8ada8476e562185 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Mon, 20 Jun 2016 21:53:42 +0200 Subject: lib, irmd: Change sockets and shm path Reverting from previous commit. Even when running Ouroboros sandboxed, the sockets and shared memory should be created in the default system paths. --- include/ouroboros/sockets.h | 2 +- src/irmd/main.c | 4 +++- src/lib/ipcp.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h index b765b55b..0a215a76 100644 --- a/include/ouroboros/sockets.h +++ b/include/ouroboros/sockets.h @@ -36,7 +36,7 @@ typedef IrmMsg irm_msg_t; #include "ipcpd_messages.pb-c.h" typedef IpcpMsg ipcp_msg_t; -#define SOCK_PATH INSTALL_DIR "var/run/ouroboros/" +#define SOCK_PATH "/var/run/ouroboros/" #define SOCK_PATH_SUFFIX ".sock" #define IRM_SOCK_PATH SOCK_PATH "irm" SOCK_PATH_SUFFIX diff --git a/src/irmd/main.c b/src/irmd/main.c index 68789e94..5f7c1ddc 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1578,12 +1578,14 @@ static struct irm * irm_create() if (i == NULL) return NULL; - if (access(INSTALL_DIR "dev/shm/" SHM_DU_MAP_FILENAME, F_OK) != -1) { + if (access("/dev/shm/" SHM_DU_MAP_FILENAME, F_OK) != -1) { struct shm_du_map * dum = shm_du_map_open(); + if (dum == NULL) { LOG_ERR("Could not examine existing shm file."); exit(EXIT_FAILURE); } + if (kill(shm_du_map_owner(dum), 0) < 0) { LOG_INFO("IRMd didn't properly shut down last time."); shm_du_map_destroy(dum); diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c index fcaf9f83..a43afd21 100644 --- a/src/lib/ipcp.c +++ b/src/lib/ipcp.c @@ -109,7 +109,7 @@ pid_t ipcp_create(char * ipcp_name, char * full_name = NULL; char * exec_name = NULL; - sprintf (irmd_pid, "%u", getpid()); + sprintf(irmd_pid, "%u", getpid()); pid = fork(); if (pid == -1) { -- cgit v1.2.3