Attachment 413292 Details for Bug 656104

startproc: socket activation forwarding

x (text/plain), 4.15 KB, created by Dr. Werner Fink on 2011-02-10 13:00:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dr. Werner Fink

Created: 2011-02-10 13:00:51 UTC

Size: 4.15 KB

patch

obsolete

>--- libinit.h
>+++ libinit.h	2011-02-10 12:00:34.378714740 +0000
>@@ -249,6 +249,12 @@ static inline void set_newenv(const char
>     else
> 	addnewenv("SHELL","/bin/sh");
> 
>+    if ( (tmp = getenv("LISTEN_PID")) != (char*)0 )
>+	addnewenv("LISTEN_PID",tmp);
>+
>+    if ( (tmp = getenv("LISTEN_FDS")) != (char*)0 )
>+	addnewenv("LISTEN_FDS",tmp);
>+
>     if ( (tmp = getenv("RUNLEVEL")) != (char*)0 )
> 	addnewenv("RUNLEVEL",tmp);
> 
>--- startproc.8
>+++ startproc.8	2011-02-10 12:57:47.399926287 +0000
>@@ -138,7 +138,7 @@ Only root is allowed to set negative nic
> .TP
> .B \-e
> Bequeath only a minimal set of environment variables to the new process:
>-.BR HOME ", " PATH ", " SHELL ", " RUNLEVEL ", and " PREVLEVEL .
>+.BR HOME ", " PATH ", " SHELL ", " LISTEN_PID ", " LISTEN_FDS ", " RUNLEVEL ", and " PREVLEVEL .
> .TP
> .BI \-p " pid_file"
> (Former option
>--- startproc.c
>+++ startproc.c	2011-02-10 12:55:27.763925713 +0000
>@@ -29,6 +29,10 @@
> #include <argz.h>
> #include <grp.h>
> 
>+#ifndef  SD_LISTEN_FDS_START
>+# define SD_LISTEN_FDS_START	3
>+#endif
>+
> #define USAGE		"Usage:\n"\
> 			"    %s [-f] [-L] [[-n ]+/-<prio>] [-s] [-t sec|-T sec] [-u uid] [-g gid] [-v] [-e] \\\n"\
> 			"        [-l log|-q|-d] [-p pid_file] [-i ignore_file] [-c root] [-w|-W list] /path/to/executable [args]\n"
>@@ -40,6 +44,8 @@ static int do_start(const char *name, ch
> 		   const int nicelvl, const int env, const char* root, unsigned short flags);
> static void closefds(FILE *not);
> static void waiton(const char *list);
>+static int get_sd_listen_fds(void);
>+static void fwd_sd_listen_pid(void);
> 
> static int quiet = true, supprmsg = false, sess = false, seconds = false;
> static int sigchld = false, force = false, dialog = false;
>@@ -430,6 +436,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 +450,10 @@ static int do_start(const char *inname,
> 	    (void)signal(SIGCHLD, sig_chld);
> 	else
> 	    (void)signal(SIGCHLD, SIG_DFL);
>-    	pid = fork();
>+	if ((pid = fork()) == 0) {
>+	    /* Update again to point to the child pid */
>+	    fwd_sd_listen_pid();
>+	}
>     }
> 
>     switch (pid) {
>@@ -683,6 +698,7 @@ static void closefds(FILE *not)
> {
>     const int fdnot = not ? fileno(not) : -1;
>     const int fderr = fileno(stderr);
>+    const int sdfds = get_sd_listen_fds();
>     char dir[128];
>     struct dirent *fdd;
>     DIR *fds;
>@@ -702,6 +718,9 @@ static void closefds(FILE *not)
> 	    continue;
> 	if (fd == fdnot)
> 	    continue;
>+	if (sdfds > 0 && fd >= SD_LISTEN_FDS_START
>+		      && fd <  SD_LISTEN_FDS_START + sdfds)
>+	    continue;
> 	if (isatty(fd)) {
> 	    close(fd);
> 	    continue;
>@@ -819,3 +838,74 @@ static void waiton(const char *list)
> 
>     close(fd);
> }
>+
>+static int get_sd_listen_fds()
>+{
>+    const char *env;
>+    char *ptr = (char*)0;
>+    long l;
>+
>+    if ((env = getenv("LISTEN_PID")) == (const char*)0)
>+	return 0;
>+
>+    errno = 0;
>+    l = strtol(env, &ptr, 10);
>+    if (errno != 0)
>+	return -errno;
>+    if (ptr == env)
>+	return -EINVAL;
>+    if (*ptr != '\0')
>+	return -EINVAL;
>+    if (l < 0)
>+	return -EINVAL;
>+
>+    if (getpid() != (pid_t)l)
>+	return 0;
>+
>+    if ((env = getenv("LISTEN_FDS")) == (const char*)0)
>+	return 0;
>+
>+    errno = 0;
>+    l = strtol(env, &ptr, 10);
>+    if (errno != 0)
>+	return -errno;
>+    if (ptr == env)
>+	return -EINVAL;
>+    if (*ptr != '\0')
>+	return -EINVAL;
>+    if (l < 0)
>+	return -EINVAL;
>+
>+    return (int)l;
>+}
>+
>+static void fwd_sd_listen_pid(void)
>+{
>+    const char *env;
>+
>+    /*
>+     * fork & 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);
>+	}
>+    }
>+}

Actions: View

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