X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=b4be150408e37c94ef4c69f7f14c948d23701662;hb=355215b6f2c914f2eb099dda88828b8f0c8cb001;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..b4be150 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,10 +1,29 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy-main.cpp,v $
- * Revision 1.6  1999-11-10 10:02:34  adam
+ * 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
@@ -26,16 +45,16 @@
  *
  */
 
-#include <log.h>
-#include <options.h>
+#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);
 }
 
@@ -47,7 +66,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,11 +78,17 @@ 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));
+	    yaz_log_init_level (yaz_log_mask_str(arg));
+	    break;
+	case 'c':
+	    proxy->set_max_clients(atoi(arg));
 	    break;
         default:
 	    usage(prog);
@@ -74,10 +99,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;