Implementation name GFS/YAZ instead of GFS.

diff --git a/server/eventl.c b/server/eventl.c
index a2d7871..aade89b 100644 (file)
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -3,101 +3,7 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *

- * $Log: eventl.c,v $
- * Revision 1.30  2001-10-05 13:55:17  adam
- * Added defines YAZ_GNU_THREADS, YAZ_POSIX_THREADS in code and yaz-config
- *
- * Revision 1.29  1999/11/30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.28  1999/08/27 09:40:32  adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.27  1999/02/02 13:57:34  adam
- * Uses preprocessor define WIN32 instead of WINDOWS to build code
- * for Microsoft WIN32.
- *
- * Revision 1.26  1998/02/11 11:53:35  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.25  1998/01/29 13:30:23  adam
- * Better event handle system for NT/Unix.
- *
- * Revision 1.24  1997/09/04 14:19:13  adam
- * Added credits.
- *
- * Revision 1.23  1997/09/01 08:52:59  adam
- * New windows NT/95 port using MSV5.0. The test server 'ztest' was
- * moved a separate directory. MSV5.0 project server.dsp created.
- * As an option, the server can now operate as an NT service.
- *
- * Revision 1.22  1996/07/06 19:58:35  quinn
- * System headerfiles gathered in yconfig
- *
- * Revision 1.21  1996/02/21  12:55:51  quinn
- * small
- *
- * Revision 1.20  1996/02/21  12:52:55  quinn
- * Test
- *
- * Revision 1.19  1995/12/05  11:17:30  quinn
- * Moved some paranthesises around. Sigh.
- *
- * Revision 1.18  1995/11/13  09:27:41  quinn
- * Fiddling with the variant stuff.
- *
- * Revision 1.17  1995/11/07  12:37:44  quinn
- * Added support for forcing TIMEOUT event.
- *
- * Revision 1.16  1995/11/01  13:54:56  quinn
- * Minor adjustments
- *
- * Revision 1.15  1995/09/15  14:44:15  quinn
- * *** empty log message ***
- *
- * Revision 1.14  1995/08/29  14:44:50  quinn
- * Reset timeouts.
- *
- * Revision 1.13  1995/08/29  11:17:56  quinn
- * Added code to receive close
- *
- * Revision 1.12  1995/08/29  10:41:18  quinn
- * Small.
- *
- * Revision 1.11  1995/06/19  12:39:09  quinn
- * Fixed bug in timeout code. Added BER dumper.
- *
- * Revision 1.10  1995/06/16  10:31:33  quinn
- * Added session timeout.
- *
- * Revision 1.9  1995/06/05  10:53:31  quinn
- * Added a better SCAN.
- *
- * Revision 1.8  1995/05/16  08:51:01  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.7  1995/03/27  15:02:01  quinn
- * Added some includes for better portability
- *
- * Revision 1.6  1995/03/27  08:34:21  quinn
- * Added dynamic server functionality.
- * Released bindings to session.c (is now redundant)
- *
- * Revision 1.5  1995/03/15  08:37:41  quinn
- * Now we're pretty much set for nonblocking I/O.
- *
- * Revision 1.4  1995/03/14  16:59:48  quinn
- * Bug-fixes
- *
- * Revision 1.3  1995/03/14  11:30:14  quinn
- * Works better now.
- *
- * Revision 1.2  1995/03/14  10:27:59  quinn
- * More work on demo server.
- *
- * Revision 1.1  1995/03/10  18:22:44  quinn
- * The rudiments of an asynchronous server.
- *
+ * $Id: eventl.c,v 1.31 2001-10-05 14:43:22 adam Exp $

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

diff --git a/server/seshigh.c b/server/seshigh.c
index a2f4c35..4cb1d35 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -2,374 +2,7 @@
  * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  *
  * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  *

