X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/8362ac1c9b2fbf253b06a50639c57047d43a8fa2..11586be23b78ec23a6a22cc7fa9f8970a3935782:/server/tripe.c diff --git a/server/tripe.c b/server/tripe.c index d50757bc..bf217b37 100644 --- a/server/tripe.c +++ b/server/tripe.c @@ -36,7 +36,10 @@ sel_state sel; static sel_timer it; #define T_INTERVAL MIN(1) -/*----- Main code ---------------------------------------------------------*/ +static unsigned iv_nreasons = 0; +static struct timeval iv_next = { 0, 0 }; + +/*----- The interval timer ------------------------------------------------*/ /* --- @interval@ --- * * @@ -50,15 +53,104 @@ static sel_timer it; static void interval(struct timeval *tv, void *v) { - struct timeval tvv; T( trace(T_PEER, "peer: interval timer"); ) + iv_next = *tv; rand_seed(RAND_GLOBAL, MAXHASHSZ); p_interval(); - tvv = *tv; - tvv.tv_sec += T_INTERVAL; - sel_addtimer(&sel, &it, &tvv, interval, v); + iv_next.tv_sec += T_INTERVAL; + sel_addtimer(&sel, &it, &iv_next, interval, v); +} + +/* --- @iv_addreason@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Adds an `interval timer reason'; if there are no others, the + * interval timer is engaged. + */ + +void iv_addreason(void) +{ + struct timeval tv; + + if (!iv_nreasons) { + gettimeofday(&tv, 0); + if (TV_CMP(&tv, >=, &iv_next)) interval(&tv, 0); + else sel_addtimer(&sel, &it, &iv_next, interval, 0); + } + iv_nreasons++; +} + +/* --- @iv_rmreason@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Removes an interval timer reason; if there are none left, the + * interval timer is disengaged. + */ + +void iv_rmreason(void) +{ + assert(iv_nreasons); iv_nreasons--; + if (!iv_nreasons) sel_rmtimer(&it); +} + +/*----- The main loop -----------------------------------------------------*/ + +/* --- @lp_init@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Initializes the main loop. Most importantly, this sets up + * the select multiplexor that everything else hooks onto. + */ + +void lp_init(void) +{ + rand_noisesrc(RAND_GLOBAL, &noise_source); + rand_seed(RAND_GLOBAL, MAXHASHSZ); + gettimeofday(&iv_next, 0); iv_next.tv_sec += T_INTERVAL; + signal(SIGPIPE, SIG_IGN); + sel_init(&sel); + sig_init(&sel); +} + +/* --- @lp_run@ --- * + * + * Arguments: --- + * + * Returns: Zero on successful termination; @-1@ if things went wrong. + * + * Use: Cranks the main loop until it should be cranked no more. + */ + +int lp_run(void) +{ + int nerr = 0; + + for (;;) { + a_preselect(); + if (!sel_select(&sel)) nerr = 0; + else if (errno != EINTR && errno != EAGAIN) { + a_warn("SERVER", "select-error", "?ERRNO", A_END); + nerr++; + if (nerr > 8) { + a_warn("ABORT", "repeated-select-errors", A_END); + abort(); + } + } + } + return (0); } +/*----- Main code ---------------------------------------------------------*/ + /* --- @main@ --- * * * Arguments: @int argc@ = number of command line arguments @@ -91,6 +183,8 @@ Options:\n\ -u, --usage Display pointless usage message.\n\ --tunnels Display IP tunnel drivers and exit.\n\ \n\ +-4, --ipv4 Transport over IPv4 only.\n\ +-6, --ipv6 Transport over IPv6 only.\n\ -D, --daemon Run in the background.\n\ -F, --foreground Quit when stdin reports end-of-file.\n\ -d, --directory=DIR Switch to directory DIR [default " CONFIGDIR "].\n\ @@ -119,13 +213,12 @@ int main(int argc, char *argv[]) int csockmode = 0600; const char *dir = CONFIGDIR; const char *p; - unsigned port = TRIPE_PORT; - struct in_addr baddr = { INADDR_ANY }; + const char *bindhost = 0, *bindsvc = STR(TRIPE_PORT); + struct addrinfo aihint = { 0 }, *ailist; unsigned f = 0; int i; - int selerr = 0; + int err; unsigned af; - struct timeval tv; uid_t u = -1; gid_t g = -1; @@ -141,6 +234,7 @@ int main(int argc, char *argv[]) if ((p = getenv("TRIPESOCK")) != 0) csock = p; tun_default = tunnels[0]; + aihint.ai_family = AF_UNSPEC; for (;;) { static const struct option opts[] = { @@ -149,6 +243,8 @@ int main(int argc, char *argv[]) { "usage", 0, 0, 'u' }, { "tunnels", 0, 0, '0' }, + { "ipv4", 0, 0, '4' }, + { "ipv6", 0, 0, '6' }, { "daemon", 0, 0, 'D' }, { "foreground", 0, 0, 'F' }, { "uid", OPTF_ARGREQ, 0, 'U' }, @@ -171,7 +267,7 @@ int main(int argc, char *argv[]) { 0, 0, 0, 0 } }; - i = mdwopt(argc, argv, "hvuDFU:G:b:n:p:d:k:K:t:a:m:" T("T:"), + i = mdwopt(argc, argv, "hvu46DFU:G:b:n:p:d:k:K:t:a:m:" T("T:"), opts, 0, 0, 0); if (i < 0) break; @@ -186,6 +282,12 @@ int main(int argc, char *argv[]) usage(stdout); exit(0); + case '4': + aihint.ai_family = AF_INET; + break; + case '6': + aihint.ai_family = AF_INET6; + break; case 'D': f |= f_daemon; break; @@ -199,25 +301,12 @@ int main(int argc, char *argv[]) f |= f_foreground; 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); - if (*p) { - struct servent *s = getservbyname(optarg, "udp"); - if (!s) - die(EXIT_FAILURE, "unknown service name `%s'", optarg); - i = ntohs(s->s_port); - } - if (i >= 65536) - die(EXIT_FAILURE, "bad port number %lu", i); - port = i; - } break; + case 'b': + bindhost = optarg; + break; + case 'p': + bindsvc = optarg; + break; case 'n': { int i; for (i = 0;; i++) { @@ -273,19 +362,24 @@ int main(int argc, char *argv[]) if (!(~f & (f_daemon | f_foreground))) die(EXIT_FAILURE, "foreground operation for a daemon is silly"); + aihint.ai_protocol = IPPROTO_UDP; + aihint.ai_socktype = SOCK_DGRAM; + aihint.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; + if ((err = getaddrinfo(bindhost, bindsvc, &aihint, &ailist)) != 0) { + die(EXIT_FAILURE, "couldn't resolve hostname %c%s%c, port `%s': %s", + bindhost ? '`' : '<', + bindhost ? bindhost : "nil", + bindhost ? '\'' : '>', + bindsvc, gai_strerror(err)); + } + if (chdir(dir)) { die(EXIT_FAILURE, "can't set current directory to `%s': %s", dir, strerror(errno)); } - sel_init(&sel); - sig_init(&sel); - rand_noisesrc(RAND_GLOBAL, &noise_source); - rand_seed(RAND_GLOBAL, MAXHASHSZ); - signal(SIGPIPE, SIG_IGN); - for (i = 0; tunnels[i]; i++) - tunnels[i]->init(); - p_init(baddr, port); + lp_init(); + if (!(f & f_daemon)) { af = AF_WARN; #ifndef NTRACE @@ -294,36 +388,37 @@ int main(int argc, char *argv[]) if (f & f_foreground) af |= AF_FOREGROUND; a_create(STDIN_FILENO, STDOUT_FILENO, af); + a_switcherr(); + } + + p_init(); + for (i = 0; tunnels[i]; i++) + tunnels[i]->init(); + p_bind(ailist); freeaddrinfo(ailist); + + for (i = 0; tunnels[i]; i++) { + if (tunnels[i]->flags&TUNF_PRIVOPEN) { + ps_split(f & f_daemon); + break; + } } - ps_split(f & f_daemon); - a_init(csock, u, g, csockmode); + + a_init(); + a_signals(); + a_listen(csock, u, g, csockmode); u_setugid(u, g); km_init(kr_priv, kr_pub, tag_priv); kx_init(); if (f & f_daemon) { - if (daemonize()) - die(EXIT_FAILURE, "couldn't become a daemon: %s", strerror(errno)); - a_daemon(); - } - - tv.tv_sec = time(0) + T_INTERVAL; - tv.tv_usec = 0; - sel_addtimer(&sel, &it, &tv, interval, 0); - - for (;;) { - a_preselect(); - 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(); - } + if (daemonize()) { + a_warn("SERVER", "daemon-error", "?ERRNO", A_END); + exit(EXIT_FAILURE); } + a_daemon(); + a_switcherr(); } + lp_run(); return (0); }