Attachment 413031 Details for Bug 656104

[patch] startproc: socket activation forwarding

killproc-2.18-sd-socket-fwd.diff (text/plain), 2.65 KB, created by Marius Tomaschewski on 2011-02-09 14:40:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2011-02-09 14:40:38 UTC

Size: 2.65 KB

patch

obsolete

>--- startproc.c
>+++ startproc.c	2011/02/09 14:30:43
>@@ -66,6 +66,68 @@ static void sig_chld(int nsig)
>     seconds = 0;
> }
> 
>+#ifndef SD_LISTEN_FDS_START
>+#define SD_LISTEN_FDS_START 3
>+#endif
>+
>+static int get_sd_listen_fds()
>+{
>+	const char *e;
>+	char *p = NULL;
>+	unsigned long l;
>+
>+	if (!(e = getenv("LISTEN_PID")))
>+	    return 0;
>+	
>+	errno = 0;
>+	l = strtoul(e, &p, 10);
>+	if (errno != 0)
>+	    return -errno;
>+	
>+	if (!p || *p || l <= 0)
>+	    return -EINVAL;
>+	
>+	if (getpid() != (pid_t) l)
>+	    return 0;
>+	
>+	if (!(e = getenv("LISTEN_FDS")))
>+	    return 0;
>+	
>+	errno = 0;
>+	l = strtoul(e, &p, 10);
>+	if (errno != 0)
>+	    return -errno;
>+
>+	if (!p || *p)
>+	    return -EINVAL;
>+	else
>+	    return (int) l;
>+}
>+
>+static void fwd_sd_listen_pid(void)
>+{
>+    const char *e;
>+    char buf[24] = { '\0' };
>+    char *p = NULL;
>+    unsigned long l;
>+
>+    /*
>+     * fork & systemd socket activation:
>+     * fetch listen pid and update to ours,
>+     *  when it is set to pid of our parent.
>+     */
>+    if ( (e = getenv("LISTEN_PID"))) {
>+	errno = 0;
>+	l = strtoul(e, &p, 10);
>+	if (errno ==  0 && l > 0 && (!p || !*p)) {
>+	    if (getppid() == (pid_t)l) {
>+		snprintf(buf, sizeof(buf), "%d", getpid());
>+		setenv("LISTEN_PID", buf, 1);
>+	    }
>+	}
>+    }
>+}
>+
> int main(int argc, char **argv)
> {
>     struct stat st;
>@@ -430,6 +492,12 @@ static int do_start(const char *inname,
>     fflush(stderr);		/* flush stdout and especially stderr */
>     errno = 0;
> 
>+    /*
>+     * when used to start service in the init script,
>+     * update the init script pid to ours first ...
>+     */
>+    fwd_sd_listen_pid();
>+
>     if (sdaemon)
> 	pid = 0;
>     else {
>@@ -438,7 +506,14 @@ static int do_start(const char *inname,
> 	    (void)signal(SIGCHLD, sig_chld);
> 	else
> 	    (void)signal(SIGCHLD, SIG_DFL);
>+
>     	pid = fork();
>+	if(pid == 0) {
>+	    /*
>+	     * update again to point to the child pid
>+	     */
>+	    fwd_sd_listen_pid();
>+	}
>     }
> 
>     switch (pid) {
>@@ -498,6 +573,7 @@ static int do_start(const char *inname,
> 	}
> 	/*
> 	 * Close all above stdin, stdout, stderr ... but not fileno(tmp)
>+	 * or the systemd activated sockets
> 	 */
> 	closefds(tmp);
> 
>@@ -687,6 +763,7 @@ static void closefds(FILE *not)
>     struct dirent *fdd;
>     DIR *fds;
>     int ret;
>+    int sd_fds = get_sd_listen_fds();
> 
>     if (((ret = snprintf(dir, sizeof(dir), "/proc/%ld/fd", (long)getpid())) < 0) ||
> 	(ret == sizeof(dir)))
>@@ -702,6 +779,9 @@ static void closefds(FILE *not)
> 	    continue;
> 	if (fd == fdnot)
> 	    continue;
>+	if (sd_fds > 0 && fd >= SD_LISTEN_FDS_START &&
>+	                  fd <  SD_LISTEN_FDS_START + sd_fds)
>+	    continue;
> 	if (isatty(fd)) {
> 	    close(fd);
> 	    continue;

Actions: View | Diff

Attachments on bug 656104: 402328 | 404503 | 404504 | 413031 | 413292