/*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
* See the file LICENSE for details.
*
- * $Log: yaz-proxy-main.cpp,v $
- * Revision 1.13 2001-04-10 10:48:08 adam
- * Fixed problem where proxy could cash bad result sets.
- *
- * Revision 1.12 2000/10/11 11:58:16 adam
- * Moved header files to include/yaz++. Switched to libtool and automake.
- * Configure script creates yaz++-config script.
- *
- * Revision 1.11 2000/09/08 10:23:42 adam
- * Added skeleton of yaz-z-server.
- *
- * Revision 1.10 2000/09/04 08:59:16 adam
- * Changed call to logging functions (yaz_ added).
- *
- * Revision 1.9 2000/08/07 14:19:59 adam
- * Fixed serious bug regarding timeouts. Improved logging for proxy.
- *
- * Revision 1.8 2000/07/04 13:48:49 adam
- * Implemented upper-limit on proxy-to-target sessions.
- *
- * Revision 1.7 1999/12/06 13:52:45 adam
- * Modified for new location of YAZ header files. Experimental threaded
- * operation.
- *
- * Revision 1.6 1999/11/10 10:02:34 adam
- * Work on proxy.
- *
- * Revision 1.5 1999/04/21 12:09:01 adam
- * Many improvements. Modified to proxy server to work with "sessions"
- * based on cookies.
- *
- * Revision 1.4 1999/04/09 11:46:57 adam
- * Added object Yaz_Z_Assoc. Much more functional client.
- *
- * Revision 1.3 1999/02/02 14:01:21 adam
- * First WIN32 port of YAZ++.
- *
- * Revision 1.2 1999/01/28 13:08:45 adam
- * Yaz_PDU_Assoc better encapsulated. Memory leak fix in
- * yaz-socket-manager.cc.
- *
- * Revision 1.1.1.1 1999/01/28 09:41:07 adam
- * First implementation of YAZ++.
- *
+ * $Id: yaz-proxy-main.cpp,v 1.25 2003-10-23 13:49:58 adam Exp $
*/
+#include <signal.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
+
#include <yaz/log.h>
#include <yaz/options.h>
-#include <yaz++/yaz-socket-manager.h>
-#include <yaz++/yaz-pdu-assoc.h>
-#include <yaz++/yaz-proxy.h>
+#include <yaz++/socket-manager.h>
+#include <yaz++/pdu-assoc.h>
+#include <yaz++/proxy.h>
void usage(char *prog)
{
- fprintf (stderr, "%s: [-a log] [-c num] [-v level] [-t target] @:port\n", prog);
+ fprintf (stderr, "%s: [-c config] [-a log] [-m num] [-v level] [-t target] [-i sec] "
+ "[-u uid] [-p pidfile] [-o optlevel] @:port\n", prog);
exit (1);
}
+static char *pid_fname = 0;
+static char *uid = 0;
+static char *log_file = 0;
int args(Yaz_Proxy *proxy, int argc, char **argv)
{
char *prog = argv[0];
int ret;
- while ((ret = options("a:t:v:c:", argv, argc, &arg)) != -2)
+ while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:", argv, argc, &arg)) != -2)
{
+ int err;
switch (ret)
{
case 0:
}
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_proxyTarget(arg);
+ proxy->set_default_target(arg);
+ break;
+ case 'U':
+ proxy->set_proxy_authentication(arg);
+ break;
+ case 'o':
+ proxy->option("optimize", arg);
break;
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 'p':
+ if (!pid_fname)
+ pid_fname = xstrdup(arg);
+ break;
+ case 'u':
+ if (!uid)
+ uid = xstrdup(arg);
+ break;
default:
usage(prog);
return 1;
}
if (addr)
{
- proxy->server(addr);
+ yaz_log(LOG_LOG, "Starting proxy pid=%ld", (long) getpid());
+ if (proxy->server(addr))
+ {
+ yaz_log(LOG_FATAL|LOG_ERRNO, "listen %s", addr);
+ exit(1);
+ }
}
else
{
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();
+}
+
int main(int argc, char **argv)
{
+ static int mk_pid = 0;
Yaz_SocketManager mySocketManager;
Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
+ static_yaz_proxy = &proxy;
+
+ signal(SIGHUP, sighup_handler);
+
args(&proxy, argc, argv);
+
+ 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 (mySocketManager.processEvent() > 0)
;
+
exit (0);
return 0;
}
projects / yazpp-moved-to-github.git / blobdiff