X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=f6abc77432fecdf46e2ed2f0630bdac1a95902fe;hb=e55896f9cb43034c3e8743b51ef79936f5404bc3;hp=126b5bbd1e4b5c8e564b7521d35463885fc90836;hpb=26b3f7f15abcb69aaf00fb6bdaf410ff3e7de14c;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 126b5bb..f6abc77 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,10 +1,28 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy-main.cpp,v $
- * Revision 1.7  1999-12-06 13:52:45  adam
+ * 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.
  *
@@ -33,13 +51,13 @@
 #include <yaz/log.h>
 #include <yaz/options.h>
 
-#include <yaz-socket-manager.h>
-#include <yaz-pdu-assoc.h>
-#include <yaz-proxy.h>
+#include <yaz++/yaz-socket-manager.h>
+#include <yaz++/yaz-pdu-assoc.h>
+#include <yaz++/yaz-proxy.h>
 
 void usage(char *prog)
 {
-    fprintf (stderr, "%s: [-v log] [-t target] @:port\n", prog);
+    fprintf (stderr, "%s: [-a log] [-c num] [-v level] [-t target] @:port\n", prog);
     exit (1);
 }
 
@@ -51,7 +69,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("t:v:", argv, argc, &arg)) != -2)
+    while ((ret = options("a:t:v:c:", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -63,11 +81,17 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
 	    }
 	    addr = arg;
             break;
+	case 'a':
+	    proxy->set_APDU_log(arg);
+	    break;
         case 't':
 	    proxy->set_proxyTarget(arg);
 	    break;
 	case 'v':
-	    log_init_level (log_mask_str(arg));
+	    yaz_log_init_level (yaz_log_mask_str(arg));
+	    break;
+	case 'c':
+	    proxy->set_max_clients(atoi(arg));
 	    break;
         default:
 	    usage(prog);
@@ -94,5 +118,6 @@ int main(int argc, char **argv)
     args(&proxy, argc, argv);
     while (mySocketManager.processEvent() > 0)
 	;
+    exit (0);
     return 0;
 }