X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/ef4a1ab72d88f8790c367b513863d4f9a101a34d..13a55605839046f6f42910de713f4a9b6c44dfd4:/tripe.c diff --git a/tripe.c b/tripe.c index 447a0c4c..be37617a 100644 --- a/tripe.c +++ b/tripe.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: tripe.c,v 1.12 2003/11/29 23:49:32 mdw Exp $ + * $Id$ * * Main program * @@ -26,47 +26,6 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: tripe.c,v $ - * Revision 1.12 2003/11/29 23:49:32 mdw - * Debianization. - * - * Revision 1.11 2003/05/17 11:02:03 mdw - * Document the new `-b' option. - * - * Revision 1.10 2003/05/16 12:09:03 mdw - * Allow binding to a chosen address. - * - * Revision 1.9 2003/04/15 14:11:09 mdw - * Rationalize the behaviour of the `-G' and `-U' options. - * - * Revision 1.8 2002/01/13 17:28:29 mdw - * Don't turn tracing on if tracing is turned off (!). - * - * Revision 1.7 2002/01/13 17:14:05 mdw - * Don't include the tracing option in the help if not compiled in. - * - * Revision 1.6 2001/06/19 22:08:37 mdw - * Moved buffers to peer.c. - * - * Revision 1.5 2001/02/16 21:43:12 mdw - * Provide a more helpful usage message. - * - * Revision 1.4 2001/02/16 21:41:31 mdw - * Add a new buffer. - * - * Revision 1.3 2001/02/04 17:10:40 mdw - * Remove a debugging @abort@ call. - * - * Revision 1.2 2001/02/03 22:33:00 mdw - * Stuff more randomness into the pool in the interval timer. - * - * Revision 1.1 2001/02/03 20:26:37 mdw - * Initial checkin. - * - */ - /*----- Header files ------------------------------------------------------*/ #include "tripe.h" @@ -92,17 +51,34 @@ static sel_timer it; * Use: Called periodically to do housekeeping tasks. */ -void interval(struct timeval *tv, void *v) +static void interval(struct timeval *tv, void *v) { struct timeval tvv; T( trace(T_PEER, "peer: interval timer"); ) - rand_seed(RAND_GLOBAL, HASHSZ); + rand_seed(RAND_GLOBAL, MAXHASHSZ); p_interval(); tvv = *tv; tvv.tv_sec += T_INTERVAL; sel_addtimer(&sel, &it, &tvv, interval, v); } +/* --- @mystrieq@ --- * + * + * Arguments: @const char *x, *y@ = two strings + * + * Returns: True if @x@ and @y are equal, up to case. + */ + +int mystrieq(const char *x, const char *y) +{ + for (;;) { + if (!*x && !*y) return (1); + if (tolower((unsigned char)*x) != tolower((unsigned char)*y)) + return (0); + x++; y++; + } +} + /* --- @main@ --- * * * Arguments: @int argc@ = number of command line arguments @@ -115,9 +91,9 @@ void interval(struct timeval *tv, void *v) static void usage(FILE *fp) { - pquis(fp, "Usage: $ [-D] [-d dir] [-b addr] [-p port]\n\ - [-U user] [-G group] [-a socket] [-T trace-opts]\n\ - [-k priv-keyring] [-K pub-keyring] [-t key-tag]\n"); + pquis(fp, "Usage: $ [-D] [-d DIR] [-b ADDR] [-p PORT] [-n TUNNEL]\n\ + [-U USER] [-G GROUP] [-a SOCKET] [-T TRACE-OPTS]\n\ + [-k PRIV-KEYRING] [-K PUB-KEYRING] [-t KEY-TAG]\n"); } static void version(FILE *fp) @@ -136,11 +112,13 @@ Options:\n\ -h, --help Display this help text.\n\ -v, --version Display version number.\n\ -u, --usage Display pointless usage message.\n\ + --tunnels Display IP tunnel drivers and exit.\n\ \n\ -D, --daemon Run in the background.\n\ -d, --directory=DIR Switch to directory DIR [default " CONFIGDIR "].\n\ -b, --bind-address=ADDR Bind UDP socket to this IP ADDR.\n\ -p, --port=PORT Select UDP port to listen to.\n\ +-n, --tunnel=TUNNEL Seelect default tunnel driver.\n\ -U, --setuid=USER Set uid to USER after initialization.\n\ -G, --setgid=GROUP Set gid to GROUP after initialization.\n\ -k, --priv-keyring=FILE Get private key from FILE.\n\ @@ -163,6 +141,9 @@ int main(int argc, char *argv[]) unsigned port = 0; struct in_addr baddr = { INADDR_ANY }; unsigned f = 0; + int i; + int selerr = 0; + struct timeval tv; uid_t u = -1; gid_t g = -1; @@ -174,12 +155,14 @@ int main(int argc, char *argv[]) if ((p = getenv("TRIPEDIR")) != 0) dir = p; + tun_default = tunnels[0]; for (;;) { static const struct option opts[] = { { "help", 0, 0, 'h' }, { "version", 0, 0, 'v' }, { "usage", 0, 0, 'u' }, + { "tunnels", 0, 0, '0' }, { "daemon", 0, 0, 'D' }, { "uid", OPTF_ARGREQ, 0, 'U' }, @@ -187,6 +170,7 @@ int main(int argc, char *argv[]) { "gid", OPTF_ARGREQ, 0, 'G' }, { "setgid", OPTF_ARGREQ, 0, 'G' }, { "bind-address", OPTF_ARGREQ, 0, 'b' }, + { "tunnel", OPTF_ARGREQ, 0, 'n' }, { "port", OPTF_ARGREQ, 0, 'p' }, { "directory", OPTF_ARGREQ, 0, 'd' }, { "priv-keyring", OPTF_ARGREQ, 0, 'k' }, @@ -197,12 +181,11 @@ int main(int argc, char *argv[]) { "trace", OPTF_ARGREQ, 0, 'T' }, #endif - { "tunnel", 0, 0, '0' }, { 0, 0, 0, 0 } }; - int i = mdwopt(argc, argv, "hvu DU:G: b:p:d:k:K:t:a:" T("T:"), - opts, 0, 0, 0); + i = mdwopt(argc, argv, "hvuDU:G:b:p:d:k:K:t:a:" T("T:"), + opts, 0, 0, 0); if (i < 0) break; switch (i) { @@ -265,6 +248,16 @@ int main(int argc, char *argv[]) die(EXIT_FAILURE, "bad port number %lu", i); port = i; } break; + case 'n': { + int i; + for (i = 0;; i++) { + if (!tunnels[i]) + die(EXIT_FAILURE, "unknown tunnel `%s'", optarg); + if (mystrieq(optarg, tunnels[i]->name)) + break; + } + tun_default = tunnels[i]; + } break; case 'd': dir = optarg; break; @@ -287,8 +280,9 @@ int main(int argc, char *argv[]) break; #endif case '0': { - static const char *tun[] = { "notdef", "unet", "bsd", "linux" }; - puts(tun[TUN_TYPE]); + int i; + for (i = 0; tunnels[i]; i++) + puts(tunnels[i]->name); exit(0); } break; default: @@ -310,12 +304,18 @@ int main(int argc, char *argv[]) sel_init(&sel); sig_init(&sel); rand_noisesrc(RAND_GLOBAL, &noise_source); - rand_seed(RAND_GLOBAL, RMD160_HASHSZ); + rand_seed(RAND_GLOBAL, MAXHASHSZ); signal(SIGPIPE, SIG_IGN); - tun_init(); + for (i = 0; tunnels[i]; i++) + tunnels[i]->init(); p_init(baddr, port); - if (!(f & f_daemon)) - a_create(STDIN_FILENO, STDOUT_FILENO); + if (!(f & f_daemon)) { +#ifndef NTRACE + a_create(STDIN_FILENO, STDOUT_FILENO, AF_TRACE | AF_WARN); +#else + a_create(STDIN_FILENO, STDOUT_FILENO, AF_WARN); +#endif + } if (g != (gid_t)-1) { if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) { die(EXIT_FAILURE, "couldn't setgid to %u: %s", @@ -336,25 +336,19 @@ int main(int argc, char *argv[]) a_daemon(); } - { - struct timeval tv; - tv.tv_sec = time(0) + T_INTERVAL; - tv.tv_usec = 0; - sel_addtimer(&sel, &it, &tv, interval, 0); - } + tv.tv_sec = time(0) + T_INTERVAL; + tv.tv_usec = 0; + sel_addtimer(&sel, &it, &tv, interval, 0); - { - int selerr = 0; - for (;;) { - if (!sel_select(&sel)) - selerr = 0; - else if (errno != EINTR && errno != EAGAIN) { - a_warn("select failed: %s", strerror(errno)); - selerr++; - if (selerr > 8) { - a_warn("too many select errors: bailing out"); - a_quit(); - } + for (;;) { + if (!sel_select(&sel)) + selerr = 0; + else if (errno != EINTR && errno != EAGAIN) { + a_warn("SERVER", "select-error", "?ERRNO", A_END); + selerr++; + if (selerr > 8) { + a_warn("ABORT", "repeated-select-errors", A_END); + abort(); } } }