- * $Log: seshigh.c,v $
- * Revision 1.119  2001-09-24 21:51:55  adam
- * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
- * and yaz_z3950oid_to_str.
- *
- * Revision 1.118  2001/07/19 19:51:41  adam
- * Added typecasts to make C++ happy.
- *
- * Revision 1.117  2001/06/13 20:47:40  adam
- * When error is returned from present handler, non-surrogate diagnostic
- * is returned in present response (and fetch handler is no longer called).
- *
- * Revision 1.116  2001/05/16 07:21:36  adam
- * Accept any OID for record syntax.
- *
- * Revision 1.115  2001/03/25 21:55:12  adam
- * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate.
- *
- * Revision 1.114  2001/02/21 13:46:53  adam
- * C++ fixes.
- *
- * Revision 1.113  2001/01/30 21:34:17  adam
- * Added step-size for Scan backend interface.
- *
- * Revision 1.112  2001/01/29 09:38:22  adam
- * Fixed bug that made the frontend server crash when no attribute set
- * was specified for scan.
- *
- * Revision 1.111  2000/11/23 10:58:32  adam
- * SSL comstack support. Separate POSIX thread support library.
- *
- * Revision 1.110  2000/10/02 13:05:32  adam
- * Fixed bug introduced by previous commit.
- *
- * Revision 1.109  2000/10/02 11:07:44  adam
- * Added peer_name member for bend_init handler. Changed the YAZ
- * client so that tcp: can be avoided in target spec.
- *
- * Revision 1.108  2000/09/04 08:58:15  adam
- * Added prefix yaz_ for most logging utility functions.
- *
- * Revision 1.107  2000/08/31 10:20:12  adam
- * Added member request_format and output_format for backend fetch method.
- *
- * Revision 1.106  2000/08/31 09:51:25  adam
- * Added record_syntax member for fetch method (raw OID).
- *
- * Revision 1.105  2000/07/06 10:38:47  adam
- * Enhanced option --enable-tcpd.
- *
- * Revision 1.104  2000/04/05 07:39:55  adam
- * Added shared library support (libtool).
- *
- * Revision 1.103  2000/03/20 19:06:25  adam
- * Added Segment request for fronend server. Work on admin for client.
- *
- * Revision 1.102  2000/03/15 12:59:49  adam
- * Added handle member to statserv_control.
- *
- * Revision 1.101  2000/01/12 14:36:07  adam
- * Added printing stream (ODR) for backend functions.
- *
- * Revision 1.100  1999/12/16 23:36:19  adam
- * Implemented ILL protocol. Minor updates ASN.1 compiler.
- *
- * Revision 1.99  1999/11/30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.98  1999/11/29 15:12:27  adam
- * Changed the way implementationName - and version is set.
- *
- * Revision 1.96  1999/11/04 14:58:44  adam
- * Added status elements for backend delete result set handler.
- * Updated delete result result set command for client.
- *
- * Revision 1.95  1999/10/11 10:01:24  adam
- * Implemented bend_sort_rr handler for frontend server.
- *
- * Revision 1.94  1999/08/27 09:40:32  adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.93  1999/07/06 12:17:15  adam
- * Added option -1 that runs server once (for profiling purposes).
- *
- * Revision 1.92  1999/06/17 10:54:45  adam
- * Added facility to specify implementation version - and name
- * for server.
- *
- * Revision 1.91  1999/06/01 14:29:12  adam
- * Work on Extended Services.
- *
- * Revision 1.90  1999/05/27 13:02:20  adam
- * Assigned OID for old DB Update (VAL_DBUPDATE0).
- *
- * Revision 1.89  1999/05/26 15:24:26  adam
- * Fixed minor bugs regarding DB Update (introduced by previous commit).
- *
- * Revision 1.88  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.87  1999/03/31 11:18:25  adam
- * Implemented odr_strdup. Added Reference ID to backend server API.
- *
- * Revision 1.86  1999/02/02 13:57:38  adam
- * Uses preprocessor define WIN32 instead of WINDOWS to build code
- * for Microsoft WIN32.
- *
- * Revision 1.85  1998/11/17 09:52:59  adam
- * Fixed minor bug (introduced by previous commit).
- *
- * Revision 1.84  1998/11/16 16:02:32  adam
- * Added loggin utilies, log_rpn_query and log_scan_term. These used
- * to be part of Zebra.
- *
- * Revision 1.83  1998/11/03 10:09:36  adam
- * Fixed bug regarding YC.
- *
- * Revision 1.82  1998/10/20 14:00:30  quinn
- * Fixed Scan
- *
- * Revision 1.81  1998/10/13 16:12:24  adam
- * Added support for Surrogate Diagnostics for Scan Term entries.
- *
- * Revision 1.80  1998/09/02 12:41:53  adam
- * Added decode stream in bend search structures.
- *
- * Revision 1.79  1998/08/19 16:10:08  adam
- * Changed som member names of DeleteResultSetRequest/Response.
- *
- * Revision 1.78  1998/08/03 10:23:55  adam
- * Fixed bug regarding Options for Sort.
- *
- * Revision 1.77  1998/07/20 12:38:42  adam
- * Implemented delete result set service to server API.
- *
- * Revision 1.76  1998/05/27 16:57:07  adam
- * Support for surrogate diagnostic records added for bend_fetch.
- *
- * Revision 1.75  1998/05/18 10:13:07  adam
- * Fixed call to es_request handler - extra argument was passed.
- *
- * Revision 1.74  1998/03/31 15:13:20  adam
- * Development towards compiled ASN.1.
- *
- * Revision 1.73  1998/03/31 11:07:45  adam
- * Furhter work on UNIverse resource report.
- * Added Extended Services handling in frontend server.
- *
- * Revision 1.72  1998/02/11 11:53:35  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.71  1998/02/10 11:03:57  adam
- * Added support for extended handlers in backend server interface.
- *
- * Revision 1.70  1998/01/29 13:15:35  adam
- * Implemented sort for the backend interface.
- *
- * Revision 1.69  1997/09/30 11:48:12  adam
- * Fixed bug introduced by previous commit.
- *
- * Revision 1.68  1997/09/29 13:18:59  adam
- * Added function, oid_ent_to_oid, to replace the function
- * oid_getoidbyent, which is not thread safe.
- *
- * Revision 1.67  1997/09/17 12:10:40  adam
- * YAZ version 1.4.
- *
- * Revision 1.66  1997/09/05 15:26:44  adam
- * Added ODR encode in search and scen bend request structures.
- * Fixed a few enums that caused trouble with C++.
- *
- * Revision 1.65  1997/09/01 08:53:01  adam
- * New windows NT/95 port using MSV5.0. The test server 'ztest' was
- * moved a separate directory. MSV5.0 project server.dsp created.
- * As an option, the server can now operate as an NT service.
- *
- * Revision 1.64  1997/04/30 08:52:11  quinn
- * Null
- *
- * Revision 1.63  1996/10/11  11:57:26  quinn
- * Smallish
- *
- * Revision 1.62  1996/07/06  19:58:35  quinn
- * System headerfiles gathered in yconfig
- *
- * Revision 1.61  1996/06/10  08:56:16  quinn
- * Work on Summary.
- *
- * Revision 1.60  1996/05/30  11:03:10  quinn
- * Fixed NextresultSetPosition bug fixed.
- *
- * Revision 1.59  1996/05/14  09:26:46  quinn
- * Added attribute set to scan backend
- *
- * Revision 1.58  1996/02/20  12:53:04  quinn
- * Chanes to SCAN
- *
- * Revision 1.57  1996/01/02  08:57:47  quinn
- * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
- *
- * Revision 1.56  1995/12/14  11:09:57  quinn
- * Work on Explain
- *
- * Revision 1.55  1995/11/08  17:41:37  quinn
- * Smallish.
- *
- * Revision 1.54  1995/11/08  15:11:29  quinn
- * Log of close transmit.
- *
- * Revision 1.53  1995/11/01  13:54:58  quinn
- * Minor adjustments
- *
- * Revision 1.52  1995/11/01  12:19:13  quinn
- * Second attempt to fix same bug.
- *
- * Revision 1.50  1995/10/25  16:58:32  quinn
- * Simple.
- *
- * Revision 1.49  1995/10/16  13:51:53  quinn
- * Changes to provide Especs to the backend.
- *
- * Revision 1.48  1995/10/06  08:51:20  quinn
- * Added Write-buffer.
- *
- * Revision 1.47  1995/08/29  14:24:16  quinn
- * Added second half of close-handshake
- *
- * Revision 1.46  1995/08/29  11:17:58  quinn
- * Added code to receive close
- *
- * Revision 1.45  1995/08/21  09:11:00  quinn
- * Smallish fixes to suppport new formats.
- *
- * Revision 1.44  1995/08/17  12:45:25  quinn
- * Fixed minor problems with GRS-1. Added support in c&s.
- *
- * Revision 1.43  1995/08/15  12:00:31  quinn
- * Updated External
- *
- * Revision 1.42  1995/08/15  11:16:50  quinn
- *
- * Revision 1.41  1995/08/02  10:23:06  quinn
- * Smallish
- *
- * Revision 1.40  1995/07/31  14:34:26  quinn
- * Fixed bug in process_searchResponse (numberOfRecordsReturned).
- *
- * Revision 1.39  1995/06/27  13:21:00  quinn
- * SUTRS support
- *
- * Revision 1.38  1995/06/19  12:39:11  quinn
- * Fixed bug in timeout code. Added BER dumper.
- *
- * Revision 1.37  1995/06/16  13:16:14  quinn
- * Fixed Defaultdiagformat.
- *
- * Revision 1.36  1995/06/16  10:31:36  quinn
- * Added session timeout.
- *
- * Revision 1.35  1995/06/15  07:45:14  quinn
- * Moving to v3.
- *
- * Revision 1.34  1995/06/14  15:26:46  quinn
- * *** empty log message ***
- *
- * Revision 1.33  1995/06/06  14:57:05  quinn
- * Better diagnostics.
- *
- * Revision 1.32  1995/06/06  08:41:44  quinn
- * Better diagnostics.
- *
- * Revision 1.31  1995/06/06  08:15:37  quinn
- * Cosmetic.
- *
- * Revision 1.30  1995/06/05  10:53:32  quinn
- * Added a better SCAN.
- *
- * Revision 1.29  1995/06/01  11:25:03  quinn
- * Smallish.
- *
- * Revision 1.28  1995/06/01  11:21:01  quinn
- * Attempting to fix a bug in pack-records. replaced break with continue
- * for large records, according to standard.
- *
- * Revision 1.27  1995/05/29  08:12:06  quinn
- * Moved oid to util
- *
- * Revision 1.26  1995/05/18  13:02:12  quinn
- * Smallish.
- *
- * Revision 1.25  1995/05/17  08:42:26  quinn
- * Transfer auth info to backend. Allow backend to reject init gracefully.
- *
- * Revision 1.24  1995/05/16  08:51:04  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.23  1995/05/15  13:25:10  quinn
- * Fixed memory bug.
- *
- * Revision 1.22  1995/05/15  11:56:39  quinn
- * Asynchronous facilities. Restructuring of seshigh code.
- *
- * Revision 1.21  1995/05/02  08:53:19  quinn
- * Trying in vain to fix comm with ISODE
- *
- * Revision 1.20  1995/04/20  15:13:00  quinn
- * Cosmetic
- *
- * Revision 1.19  1995/04/18  08:15:34  quinn
- * Added dynamic memory allocation on encoding (whew). Code is now somewhat
- * neater. We'll make the same change for decoding one day.
- *
- * Revision 1.18  1995/04/17  11:28:25  quinn
- * Smallish
- *
- * Revision 1.17  1995/04/10  10:23:36  quinn
- * Some work to add scan and other things.
- *
- * Revision 1.16  1995/03/31  09:18:55  quinn
- * Added logging.
- *
- * Revision 1.15  1995/03/30  14:03:23  quinn
- * Added RFC1006 as separate library
- *
- * Revision 1.14  1995/03/30  12:18:17  quinn
- * Fixed bug.
- *
- * Revision 1.13  1995/03/30  09:09:24  quinn
- * Added state-handle and some support for asynchronous activities.
- *
- * Revision 1.12  1995/03/29  15:40:16  quinn
- * Ongoing work. Statserv is now dynamic by default
- *
- * Revision 1.11  1995/03/28  09:16:21  quinn
- * Added record packing to the search request
- *
- * Revision 1.10  1995/03/27  08:34:24  quinn
- * Added dynamic server functionality.
- * Released bindings to session.c (is now redundant)
- *
- * Revision 1.9  1995/03/22  15:01:26  quinn
- * Adjusting record packing.
- *
- * Revision 1.8  1995/03/22  10:13:21  quinn
- * Working on record packer
- *
- * Revision 1.7  1995/03/21  15:53:31  quinn
- * Little changes.
- *
- * Revision 1.6  1995/03/21  12:30:09  quinn
- * Beginning to add support for record packing.
- *
- * Revision 1.5  1995/03/17  10:44:13  quinn
- * Added catch of null-string in makediagrec
- *
- * Revision 1.4  1995/03/17  10:18:08  quinn
- * Added memory management.
- *
- * Revision 1.3  1995/03/16  17:42:39  quinn
- * Little changes
- *
- * Revision 1.2  1995/03/16  13:29:01  quinn
- * Partitioned server.
- *
- * Revision 1.1  1995/03/15  16:02:10  quinn
- * Modded session.c to seshigh.c
- *
+ * $Id: seshigh.c,v 1.120 2001-10-05 14:43:22 adam Exp $

  */
 
 /*
  */
 
 /*

@@ -391,14 +24,6 @@
  * will maintain a pool of buffers for encoding and decoding, trying to
  * minimize memory allocation/deallocation during normal operation.
  *
  * will maintain a pool of buffers for encoding and decoding, trying to
  * minimize memory allocation/deallocation during normal operation.
  *

- * TODOs include (and will be done in order of public interest):
- * 
- * Support for EXPLAIN - provide simple meta-database system.
- * Support for access control.
- * Support for resource control.
- * Support for extended services - primarily Item Order.
- * Rest of Z39.50-1994
- *

  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>

@@ -1075,7 +700,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     resp->preferredMessageSize = &assoc->preferredMessageSize;
     resp->maximumRecordSize = &assoc->maximumRecordSize;
 
     resp->preferredMessageSize = &assoc->preferredMessageSize;
     resp->maximumRecordSize = &assoc->maximumRecordSize;
 

-    resp->implementationName = "GFS";
+    resp->implementationName = "GFS/YAZ";

 
     if (assoc->init->implementation_name)
     {
 
     if (assoc->init->implementation_name)
     {

diff --git a/server/statserv.c b/server/statserv.c
index 35ef6ac..4329b77 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -6,258 +6,7 @@
  * NT server based on threads by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
  * NT server based on threads by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *

- * $Log: statserv.c,v $
- * Revision 1.76  2001-10-05 13:55:17  adam
- * Added defines YAZ_GNU_THREADS, YAZ_POSIX_THREADS in code and yaz-config
- *
- * Revision 1.75  2001/10/04 00:37:58  adam
- * Fixes for GNU threads (not working yet).
- *
- * Revision 1.74  2001/10/03 23:55:18  adam
- * GNU threads support.
- *
- * Revision 1.73  2001/06/28 09:27:06  adam
- * Number of started sessions logged.
- *
- * Revision 1.72  2001/03/25 21:55:13  adam
- * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate.
- *
- * Revision 1.71  2001/03/21 12:43:36  adam
- * Implemented cs_create_host. Better error reporting for SSL comstack.
- *
- * Revision 1.70  2001/02/01 08:52:26  adam
- * Fixed bug regarding inetd mode.
- *
- * Revision 1.69  2000/12/01 17:56:41  adam
- * on WIN32 function statserv_closedown closes socket(s) to provoke close.
- *
- * Revision 1.68  2000/11/29 14:22:47  adam
- * Implemented XML/SGML attributes for data1 so that d1_read reads them
- * and d1_write generates proper attributes for XML/SGML records. Added
- * register locking for threaded version.
- *
- * Revision 1.67  2000/11/23 10:58:32  adam
- * SSL comstack support. Separate POSIX thread support library.
- *
- * Revision 1.66  2000/10/06 12:00:28  adam
- * Fixed Handle leak for WIN32.
- *
- * Revision 1.65  2000/09/04 08:58:15  adam
- * Added prefix yaz_ for most logging utility functions.
- *
- * 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
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.58  1999/08/27 09:40:32  adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.57  1999/07/06 12:17:15  adam
- * Added option -1 that runs server once (for profiling purposes).
- *
- * Revision 1.56  1999/06/10 11:45:30  adam
- * Added bend_start, bend_stop handlers and removed pre_init.
- * Handlers bend_start/bend_stop are called when service/daemon is
- * started/stopped.
- *
- * Revision 1.55  1999/06/10 09:18:54  adam
- * Modified so that pre_init is called when service/server is started.
- *
- * Revision 1.54  1999/04/16 14:45:55  adam
- * Added interface for tcpd wrapper for access control.
- *
- * 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
- * Added app_name, service_dependencies, service_display_name and
- * options_func. options_func allows us to specify a different function
- * to interogate the command line arguments. The other members allow us
- * to pass the full service details accross to the service manager (CW).
- *
- *
- * Revision 1.46  1998/01/30 15:24:57  adam
- * Fixed bug in inetd code. The server listened on tcp:@:9999 even
- * though it was started in inetd mode.
- *
- * Revision 1.45  1998/01/29 13:30:23  adam
- * Better event handle system for NT/Unix.
- *
- * Revision 1.44  1997/11/07 13:31:52  adam
- * Added NT Service name part of statserv_options_block. Moved NT
- * service utility to server library.
- *
- * Revision 1.43  1997/10/31 12:20:09  adam
- * Improved memory debugging for xmalloc/nmem.c. References to NMEM
- * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
- * Bug fix: missing fclose in data1_read_espec1.
- *
- * Revision 1.42  1997/10/27 14:03:02  adam
- * Added new member to statserver_options_block, pre_init, which
- * specifies a callback to be invoked after command line parsing and
- * before the server listens for the first time.
- *
- * Revision 1.41  1997/09/29 07:19:32  adam
- * Server library uses nmem_init/nmem_exit. The log prefix no longer
- * includes leading path on NT.
- *
- * Revision 1.40  1997/09/17 12:10:41  adam
- * YAZ version 1.4.
- *
- * Revision 1.39  1997/09/09 10:10:19  adam
- * Another MSV5.0 port. Changed projects to include proper
- * library/include paths.
- * Server starts server in test-mode when no options are given.
- *
- * Revision 1.38  1997/09/04 14:19:14  adam
- * Added credits.
- *
- * Revision 1.37  1997/09/01 08:53:01  adam
- * New windows NT/95 port using MSV5.0. The test server 'ztest' was
- * moved a separate directory. MSV5.0 project server.dsp created.
- * As an option, the server can now operate as an NT service.
- *
- * Revision 1.36  1996/07/06 19:58:36  quinn
- * System headerfiles gathered in yconfig
- *
- * Revision 1.35  1996/05/29  10:03:28  quinn
- * Options work
- *
- * Revision 1.34  1996/02/21  13:12:07  quinn
- * *** empty log message ***
- *
- * Revision 1.33  1996/02/10  12:23:49  quinn
- * Enable inetd operations fro TCP/IP stack
- *
- * Revision 1.32  1996/01/19  15:41:52  quinn
- * *** empty log message ***
- *
- * Revision 1.31  1995/11/17  11:09:39  adam
- * Added new option '-c' to specify configuration name in control block.
- *
- * Revision 1.30  1995/11/01  13:54:59  quinn
- * Minor adjustments
- *
- * Revision 1.29  1995/10/30  12:41:29  quinn
- * Added hostname lookup for server.
- *
- * Revision 1.28  1995/09/29  17:12:30  quinn
- * Smallish
- *
- * Revision 1.27  1995/09/27  15:03:02  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.26  1995/08/29  14:44:51  quinn
- * Reset timeouts.
- *
- * Revision 1.25  1995/08/29  11:18:02  quinn
- * Added code to receive close
- *
- * Revision 1.24  1995/06/16  10:31:39  quinn
- * Added session timeout.
- *
- * Revision 1.23  1995/06/15  12:30:48  quinn
- * Setuid-facility.
- *
- * Revision 1.22  1995/06/15  07:45:17  quinn
- * Moving to v3.
- *
- * Revision 1.21  1995/06/06  08:15:40  quinn
- * Cosmetic.
- *
- * Revision 1.20  1995/05/29  08:12:09  quinn
- * Moved oid to util
- *
- * Revision 1.19  1995/05/16  09:37:27  quinn
- * Fixed bug
- *
- * Revision 1.18  1995/05/16  08:51:09  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.17  1995/05/15  11:56:42  quinn
- * Asynchronous facilities. Restructuring of seshigh code.
- *
- * Revision 1.16  1995/04/10  10:23:40  quinn
- * Some work to add scan and other things.
- *
- * Revision 1.15  1995/03/31  10:16:51  quinn
- * Fixed logging.
- *
- * Revision 1.14  1995/03/31  09:18:58  quinn
- * Added logging.
- *
- * Revision 1.13  1995/03/30  16:08:39  quinn
- * Little mods.
- *
- * Revision 1.12  1995/03/30  13:29:02  quinn
- * Smallish
- *
- * Revision 1.11  1995/03/30  12:18:17  quinn
- * Fixed bug.
- *
- * Revision 1.10  1995/03/29  15:40:16  quinn
- * Ongoing work. Statserv is now dynamic by default
- *
- * Revision 1.9  1995/03/27  08:34:30  quinn
- * Added dynamic server functionality.
- * Released bindings to session.c (is now redundant)
- *
- * Revision 1.8  1995/03/20  09:46:26  quinn
- * Added osi support.
- *
- * Revision 1.7  1995/03/16  13:29:04  quinn
- * Partitioned server.
- *
- * Revision 1.6  1995/03/15  15:18:52  quinn
- * Little changes to better support nonblocking I/O
- * Added backend.h
- *
- * Revision 1.5  1995/03/15  08:37:45  quinn
- * Now we're pretty much set for nonblocking I/O.
- *
- * Revision 1.4  1995/03/14  16:59:48  quinn
- * Bug-fixes
- *
- * Revision 1.3  1995/03/14  11:30:15  quinn
- * Works better now.
- *
- * Revision 1.2  1995/03/14  10:28:03  quinn
- * More work on demo server.
- *
- * Revision 1.1  1995/03/10  18:22:45  quinn
- * The rudiments of an asynchronous server.
- *
+ * $Id: statserv.c,v 1.77 2001-10-05 14:43:22 adam Exp $

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

@@ -795,8 +544,8 @@ static void *new_session (void *vp)
     iochan_setdata(new_chan, newas);
     iochan_settimeout(new_chan, control_block.idle_timeout * 60);
     a = cs_addrstr(new_line);
     iochan_setdata(new_chan, newas);
     iochan_settimeout(new_chan, control_block.idle_timeout * 60);
     a = cs_addrstr(new_line);

-    yaz_log(LOG_LOG, "Starting session %d from %s", no_sessions, a ? a : "[Unknown]");
-    
+    yaz_log(LOG_LOG, "Starting session %d from %s",
+        no_sessions, a ? a : "[Unknown]");

     if (control_block.threads)
     {
        event_loop(&new_chan);
     if (control_block.threads)
     {
        event_loop(&new_chan);

@@ -827,7 +576,8 @@ static void inetd_connection(int what)
                 iochan_setdata(chan, assoc);
                 iochan_settimeout(chan, control_block.idle_timeout * 60);
                 addr = cs_addrstr(line);
                 iochan_setdata(chan, assoc);
                 iochan_settimeout(chan, control_block.idle_timeout * 60);
                 addr = cs_addrstr(line);

-                yaz_log(LOG_LOG, "Inetd association from %s", addr ? addr : "[UNKNOWN]");
+                yaz_log(LOG_LOG, "Inetd association from %s",
+                        addr ? addr : "[UNKNOWN]");

                assoc->cs_get_mask = EVENT_INPUT;
             }
             else
                assoc->cs_get_mask = EVENT_INPUT;
             }
             else