Added shared library support (libtool).

[yaz-moved-to-github.git] / server / statserv.c

diff --git a/server/statserv.c b/server/statserv.c
index 0ef6878..c5228f5 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -1,13 +1,25 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * NT server based on threads by
- *   Chas Woodfield, Fretwell Downing Datasystems.
+ *   Chas Woodfield, Fretwell Downing Informatics.
  *
  * $Log: statserv.c,v $
- * Revision 1.60  2000-03-14 09:06:11  adam
+ * Revision 1.64  2000-04-05 07:39:55  adam
+ * Added shared library support (libtool).
+ *
+ * Revision 1.63  2000/03/20 19:06:25  adam
+ * Added Segment request for fronend server. Work on admin for client.
+ *
+ * Revision 1.62  2000/03/17 12:47:02  adam
+ * Minor changes to admin client.
+ *
+ * Revision 1.61  2000/03/15 12:59:49  adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.60  2000/03/14 09:06:11  adam
  * Added POSIX threads support for frontend server.
  *
  * Revision 1.59  1999/11/30 13:47:12  adam
@@ -264,8 +276,10 @@ statserv_options_block control_block = {
     check_options,              /* Default routine, for checking the run-time arguments */
     check_ip_tcpd,
     "",
-    0                           /* default value for inet deamon */
-
+    0,                          /* default value for inet deamon */
+    0,                          /* handle (for service, etc) */
+    0,                          /* bend_init handle */
+    0                           /* bend_close handle */
 #ifdef WIN32
     ,"Z39.50 Server",           /* NT Service Name */
     "Server",                   /* NT application Name */
@@ -537,10 +551,20 @@ void statserv_remove(IOCHAN pIOChannel)
 void statserv_closedown()
 {
     IOCHAN p;
+
+    if (control_block.bend_stop)
+        (*control_block.bend_stop)(&control_block);
+
     for (p = pListener; p; p = p->next)
         iochan_destroy(p);
 }
 
+void sigterm(int sig)
+{
+    statserv_closedown();
+    exit (0);
+}
+
 static void *new_session (void *vp);
 
 static void listener(IOCHAN h, int event)
@@ -856,14 +880,29 @@ int statserv_start(int argc, char **argv)
 
     if (control_block.bend_start)
         (*control_block.bend_start)(&control_block);
-#ifndef WIN32
+#ifdef WIN32
+    logf (LOG_LOG, "Starting server %s", me);
+#else
     if (control_block.inetd)
        inetd_connection(control_block.default_proto);
     else
     {
+       logf (LOG_LOG, "Starting server %s pid=%d", me, getpid());
+#if 0
+       sigset_t sigs_to_block;
+
+       sigemptyset(&sigs_to_block);
+       sigaddset (&sigs_to_block, SIGTERM);
+       pthread_sigmask (SIG_BLOCK, &sigs_to_block, 0);
+       pthread_create (&
+
+
+#endif
        if (control_block.dynamic)
            signal(SIGCHLD, catchchld);
     }
+    
+    signal (SIGTERM, sigterm);
     if (*control_block.setuid)
     {
        struct passwd *pw;
@@ -927,6 +966,7 @@ int check_options(int argc, char **argv)
            control_block.threads = 1;
 #else
            fprintf(stderr, "%s: Threaded mode not available.\n", me);
+           return 1;
 #endif
            break;
        case 'l':
@@ -972,7 +1012,7 @@ int check_options(int argc, char **argv)
            if (chdir(arg))
            {
                perror(arg);            
-               return(1);
+               return 1;
            }
            break;
        default:
@@ -980,7 +1020,7 @@ int check_options(int argc, char **argv)
                    " -l <logfile> -u <user> -c <config> -t <minutes>"
                    " -k <kilobytes> -d <daemon>"
                         " -zsiST -w <directory> <listender-addr>... ]\n", me);
-           return(1);
+           return 1;
         }
     }
     return 0;
@@ -1001,10 +1041,17 @@ static Args ArgDetails;
 /* list of service dependencies - "dep1\0dep2\0\0" */
 #define SZDEPENDENCIES       ""
 
-int statserv_main(int argc, char **argv)
+int statserv_main(int argc, char **argv,
+                 bend_initresult *(*bend_init)(bend_initrequest *r),
+                 void (*bend_close)(void *handle))
 {
     statserv_options_block *cb = statserv_getcontrol();
     
+    cb->bend_init = bend_init;
+    cb->bend_close = bend_close;
+
+    statserv_setcontrol(cb);
+
     /* Lets setup the Arg structure */
     ArgDetails.argc = argc;
     ArgDetails.argv = argv;
@@ -1037,9 +1084,18 @@ void StopAppService(void *pHandle)
     statserv_closedown();
 }
 #else
-int statserv_main(int argc, char **argv)
+int statserv_main(int argc, char **argv,
+                 bend_initresult *(*bend_init)(bend_initrequest *r),
+                 void (*bend_close)(void *handle))
 {
-    int ret = statserv_start (argc, argv);
+    int ret;
+    statserv_options_block *cb = statserv_getcontrol();
+    
+    cb->bend_init = bend_init;
+    cb->bend_close = bend_close;
+
+    statserv_setcontrol(cb);
+    ret = statserv_start (argc, argv);
     statserv_closedown ();
     return ret;
 }