X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=7b5d3f30acc1c702569c394569578bbc6cd6cd28;hb=d8c09f27e7a06712a0c76adb1ff3a366fb69edf0;hp=a7faf3be5f32163adeabb5aef8594f83d39fd8ef;hpb=28588b9224eb5189af32b10f440ef2a917a05ea2;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index a7faf3b..7b5d3f3 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,10 +1,15 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-main.cpp,v 1.19 2003-10-01 13:13:51 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.25 2003-10-23 13:49:58 adam Exp $
  */
 
+#include <signal.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
+
 #include <yaz/log.h>
 #include <yaz/options.h>
 
@@ -15,10 +20,13 @@
 void usage(char *prog)
 {
     fprintf (stderr, "%s: [-c config] [-a log] [-m num] [-v level] [-t target] [-i sec] "
-             "[-u auth] [-o optlevel] @:port\n", prog);
+             "[-u uid] [-p pidfile] [-o optlevel] @:port\n", prog);
     exit (1);
 }
 
+static char *pid_fname = 0;
+static char *uid = 0;
+static char *log_file = 0;
 
 int args(Yaz_Proxy *proxy, int argc, char **argv)
 {
@@ -27,7 +35,7 @@ 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:", argv, argc, &arg)) != -2)
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:", argv, argc, &arg)) != -2)
     {
 	int err;
         switch (ret)
@@ -59,7 +67,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
         case 't':
 	    proxy->set_default_target(arg);
 	    break;
-        case 'u':
+        case 'U':
             proxy->set_proxy_authentication(arg);
             break;
         case 'o':
@@ -70,6 +78,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
 	    break;
 	case 'l':
 	    yaz_log_init_file (arg);
+	    log_file = xstrdup(arg);
 	    break;
 	case 'm':
 	    proxy->set_max_clients(atoi(arg));
@@ -80,6 +89,14 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
         case 'T':
 	    proxy->set_target_idletime(atoi(arg));
 	    break;
+	case 'p':
+	    if (!pid_fname)
+		pid_fname = xstrdup(arg);
+	    break;
+	case 'u':
+	    if (!uid)
+		uid = xstrdup(arg);
+	    break;
         default:
 	    usage(prog);
 	    return 1;
@@ -87,7 +104,12 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     }
     if (addr)
     {
-	proxy->server(addr);
+	yaz_log(LOG_LOG, "Starting proxy pid=%ld", (long) getpid());
+	if (proxy->server(addr))
+	{
+	    yaz_log(LOG_FATAL|LOG_ERRNO, "listen %s", addr);
+	    exit(1);
+	}
     }
     else
     {
@@ -97,14 +119,64 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     return 0;
 }
 
+static Yaz_Proxy *static_yaz_proxy = 0;
+static void sighup_handler(int num)
+{
+    signal(SIGHUP, sighup_handler);
+    if (static_yaz_proxy)
+	static_yaz_proxy->reconfig();
+}
+
 int main(int argc, char **argv)
 {
+    static int mk_pid = 0;
     Yaz_SocketManager mySocketManager;
     Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 
+    static_yaz_proxy = &proxy;
+
+    signal(SIGHUP, sighup_handler);
+
     args(&proxy, argc, argv);
+
+    if (pid_fname)
+    {
+	FILE *f = fopen(pid_fname, "w");
+	if (!f)
+	{
+	    yaz_log(LOG_ERRNO|LOG_FATAL, "Couldn't create %s", pid_fname);
+	    exit(0);
+	}
+	fprintf(f, "%ld", (long) getpid());
+	fclose(f);
+	xfree(pid_fname);
+    }
+    if (uid)
+    {
+    	struct passwd *pw;
+
+	if (!(pw = getpwnam(uid)))
+	{
+	    yaz_log(LOG_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(LOG_FATAL|LOG_ERRNO, "setuid");
+	    exit(4);
+	}
+	xfree(uid);
+    }
+
     while (mySocketManager.processEvent() > 0)
 	;
+
     exit (0);
     return 0;
 }