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

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index b7292fd..6d98175 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -4,7 +4,24 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy-main.cpp,v $
- * Revision 1.4  1999-04-09 11:46:57  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
+ * Many improvements. Modified to proxy server to work with "sessions"
+ * based on cookies.
+ *
+ * Revision 1.4  1999/04/09 11:46:57  adam
  * Added object Yaz_Z_Assoc. Much more functional client.
  *
  * Revision 1.3  1999/02/02 14:01:21  adam
@@ -19,18 +36,74 @@
  *
  */
 
-#include <log.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
 
 #include <yaz-socket-manager.h>
 #include <yaz-pdu-assoc.h>
 #include <yaz-proxy.h>
 
+void usage(char *prog)
+{
+    fprintf (stderr, "%s: [-a log] [-c num] [-v level] [-t target] @:port\n", prog);
+    exit (1);
+}
+
+
+int args(Yaz_Proxy *proxy, int argc, char **argv)
+{
+    char *addr = 0;
+    char *arg;
+    char *prog = argv[0];
+    int ret;
+
+    while ((ret = options("a:t:v:c:", argv, argc, &arg)) != -2)
+    {
+        switch (ret)
+        {
+        case 0:
+            if (addr)
+	    {
+		usage(prog);
+		return 1;
+	    }
+	    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));
+	    break;
+	case 'c':
+	    proxy->set_max_clients(atoi(arg));
+	    break;
+        default:
+	    usage(prog);
+	    return 1;
+        }
+    }
+    if (addr)
+    {
+	proxy->server(addr);
+    }
+    else
+    {
+	usage(prog);
+	return 1;
+    }
+    return 0;
+}
+
 int main(int argc, char **argv)
 {
     Yaz_SocketManager mySocketManager;
-    Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager, 0));
+    Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 
-    proxy.server(argc < 2 ? "@:9999" : argv[1]);
+    args(&proxy, argc, argv);
     while (mySocketManager.processEvent() > 0)
 	;
     return 0;