X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/7fadfa0dee83a6db67609a58f370d7f235e4ac54..ef4a1ab72d88f8790c367b513863d4f9a101a34d:/client.c?ds=sidebyside diff --git a/client.c b/client.c index 270bbc23..1910ef74 100644 --- a/client.c +++ b/client.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: client.c,v 1.4 2001/02/06 09:34:53 mdw Exp $ + * $Id: client.c,v 1.13 2003/11/29 23:49:32 mdw Exp $ * * Client for TrIPE * @@ -29,6 +29,36 @@ /*----- Revision history --------------------------------------------------* * * $Log: client.c,v $ + * Revision 1.13 2003/11/29 23:49:32 mdw + * Debianization. + * + * Revision 1.12 2003/10/15 09:29:38 mdw + * Cosmetic fix to changelog comment. + * + * Revision 1.11 2003/07/13 11:19:49 mdw + * Incompatible protocol fix! Include message type code under MAC tag to + * prevent cut-and-paste from key-exchange messages to general packet + * transport. + * + * Revision 1.10 2003/05/17 10:59:19 mdw + * Put a newline in the pidfile. + * + * Revision 1.9 2002/01/13 14:57:18 mdw + * Track @lbuf@ changes in mLib. + * + * Revision 1.8 2001/06/19 22:09:37 mdw + * Move the program name to the right place when constructing the arguments + * to pass to a new server. + * + * Revision 1.7 2001/02/22 09:07:54 mdw + * Write a pidfile on request, and delete it when finished. + * + * Revision 1.6 2001/02/22 09:06:08 mdw + * Fix logfile rotation to avoid program collapse. + * + * Revision 1.5 2001/02/16 21:23:39 mdw + * Use reliable signal handling for reopening logs. + * * Revision 1.4 2001/02/06 09:34:53 mdw * Change ERR response to FAIL for consistency with other programs. * @@ -71,12 +101,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include "util.h" @@ -92,10 +122,11 @@ /*----- Static variables --------------------------------------------------*/ +static const char *pidfile = 0; +static const char *logname = 0; static FILE *logfp = 0; static unsigned f = 0; static int fd; -static volatile sig_atomic_t reopen = 0; #define f_bogus 1u #define f_spawn 2u @@ -111,18 +142,12 @@ static volatile sig_atomic_t reopen = 0; static void reap(int sig) { - int s; int e = errno; - while (waitpid(-1, &s, WNOHANG) > 0) + while (waitpid(-1, 0, WNOHANG) > 0) ; errno = e; } -static void sighup(int sig) -{ - reopen = 1; -} - static void writelog(const char *cat, const char *msg) { char buf[256]; @@ -132,7 +157,7 @@ static void writelog(const char *cat, const char *msg) fprintf(logfp, "%s %s: %s\n", buf, cat, msg); } -static void cline(char *p, void *b) +static void cline(char *p, size_t len, void *b) { char *q; if (!p) { @@ -174,7 +199,7 @@ static void cline(char *p, void *b) die(EXIT_FAILURE, "unexpected output `%s %s'", q, p); } -static void sline(char *p, void *b) +static void sline(char *p, size_t len, void *b) { if (!p) { if (!(f & f_uclose)) @@ -184,29 +209,56 @@ static void sline(char *p, void *b) puts(p); } -static void uline(char *p, void *b) +static void uline(char *p, size_t len, void *b) { - size_t sz; if (!p) { selbuf_destroy(b); shutdown(fd, 1); f |= f_uclose; } else { - sz = strlen(p); - p[sz] = '\n'; - write(fd, p, sz + 1); + p[len] = '\n'; + write(fd, p, len + 1); } } static void logfile(const char *name) { - if (logfp) - fclose(logfp); - if ((logfp = fopen(name, "a")) == 0) { - die(EXIT_FAILURE, "error opening logfile `%s': %s", - name, strerror(errno)); + FILE *fp; + + if ((fp = fopen(name, "a")) != 0) { + if (logfp) + fclose(logfp); + logfp = fp; + setvbuf(logfp, 0, _IOLBF, BUFSIZ); + } else { + dstr d = DSTR_INIT; + dstr_putf(&d, "error opening logfile `%s': %s", name, strerror(errno)); + if (logfp) + writelog("error", d.buf); + else if (logname) + die(EXIT_FAILURE, d.buf); + if (f & f_syslog) + syslog(LOG_ERR, d.buf); + dstr_destroy(&d); } - setvbuf(logfp, 0, _IOLBF, BUFSIZ); +} + +static void sighup(int sig, void *v) +{ + logfile(logname); +} + +static void cleanup(void) +{ + if (pidfile) + unlink(pidfile); +} + +static void sigdie(int sig) +{ + cleanup(); + signal(sig, SIG_DFL); + raise(sig); } static void version(FILE *fp) @@ -221,7 +273,8 @@ Usage:\n\ $ [-w] [-options] [command [args]...]\n\ $ [-Dl] [-f file] [-options]\n\ Options:\n\ - [-s] [-d directory] [-a socket] [-p program] [-S arg,arg,...]\n\ + [-s] [-d directory] [-a socket] [-P pidfile]\n\ + [-p program] [-S arg,arg,...]\n\ "); } @@ -239,8 +292,10 @@ Options in full:\n\ -u, --usage Show brief usage message.\n\ \n\ -D, --daemon Become a background task after connecting.\n\ --d, --directory=DIR Select current directory [default /var/lib/tripe]\n\ --a, --admin-socket=FILE Select socket to connect to.\n\ +-d, --directory=DIR Select current directory [default " CONFIGDIR "].\n\ +-a, --admin-socket=FILE Select socket to connect to + [default " SOCKETDIR "/tripesock].\n\ +-P, --pidfile=FILE Write process-id to FILE.\n\ \n\ -s, --spawn Start server rather than connecting.\n\ -p, --spawn-path=PATH Specify path to executable.\n\ @@ -254,12 +309,12 @@ Options in full:\n\ int main(int argc, char *argv[]) { - const char *dir = "/var/lib/tripe"; - const char *sock = "tripesock"; + const char *dir = CONFIGDIR; + const char *sock = SOCKETDIR "/tripesock"; const char *spawnpath = "tripe"; string_v spawnopts = DA_INIT; - const char *logname = 0; char *p; + FILE *pidfp = 0; ego(argv[0]); @@ -282,10 +337,11 @@ int main(int argc, char *argv[]) { "syslog", 0, 0, 'l' }, { "logfile", OPTF_ARGREQ, 0, 'f' }, { "warnings", 0, 0, 'w' }, + { "pidfile", OPTF_ARGREQ, 0, 'P' }, { 0, 0, 0, 0 } }; - int i = mdwopt(argc, argv, "hvuDd:a:sp:S:lwf:n", opts, 0, 0, 0); + int i = mdwopt(argc, argv, "+hvuDd:a:sp:S:lwf:nP:", opts, 0, 0, 0); if (i < 0) break; switch (i) { @@ -327,9 +383,11 @@ int main(int argc, char *argv[]) break; case 'f': logname = optarg; - logfile(logname); f |= f_noinput; break; + case 'P': + pidfile = optarg; + break; default: f |= f_bogus; break; @@ -340,6 +398,25 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + /* --- Set various things up --- */ + + if (chdir(dir)) { + die(EXIT_FAILURE, "couldn't set `%s' as current directory: %s", + dir, strerror(errno)); + } + if (logname) + logfile(logname); + if (!pidfile && (f & f_daemon) && ((f & f_syslog) || logname)) + pidfile = "tripectl.pid"; + if (pidfile && (pidfp = fopen(pidfile, "w")) == 0) { + die(EXIT_FAILURE, "couldn't open `%s' for writing: %s", + pidfile, strerror(errno)); + } + signal(SIGINT, sigdie); + signal(SIGQUIT, sigdie); + signal(SIGTERM, sigdie); + atexit(cleanup); + /* --- Connect to the server --- */ if (f & f_spawn) { @@ -356,13 +433,10 @@ int main(int argc, char *argv[]) #endif sigaction(SIGCHLD, &sa, 0); + DA_UNSHIFT(&spawnopts, (char *)sock); + DA_UNSHIFT(&spawnopts, "-a"); + DA_UNSHIFT(&spawnopts, "-d."); DA_UNSHIFT(&spawnopts, (char *)spawnpath); - if (!(f & f_spawnopts)) { - DA_PUSH(&spawnopts, "-d"); - DA_PUSH(&spawnopts, (char *)dir); - DA_PUSH(&spawnopts, "-a"); - DA_PUSH(&spawnopts, (char *)sock); - } DA_PUSH(&spawnopts, 0); if (socketpair(PF_UNIX, SOCK_STREAM, 0, pfd)) die(EXIT_FAILURE, "error from socketpair: %s", strerror(errno)); @@ -378,7 +452,11 @@ int main(int argc, char *argv[]) close(pfd[0]); if (logfp) fclose(logfp); + if (pidfp) + fclose(pidfp); closelog(); + if (f & f_daemon) + u_detach(); execvp(DA(&spawnopts)[0], DA(&spawnopts)); die(127, "couldn't exec `%s': %s", spawnpath, strerror(errno)); } @@ -388,15 +466,12 @@ int main(int argc, char *argv[]) } else { struct sockaddr_un sun; size_t sz = strlen(sock) + 1; - dstr d = DSTR_INIT; - dstr_putf(&d, "%s/%s", dir, sock); - if (d.sz + 1 > sizeof(sun.sun_path)) + if (sz > sizeof(sun.sun_path)) die(EXIT_FAILURE, "socket name `%s' too long", sock); memset(&sun, 0, sizeof(sun)); sun.sun_family = AF_UNIX; - memcpy(sun.sun_path, d.buf, d.sz + 1); - sz = d.sz + offsetof(struct sockaddr_un, sun_path) + 1; - dstr_destroy(&d); + memcpy(sun.sun_path, sock, sz); + sz = sz + offsetof(struct sockaddr_un, sun_path); if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) die(EXIT_FAILURE, "error making socket: %s", strerror(errno)); if (connect(fd, (struct sockaddr *)&sun, sz)) { @@ -409,6 +484,10 @@ int main(int argc, char *argv[]) if (u_daemon()) die(EXIT_FAILURE, "error becoming daemon: %s", strerror(errno)); } + if (pidfp) { + fprintf(pidfp, "%li\n", (long)getpid()); + fclose(pidfp); + } /* --- If we're meant to be interactive, do that --- */ @@ -420,7 +499,7 @@ int main(int argc, char *argv[]) selbuf_init(&bu, &sel, STDIN_FILENO, uline, &bu); selbuf_init(&bs, &sel, fd, sline, &bs); for (;;) { - if (sel_select(&sel)) + if (sel_select(&sel) && errno != EINTR && errno != EAGAIN) die(EXIT_FAILURE, "select failed: %s", strerror(errno)); } } @@ -444,36 +523,23 @@ int main(int argc, char *argv[]) /* --- Pull everything else out of the box --- */ { - lbuf b; - lbuf_init(&b, cline, 0); + sel_state sel; + selbuf b; + sig hup; + + sel_init(&sel); + selbuf_init(&b, &sel, fd, cline, 0); + if (f & f_syslog) openlog(QUIS, 0, LOG_DAEMON); if (logfp) { - struct sigaction sa; - sa.sa_handler = sighup; - sa.sa_flags = 0; - sigemptyset(&sa.sa_mask); - sigaction(SIGHUP, &sa, 0); + sig_init(&sel); + sig_add(&hup, SIGHUP, sighup, 0); } for (;;) { - size_t sz; - ssize_t n; - if (reopen) { - logfile(logname); - reopen = 0; - } - sz = lbuf_free(&b, &p); - n = read(fd, p, sz); - if (n < 0) { - if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) - continue; - die(EXIT_FAILURE, "read failed: %s", strerror(errno)); - } - if (n == 0) - break; - lbuf_flush(&b, p, n); + if (sel_select(&sel) && errno != EINTR && errno != EAGAIN) + die(EXIT_FAILURE, "select failed: %s", strerror(errno)); } - lbuf_close(&b); } return (0);