summaryrefslogtreecommitdiff
path: root/src/libstddjb
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-11-08 09:32:32 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-11-08 09:32:32 +0000
commitb992db748b9ffe8d88d609950f5da28b5a1db135 (patch)
tree7b3c70238073a643e83caef7a5d1fa1d7ce6bc28 /src/libstddjb
parent34896cda4e7156a5e232dfa4cde92d1ea1e93da2 (diff)
downloadskalibs-b992db748b9ffe8d88d609950f5da28b5a1db135.tar.xz
Add ipc_bind_reuse_lock, rewrite ipc_bind_reuse to use it
Diffstat (limited to 'src/libstddjb')
-rw-r--r--src/libstddjb/ipc_bind_reuse.c9
-rw-r--r--src/libstddjb/ipc_bind_reuse_lock.c28
2 files changed, 30 insertions, 7 deletions
diff --git a/src/libstddjb/ipc_bind_reuse.c b/src/libstddjb/ipc_bind_reuse.c
index 31db745..ce5c7a4 100644
--- a/src/libstddjb/ipc_bind_reuse.c
+++ b/src/libstddjb/ipc_bind_reuse.c
@@ -1,14 +1,9 @@
/* ISC license. */
-#include <skalibs/nonposix.h>
-#include <sys/socket.h>
-#include <unistd.h>
#include <skalibs/webipc.h>
int ipc_bind_reuse (int s, char const *p)
{
- unsigned int opt = 1 ;
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt) ;
- unlink(p) ;
- return ipc_bind(s, p) ;
+ int fdlock ;
+ return ipc_bind_reuse_lock(s, p, &fdlock) ;
}
diff --git a/src/libstddjb/ipc_bind_reuse_lock.c b/src/libstddjb/ipc_bind_reuse_lock.c
new file mode 100644
index 0000000..aede744
--- /dev/null
+++ b/src/libstddjb/ipc_bind_reuse_lock.c
@@ -0,0 +1,28 @@
+/* ISC license. */
+
+#include <skalibs/nonposix.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
+#include <skalibs/djbunix.h>
+#include <skalibs/webipc.h>
+
+int ipc_bind_reuse_lock (int s, char const *p, int *fdlock)
+{
+ unsigned int opt = 1 ;
+ size_t len = strlen(p) ;
+ int fd ;
+ char lockname[len + 6] ;
+ memcpy(lockname, p, len) ;
+ memcpy(lockname + len, ".lock", 6) ;
+ fd = openc_create(lockname) ;
+ if (fd < 0) return -1 ;
+ if (lock_exnb(fd) < 0) return -1 ;
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt) ;
+ unlink(p) ;
+ if (ipc_bind(s, p) < 0) return -1 ;
+ *fdlock = fd ;
+ return 0 ;
+}