X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=4a7a9b78f1c319d7593bd38aeb4c118616bdc21a;hp=1a230202652a0c4e597bf0eaabe3c85075094fb2;hb=d84b43231c7c5b0786e9aa62d0f7ca7ecd83bdb5;hpb=f45771ec3032b3ef67ec4c275da242e3c647b53e diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp index 1a23020..4a7a9b7 100644 --- a/src/yaz-proxy-main.cpp +++ b/src/yaz-proxy-main.cpp @@ -1,24 +1,33 @@ /* - * Copyright (c) 1998-2001, Index Data. + * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy-main.cpp,v 1.16 2002-01-14 12:01:28 adam Exp $ + * $Id: yaz-proxy-main.cpp,v 1.30 2004-01-12 22:35:26 adam Exp $ */ +#include +#include +#include +#include + #include #include -#include -#include -#include +#include +#include +#include void usage(char *prog) { - fprintf (stderr, "%s: [-a log] [-c num] [-v level] [-t target] " - "[-u auth] [-o optlevel] @:port\n", prog); + fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] " + "[-u uid] [-p pidfile] @:port\n", prog); exit (1); } +static char *pid_fname = 0; +static char *uid = 0; +static char *log_file = 0; +static int debug = 0; int args(Yaz_Proxy *proxy, int argc, char **argv) { @@ -27,8 +36,10 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) char *prog = argv[0]; int ret; - while ((ret = options("o:a:t:v:c:u:", argv, argc, &arg)) != -2) + while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:X", + argv, argc, &arg)) != -2) { + int err; switch (ret) { case 0: @@ -39,13 +50,26 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) } addr = arg; break; + case 'c': + err = proxy->set_config(arg); + if (err == -2) + { + fprintf(stderr, "Config file support not enabled (proxy not compiled with libxml2 support)\n"); + exit(1); + } + else if (err == -1) + { + fprintf(stderr, "Bad or missing file %s\n", arg); + exit(1); + } + break; case 'a': proxy->set_APDU_log(arg); break; case 't': - proxy->set_proxy_target(arg); + proxy->set_default_target(arg); break; - case 'u': + case 'U': proxy->set_proxy_authentication(arg); break; case 'o': @@ -54,9 +78,30 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) case 'v': yaz_log_init_level (yaz_log_mask_str(arg)); break; - case 'c': + case 'l': + yaz_log_init_file (arg); + log_file = xstrdup(arg); + break; + case 'm': proxy->set_max_clients(atoi(arg)); break; + case 'i': + proxy->set_client_idletime(atoi(arg)); + break; + case 'T': + proxy->set_target_idletime(atoi(arg)); + break; + case 'X': + debug = 1; + break; + case 'p': + if (!pid_fname) + pid_fname = xstrdup(arg); + break; + case 'u': + if (!uid) + uid = xstrdup(arg); + break; default: usage(prog); return 1; @@ -64,7 +109,11 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) } if (addr) { - proxy->server(addr); + if (proxy->server(addr)) + { + yaz_log(LOG_FATAL|LOG_ERRNO, "listen %s", addr); + exit(1); + } } else { @@ -74,14 +123,142 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) return 0; } +static Yaz_Proxy *static_yaz_proxy = 0; +static void sighup_handler(int num) +{ + signal(SIGHUP, sighup_handler); + if (static_yaz_proxy) + static_yaz_proxy->reconfig(); +} + + +static void child_run(Yaz_SocketManager *m, int run) +{ + signal(SIGHUP, sighup_handler); + + yaz_log(LOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid()); + if (pid_fname) + { + FILE *f = fopen(pid_fname, "w"); + if (!f) + { + yaz_log(LOG_ERRNO|LOG_FATAL, "Couldn't create %s", pid_fname); + exit(0); + } + fprintf(f, "%ld", (long) getpid()); + fclose(f); + xfree(pid_fname); + } + if (uid) + { + struct passwd *pw; + + if (!(pw = getpwnam(uid))) + { + yaz_log(LOG_FATAL, "%s: Unknown user", uid); + exit(3); + } + if (log_file) + { + chown(log_file, pw->pw_uid, pw->pw_gid); + xfree(log_file); + } + + if (setuid(pw->pw_uid) < 0) + { + yaz_log(LOG_FATAL|LOG_ERRNO, "setuid"); + exit(4); + } + xfree(uid); + } + + while (m->processEvent() > 0) + ; + + exit (0); +} + int main(int argc, char **argv) { +#if HAVE_XSLT + xmlInitMemory(); + + LIBXML_TEST_VERSION +#endif + int cont = 1; + int run = 1; Yaz_SocketManager mySocketManager; Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager)); + static_yaz_proxy = &proxy; + args(&proxy, argc, argv); - while (mySocketManager.processEvent() > 0) - ; + + if (debug) + { + child_run(&mySocketManager, run); + exit(0); + } + while (cont) + { + pid_t p = fork(); + if (p == (pid_t) -1) + { + yaz_log(LOG_FATAL|LOG_ERRNO, "fork"); + exit(1); + } + else if (p == 0) + { + child_run(&mySocketManager, run); + } + pid_t p1; + int status; + p1 = wait(&status); + + yaz_log_reopen(); + + if (p1 != p) + { + yaz_log(LOG_FATAL, "p1=%d != p=%d", p1, p); + exit(1); + } + if (WIFSIGNALED(status)) + { + switch(WTERMSIG(status)) { + case SIGILL: + yaz_log(LOG_WARN, "Received SIGILL from child %ld", (long) p); + cont = 1; + break; + case SIGABRT: + yaz_log(LOG_WARN, "Received SIGABRT from child %ld", (long) p); + cont = 1; + break ; + case SIGSEGV: + yaz_log(LOG_WARN, "Received SIGSEGV from child %ld", (long) p); + cont = 1; + break; + case SIGTERM: + yaz_log(LOG_LOG, "Received SIGTERM from child %ld", + (long) p); + cont = 0; + break; + default: + yaz_log(LOG_WARN, "Received SIG %d from child %ld", + WTERMSIG(status), (long) p); + cont = 0; + } + } + else if (status == 0) + cont = 0; + else + { + yaz_log(LOG_LOG, "Exit %d from child %ld", status, (long) p); + cont = 1; + } + if (cont) + sleep(1); + run++; + } exit (0); return 0; }