X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=6d981757a7dcc6ac7c9bfee24ab465656064e81e;hb=87be6c609c22d9620c781b95ab74298b63694055;hp=2f410542a35a73de705253e2ce688dd16aabbcb5;hpb=2e14b1af67a2044e73d024bc29445035910a2dd4;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 2f41054..6d98175 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy-main.cpp,v $
- * Revision 1.6  1999-11-10 10:02:34  adam
+ * 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
@@ -26,8 +36,8 @@
  *
  */
 
-#include <log.h>
-#include <options.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
 
 #include <yaz-socket-manager.h>
 #include <yaz-pdu-assoc.h>
@@ -35,7 +45,7 @@
 
 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);
 }
 
@@ -47,7 +57,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("p:v:q", argv, argc, &arg)) != -2)
+    while ((ret = options("a:t:v:c:", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -59,12 +69,18 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
 	    }
 	    addr = arg;
             break;
+	case 'a':
+	    proxy->set_APDU_log(arg);
+	    break;
         case 't':
-	    proxy->proxyTarget(arg);
+	    proxy->set_proxyTarget(arg);
 	    break;
 	case 'v':
 	    log_init_level (log_mask_str(arg));
 	    break;
+	case 'c':
+	    proxy->set_max_clients(atoi(arg));
+	    break;
         default:
 	    usage(prog);
 	    return 1;
@@ -74,10 +90,14 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     {
 	proxy->server(addr);
     }
+    else
+    {
+	usage(prog);
+	return 1;
+    }
     return 0;
 }
 
-
 int main(int argc, char **argv)
 {
     Yaz_SocketManager mySocketManager;