projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yaz_ProxyModules keeps track of number of open modules.
[yazproxy-moved-to-github.git]
/
src
/
yaz-proxy-main.cpp
diff --git
a/src/yaz-proxy-main.cpp
b/src/yaz-proxy-main.cpp
index
70d8eeb
..
b8a26d1
100644
(file)
--- a/
src/yaz-proxy-main.cpp
+++ b/
src/yaz-proxy-main.cpp
@@
-1,4
+1,4
@@
-/* $Id: yaz-proxy-main.cpp,v 1.8 2005-01-11 20:50:28 adam Exp $
+/* $Id: yaz-proxy-main.cpp,v 1.15 2005-06-08 13:29:03 adam Exp $
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
@@
-29,13
+29,18
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
#if HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
#if HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
-
+#if HAVE_PWD_H
#include <pwd.h>
#include <pwd.h>
+#endif
#include <stdarg.h>
#include <stdarg.h>
+#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/log.h>
#include <yaz/options.h>
@@
-51,6
+56,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <libxslt/transform.h>
#endif
#include <libxslt/transform.h>
#endif
+using namespace yazpp_1;
+
void usage(char *prog)
{
fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] "
void usage(char *prog)
{
fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] "
@@
-71,7
+78,7
@@
int args(Yaz_Proxy *proxy, int argc, char **argv)
char *prog = argv[0];
int ret;
char *prog = argv[0];
int ret;
- while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:n:X",
+ while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:n:X",
argv, argc, &arg)) != -2)
{
int err;
argv, argc, &arg)) != -2)
{
int err;
@@
-89,7
+96,7
@@
int args(Yaz_Proxy *proxy, int argc, char **argv)
err = proxy->set_config(arg);
if (err == -2)
{
err = proxy->set_config(arg);
if (err == -2)
{
- fprintf(stderr, "Config file support not enabled (proxy not compiled with libxml2 support)\n");
+ fprintf(stderr, "Config file support not enabled (not using libxslt & libxml2)\n");
exit(1);
}
else if (err == -1)
exit(1);
}
else if (err == -1)
@@
-104,9
+111,6
@@
int args(Yaz_Proxy *proxy, int argc, char **argv)
case 't':
proxy->set_default_target(arg);
break;
case 't':
proxy->set_default_target(arg);
break;
- case 'U':
- proxy->set_proxy_authentication(arg);
- break;
case 'o':
proxy->option("optimize", arg);
break;
case 'o':
proxy->option("optimize", arg);
break;
@@
-130,6
+134,7
@@
int args(Yaz_Proxy *proxy, int argc, char **argv)
no_limit_files = atoi(arg);
break;
case 'X':
no_limit_files = atoi(arg);
break;
case 'X':
+ proxy->set_debug_mode(1);
debug = 1;
break;
case 'p':
debug = 1;
break;
case 'p':
@@
-191,7
+196,7
@@
static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
}
#endif
}
#endif
-static void child_run(Yaz_SocketManager *m, int run)
+static void child_run(SocketManager *m, int run)
{
#ifdef WIN32
#else
{
#ifdef WIN32
#else
@@
-279,8
+284,8
@@
int main(int argc, char **argv)
#endif
int cont = 1;
int run = 1;
#endif
int cont = 1;
int run = 1;
- Yaz_SocketManager mySocketManager;
- Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
+ SocketManager mySocketManager;
+ Yaz_Proxy proxy(new PDU_Assoc(&mySocketManager), &mySocketManager);
static_yaz_proxy = &proxy;
static_yaz_proxy = &proxy;