X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/927950400bd569326c3babf4e29038523fa464a6..5e7a5e2d42c1b06f249debca72c10ad33d157402:/slip.c

diff --git a/slip.c b/slip.c
index 17a9099..3f7935a 100644
--- a/slip.c
+++ b/slip.c
@@ -170,13 +170,13 @@ static int userv_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
     struct userv *st=sst;
 
     if (st->rxfd!=-1) {
-	*nfds_io=2;
+	BEFOREPOLL_WANT_FDS(2);
 	fds[0].fd=st->txfd;
 	fds[0].events=0; /* Might want to pick up POLLOUT sometime */
 	fds[1].fd=st->rxfd;
 	fds[1].events=POLLIN;
     } else {
-	*nfds_io=0;
+	BEFOREPOLL_WANT_FDS(0);
     }
     return 0;
 }
@@ -230,20 +230,13 @@ static void userv_userv_callback(void *sst, pid_t pid, int status)
 		"(expected %d)\n",pid,st->pid);
 	return;
     }
-    if (!st->expecting_userv_exit) {
-	if (WIFEXITED(status)) {
-	    fatal("%s: userv exited unexpectedly with status %d",
-		  st->slip.nl.name,WEXITSTATUS(status));
-	} else if (WIFSIGNALED(status)) {
-	    fatal("%s: userv exited unexpectedly: uncaught signal %d",
-		  st->slip.nl.name,WTERMSIG(status));
-	} else {
-	    fatal("%s: userv stopped unexpectedly",
-		  st->slip.nl.name);
-	}
+    if (!(st->expecting_userv_exit &&
+	  (!status ||
+	   (WIFSIGNALED(status) && WTERMSIG(status)==SIGTERM)))) {
+	lg_exitstatus(0,st->slip.nl.name,0,
+		      st->expecting_userv_exit ? M_WARNING : M_FATAL,
+		      status,"userv");
     }
-    Message(M_WARNING,"%s: userv subprocess died with status %d\n",
-	    st->slip.nl.name,WEXITSTATUS(status));
     st->pid=0;
 }
 
@@ -262,7 +255,6 @@ static void userv_entry(void *sst)
     dup2(st->in,0);
     dup2(st->out,1);
 
-    /* XXX close all other fds */
     setsid();
     /* XXX We really should strdup() all of argv[] but because we'll just
        exit anyway if execvp() fails it doesn't seem worth bothering. */
@@ -273,10 +265,9 @@ static void userv_entry(void *sst)
 
 static void userv_invoke_userv(struct userv *st)
 {
-    struct userv_entry_rec *er;
+    struct userv_entry_rec er[1];
     int c_stdin[2];
     int c_stdout[2];
-    string_t addrs;
     string_t nets;
     string_t s;
     struct netlink_client *r;
@@ -292,8 +283,8 @@ static void userv_invoke_userv(struct userv *st)
     /* This is where we actually invoke userv - all the networks we'll
        be using should already have been registered. */
 
-    addrs=safe_malloc(512,"userv_invoke_userv:addrs");
-    snprintf(addrs,512,"%s,%s,%d,slip",
+    char addrs[512];
+    snprintf(addrs,sizeof(addrs),"%s,%s,%d,slip",
 	     ipaddr_to_string(st->slip.nl.local_address),
 	     ipaddr_to_string(st->slip.nl.secnet_address),st->slip.nl.mtu);
 
@@ -315,7 +306,6 @@ static void userv_invoke_userv(struct userv *st)
 	s=subnet_to_string(snets->list[i]);
 	strcat(nets,s);
 	strcat(nets,",");
-	free(s);
     }
     nets[strlen(nets)-1]=0;
     subnet_list_free(snets);
@@ -326,17 +316,11 @@ static void userv_invoke_userv(struct userv *st)
     st->slip.pending_esc=False;
 
     /* Invoke userv */
-    if (pipe(c_stdin)!=0) {
-	fatal_perror("userv_invoke_userv: pipe(c_stdin)");
-    }
-    if (pipe(c_stdout)!=0) {
-	fatal_perror("userv_invoke_userv: pipe(c_stdout)");
-    }
+    pipe_cloexec(c_stdin);
+    pipe_cloexec(c_stdout);
     st->txfd=c_stdin[1];
     st->rxfd=c_stdout[0];
 
-    er=safe_malloc(sizeof(*r),"userv_invoke_userv: er");
-
     er->in=c_stdin[0];
     er->out=c_stdout[1];
     /* The arguments are:
@@ -345,7 +329,8 @@ static void userv_invoke_userv(struct userv *st)
        service-name
        local-addr,secnet-addr,mtu,protocol
        route1,route2,... */
-    er->argv=safe_malloc(sizeof(*er->argv)*6,"userv_invoke_userv:argv");
+    const char *er_argv[6];
+    er->argv=er_argv;
     er->argv[0]=st->userv_path;
     er->argv[1]=st->service_user;
     er->argv[2]=st->service_name;
@@ -358,9 +343,6 @@ static void userv_invoke_userv(struct userv *st)
 			er, st, st->slip.nl.name);
     close(er->in);
     close(er->out);
-    free(er->argv);
-    free(er);
-    free(addrs);
     free(nets);
     Message(M_INFO,"%s: userv-ipif pid is %d\n",st->slip.nl.name,st->pid);
     /* Read a single character from the pipe to confirm userv-ipif is
@@ -402,7 +384,7 @@ static void userv_phase_hook(void *sst, uint32_t newphase)
     if (newphase==PHASE_RUN) {
 	userv_invoke_userv(st);
 	/* Register for poll() */
-	register_for_poll(st, userv_beforepoll, userv_afterpoll, 2,
+	register_for_poll(st, userv_beforepoll, userv_afterpoll,
 			  st->slip.nl.name);
     }
     if (newphase==PHASE_SHUTDOWN) {