X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/c5a2ea9b8e68a323297a899770bc3b813c24b222..2d752320d61b46a65ebb9fa754033f250f097cd3:/tripe.c diff --git a/tripe.c b/tripe.c index f505f3c1..0ba169b2 100644 --- a/tripe.c +++ b/tripe.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: tripe.c,v 1.7 2002/01/13 17:14:05 mdw Exp $ + * $Id$ * * Main program * @@ -26,32 +26,6 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: tripe.c,v $ - * 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" @@ -81,7 +55,7 @@ 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; @@ -100,8 +74,9 @@ void interval(struct timeval *tv, void *v) static void usage(FILE *fp) { - pquis(fp, "Usage: $ [-D] [-p port] [-T trace-opts] [-d dir] [-a socket]\n\ - [-k priv-keyring] [-K pub-keyring] [-t key-tag]\n"); + 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"); } static void version(FILE *fp) @@ -122,8 +97,11 @@ Options:\n\ -u, --usage Display pointless usage message.\n\ \n\ -D, --daemon Run in the background.\n\ --d, --directory=DIR Switch to directory DIR (default $TRIPEDIR).\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\ +-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\ -K, --pub-keyring=FILE Get public keys from FILE.\n\ -t, --tag=KEYTAG Use private key labelled TAG.\n\ @@ -138,10 +116,11 @@ int main(int argc, char *argv[]) { const char *kr_priv = "keyring", *kr_pub = "keyring.pub"; const char *tag_priv = "tripe-dh"; - const char *csock = "tripesock"; - const char *dir = "/var/lib/tripe"; + const char *csock = SOCKETDIR "/tripesock"; + const char *dir = CONFIGDIR; const char *p; unsigned port = 0; + struct in_addr baddr = { INADDR_ANY }; unsigned f = 0; uid_t u = -1; gid_t g = -1; @@ -150,7 +129,7 @@ int main(int argc, char *argv[]) #define f_daemon 2u ego(argv[0]); - trace_on(stderr, 0); + T( trace_on(stderr, 0); ) if ((p = getenv("TRIPEDIR")) != 0) dir = p; @@ -166,6 +145,7 @@ int main(int argc, char *argv[]) { "setuid", OPTF_ARGREQ, 0, 'U' }, { "gid", OPTF_ARGREQ, 0, 'G' }, { "setgid", OPTF_ARGREQ, 0, 'G' }, + { "bind-address", OPTF_ARGREQ, 0, 'b' }, { "port", OPTF_ARGREQ, 0, 'p' }, { "directory", OPTF_ARGREQ, 0, 'd' }, { "priv-keyring", OPTF_ARGREQ, 0, 'k' }, @@ -176,10 +156,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: p:d:k:K:t:a:" T("T:"), + int i = mdwopt(argc, argv, "hvuDU:G:b:p:d:k:K:t:a:" T("T:"), opts, 0, 0, 0); if (i < 0) break; @@ -198,30 +179,38 @@ int main(int argc, char *argv[]) f |= f_daemon; break; case 'U': { + struct passwd *pw; char *p; unsigned long i = strtoul(optarg, &p, 0); if (!*p) - u = i; - else { - struct passwd *pw; - if ((pw = getpwnam(optarg)) == 0) - die(EXIT_FAILURE, "user name `%s' not found", optarg); - u = pw->pw_uid; - } + pw = getpwuid(i); + else + pw = getpwnam(optarg); + if (!pw) + die(EXIT_FAILURE, "user `%s' not found", optarg); + u = pw->pw_uid; + if (g == -1) + g = pw->pw_gid; } break; case 'G': { + struct group *gr; char *p; unsigned long i = strtoul(optarg, &p, 0); if (!*p) - g = i; - else { - struct group *gr; - if ((gr = getgrnam(optarg)) == 0) - die(EXIT_FAILURE, "group name `%s' not found", optarg); - g = gr->gr_gid; - } + gr = getgrgid(i); + else + gr = getgrnam(optarg); + if (!gr) + die(EXIT_FAILURE, "group `%s' not found", optarg); + g = gr->gr_gid; + } break; + + case 'b': { + struct hostent *h = gethostbyname(optarg); + if (!h) + die(EXIT_FAILURE, "unknown host name `%s'", optarg); + memcpy(&baddr, h->h_addr, sizeof(struct in_addr)); } break; - case 'p': { char *p; unsigned long i = strtoul(optarg, &p, 0); @@ -256,6 +245,11 @@ int main(int argc, char *argv[]) trace_level(tr_flags); break; #endif + case '0': { + static const char *tun[] = { "notdef", "unet", "bsd", "linux" }; + puts(tun[TUN_TYPE]); + exit(0); + } break; default: f |= f_bogus; break; @@ -275,19 +269,19 @@ 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(); - p_init(port); + p_init(baddr, port); if (!(f & f_daemon)) a_create(STDIN_FILENO, STDOUT_FILENO); - if (g != -1) { - if (setgid(g)) { + if (g != (gid_t)-1) { + if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) { die(EXIT_FAILURE, "couldn't setgid to %u: %s", (unsigned)g, strerror(errno)); } } - if (u != -1) { + if (u != (uid_t)-1) { if (setuid(u)) { die(EXIT_FAILURE, "couldn't setuid to %u: %s", (unsigned)u, strerror(errno));