Final round of module changes

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index d6a3405702e9cd1ae6e479b0e42e5905eec99b13..b85204297674e778a9a2c2d77ea3785b39338df9 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -1,6 +1,15 @@
 /*
  * Generic socket.h
  */
+/*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
 
 #ifndef _AC_SOCKET_H_
 #define _AC_SOCKET_H_
@@ -17,18 +26,33 @@
 #endif
 
 #include <netinet/in.h>
+
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
+#endif
+
 #include <netdb.h>
+
+#ifdef HAVE_RESOLV_H
 #include <resolv.h>
 #endif
 
+#endif /* HAVE_SYS_SOCKET_H */
+
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
-#define EMSGSIZE WSAEMSGSIZE
-#define EHOSTUNREACH WSAEHOSTUNREACH
 #elif HAVE_WINSOCK
 #include <winsock.h>
+#else
+#define WSACleanup()
 #endif
 
 #ifdef HAVE_PCNFS
@@ -36,31 +60,63 @@
 #endif /* HAVE_PCNFS */
 
 #ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK        ((unsigned long) 0x7f000001)
+#define INADDR_LOOPBACK        (0x7f000001UL)
+#endif
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN  64
 #endif
 
-#ifdef MACOS
-#define tcp_close( s )         tcpclose( s )
-#else /* MACOS */
-#ifdef DOS
-#ifdef PCNFS
-#define tcp_close( s )         close( s )
-#endif /* PCNFS */
-#ifdef NCSA
-#define tcp_close( s )         netclose( s ); netshut()
-#endif /* NCSA */
-#ifdef WINSOCK
-#define tcp_close( s )         closesocket( s ); WSACleanup();
-#endif /* WINSOCK */
-#else /* DOS */
-#define tcp_close( s )         close( s )
-#endif /* DOS */
+#ifdef HAVE_WINSOCK
+#      define tcp_close( s )           closesocket( s );
+#      define ioctl( s, c, a )         ioctlsocket( (s), (c), (a) )
+#      define ioctl_t                          u_long
+#      define AC_SOCKET_INVALID        ((unsigned int) ~0)
+
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define EINPROGRESS WSAEINPROGRESS
+#define ETIMEDOUT      WSAETIMEDOUT
+
+#elif MACOS
+#      define tcp_close( s )           tcpclose( s )
+
+#elif DOS
+#      ifdef PCNFS
+#              define tcp_close( s )   close( s )
+#      endif /* PCNFS */
+#      ifdef NCSA
+#              define tcp_close( s )   do { netclose( s ); netshut() } while(0)
+#      endif /* NCSA */
+
+#elif HAVE_CLOSESOCKET
+#      define tcp_close( s )           closesocket( s )
+
+#else
+#      define tcp_close( s )           close( s )
 #endif /* MACOS */
 
-#if !defined(__alpha) || defined(VMS)
-#define AC_HTONL( l ) htonl( l )
-#define AC_NTOHL( l ) ntohl( l )
-#else /* __alpha && !VMS */
+#ifndef ioctl_t
+#      define ioctl_t                          int
+#endif
+
+#ifndef AC_SOCKET_INVALID
+#      define AC_SOCKET_INVALID        (-1)
+#endif
+
+#if !defined( HAVE_INET_ATON ) && !defined( inet_aton )
+#define inet_aton ldap_pvt_inet_aton
+struct in_addr;
+int ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
+#endif
+
+#if    defined(__WIN32) && defined(_ALPHA)
+/* NT on Alpha is hosed. */
+#define AC_HTONL( l ) \
+        ((((l)&0xff)<<24) + (((l)&0xff00)<<8) + \
+         (((l)&0xff0000)>>8) + (((l)&0xff000000)>>24))
+#define AC_NTOHL(l) AC_HTONL(l)
+
+#elif defined(__alpha) && !defined(VMS)
 /*
  * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the
  * lower-order 32-bits of a (64-bit) long, so we define correct versions
@@ -72,7 +128,14 @@
 #define AC_NTOHL( l ) (((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \
        | ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
 
-#endif /* __alpha && !VMS */
+#else
+#define AC_HTONL( l ) htonl( l )
+#define AC_NTOHL( l ) ntohl( l )
+#endif
+
+/* htons()/ntohs() may be broken much like htonl()/ntohl() */
+#define AC_HTONS( s ) htons( s )
+#define AC_NTOHS( s ) ntohs( s )
 
 
 #endif /* _AC_SOCKET_H_ */