X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/1e9634732a90ffe9bf3aeff4be92b5baa402599f..d31674ca96a34a90de366fe7fdbb826617219e19:/ipif/service.c diff --git a/ipif/service.c b/ipif/service.c index b770623..ebfd61b 100644 --- a/ipif/service.c +++ b/ipif/service.c @@ -15,7 +15,7 @@ * is the address of the point-to-point peer. * /,/,... * List of additional routes to add for this interface. - * May be the empty argument. + * May be the empty argument, or `-' if this is problematic. * * is either * ,/[,] @@ -31,6 +31,25 @@ * * Should be run from userv with no-disconnect-hup. */ +/* + * Copyright (C) 1999 Ian Jackson + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with userv-utils; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id: service.c,v 1.10 1999/11/09 22:35:41 ian Exp $ + */ #include #include @@ -40,13 +59,20 @@ #include #include #include +#include +#include + +#include +#include +#include #define NARGS 4 #define MAXEXROUTES 5 -#define ATXTLEN 12 +#define ATXTLEN 16 static const unsigned long gidmaxval= (unsigned long)((gid_t)-2); static const char *const protos_ok[]= { "slip", "cslip", "adaptive", 0 }; +static const int signals[]= { SIGHUP, SIGINT, SIGTERM, 0 }; static const char *configstr, *proto; static unsigned long localaddr, peeraddr, mtu; @@ -67,6 +93,58 @@ static struct pplace { int lineno; } *cpplace; + +static int slpipe[2], ptmaster, undoslattach; +static const char *ifname; +static const char *ptyname; + +#define NPIDS 4 + +static union { + struct { pid_t sl, cout, cin, task; } byname; + pid_t bynumber[NPIDS]; +} pids; +sigset_t emptyset, fullset; + + +static int cleantask(void) { + pid_t pid; + + pid= fork(); + if (!pid) return 1; + if (pid == (pid_t)-1) + perror("userv-ipif: fork for undo slattach failed - cannot clean up properly"); + return 0; +} + +static void terminate(int estatus) { + int i, status; + pid_t pid; + + for (i=0; ifilename, cpp->lineno); } } - exit(16); + terminate(16); } static char *ip2txt(unsigned long addr, char *buf) { @@ -143,13 +221,13 @@ static unsigned long eat_number(const char **argp, const char *what, char *ep; int endchar; - if (!*argp) { badusage("missing number %s\n",what); } + if (!*argp) { badusage("missing number %s",what); } rv= strtoul(*argp,&ep,0); if ((endchar= *ep)) { - if (!endchars) badusage("junk after number %s\n",what); + if (!endchars) badusage("junk after number %s",what); if (!strchr(endchars,endchar)) badusage("invalid character or delimiter `%c' in or after number, %s:" - " expected %s (or none?)\n", endchar,what,endchars); + " expected %s (or none?)", endchar,what,endchars); *argp= ep+1; } else { *argp= 0; @@ -200,7 +278,7 @@ static void eat_prefixmask(const char **argp, const char *what, len= eat_number(argp,whatbuf, 0,32, endchars,endchar_r); mask= (~0UL << (32-len)); - if (prefix & ~mask) badusage("%s prefix %08lx not fully contained in mask %08lx\n", + if (prefix & ~mask) badusage("%s prefix %08lx not fully contained in mask %08lx", what,prefix,mask); *prefix_r= prefix; if (mask_r) *mask_r= mask; @@ -217,6 +295,7 @@ static void permit(unsigned long pprefix, unsigned long pmask) { int i, any; assert(!(pprefix & ~pmask)); + any= 0; if (!proto) fputs("permits",stdout); if (addrnet_isin(localaddr,~0UL, pprefix,pmask)) { @@ -234,7 +313,7 @@ static void permit(unsigned long pprefix, unsigned long pmask) { } } if (!proto) { - if (!any) fputs(" nothing!",stderr); + if (!any) fputs(" nothing",stdout); putchar('\n'); } } @@ -372,29 +451,32 @@ static void parseargs(int argc, const char *const *argv) { addrnet_mustdiffer("local-addr",localaddr,~0UL, "peer-addr",peeraddr,~0UL); carg= *++argv; - for (nexroutes=0; - carg; - nexroutes++) { - if (nexroutes == MAXEXROUTES) - fatal("too many extra routes (only %d allowed)",MAXEXROUTES); - sprintf(erwhatbuf,"route#%d",nexroutes); + if (strcmp(carg,"-")) { + for (nexroutes=0; + carg && *carg; + nexroutes++) { + if (nexroutes == MAXEXROUTES) + fatal("too many extra routes (only %d allowed)",MAXEXROUTES); + sprintf(erwhatbuf,"route#%d",nexroutes); - eat_prefixmask(&carg,erwhatbuf, ",",0, &routeaddr,&routemask,0); - if (routemask == ~0UL) { - addrnet_mustdiffer(erwhatbuf,routeaddr,routemask, "local-addr",localaddr,~0UL); - addrnet_mustdiffer(erwhatbuf,routeaddr,routemask, "peer-addr",peeraddr,~0UL); - } - for (i=0; isa_handler= handler; + sa->sa_flags= 0; + for (signalp=signals; (sig=*signalp); signalp++) { + r= sigaction(sig, sa, 0); if (r) sysfatal("uncatch signal"); + } + sa->sa_flags= chldflags; + r= sigaction(SIGCHLD, sa, 0); if (r) sysfatal("uncatch children"); +} + +static void infork(void) { + struct sigaction sa; + + memset(&pids,0,sizeof(pids)); + sigemptyset(&sa.sa_mask); + setsignals(SIG_DFL,&sa,0); + setsigmask(&emptyset); + undoslattach= 0; +} + +static pid_t makesubproc(void (*entry)(void)) { + pid_t pid; + + pid= fork(); if (pid == (pid_t)-1) sysfatal("fork for subprocess"); + if (pid) return pid; + + infork(); + entry(); + abort(); +} + +static int task(void) { + pid_t pid; + + pid= fork(); + if (pid == (pid_t)-1) sysfatal("fork for task"); + if (!pid) { infork(); return 1; } + + pids.byname.task= pid; + while (pids.byname.task) sigsuspend(&emptyset); + return 0; +} + +static void mdup2(int fd1, int fd2, const char *what) { + int r; + + for (;;) { + r= dup2(fd1,fd2); if (r==fd2) return; + if (r!=-1) fatal("dup2 in %s gave wrong answer %d instead of %d",what,r,fd2); + if (errno != EINTR) sysfatal("dup2 failed in %s",what); + } +} + +static void sl_entry(void) { + mdup2(slpipe[1],1,"slattach child"); + execlp("slattach", "slattach", "-v", "-L", "-p",proto, ptyname, (char*)0); + sysfatal("cannot exec slattach"); +} + +static void cin_entry(void) { + mdup2(ptmaster,1,"cat input child"); + execlp("cat", "cat", (char*)0); + sysfatal("cannot exec cat input"); +} + +static void cout_entry(void) { + mdup2(ptmaster,0,"cat output child"); + execlp("cat", "cat", (char*)0); + sysfatal("cannot exec cat output"); +} + +static void sighandler(int signum) { + pid_t pid; + int estatus, status; + const char *taskfail; + + estatus= 4; + + if (signum == SIGCHLD) { + for (;;) { + pid= waitpid(-1,&status,WNOHANG); + if (!pid || pid == (pid_t)-1) return; + + if (pid == pids.byname.task) { + pids.byname.task= 0; + if (!status) return; + taskfail= "task"; + } else if (pid == pids.byname.cin) { + pids.byname.cin= 0; + if (status) { + taskfail= "input cat"; + } else { + taskfail= 0; + estatus= 0; + } + } else if (pid == pids.byname.cout) { + pids.byname.cout= 0; + taskfail= "output cat"; + } else if (pid == pids.byname.sl) { + pids.byname.sl= 0; + taskfail= "slattach"; + } else { + continue; + } + break; + } + if (taskfail) { + if (WIFEXITED(status)) { + fprintf(stderr, + "userv-ipif service: %s unexpectedly exited with exit status %d\n", + taskfail, WEXITSTATUS(status)); + } else if (WIFSIGNALED(status)) { + fprintf(stderr, + "userv-ipif service: %s unexpectedly killed by signal %s%s\n", + taskfail, strsignal(WTERMSIG(status)), + WCOREDUMP(status) ? " (core dumped)" : ""); + } else { + fprintf(stderr, "userv-ipif service: %s unexpectedly terminated" + " with unknown status code %d\n", taskfail, status); + } + } + } else { + fprintf(stderr, + "userv-ipif service: received signal %d, terminating\n", + signum); + } + + terminate(estatus); +} + +static void startup(void) { + int r; + struct sigaction sa; + + sigfillset(&fullset); + sigemptyset(&emptyset); + + ptmaster= getpt(); if (ptmaster==-1) sysfatal("allocate pty master"); + r= grantpt(ptmaster); if (r) sysfatal("grab/grant pty slave"); + ptyname= ptsname(ptmaster); if (!ptyname) sysfatal("get pty slave name"); + r= chmod(ptyname,0600); if (r) sysfatal("chmod pty slave"); + r= unlockpt(ptmaster); if (r) sysfatal("unlock pty"); + + sigfillset(&sa.sa_mask); + setsignals(sighandler,&sa,SA_NOCLDSTOP); + setsigmask(&fullset); +} + +static void startslattach(void) { + static char ifnbuf[200]; + + FILE *piper; + int r, l, k; + + r= pipe(slpipe); if (r) sysfatal("create pipe"); + piper= fdopen(slpipe[0],"r"); if (!piper) sysfatal("fdopen pipe"); + + undoslattach= 1; + pids.byname.sl= makesubproc(sl_entry); + + close(slpipe[1]); + setsigmask(&emptyset); + if (!fgets(ifnbuf,sizeof(ifnbuf),piper)) { + if (ferror(piper)) sysfatal("cannot read ifname from slattach"); + else fatal("cannot read ifname from slattach"); + } + setsigmask(&fullset); + l= strlen(ifnbuf); + if (l<=0 || ifnbuf[l-1] != '\n') fatal("slattach gave strange output `%s'",ifnbuf); + ifnbuf[l-1]= 0; + for (k=l; k>0 && ifnbuf[k-1]!=' '; k--); + ifname= ifnbuf+k; +} + +static void netconfigure(void) { + char mtutxt[100]; + int i; + + if (task()) { + sprintf(mtutxt,"%lu",mtu); + + execlp("ifconfig", "ifconfig", ifname, localtxt, + "netmask","255.255.255.255", "-broadcast", "pointopoint",peertxt, + "mtu",mtutxt, "up", (char*)0); + sysfatal("cannot exec ifconfig"); + } + + for (i=0; i