Fix up abandon merge. Hallvard will holler if I get this wrong. :-)

[openldap] / libraries / liblutil / sockpair.c

diff --git a/libraries/liblutil/sockpair.c b/libraries/liblutil/sockpair.c
index 8fb279cf409fcfb0183e9a7421f132d76efb5fa2..e831408c4aef65c4ceac1fa642dfea2c9de04963 100644 (file)
--- a/libraries/liblutil/sockpair.c
+++ b/libraries/liblutil/sockpair.c
@@ -1,45 +1,68 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include "portable.h"
-
 #include <ac/socket.h>
+#include <ac/unistd.h>
+
+#include <lutil.h>
 
-/* Return a pair of descriptors that are connected to each other. The
- * returned descriptors are suitable for use with select(). The two
+/* Return a pair of socket descriptors that are connected to each other.
+ * The returned descriptors are suitable for use with select(). The two
  * descriptors may or may not be identical; the function may return
  * the same descriptor number in both slots. It is guaranteed that
- * data written on fds[1] will be readable on fds[0]. The returned
+ * data written on sds[1] will be readable on sds[0]. The returned
  * descriptors may be datagram oriented, so data should be written
  * in reasonably small pieces and read all at once. On Unix systems
  * this function is best implemented using a single pipe() call.
  */
-int lutil_pair( int fds[2] )
+
+int lutil_pair( ber_socket_t sds[2] )
 {
+#ifdef USE_PIPE
+       return pipe( sds );
+#else
        struct sockaddr_in si;
        int rc, len = sizeof(si);
-       int fd;
+       ber_socket_t sd;
 
-       fd = socket( AF_INET, SOCK_DGRAM, 0 );
-       if (fd < 0)
-               return fd;
+       sd = socket( AF_INET, SOCK_DGRAM, 0 );
+       if ( sd == AC_SOCKET_INVALID ) {
+               return sd;
+       }
        
-       (void) memset( (void*) &si, 0, len );
+       (void) memset( (void*) &si, '\0', len );
        si.sin_family = AF_INET;
        si.sin_port = 0;
        si.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
 
-       if ( rc = bind( fd, (struct sockaddr *)&si, len ) )
-       {
-fail:          tcp_close(fd);
+       rc = bind( sd, (struct sockaddr *)&si, len );
+       if ( rc == AC_SOCKET_ERROR ) {
+               tcp_close(sd);
                return rc;
        }
-       if ( rc = getsockname( fd, (struct sockaddr *)&si, &len ) )
-               goto fail;
-       if ( rc = connect( fd, (struct sockaddr *)&si, len ) )
-               goto fail;
-       fds[0] = fds[1] = fd;
+
+       rc = getsockname( sd, (struct sockaddr *)&si, &len );
+       if ( rc == AC_SOCKET_ERROR ) {
+               tcp_close(sd);
+               return rc;
+       }
+
+       rc = connect( sd, (struct sockaddr *)&si, len );
+       if ( rc == AC_SOCKET_ERROR ) {
+               tcp_close(sd);
+               return rc;
+       }
+
+       sds[0] = sd;
+#if !HAVE_WINSOCK
+       sds[1] = dup( sds[0] );
+#else
+       sds[1] = sds[0];
+#endif
        return 0;
+#endif
 }