X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=a7faf3be5f32163adeabb5aef8594f83d39fd8ef;hb=8cd77956b745e79b984bc0c9b74989aeae8dd49d;hp=1a230202652a0c4e597bf0eaabe3c85075094fb2;hpb=f45771ec3032b3ef67ec4c275da242e3c647b53e;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 1a23020..a7faf3b 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -2,19 +2,19 @@
  * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-main.cpp,v 1.16 2002-01-14 12:01:28 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.19 2003-10-01 13:13:51 adam Exp $
  */
 
 #include <yaz/log.h>
 #include <yaz/options.h>
 
-#include <yaz++/yaz-socket-manager.h>
-#include <yaz++/yaz-pdu-assoc.h>
-#include <yaz++/yaz-proxy.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] "
+    fprintf (stderr, "%s: [-c config] [-a log] [-m num] [-v level] [-t target] [-i sec] "
              "[-u auth] [-o optlevel] @:port\n", prog);
     exit (1);
 }
@@ -27,8 +27,9 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("o:a:t:v:c:u:", argv, argc, &arg)) != -2)
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:", argv, argc, &arg)) != -2)
     {
+	int err;
         switch (ret)
         {
         case 0:
@@ -39,11 +40,24 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
 	    }
 	    addr = arg;
             break;
+	case 'c':
+	    err = proxy->set_config(arg);
+	    if (err == -2)
+	    {
+		fprintf(stderr, "Config file support not enabled (proxy not compiled with libxml2 support)\n");
+		exit(1);
+	    }
+	    else if (err == -1)
+	    {
+		fprintf(stderr, "Bad or missing file %s\n", arg);
+		exit(1);
+	    }
+	    break;
 	case 'a':
 	    proxy->set_APDU_log(arg);
 	    break;
         case 't':
-	    proxy->set_proxy_target(arg);
+	    proxy->set_default_target(arg);
 	    break;
         case 'u':
             proxy->set_proxy_authentication(arg);
@@ -54,9 +68,18 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
 	case 'v':
 	    yaz_log_init_level (yaz_log_mask_str(arg));
 	    break;
-	case 'c':
+	case 'l':
+	    yaz_log_init_file (arg);
+	    break;
+	case 'm':
 	    proxy->set_max_clients(atoi(arg));
 	    break;
+        case 'i':
+	    proxy->set_client_idletime(atoi(arg));
+	    break;
+        case 'T':
+	    proxy->set_target_idletime(atoi(arg));
+	    break;
         default:
 	    usage(prog);
 	    return 1;