update Win32 build environment to support back-sql

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 415f5a265fc773e67382838ffe8a16a7d0a044c5..5e20569f54f6f3bf115464232413577a7857501a 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -1,6 +1,5 @@
-/*
- * Generic socket.h
- */
+/* Generic socket.h */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
@@ -21,12 +20,20 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #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
@@ -56,46 +63,109 @@
 #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 );
-#endif /* WINSOCK */
-#else /* DOS */
-#define tcp_close( s )         close( s )
-#endif /* DOS */
-#endif /* MACOS */
+#undef sock_errno
+#undef sock_errstr
+#define sock_errno()   errno
+#define sock_errstr(e) STRERROR(e)
+
+#ifdef HAVE_WINSOCK
+#      define tcp_close( s )           closesocket( s )
+#      define tcp_read( s, buf, len )  recv( s, buf, len, 0 )
+#      define tcp_write( s, buf, len ) send( s, buf, len, 0 )
+#      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
+
+#undef sock_errno
+#undef sock_errstr
+#define        sock_errno()    WSAGetLastError()
+#define        sock_errstr(e)  WSAGetErrorString(e)
+
+LIBLUTIL_F (char *) WSAGetErrorString LDAP_P((int));
+
+#elif MACOS
+#      define tcp_close( s )           tcpclose( s )
+#      define tcp_read( s, buf, len )  tcpread( s, buf, len )
+#      define tcp_write( s, buf, len ) tcpwrite( s, buf, len )
+
+#elif DOS
+#      ifdef PCNFS
+#              define tcp_close( s )   close( s )
+#              define tcp_read( s, buf, len )  recv( s, buf, len, 0 )
+#              define tcp_write( s, buf, len ) send( s, buf, len, 0 )
+#      endif /* PCNFS */
+#      ifdef NCSA
+#              define tcp_close( s )   do { netclose( s ); netshut() } while(0)
+#              define tcp_read( s, buf, len )  nread( s, buf, len )
+#              define tcp_write( s, buf, len ) netwrite( s, buf, len )
+#      endif /* NCSA */
+
+#elif HAVE_CLOSESOCKET
+#      define tcp_close( s )           closesocket( s )
+
+#      ifdef __BEOS__
+#              define tcp_read( s, buf, len )  recv( s, buf, len, 0 )
+#              define tcp_write( s, buf, len ) send( s, buf, len, 0 )
+#      endif
+
+#else
+#      define tcp_close( s )           close( s )
+#      define tcp_read( s, buf, len)   read( s, buf, len )
+#      define tcp_write( s, buf, len)  write( s, buf, len )
 
-#if !defined(__alpha) || defined(VMS)
-#define AC_HTONL( l ) htonl( l )
-#define AC_NTOHL( l ) ntohl( l )
-#else /* __alpha && !VMS */
+#ifdef HAVE_PIPE
 /*
- * 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
- * here.
- */ 
-#define AC_HTONL( l )  (((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \
-       | htonl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
+ * Only use pipe() on systems where file and socket descriptors 
+ * are interchangable
+ */
+#define USE_PIPE HAVE_PIPE
+#endif
+
+#endif /* MACOS */
+
+#ifndef ioctl_t
+#      define ioctl_t                          int
+#endif
+
+#ifndef AC_SOCKET_INVALID
+#      define AC_SOCKET_INVALID        (-1)
+#endif
+#ifndef AC_SOCKET_ERROR
+#      define AC_SOCKET_ERROR          (-1)
+#endif
+
+#if !defined( HAVE_INET_ATON ) && !defined( inet_aton )
+#define inet_aton ldap_pvt_inet_aton
+struct in_addr;
+LIBLDAP_F (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)&0xffU)<<24) + (((l)&0xff00U)<<8) + \
+         (((l)&0xff0000U)>>8) + (((l)&0xff000000U)>>24))
+#      define AC_NTOHL(l) AC_HTONL(l)
+
+#else
+#      define AC_HTONL( l ) htonl( l )
+#      define AC_NTOHL( l ) ntohl( l )
+#endif
 
-#define AC_NTOHL( l ) (((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \
-       | ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
+/* htons()/ntohs() may be broken much like htonl()/ntohl() */
+#define AC_HTONS( s ) htons( s )
+#define AC_NTOHS( s ) ntohs( s )
 
-#endif /* __alpha && !VMS */
 
 #endif /* _AC_SOCKET_H_ */