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
Added support for threaded authentication modules. See
[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
a707e7c
..
4257c79
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.9 2005-01-16 21:50:25 adam Exp $
+/* $Id: yaz-proxy-main.cpp,v 1.13 2005-05-30 20:09:21 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.
@@
-40,6
+40,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#endif
#include <stdarg.h>
#endif
#include <stdarg.h>
+#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/log.h>
#include <yaz/options.h>
@@
-75,7
+76,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;
@@
-93,7
+94,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)
@@
-108,9
+109,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;
@@
-134,6
+132,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':
@@
-284,7
+283,7
@@
int main(int argc, char **argv)
int cont = 1;
int run = 1;
Yaz_SocketManager mySocketManager;
int cont = 1;
int run = 1;
Yaz_SocketManager mySocketManager;
- Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
+ Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager), &mySocketManager);
static_yaz_proxy = &proxy;
static_yaz_proxy = &proxy;