Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(sockctl): store tmp sock in /tmp/edgesec #290

Merged
merged 2 commits into from
Sep 21, 2022
Merged

refactor(sockctl): store tmp sock in /tmp/edgesec #290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b973e04
refactor(sockctl): store tmp sock in /tmp/edgesec
aloisklink Sep 20, 2022
146fc1c
Merge branch 'main' into refactor/store-tmp-unix-sockets-in-tmp-edgesec
mereacre Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/utils/sockctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "net.h"

#define SOCK_EXTENSION ".sock"
#define TMP_UNIX_SOCK_FOLDER_PREFIX "/tmp/edgesec."
#define TMP_UNIX_SOCK_FOLDER_PREFIX "/tmp/edgesec/tmp-unix-socks."
/** Template for mkdtemp() to create tmp folders for temporary unix domain
* sockets */
#define TMP_UNIX_SOCK_FOLDER_TEMPLATE TMP_UNIX_SOCK_FOLDER_PREFIX "XXXXXX"
Expand All @@ -46,9 +46,15 @@ void init_domain_addr(struct sockaddr_un *unaddr, const char *addr) {
*
* @return A path that can be used to create a temporary domain socket.
* @retval NULL on error (see @p errno).
* @post Please free() the returned string.
* @post Please delete the temporary folder,
* e.g. by using cleanup_tmp_domain_socket_path()
*/
static const char *create_tmp_domain_socket_path() {
char socket_dir[] = TMP_UNIX_SOCK_FOLDER_TEMPLATE;
if (make_dirs_to_path(socket_dir, 0755)) {
log_errno("Failed to make_dirs_to_path(%s, 0755)", socket_dir);
}
if (mkdtemp(socket_dir) == NULL) {
log_errno("Failed to mkdtemp %s", socket_dir);
return NULL;
Expand Down