Added ldap_pvt_sasl_bind() prototype to ldap_pvt.h. This

[openldap] / libraries / libldap / os-ip.c

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index eba57bee271f6c0329802c73dea205bc6d7dc007..530c9299dcea66b3a1f7041b179b98205ed960a1 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -25,19 +26,6 @@
 #include <io.h>
 #endif /* HAVE_IO_H */
 
-#if defined( HAVE_FCNTL_H )
-#include <fcntl.h>
-#ifndef O_NONBLOCK
-#define O_NONBLOCK O_NDELAY
-#endif
-#endif /* HAVE_FCNTL_H */
-
-#if defined( HAVE_SYS_FILIO_H )
-#include <sys/filio.h>
-#elif defined( HAVE_SYS_IOCTL_H )
-#include <sys/ioctl.h>
-#endif
-
 #include "ldap-int.h"
 
 int ldap_int_tblsize = 0;
@@ -86,7 +74,7 @@ ldap_int_timeval_dup( struct timeval **dest, const struct timeval *src )
                return 1;
        }
 
-       SAFEMEMCPY( (char *) new, (char *) src, sizeof(struct timeval));
+       SAFEMEMCPY( (char *) new, (const char *) src, sizeof(struct timeval));
 
        *dest = new;
        return 0;
@@ -96,31 +84,14 @@ static int
 ldap_pvt_ndelay_on(LDAP *ld, int fd)
 {
        osip_debug(ld, "ldap_ndelay_on: %d\n",fd,0,0);
-#ifdef notyet
-/* #if defined( HAVE_FCNTL_H ) */
-       return fcntl(fd,F_SETFL,fcntl(fd,F_GETFL,0) | O_NONBLOCK);
-#else
-{
-       ioctl_t status = 1;
-       return ioctl( fd, FIONBIO, (caddr_t)&status );
-}
-#endif
-       return 0;
+       return ber_pvt_socket_set_nonblock( fd, 1 );
 }
    
 static int
 ldap_pvt_ndelay_off(LDAP *ld, int fd)
 {
        osip_debug(ld, "ldap_ndelay_off: %d\n",fd,0,0);
-#ifdef notyet
-/* #if defined( HAVE_FCNTL_H ) */
-       return fcntl(fd,F_SETFL,fcntl(fd,F_GETFL,0) & ~O_NONBLOCK);
-#else
-{
-       ioctl_t status = 0;
-       return ioctl( fd, FIONBIO, (caddr_t)&status );
-}
-#endif
+       return ber_pvt_socket_set_nonblock( fd, 0 );
 }
 
 static ber_socket_t
@@ -146,13 +117,27 @@ ldap_pvt_prepare_socket(LDAP *ld, int fd)
 #ifdef TCP_NODELAY
 {
        int dummy = 1;
-       if ( setsockopt(fd,IPPROTO_TCP,TCP_NODELAY,&dummy,sizeof(dummy)) == -1 )
-               return -1;
+       if ( setsockopt( fd, IPPROTO_TCP, TCP_NODELAY,
+               (char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR )
+       {
+               osip_debug(ld, "ldap_prepare_socket: "
+                       "setsockopt(%d, TCP_NODELAY) failed (ignored).\n",
+                       fd, 0, 0);
+       }
 }
 #endif
        return 0;
 }
 
+#undef TRACE
+#define TRACE do { \
+       osip_debug(ld, \
+               "ldap_is_socket_ready: errror on socket %d: errno: %d (%s)\n", \
+               s, \
+               errno, \
+               strerror(errno) ); \
+} while( 0 )
+
 /*
  * check the socket for errors after select returned.
  */
