X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=75d31bc86e052bec813acfacd904a60407085db6;hp=a707e7c7e165f0e0f7646479b605bc1e3afed9f1;hb=2687af689ae79c5a823e28e0ecb3429106df1caa;hpb=daae372cfd8598627aa3c31db44e735d4d78ec81

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index a707e7c..75d31bc 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,7 +1,7 @@
-/* $Id: yaz-proxy-main.cpp,v 1.9 2005-01-16 21:50:25 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $Id: yaz-proxy-main.cpp,v 1.19 2006-03-30 10:32:16 adam Exp $
+   Copyright (c) 1998-2006, Index Data.
 
-This file is part of the yaz-proxy.
+This file is part of the yazproxy.
 
 YAZ proxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -40,12 +40,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include <yaz/log.h>
 #include <yaz/options.h>
 
-#include <yaz++/socket-manager.h>
-#include <yaz++/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
 #include <yazproxy/proxy.h>
 
 #if HAVE_XSLT
@@ -55,10 +56,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <libxslt/transform.h>
 #endif
 
+using namespace yazpp_1;
+
 void usage(char *prog)
 {
-    fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] "
-             "[-u uid] [-p pidfile] @:port\n", prog);
+    fprintf (stderr, "%s: [-a log] [-c config]\n"
+             " [-i sec] [-l log] [-m num] [-n num] [-p pidfile]"
+             " [-t target] [-T sec] [-u uid]\n"
+             " [-v level] [-X] @:port\n", prog);
     exit (1);
 }
 
@@ -75,92 +80,90 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:n:X",
-			  argv, argc, &arg)) != -2)
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:n:X",
+                          argv, argc, &arg)) != -2)
     {
-	int err;
+        int err;
         switch (ret)
         {
         case 0:
             if (addr)
-	    {
-		usage(prog);
-		return 1;
-	    }
-	    addr = arg;
+            {
+                usage(prog);
+                return 1;
+            }
+            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_default_target(arg);
-	    break;
-        case 'U':
-            proxy->set_proxy_authentication(arg);
+        case 'a':
+            proxy->set_APDU_log(arg);
+            break;
+        case 'c':
+            err = proxy->set_config(arg);
+            if (err == -2)
+            {
+                fprintf(stderr, "Config file support not enabled (not using libxslt & libxml2)\n");
+                exit(1);
+            }
+            else if (err == -1)
+            {
+                fprintf(stderr, "Bad or missing file %s\n", arg);
+                exit(1);
+            }
             break;
-        case 'o':
-	    proxy->option("optimize", arg);
-	    break;
-	case 'v':
-	    yaz_log_init_level (yaz_log_mask_str(arg));
-	    break;
-	case 'l':
-	    yaz_log_init_file (arg);
-	    log_file = xstrdup(arg);
-	    break;
-	case 'm':
-	    proxy->set_max_clients(atoi(arg));
-	    break;
         case 'i':
-	    proxy->set_client_idletime(atoi(arg));
-	    break;
+            proxy->set_client_idletime(atoi(arg));
+            break;
+        case 'l':
+            yaz_log_init_file (arg);
+            log_file = xstrdup(arg);
+            break;
+        case 'm':
+            proxy->set_max_clients(atoi(arg));
+            break;
+        case 'n':
+            no_limit_files = atoi(arg);
+            break;
+        case 'o':
+            proxy->option("optimize", arg);
+            break;
+        case 'p':
+            if (!pid_fname)
+                pid_fname = xstrdup(arg);
+            break;
+        case 't':
+            proxy->set_default_target(arg);
+            break;
         case 'T':
-	    proxy->set_target_idletime(atoi(arg));
-	    break;
-	case 'n':
-	    no_limit_files = atoi(arg);
-	    break;
-	case 'X':
-	    debug = 1;
-	    break;
-	case 'p':
-	    if (!pid_fname)
-		pid_fname = xstrdup(arg);
-	    break;
-	case 'u':
-	    if (!uid)
-		uid = xstrdup(arg);
-	    break;
+            proxy->set_target_idletime(atoi(arg));
+            break;
+        case 'u':
+            if (!uid)
+                uid = xstrdup(arg);
+            break;
+        case 'v':
+            yaz_log_init_level (yaz_log_mask_str(arg));
+            break;
+        case 'X':
+            proxy->set_debug_mode(1);
+            debug = 1;
+            break;
         default:
-	    usage(prog);
-	    return 1;
+            usage(prog);
+            return 1;
         }
     }
     if (addr)
     {
-	if (proxy->server(addr))
-	{
-	    yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen %s", addr);
-	    exit(1);
-	}
+        if (proxy->server(addr))
+        {
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen %s", addr);
+            exit(1);
+        }
     }
     else
     {
-	usage(prog);
-	return 1;
+        usage(prog);
+        return 1;
     }
     return 0;
 }
@@ -173,7 +176,7 @@ static void sighup_handler(int num)
     signal(SIGHUP, sighup_handler);
 #endif
     if (static_yaz_proxy)
-	static_yaz_proxy->reconfig();
+        static_yaz_proxy->reconfig();
 }
 
 #if HAVE_XSLT
@@ -195,7 +198,7 @@ static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
 }
 #endif
 
-static void child_run(Yaz_SocketManager *m, int run)
+static void child_run(SocketManager *m, int run)
 {
 #ifdef WIN32
 #else
@@ -213,63 +216,63 @@ static void child_run(Yaz_SocketManager *m, int run)
     if (no_limit_files)
     {
 #if HAVE_SETRLIMIT
-	struct rlimit limit_data;
-	limit_data.rlim_cur = no_limit_files;
-	limit_data.rlim_max = no_limit_files;
-	
-	yaz_log(YLOG_LOG, "0 setrlimit NOFILE cur=%ld max=%ld",
-		(long) limit_data.rlim_cur, (long) limit_data.rlim_max);
-	if (setrlimit(RLIMIT_NOFILE, &limit_data))
-	    yaz_log(YLOG_ERRNO|YLOG_WARN, "setrlimit");
+        struct rlimit limit_data;
+        limit_data.rlim_cur = no_limit_files;
+        limit_data.rlim_max = no_limit_files;
+        
+        yaz_log(YLOG_LOG, "0 setrlimit NOFILE cur=%ld max=%ld",
+                (long) limit_data.rlim_cur, (long) limit_data.rlim_max);
+        if (setrlimit(RLIMIT_NOFILE, &limit_data))
+            yaz_log(YLOG_ERRNO|YLOG_WARN, "setrlimit");
 #else
-	yaz_log(YLOG_WARN, "setrlimit unavablable. Option -n ignored");
+        yaz_log(YLOG_WARN, "setrlimit unavablable. Option -n ignored");
 #endif
     }
 #ifdef WIN32
 #else
     if (pid_fname)
     {
-	FILE *f = fopen(pid_fname, "w");
-	if (!f)
-	{
-	    yaz_log(YLOG_ERRNO|YLOG_FATAL, "Couldn't create %s", pid_fname);
-	    exit(0);
-	}
-	fprintf(f, "%ld", (long) getpid());
-	fclose(f);
-	xfree(pid_fname);
+        FILE *f = fopen(pid_fname, "w");
+        if (!f)
+        {
+            yaz_log(YLOG_ERRNO|YLOG_FATAL, "Couldn't create %s", pid_fname);
+            exit(0);
+        }
+        fprintf(f, "%ld", (long) getpid());
+        fclose(f);
+        xfree(pid_fname);
     }
     if (uid)
     {
-    	struct passwd *pw;
+        struct passwd *pw;
 
-	if (!(pw = getpwnam(uid)))
-	{
-	    yaz_log(YLOG_FATAL, "%s: Unknown user", uid);
-	    exit(3);
-	}
-	if (log_file)
-	{
-	    chown(log_file, pw->pw_uid,  pw->pw_gid);
-	    xfree(log_file);
-	}
-	if (setuid(pw->pw_uid) < 0)
-	{
-	    yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid");
-	    exit(4);
-	}
-	xfree(uid);
+        if (!(pw = getpwnam(uid)))
+        {
+            yaz_log(YLOG_FATAL, "%s: Unknown user", uid);
+            exit(3);
+        }
+        if (log_file)
+        {
+            chown(log_file, pw->pw_uid,  pw->pw_gid);
+            xfree(log_file);
+        }
+        if (setuid(pw->pw_uid) < 0)
+        {
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid");
+            exit(4);
+        }
+        xfree(uid);
     }
 #endif
 #if HAVE_GETRLIMIT
     struct rlimit limit_data;
     getrlimit(RLIMIT_NOFILE, &limit_data);
     yaz_log(YLOG_LOG, "0 getrlimit NOFILE cur=%ld max=%ld",
-	    (long) limit_data.rlim_cur, (long) limit_data.rlim_max);
+            (long) limit_data.rlim_cur, (long) limit_data.rlim_max);
 #endif
     
     while (m->processEvent() > 0)
-	;
+        ;
 
     exit (0);
 }
@@ -283,8 +286,8 @@ int main(int argc, char **argv)
 #endif
     int cont = 1;
     int run = 1;
-    Yaz_SocketManager mySocketManager;
-    Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
+    SocketManager mySocketManager;
+    Yaz_Proxy proxy(new PDU_Assoc(&mySocketManager), &mySocketManager);
 
     static_yaz_proxy = &proxy;
 
@@ -295,74 +298,82 @@ int main(int argc, char **argv)
 #else
     if (debug)
     {
-	child_run(&mySocketManager, run);
-	exit(0);
+        child_run(&mySocketManager, run);
+        exit(0);
     }
     while (cont)
     {
-	pid_t p = fork();
-	if (p == (pid_t) -1)
-	{
-	    yaz_log(YLOG_FATAL|YLOG_ERRNO, "fork");
-	    exit(1);
-	}
-	else if (p == 0)
-	{
-	    child_run(&mySocketManager, run);
-	}
-	pid_t p1;
-	int status;
-	p1 = wait(&status);
+        pid_t p = fork();
+        if (p == (pid_t) -1)
+        {
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "fork");
+            exit(1);
+        }
+        else if (p == 0)
+        {
+            child_run(&mySocketManager, run);
+        }
+        pid_t p1;
+        int status;
+        p1 = wait(&status);
 
-	yaz_log_reopen();
+        yaz_log_reopen();
 
-	if (p1 != p)
-	{
-	    yaz_log(YLOG_FATAL, "p1=%d != p=%d", p1, p);
-	    exit(1);
-	}
-	if (WIFSIGNALED(status))
-	{
-	    switch(WTERMSIG(status)) {
-	    case SIGILL:
-		yaz_log(YLOG_WARN, "Received SIGILL from child %ld", (long) p);
-		cont = 1;
-		break;
-	    case SIGABRT:
-		yaz_log(YLOG_WARN, "Received SIGABRT from child %ld", (long) p);
-		cont = 1;
-		break ;
-	    case SIGSEGV:
-		yaz_log(YLOG_WARN, "Received SIGSEGV from child %ld", (long) p);
-		cont = 1;
-		break;
-	    case SIGBUS:	
-		yaz_log(YLOG_WARN, "Received SIGBUS from child %ld", (long) p);
-		cont = 1;
-		break;
-	    case SIGTERM:
-		yaz_log(YLOG_LOG, "Received SIGTERM from child %ld",
-			(long) p);
-		cont = 0;
-		break;
-	    default:
-		yaz_log(YLOG_WARN, "Received SIG %d from child %ld",
-			WTERMSIG(status), (long) p);
-		cont = 0;
-	    }
-	}
-	else if (status == 0)
-	    cont = 0;
-	else
-	{
-	    yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
-	    cont = 1;
-	}
-	if (cont)
-	    sleep(1 + run/5);
-	run++;
+        if (p1 != p)
+        {
+            yaz_log(YLOG_FATAL, "p1=%d != p=%d", p1, p);
+            exit(1);
+        }
+        if (WIFSIGNALED(status))
+        {
+            switch(WTERMSIG(status)) {
+            case SIGILL:
+                yaz_log(YLOG_WARN, "Received SIGILL from child %ld", (long) p);
+                cont = 1;
+                break;
+            case SIGABRT:
+                yaz_log(YLOG_WARN, "Received SIGABRT from child %ld", (long) p);
+                cont = 1;
+                break ;
+            case SIGSEGV:
+                yaz_log(YLOG_WARN, "Received SIGSEGV from child %ld", (long) p);
+                cont = 1;
+                break;
+            case SIGBUS:        
+                yaz_log(YLOG_WARN, "Received SIGBUS from child %ld", (long) p);
+                cont = 1;
+                break;
+            case SIGTERM:
+                yaz_log(YLOG_LOG, "Received SIGTERM from child %ld",
+                        (long) p);
+                cont = 0;
+                break;
+            default:
+                yaz_log(YLOG_WARN, "Received SIG %d from child %ld",
+                        WTERMSIG(status), (long) p);
+                cont = 0;
+            }
+        }
+        else if (status == 0)
+            cont = 0;
+        else
+        {
+            yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
+            cont = 1;
+        }
+        if (cont)
+            sleep(1 + run/5);
+        run++;
     }
 #endif
     exit (0);
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+