X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Ftcpdchk.c;h=35c53aa9664b400dd4d302cb7c408ee99292218a;hb=c5f9b67c889e65446bcbf727bef3705229c3fd7f;hp=a5d3d64bb5e6364af48cba27216dc9bad8e09a0a;hpb=bf7ee634e855d15e955d06e7b225d2045abd518a;p=yaz-moved-to-github.git

diff --git a/server/tcpdchk.c b/server/tcpdchk.c
index a5d3d64..35c53aa 100644
--- a/server/tcpdchk.c
+++ b/server/tcpdchk.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpdchk.c,v $
- * Revision 1.1  1999-04-16 14:45:55  adam
+ * 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.
  *
  */
@@ -12,10 +25,14 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <yaz/yconfig.h>
+#include <yaz/comstack.h>
+
 #if HAVE_TCPD_H
 #include <syslog.h>
 #include <tcpd.h>
 
+
 int allow_severity = LOG_INFO;
 int deny_severity = LOG_WARNING;
 
@@ -28,19 +45,12 @@ int deny_severity = LOG_WARNING;
 
 #endif
 
-#ifdef WIN32
-#include <winsock.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <comstack.h>
-#include <statserv.h>
-#include <log.h>
+#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 = cd;
+    const char *daemon_name = (const char *) cd;
 
     if (type == AF_INET)
     {
@@ -48,8 +58,8 @@ int check_ip_tcpd(void *cd, const char *addr, int len, int type)
 	{
 #if HAVE_TCPD_H
 	    struct request_info request_info;
-#endif
 	    int i;
+#endif
 	    char *host_name = 0, *host_addr = 0;
 	    struct hostent *host;
 
@@ -73,12 +83,12 @@ int check_ip_tcpd(void *cd, const char *addr, int len, int type)
 	    i = hosts_access(&request_info);
 	    if (!i)
 	    {
-		logf (LOG_DEBUG, "access denied from %s",
-		      host_name ? host_name : host_addr);
+		yaz_log (LOG_DEBUG, "access denied from %s",
+			 host_name ? host_name : host_addr);
 		return 1;
 	    }
-	    logf (LOG_DEBUG, "access granted from %s",
-		  host_name ? host_name : host_addr);
+	    yaz_log (LOG_DEBUG, "access granted from %s",
+		     host_name ? host_name : host_addr);
 #endif
 	}
     }