@@ -161,22 +146,13 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 {
        osip_debug(ld, "ldap_is_sock_ready: %d\n",s,0,0);
 
-#define TRACE \
-{ \
-       osip_debug(ld, \
-               "ldap_is_socket_ready: errror on socket %d: errno: %d (%s)\n", \
-               s, \
-               errno, \
-               strerror(errno) ); \
-}
-
-#ifdef notyet
-/* #ifdef SO_ERROR */
+#if defined( notyet ) /* && defined( SO_ERROR ) */
 {
        int so_errno;
        int dummy = sizeof(so_errno);
-       if ( getsockopt(s,SOL_SOCKET,SO_ERROR,&so_errno,&dummy) == -1 )
+       if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy ) == -1 ) {
                return -1;
+       }
        if ( so_errno ) {
                ldap_pvt_set_errno(so_errno);
                TRACE;
@@ -190,23 +166,24 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
        struct sockaddr_in sin;
        char ch;
        int dummy = sizeof(sin);
-       if ( getpeername(s, (struct sockaddr *) &sin, &dummy) == -1 ) {
+       if ( getpeername( s, (struct sockaddr *) &sin, &dummy ) == -1 ) {
+               /* XXX: needs to be replace with ber_stream_read() */
                read(s, &ch, 1);
 #ifdef HAVE_WINSOCK
                ldap_pvt_set_errno( WSAGetLastError() );
 #endif
                TRACE;
                return -1;
-               }
+       }
        return 0;
 }
 #endif
        return -1;
-#undef TRACE
 }
+#undef TRACE
 
 static int
-ldap_pvt_connect(LDAP *ld, int s, struct sockaddr_in *sin, int async)
+ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_in *sin, int async)
 {
        struct timeval  tv, *opt_tv=NULL;
        fd_set          wfds, *z=NULL;
@@ -216,8 +193,8 @@ ldap_pvt_connect(LDAP *ld, int s, struct sockaddr_in *sin, int async)
                tv.tv_sec = opt_tv->tv_sec;
        }
 
-       osip_debug(ld, "ldap_connect_timeout: fd: %d tm: %d async: %d\n",
-                       s, opt_tv ? tv.tv_sec : -1, async);
+       osip_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n",
+                       s, opt_tv ? tv.tv_sec : -1L, async);
 
        if ( ldap_pvt_ndelay_on(ld, s) == -1 )
                return ( -1 );
@@ -233,16 +210,18 @@ ldap_pvt_connect(LDAP *ld, int s, struct sockaddr_in *sin, int async)
        ldap_pvt_set_errno( WSAGetLastError() );
 #endif
 
-       if ( (errno != EINPROGRESS) && (errno != EWOULDBLOCK) )
+       if ( errno != EINPROGRESS && errno != EWOULDBLOCK ) {
                return ( -1 );
+       }
        
 #ifdef notyet
        if ( async ) return ( -2 );
 #endif
 
-       FD_ZERO(&wfds); FD_SET(s, &wfds );
+       FD_ZERO(&wfds);
+       FD_SET(s, &wfds );
 
-       if ( select(s + 1, z, &wfds, z, opt_tv ? &tv : NULL) == -1)
+       if ( select(ldap_int_tblsize, z, &wfds, z, opt_tv ? &tv : NULL) == -1)
                return ( -1 );
 
        if ( FD_ISSET(s, &wfds) ) {
@@ -324,9 +303,9 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, const char *host,
                (void)memset((char *)&sin, 0, sizeof(struct sockaddr_in));
                sin.sin_family = AF_INET;
                sin.sin_port = port;
-               p = (char *)&sin.sin_addr.s_addr;
+               p = (char *)&sin.sin_addr;
                q = use_hp ? (char *)hp->h_addr_list[i] : (char *)&address;
-               SAFEMEMCPY(p, q, sizeof(p) );
+               SAFEMEMCPY(p, q, sizeof(sin.sin_addr) );
 
                osip_debug(ld, "ldap_connect_to_host: Trying %s:%d\n", 
                                inet_ntoa(sin.sin_addr),ntohs(sin.sin_port),0);
@@ -354,12 +333,11 @@ ldap_close_connection( Sockbuf *sb )
 }
 
 
-#if defined( HAVE_KERBEROS ) || defined( HAVE_TLS )
+#if defined( HAVE_KERBEROS ) || defined( HAVE_TLS ) || defined( HAVE_CYRUS_SASL )
 char *
 ldap_host_connected_to( Sockbuf *sb )
 {
        struct hostent          *hp;
-       char                    *p;
        socklen_t               len;
        struct sockaddr_in      sin;