Uses preprocessor define WIN32 instead of WINDOWS to build code

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

diff --git a/server/statserv.c b/server/statserv.c
index ac1940b..b7759f3 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
@@ -7,7 +7,24 @@
  *   Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: statserv.c,v $
- * Revision 1.48  1998-02-11 11:53:36  adam
+ * Revision 1.53  1999-02-02 13:57:39  adam
+ * Uses preprocessor define WIN32 instead of WINDOWS to build code
+ * for Microsoft WIN32.
+ *
+ * Revision 1.52  1998/08/21 14:13:34  adam
+ * Added GNU Configure script to build Makefiles.
+ *
+ * Revision 1.51  1998/07/07 15:51:03  adam
+ * Changed server so that it stops if bind fails - "address already in
+ * use" typically causes this.
+ *
+ * Revision 1.50  1998/06/22 11:32:39  adam
+ * Added 'conditional cs_listen' feature.
+ *
+ * Revision 1.49  1998/02/27 14:04:55  adam
+ * Fixed bug in statserv_remove.
+ *
+ * Revision 1.48  1998/02/11 11:53:36  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.47  1998/02/10 10:28:57  adam
@@ -173,7 +190,7 @@
 #include <yconfig.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <process.h>
 #include <winsock.h>
 #include <direct.h>
@@ -219,12 +236,12 @@ statserv_options_block control_block = {
     check_options,              /* Default routine, for checking the run-time arguments */
     0                           /* default value for inet deamon */
 
-#ifdef WINDOWS
+#ifdef WIN32
     ,"Z39.50 Server",           /* NT Service Name */
     "Server",                   /* NT application Name */
     "",                         /* NT Service Dependencies */
     "Z39.50 Server"             /* NT Service Display Name */
-#endif /* WINDOWS */
+#endif /* WIN32 */
 };
 
 /*
@@ -233,7 +250,7 @@ statserv_options_block control_block = {
  * doing all of the listening and accepting in the parent - it's
  * safer that way.
  */
-#ifdef WINDOWS
+#ifdef WIN32
 
 typedef struct _ThreadList ThreadList;
 
@@ -311,6 +328,7 @@ void statserv_remove(IOCHAN pIOChannel)
             {
                 /* We need to look at another thread */
                 pNextThread = pCurrentThread->pNext;
+                pPrevThread = pCurrentThread;
             }
         }
 
@@ -401,7 +419,7 @@ static void listener(IOCHAN h, int event)
     {
         if ((res = cs_listen(line, 0, 0)) < 0)
         {
-           logf(LOG_FATAL, "cs_listen failed.");
+           logf(LOG_FATAL, "cs_listen failed");
            return;
         }
         else if (res == 1)
@@ -443,7 +461,7 @@ static void listener(IOCHAN h, int event)
        logf(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout);
        iochan_setdata(new_chan, newas);
        iochan_settimeout(new_chan, control_block.idle_timeout * 60);
-#ifndef WINDOWS
+#ifndef WIN32
        logf(LOG_DEBUG, "Determining client address");
        a = cs_addrstr(new_line);
        logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]");
@@ -477,7 +495,7 @@ static void listener(IOCHAN h, int event)
     }
 }
 
-#else /* WINDOWS */
+#else /* WIN32 */
 
 /* To save having an #ifdef in event_loop we need to define this empty function */
 void statserv_remove(IOCHAN pIOChannel)
@@ -491,6 +509,19 @@ void statserv_closedown()
         iochan_destroy(p);
 }
 
+static int check_ip(void *cd, const char *addr, int len, int type)
+{
+    const unsigned char *ip = (const unsigned char *) addr;
+    int i;
+    char str[64];
+
+    sprintf (str, "%u", *ip);
+    for (i = 1; i<4; i++)
+       sprintf (str + strlen(str), ".%u", ip[i]);
+    logf (LOG_DEBUG, "ip %s", str);
+    return 0;
+}
+
 static void listener(IOCHAN h, int event)
 {
     COMSTACK line = (COMSTACK) iochan_getdata(h);
@@ -558,9 +589,9 @@ static void listener(IOCHAN h, int event)
                return;
            }
        }
-       if ((res = cs_listen(line, 0, 0)) < 0)
+       if ((res = cs_listen_check(line, 0, 0, check_ip, 0)) < 0)
        {
-           logf(LOG_FATAL, "cs_listen failed.");
+           logf(LOG_WARN, "cs_listen failed");
            return;
        }
        else if (res == 1)
@@ -628,7 +659,7 @@ static void listener(IOCHAN h, int event)
     }
 }
 
-#endif /* WINDOWS */
+#endif /* WIN32 */
 
 static void inetd_connection(int what)
 {
@@ -704,6 +735,7 @@ static void add_listener(char *where, int what)
     if (!(l = cs_create(type, 0, what)))
     {
        logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener");
+       return;
     }
     ap = cs_straddr (l, addr);
     if (!ap)
@@ -715,11 +747,15 @@ static void add_listener(char *where, int what)
     if (cs_bind(l, ap, CS_SERVER) < 0)
     {
        logf(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where);
+       cs_close (l);
+       return;
     }
     if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT |
         EVENT_EXCEPT)))
     {
        logf(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type");
+       cs_close (l);
+       return;
     }
     iochan_setdata(lst, l);
 
@@ -728,7 +764,7 @@ static void add_listener(char *where, int what)
     pListener = lst;
 }
 
-#ifndef WINDOWS
+#ifndef WIN32
 /* For windows we don't need to catch the signals */
 static void catchchld(int num)
 {
@@ -736,7 +772,7 @@ static void catchchld(int num)
        ;
     signal(SIGCHLD, catchchld);
 }
-#endif /* WINDOWS */
+#endif /* WIN32 */
 
 statserv_options_block *statserv_getcontrol(void)
 {
@@ -756,12 +792,12 @@ int statserv_start(int argc, char **argv)
     int ret;
 
     nmem_init ();
-#ifdef WINDOWS
+#ifdef WIN32
     /* We need to initialize the thread list */
     ThreadList_Initialize();
-#endif /* WINDOWS */
+#endif /* WIN32 */
 
-#ifdef WINDOWS
+#ifdef WIN32
     if ((me = strrchr (argv[0], '\\')))
        me++;
     else
@@ -772,7 +808,7 @@ int statserv_start(int argc, char **argv)
     if (control_block.options_func(argc, argv))
         return(1);
 
-#ifndef WINDOWS
+#ifndef WIN32
     if (control_block.inetd)
        inetd_connection(control_block.default_proto);
     else
@@ -797,17 +833,19 @@ int statserv_start(int argc, char **argv)
            exit(1);
        }
     }
-#endif /* WINDOWS */
+#endif /* WIN32 */
 
     if ((pListener == NULL) && *control_block.default_listen)
        add_listener(control_block.default_listen,
                     control_block.default_proto);
-    logf(LOG_LOG, "Entering event loop.");
        
     if (pListener == NULL)
        ret = 1;
     else
+    {
+       logf(LOG_LOG, "Entering event loop.");
         ret = event_loop(&pListener);
+    }
     nmem_exit ();
     return ret;
 }
@@ -887,7 +925,7 @@ int check_options(int argc, char **argv)
     return 0;
 }
 
-#ifdef WINDOWS
+#ifdef WIN32
 typedef struct _Args
 {
     char **argv;