Attachment 413346 Details for Bug 656259

[patch] Example git patch adding the functions

0001-Added-sd_listen_pid_inherit-and-sd_listen_fds_check.patch (text/plain), 3.21 KB, created by Marius Tomaschewski on 2011-02-10 16:17:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2011-02-10 16:17:54 UTC

Size: 3.21 KB

patch

obsolete

>From 912b0d6afa8381366ec7aa436da7fab8d323327f Mon Sep 17 00:00:00 2001
>From: Marius Tomaschewski <mt@suse.de>
>Date: Thu, 10 Feb 2011 17:07:28 +0100
>Subject: [PATCH] Added sd_listen_pid_inherit and sd_listen_fds_check
>
>In Type=forking mode, a daemon has to forward the fds to the
>child process and may have to disable own code closing the sd
>sockets before a fork and has to update the pid after a fork.
>
>Signed-off-by: Marius Tomaschewski <mt@suse.de>
>---
> src/sd-daemon.c |   42 ++++++++++++++++++++++++++++++++++++++++--
> src/sd-daemon.h |   17 +++++++++++++++++
> 2 files changed, 57 insertions(+), 2 deletions(-)
>
>diff --git a/src/sd-daemon.c b/src/sd-daemon.c
>index 6d1eebf..84e3089 100644
>--- a/src/sd-daemon.c
>+++ b/src/sd-daemon.c
>@@ -44,7 +44,7 @@
> 
> #include "sd-daemon.h"
> 
>-int sd_listen_fds(int unset_environment) {
>+static int _sd_listen_fds(int unset_environment, int close_on_exec) {
> 
> #if defined(DISABLE_SYSTEMD) || !defined(__linux__)
>         return 0;
>@@ -107,7 +107,7 @@ int sd_listen_fds(int unset_environment) {
>                 if (flags & FD_CLOEXEC)
>                         continue;
> 
>-                if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
>+                if (close_on_exec && fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
>                         r = -errno;
>                         goto finish;
>                 }
>@@ -125,6 +125,44 @@ finish:
> #endif
> }
> 
>+int sd_listen_fds(int unset_environment) {
>+	return _sd_listen_fds(unset_environment, 1);
>+}
>+
>+int sd_listen_fds_check(void) {
>+	return _sd_listen_fds(0, 0);
>+}
>+
>+void sd_listen_pid_inherit(void) {
>+	const char *env;
>+
>+	/*
>+	  Type=forking & systemd socket activation:
>+	  fetch listen pid and update to ours,
>+	  when it is set to pid of our parent.
>+	*/
>+	if ((env = getenv("LISTEN_PID"))) {
>+		char *ptr;
>+		long l;
>+
>+		errno = 0;
>+		l = strtol(env, &ptr, 10);
>+		if (errno != 0)
>+			return;
>+		if (ptr == env)
>+			return;
>+		if (*ptr != '\0')
>+			return;
>+		if (l < 0)
>+			return;
>+		if (getppid() == (pid_t)l) {
>+			char buf[24];
>+			snprintf(buf, sizeof(buf), "%d", getpid());
>+			setenv("LISTEN_PID", buf, 1);
>+		}
>+	}
>+}
>+
> int sd_is_fifo(int fd, const char *path) {
>         struct stat st_fd;
> 
>diff --git a/src/sd-daemon.h b/src/sd-daemon.h
>index d0a0a94..82d1cd3 100644
>--- a/src/sd-daemon.h
>+++ b/src/sd-daemon.h
>@@ -120,6 +120,23 @@ extern "C" {
> int sd_listen_fds(int unset_environment) _sd_hidden_;
> 
> /*
>+  Same to sd_listen_fds, but does not make any modifications to
>+  the sockets (FD_CLOEXEC) or unset of the environment variables.
>+  Intended use of this function is to avoid socket closing in
>+  daemons started in Type=forking mode [before the fork call],
>+  so they stay open for the child process.
>+*/
>+int sd_listen_fds_check(void) _sd_hidden_;
>+
>+/*
>+  Update the $LISTEN_PID variable to own PID, when it matches the
>+  parent. Intended use of this function is to inherit the sockets
>+  in child process of a daemon started in Type=forking mode [after
>+  the fork call].
>+*/
>+void sd_listen_pid_inherit(void)  _sd_hidden_;
>+
>+/*
>   Helper call for identifying a passed file descriptor. Returns 1 if
>   the file descriptor is a FIFO in the file system stored under the
>   specified path, 0 otherwise. If path is NULL a path name check will
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 656259: 402465 | 413346