X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftcpdchk.c;h=1a9d7868884b50cb74f5a13ff5d798bcac8c4956;hp=fe5ce24f9c8bb4595b537e3617d101b011758be0;hb=3b792849c676d96918850e2f1e0af87a75278501;hpb=05c274ef315384faafcc5900c17468f0ea2474e6

diff --git a/src/tcpdchk.c b/src/tcpdchk.c
index fe5ce24..1a9d786 100644
--- a/src/tcpdchk.c
+++ b/src/tcpdchk.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tcpdchk.c,v 1.2 2004-10-15 00:19:01 adam Exp $
+ * $Id: tcpdchk.c,v 1.9 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file tcpdchk.c
@@ -12,15 +12,34 @@
 #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
@@ -32,53 +51,58 @@ 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;
 
     if (type == AF_INET)
     {
-	if (daemon_name && *daemon_name)
-	{
+        if (daemon_name && *daemon_name)
+        {
 #if HAVE_TCPD_H
-	    struct request_info request_info;
-	    int i;
+            struct request_info request_info;
+            int i;
 #endif
-	    char *host_name = 0, *host_addr = 0;
-	    struct hostent *host;
+            char *host_name = 0, *host_addr = 0;
+            struct hostent *host;
 
-	    struct sockaddr_in *addr_in = (struct sockaddr_in *) addr;
-	    
-	    if ((host = gethostbyaddr((char*)&addr_in->sin_addr,
-				      sizeof(addr_in->sin_addr),
-				      AF_INET)))
-		host_name = (char*) host->h_name;
-	    host_addr = inet_ntoa(addr_in->sin_addr);
+            struct sockaddr_in *addr_in = (struct sockaddr_in *) addr;
+            
+            if ((host = gethostbyaddr((char*)&addr_in->sin_addr,
+                                      sizeof(addr_in->sin_addr),
+                                      AF_INET)))
+                host_name = (char*) host->h_name;
+            host_addr = inet_ntoa(addr_in->sin_addr);
 #if HAVE_TCPD_H
-	    if (host_addr)
-		request_init(&request_info, RQ_DAEMON, daemon_name,
-			     RQ_CLIENT_NAME, host_name,
-			     RQ_CLIENT_SIN, addr_in,
-			     RQ_CLIENT_ADDR, host_addr, 0);
-	    else
-		request_init(&request_info, RQ_DAEMON, daemon_name,
-			     RQ_CLIENT_SIN, addr_in,
-			     RQ_CLIENT_ADDR, host_addr, 0);
-	    i = hosts_access(&request_info);
-	    if (!i)
-	    {
-		yaz_log (LOG_DEBUG, "access denied from %s",
-			 host_name ? host_name : host_addr);
-		return 1;
-	    }
-	    yaz_log (LOG_DEBUG, "access granted from %s",
-		     host_name ? host_name : host_addr);
+            if (host_addr)
+                request_init(&request_info, RQ_DAEMON, daemon_name,
+                             RQ_CLIENT_NAME, host_name,
+                             RQ_CLIENT_SIN, addr_in,
+                             RQ_CLIENT_ADDR, host_addr, 0);
+            else
+                request_init(&request_info, RQ_DAEMON, daemon_name,
+                             RQ_CLIENT_SIN, addr_in,
+                             RQ_CLIENT_ADDR, host_addr, 0);
+            i = hosts_access(&request_info);
+            if (!i)
+            {
+                yaz_log (YLOG_DEBUG, "access denied from %s",
+                         host_name ? host_name : host_addr);
+                return 1;
+            }
+            yaz_log (YLOG_DEBUG, "access granted from %s",
+                     host_name ? host_name : host_addr);
 #endif
-	}
+        }
     }
     return 0;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+