X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftcpdchk.c;h=96ef8bc0c5a165687f58115571e1ddd947f90577;hb=60a702f390f7e2addfdab79f2328db3ba2897c8b;hp=5b9d234167e1ae71e0f77d6a381b2f9dbd0fc7b6;hpb=c6e47cbbff56f39f6d81b079ebaeac41d793d4d9;p=yaz-moved-to-github.git

diff --git a/src/tcpdchk.c b/src/tcpdchk.c
index 5b9d234..96ef8bc 100644
--- a/src/tcpdchk.c
+++ b/src/tcpdchk.c
@@ -1,42 +1,45 @@
 /*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: tcpdchk.c,v $
- * Revision 1.1  2003-10-27 12:21:35  adam
- * Source restructure. yaz-marcdump part of installation
- *
- * Revision 1.5  2000/02/28 11:20:06  adam
- * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
- *
- * Revision 1.4  1999/11/30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.3  1999/08/27 09:40:32  adam
- * Renamed logf function to yaz_log. Removed VC++ project files.
- *
- * Revision 1.2  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.1  1999/04/16 14:45:55  adam
- * Added interface for tcpd wrapper for access control.
  *
+ * $Id: tcpdchk.c,v 1.7 2005-01-17 10:29:25 adam Exp $
+ */
+/**
+ * \file tcpdchk.c
+ * \brief Implements TCP WRAPPER check.
  */
 
 #include <stdio.h>
 #include <string.h>
 
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef WIN32
+#include <winsock.h>
+#else
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#endif
+
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include <yaz/yconfig.h>
 #include <yaz/comstack.h>
+#include <yaz/statserv.h>
+#include <yaz/log.h>
+
 
 #if HAVE_TCPD_H
 #include <syslog.h>
 #include <tcpd.h>
 
-
-int allow_severity = LOG_INFO;
+int allow_severity = LOG_INFO;  /* not YLOG !! */
 int deny_severity = LOG_WARNING;
 
 #ifdef LOG_DEBUG
@@ -48,9 +51,6 @@ int deny_severity = LOG_WARNING;
 
 #endif
 
-#include <yaz/statserv.h>
-#include <yaz/log.h>
-
 int check_ip_tcpd(void *cd, const char *addr, int len, int type)
 {
     const char *daemon_name = (const char *) cd;
@@ -86,11 +86,11 @@ int check_ip_tcpd(void *cd, const char *addr, int len, int type)
 	    i = hosts_access(&request_info);
 	    if (!i)
 	    {
-		yaz_log (LOG_DEBUG, "access denied from %s",
+		yaz_log (YLOG_DEBUG, "access denied from %s",
 			 host_name ? host_name : host_addr);
 		return 1;
 	    }
-	    yaz_log (LOG_DEBUG, "access granted from %s",
+	    yaz_log (YLOG_DEBUG, "access granted from %s",
 		     host_name ? host_name : host_addr);
 #endif
 	}