X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fos-ip.c;h=02006651cbdb7dc2b4bfb94773f628f79a171ecf;hb=c9afb5e8a385c95e16e609c4ef2fef64a9f46711;hp=c4c3cd6dbb1375a96eb06a233878b74a0a0bdd77;hpb=2cf9690f9f3b8dc4c3ef3d70e2fd416b279637d8;p=openldap diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index c4c3cd6dbb..02006651cb 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -1,198 +1,476 @@ +/* $OpenLDAP$ */ /* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* Portions * Copyright (c) 1995 Regents of the University of Michigan. * All rights reserved. * * os-ip.c -- platform-specific TCP & UDP related code */ -#ifndef lint -static char copyright[] = "@(#) Copyright (c) 1995 Regents of the University of Michigan.\nAll rights reserved.\n"; -#endif +#include "portable.h" #include -#include -#include -#ifdef _WIN32 -#include -#include "msdos.h" -#else /* _WIN32 */ -#include -#include -#include -#include -#include -#endif /* _WIN32 */ -#ifdef _AIX -#include -#endif /* _AIX */ -#ifdef VMS -#include "ucx_select.h" -#endif /* VMS */ -#include "portable.h" -#include "lber.h" -#include "ldap.h" +#include -#ifdef LDAP_REFERRALS -#ifdef USE_SYSCONF -#include -#endif /* USE_SYSCONF */ -#ifdef notyet -#ifdef NEED_FILIO -#include -#else /* NEED_FILIO */ -#include -#endif /* NEED_FILIO */ -#endif /* notyet */ -#endif /* LDAP_REFERRALS */ - -#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 */ -#endif /* MACOS */ +#include +#include +#include +#include +#include + +#ifdef HAVE_IO_H +#include +#endif /* HAVE_IO_H */ #include "ldap-int.h" -int -ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address, - int port, int async ) +int ldap_int_tblsize = 0; + /* - * if host == NULL, connect using address - * "address" and "port" must be in network byte order - * zero is returned upon success, -1 if fatal error, -2 EINPROGRESS - * async is only used ifdef LDAP_REFERRALS (non-0 means don't wait for connect) - * XXX async is not used yet! + * nonblock connect code + * written by Lars Uffmann, . + * + * Copyright 1999, Lars Uffmann, All rights reserved. + * This software is not subject to any license of my employer + * mediaWays GmbH. + * + * OpenLDAP COPYING RESTRICTIONS APPLY, see COPYRIGHT file + * + * Read about the rationale in ldap_connect_timeout: + * ftp://koobera.math.uic.edu/www/docs/connect.html. */ + +#define osip_debug(ld,fmt,arg1,arg2,arg3) \ +do { \ + ldap_log_printf(NULL, LDAP_DEBUG_TRACE, fmt, arg1, arg2, arg3); \ +} while(0) + +static void +ldap_pvt_set_errno(int err) { - int rc, i, s, connected, use_hp; - struct sockaddr_in sin; - struct hostent *hp; -#ifdef notyet -#ifdef LDAP_REFERRALS - int status; /* for ioctl call */ -#endif /* LDAP_REFERRALS */ -#endif /* notyet */ + errno = err; +} - Debug( LDAP_DEBUG_TRACE, "ldap_connect_to_host: %s:%d\n", - ( host == NULL ) ? "(by address)" : host, ntohs( port ), 0 ); +int +ldap_int_timeval_dup( struct timeval **dest, const struct timeval *src ) +{ + struct timeval *new; - connected = use_hp = 0; + assert( dest != NULL ); - if ( host != NULL && ( address = inet_addr( host )) == -1 ) { - if ( (hp = gethostbyname( host )) == NULL ) { - errno = EHOSTUNREACH; /* not exactly right, but... */ - return( -1 ); - } - use_hp = 1; + if (src == NULL) { + *dest = NULL; + return 0; } - rc = -1; - for ( i = 0; !use_hp || ( hp->h_addr_list[ i ] != 0 ); i++ ) { - if (( s = socket( AF_INET, SOCK_STREAM, 0 )) < 0 ) { - return( -1 ); + new = (struct timeval *) LDAP_MALLOC(sizeof(struct timeval)); + + if( new == NULL ) { + *dest = NULL; + return 1; + } + + AC_MEMCPY( (char *) new, (const char *) src, sizeof(struct timeval)); + + *dest = new; + return 0; +} + +static int +ldap_pvt_ndelay_on(LDAP *ld, int fd) +{ + osip_debug(ld, "ldap_ndelay_on: %d\n",fd,0,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); + return ber_pvt_socket_set_nonblock( fd, 0 ); +} + +static ber_socket_t +ldap_int_socket(LDAP *ld, int family, int type ) +{ + ber_socket_t s = socket(family, type, 0); + osip_debug(ld, "ldap_new_socket: %d\n",s,0,0); + return ( s ); +} + +static int +ldap_pvt_close_socket(LDAP *ld, int s) +{ + osip_debug(ld, "ldap_close_socket: %d\n",s,0,0); + return tcp_close(s); +} + +static int +ldap_int_prepare_socket(LDAP *ld, int s, int proto ) +{ + osip_debug(ld, "ldap_prepare_socket: %d\n", s,0,0); + +#ifdef TCP_NODELAY + if( proto == LDAP_PROTO_TCP ) { + int dummy = 1; + if ( setsockopt( s, IPPROTO_TCP, TCP_NODELAY, + (char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR ) + { + osip_debug(ld, "ldap_prepare_socket: " + "setsockopt(%d, TCP_NODELAY) failed (ignored).\n", + s, 0, 0); } + } +#endif + + return 0; +} + +#undef TRACE +#define TRACE do { \ + osip_debug(ld, \ + "ldap_is_socket_ready: error on socket %d: errno: %d (%s)\n", \ + s, \ + errno, \ + sock_errstr(errno) ); \ +} while( 0 ) + +/* + * check the socket for errors after select returned. + */ +static int +ldap_pvt_is_socket_ready(LDAP *ld, int s) +{ + osip_debug(ld, "ldap_is_sock_ready: %d\n",s,0,0); + +#if defined( notyet ) /* && defined( SO_ERROR ) */ +{ + int so_errno; + int dummy = sizeof(so_errno); + if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy ) + == AC_SOCKET_ERROR ) + { + return -1; + } + if ( so_errno ) { + ldap_pvt_set_errno(so_errno); + TRACE; + return -1; + } + return 0; +} +#else +{ + /* error slippery */ + struct sockaddr_in sin; + char ch; + int dummy = sizeof(sin); + if ( getpeername( s, (struct sockaddr *) &sin, &dummy ) + == AC_SOCKET_ERROR ) + { + /* 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 + +static int +ldap_pvt_connect(LDAP *ld, ber_socket_t s, + struct sockaddr *sin, socklen_t addrlen, + int async) +{ + struct timeval tv, *opt_tv=NULL; + fd_set wfds, *z=NULL; +#ifdef HAVE_WINSOCK + fd_set efds; +#endif + +#ifdef LDAP_CONNECTIONLESS + /* We could do a connect() but that would interfere with + * attempts to poll a broadcast address + */ + if (LDAP_IS_UDP(ld)) { + if (ld->ld_options.ldo_peer) + ldap_memfree(ld->ld_options.ldo_peer); + ld->ld_options.ldo_peer=ldap_memalloc(sizeof(struct sockaddr)); + AC_MEMCPY(ld->ld_options.ldo_peer,sin,sizeof(struct sockaddr)); + return ( 0 ); + } +#endif + if ( (opt_tv = ld->ld_options.ldo_tm_net) != NULL ) { + tv.tv_usec = opt_tv->tv_usec; + tv.tv_sec = opt_tv->tv_sec; + } + + 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 ); + + if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) + { + if ( ldap_pvt_ndelay_off(ld, s) == -1 ) + return ( -1 ); + return ( 0 ); + } + +#ifdef HAVE_WINSOCK + ldap_pvt_set_errno( WSAGetLastError() ); +#endif + + if ( errno != EINPROGRESS && errno != EWOULDBLOCK ) { + return ( -1 ); + } + #ifdef notyet -#ifdef LDAP_REFERRALS - status = 1; - if ( async && ioctl( s, FIONBIO, (caddr_t)&status ) == -1 ) { - Debug( LDAP_DEBUG_ANY, "FIONBIO ioctl failed on %d\n", - s, 0, 0 ); + if ( async ) return ( -2 ); +#endif + + FD_ZERO(&wfds); + FD_SET(s, &wfds ); + +#ifdef HAVE_WINSOCK + FD_ZERO(&efds); + FD_SET(s, &efds ); +#endif + + if ( select(ldap_int_tblsize, z, &wfds, +#ifdef HAVE_WINSOCK + &efds, +#else + z, +#endif + opt_tv ? &tv : NULL) == AC_SOCKET_ERROR ) + { + return ( -1 ); + } + +#ifdef HAVE_WINSOCK + /* This means the connection failed */ + if ( FD_ISSET(s, &efds) ) { + ldap_pvt_set_errno(WSAECONNREFUSED); + osip_debug(ld, "ldap_pvt_connect: error on socket %d: " + "errno: %d (%s)\n", s, errno, sock_errstr(errno)); + return -1; + } +#endif + if ( FD_ISSET(s, &wfds) ) { + if ( ldap_pvt_is_socket_ready(ld, s) == -1 ) + return ( -1 ); + if ( ldap_pvt_ndelay_off(ld, s) == -1 ) + return ( -1 ); + return ( 0 ); + } + osip_debug(ld, "ldap_connect_timeout: timed out\n",0,0,0); + ldap_pvt_set_errno( ETIMEDOUT ); + return ( -1 ); +} + +#ifndef HAVE_INET_ATON +int +ldap_pvt_inet_aton( const char *host, struct in_addr *in) +{ + unsigned long u = inet_addr( host ); + if ( u != 0xffffffff || u != (unsigned long) -1 ) { + in->s_addr = u; + return 1; + } + return 0; +} +#endif + + +int +ldap_connect_to_host(LDAP *ld, Sockbuf *sb, + int proto, + const char *host, + unsigned long address, int port, int async ) +{ + struct sockaddr_in sin; + ber_socket_t s = AC_SOCKET_INVALID; + int rc, i, use_hp = 0; + struct hostent *hp = NULL; + char *ha_buf=NULL, *p, *q; + int socktype; + + osip_debug(ld, "ldap_connect_to_host: %s\n",host,0,0); + + switch(proto) { + case LDAP_PROTO_TCP: socktype = SOCK_STREAM; break; + case LDAP_PROTO_UDP: socktype = SOCK_DGRAM; break; + default: osip_debug(ld, "ldap_connect_to_host: unknown proto: %d\n", + proto, 0, 0); + return -1; + } + + if (host != NULL) { +#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP ) + char serv[7]; + int err; + struct addrinfo hints, *res, *sai; + + memset( &hints, '\0', sizeof(hints) ); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = socktype; + + snprintf(serv, sizeof serv, "%d", port ); + if ( err = getaddrinfo(host, serv, &hints, &res) ) { + osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n", + AC_GAI_STRERROR(err), 0, 0); + return -1; } -#endif /* LDAP_REFERRALS */ -#endif /* notyet */ - (void)memset( (char *)&sin, 0, sizeof( struct sockaddr_in )); - sin.sin_family = AF_INET; - sin.sin_port = port; - SAFEMEMCPY( (char *) &sin.sin_addr.s_addr, - ( use_hp ? (char *) hp->h_addr_list[ i ] : - (char *) &address ), sizeof( sin.sin_addr.s_addr) ); - - if ( connect( s, (struct sockaddr *)&sin, - sizeof( struct sockaddr_in )) >= 0 ) { - connected = 1; - rc = 0; - break; - } else { -#ifdef notyet -#ifdef LDAP_REFERRALS -#ifdef EAGAIN - if ( errno == EINPROGRESS || errno == EAGAIN ) { -#else /* EAGAIN */ - if ( errno == EINPROGRESS ) { -#endif /* EAGAIN */ - Debug( LDAP_DEBUG_TRACE, - "connect would block...\n", 0, 0, 0 ); - rc = -2; - break; + rc = -1; + + for( sai=res; sai != NULL; sai=sai->ai_next) { + if( sai->ai_addr == NULL ) { + osip_debug(ld, "ldap_connect_to_host: getaddrinfo " + "ai_addr is NULL?\n", 0, 0, 0); + continue; } -#endif /* LDAP_REFERRALS */ -#endif /* notyet */ -#ifdef LDAP_DEBUG - if ( ldap_debug & LDAP_DEBUG_TRACE ) { - perror( (char *)inet_ntoa( sin.sin_addr )); + /* we assume AF_x and PF_x are equal for all x */ + s = ldap_int_socket( ld, sai->ai_family, socktype ); + if ( s == AC_SOCKET_INVALID ) { + continue; } + + if ( ldap_int_prepare_socket(ld, s, proto ) == -1 ) { + ldap_pvt_close_socket(ld, s); + break; + } + + switch (sai->ai_family) { +#ifdef LDAP_PF_INET6 + case AF_INET6: { + char addr[INET6_ADDRSTRLEN]; + inet_ntop( AF_INET6, + &((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr, + addr, sizeof addr); + osip_debug(ld, "ldap_connect_to_host: Trying %s %s\n", + addr, serv, 0); + } break; #endif - close( s ); - if ( !use_hp ) { + case AF_INET: { + char addr[INET_ADDRSTRLEN]; + inet_ntop( AF_INET, + &((struct sockaddr_in *)sai->ai_addr)->sin_addr, + addr, sizeof addr); + osip_debug(ld, "ldap_connect_to_host: Trying %s:%s\n", + addr, serv, 0); + } break; + } + + rc = ldap_pvt_connect(ld, s, sai->ai_addr, sai->ai_addrlen, async); + if ( (rc == 0) || (rc == -2) ) { + ber_sockbuf_ctrl( sb, LBER_SB_OPT_SET_FD, &s ); break; } + ldap_pvt_close_socket(ld, s); } + freeaddrinfo(res); + return rc; + +#else + struct in_addr in; + if (! inet_aton( host, &in) ) { + int local_h_errno; + struct hostent he_buf; + rc = ldap_pvt_gethostbyname_a(host, &he_buf, &ha_buf, + &hp, &local_h_errno); + + if ( (rc < 0) || (hp == NULL) ) { +#ifdef HAVE_WINSOCK + ldap_pvt_set_errno( WSAGetLastError() ); +#else + /* not exactly right, but... */ + ldap_pvt_set_errno( EHOSTUNREACH ); +#endif + if (ha_buf) LDAP_FREE(ha_buf); + return -1; + } + use_hp = 1; + } + address = in.s_addr; +#endif } - sb->sb_sd = s; - - if ( connected ) { -#ifdef notyet -#ifdef LDAP_REFERRALS - status = 0; - if ( !async && ioctl( s, FIONBIO, (caddr_t)&on ) == -1 ) { - Debug( LDAP_DEBUG_ANY, "FIONBIO ioctl failed on %d\n", - s, 0, 0 ); + rc = s = -1; + for ( i = 0; !use_hp || (hp->h_addr_list[i] != 0); ++i, rc = -1 ) { + s = ldap_int_socket( ld, PF_INET, socktype ); + if ( s == AC_SOCKET_INVALID ) { + /* use_hp ? continue : break; */ + break; + } + + if ( ldap_int_prepare_socket( ld, s, proto ) == -1 ) { + ldap_pvt_close_socket(ld, s); + break; } -#endif /* LDAP_REFERRALS */ -#endif /* notyet */ - - Debug( LDAP_DEBUG_TRACE, "sd %d connected to: %s\n", - s, inet_ntoa( sin.sin_addr ), 0 ); - } - return( rc ); -} + (void)memset((char *)&sin, '\0', sizeof(struct sockaddr_in)); + sin.sin_family = AF_INET; + sin.sin_port = htons((short) port); + p = (char *)&sin.sin_addr; + q = use_hp ? (char *)hp->h_addr_list[i] : (char *)&address; + AC_MEMCPY(p, q, sizeof(sin.sin_addr) ); + + osip_debug(ld, "ldap_connect_to_host: Trying %s:%d\n", + inet_ntoa(sin.sin_addr),port,0); + + rc = ldap_pvt_connect(ld, s, + (struct sockaddr *)&sin, sizeof(struct sockaddr_in), + async); + + if ( (rc == 0) || (rc == -2) ) { + ber_sockbuf_ctrl( sb, LBER_SB_OPT_SET_FD, &s ); + break; + } + ldap_pvt_close_socket(ld, s); -void -ldap_close_connection( Sockbuf *sb ) -{ - tcp_close( sb->sb_sd ); + if (!use_hp) + break; + } + if (ha_buf) LDAP_FREE(ha_buf); + return rc; } - -#ifdef KERBEROS +#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND ) || \ + defined( HAVE_CYRUS_SASL ) char * ldap_host_connected_to( Sockbuf *sb ) { - struct hostent *hp; - char *p; - int len; - struct sockaddr_in sin; - - (void)memset( (char *)&sin, 0, sizeof( struct sockaddr_in )); - len = sizeof( sin ); - if ( getpeername( sb->sb_sd, (struct sockaddr *)&sin, &len ) == -1 ) { + struct hostent *hp; + socklen_t len; + struct sockaddr sa; + char *addr; + char *host; + + /* buffers for gethostbyaddr_r */ + struct hostent he_buf; + int local_h_errno; + char *ha_buf=NULL; + ber_socket_t sd; + + (void)memset( (char *)&sa, '\0', sizeof( struct sockaddr )); + len = sizeof( sa ); + + ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); + if ( getpeername( sd, &sa, &len ) == -1 ) { return( NULL ); } @@ -201,19 +479,66 @@ ldap_host_connected_to( Sockbuf *sb ) * this is necessary for kerberos to work right, since the official * hostname is used as the kerberos instance. */ - if (( hp = gethostbyaddr( (char *) &sin.sin_addr, - sizeof( sin.sin_addr ), AF_INET )) != NULL ) { - if ( hp->h_name != NULL ) { - return( strdup( hp->h_name )); + + switch (sa.sa_family) { +#ifdef LDAP_PF_LOCAL + case AF_LOCAL: + return LDAP_STRDUP( ldap_int_hostname ); +#endif +#ifdef LDAP_PF_INET6 + case AF_INET6: + addr = (char *) &((struct sockaddr_in6 *)&sa)->sin6_addr; + len = sizeof( struct in6_addr ); + break; +#endif + case AF_INET: + addr = (char *) &((struct sockaddr_in *)&sa)->sin_addr; + len = sizeof( struct in_addr ); + + { + struct sockaddr_in localhost; + localhost.sin_addr.s_addr = htonl( INADDR_ANY ); + + if( memcmp ( &localhost.sin_addr, + &((struct sockaddr_in *)&sa)->sin_addr, + sizeof(localhost.sin_addr) ) == 0 ) + { + return LDAP_STRDUP( ldap_int_hostname ); + } + +#ifdef INADDR_LOOPBACK + localhost.sin_addr.s_addr = htonl( INADDR_LOOPBACK ); + + if( memcmp ( &localhost.sin_addr, + &((struct sockaddr_in *)&sa)->sin_addr, + sizeof(localhost.sin_addr) ) == 0 ) + { + return LDAP_STRDUP( ldap_int_hostname ); + } +#endif } + break; + + default: + return( NULL ); + break; } - return( NULL ); + host = NULL; + if ((ldap_pvt_gethostbyaddr_a( addr, len, + sa.sa_family, &he_buf, &ha_buf, + &hp,&local_h_errno ) == 0 ) && + (hp != NULL) && ( hp->h_name != NULL ) ) + { + host = LDAP_STRDUP( hp->h_name ); + } + + LDAP_FREE( ha_buf ); + return host; } -#endif /* KERBEROS */ +#endif -#ifdef LDAP_REFERRALS /* for UNIX */ struct selectinfo { fd_set si_readfds; @@ -227,11 +552,13 @@ void ldap_mark_select_write( LDAP *ld, Sockbuf *sb ) { struct selectinfo *sip; + ber_socket_t sd; sip = (struct selectinfo *)ld->ld_selectinfo; - - if ( !FD_ISSET( sb->sb_sd, &sip->si_writefds )) { - FD_SET( sb->sb_sd, &sip->si_writefds ); + + ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); + if ( !FD_ISSET( sd, &sip->si_writefds )) { + FD_SET( sd, &sip->si_writefds ); } } @@ -240,11 +567,13 @@ void ldap_mark_select_read( LDAP *ld, Sockbuf *sb ) { struct selectinfo *sip; + ber_socket_t sd; sip = (struct selectinfo *)ld->ld_selectinfo; - if ( !FD_ISSET( sb->sb_sd, &sip->si_readfds )) { - FD_SET( sb->sb_sd, &sip->si_readfds ); + ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); + if ( !FD_ISSET( sd, &sip->si_readfds )) { + FD_SET( sd, &sip->si_readfds ); } } @@ -253,11 +582,13 @@ void ldap_mark_select_clear( LDAP *ld, Sockbuf *sb ) { struct selectinfo *sip; + ber_socket_t sd; sip = (struct selectinfo *)ld->ld_selectinfo; - FD_CLR( sb->sb_sd, &sip->si_writefds ); - FD_CLR( sb->sb_sd, &sip->si_readfds ); + ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); + FD_CLR( sd, &sip->si_writefds ); + FD_CLR( sd, &sip->si_readfds ); } @@ -265,10 +596,12 @@ int ldap_is_write_ready( LDAP *ld, Sockbuf *sb ) { struct selectinfo *sip; + ber_socket_t sd; sip = (struct selectinfo *)ld->ld_selectinfo; - return( FD_ISSET( sb->sb_sd, &sip->si_use_writefds )); + ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); + return( FD_ISSET( sd, &sip->si_use_writefds )); } @@ -276,19 +609,21 @@ int ldap_is_read_ready( LDAP *ld, Sockbuf *sb ) { struct selectinfo *sip; + ber_socket_t sd; sip = (struct selectinfo *)ld->ld_selectinfo; - return( FD_ISSET( sb->sb_sd, &sip->si_use_readfds )); + ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); + return( FD_ISSET( sd, &sip->si_use_readfds )); } void * -ldap_new_select_info() +ldap_new_select_info( void ) { struct selectinfo *sip; - if (( sip = (struct selectinfo *)calloc( 1, + if (( sip = (struct selectinfo *)LDAP_CALLOC( 1, sizeof( struct selectinfo ))) != NULL ) { FD_ZERO( &sip->si_readfds ); FD_ZERO( &sip->si_writefds ); @@ -301,7 +636,27 @@ ldap_new_select_info() void ldap_free_select_info( void *sip ) { - free( sip ); + LDAP_FREE( sip ); +} + + +void +ldap_int_ip_init( void ) +{ + int tblsize; +#if defined( HAVE_SYSCONF ) + tblsize = sysconf( _SC_OPEN_MAX ); +#elif defined( HAVE_GETDTABLESIZE ) + tblsize = getdtablesize(); +#else + tblsize = FD_SETSIZE; +#endif /* !USE_SYSCONF */ + +#ifdef FD_SETSIZE + if( tblsize > FD_SETSIZE ) + tblsize = FD_SETSIZE; +#endif /* FD_SETSIZE*/ + ldap_int_tblsize = tblsize; } @@ -309,29 +664,17 @@ int do_ldap_select( LDAP *ld, struct timeval *timeout ) { struct selectinfo *sip; - static int tblsize; Debug( LDAP_DEBUG_TRACE, "do_ldap_select\n", 0, 0, 0 ); - if ( tblsize == 0 ) { -#ifdef USE_SYSCONF - tblsize = sysconf( _SC_OPEN_MAX ); -#else /* !USE_SYSCONF */ - tblsize = getdtablesize(); -#endif /* !USE_SYSCONF */ - -#ifdef FD_SETSIZE - if( tblsize > FD_SETSIZE ) { - tblsize = FD_SETSIZE; - } -#endif /* FD_SETSIZE*/ - } + if ( ldap_int_tblsize == 0 ) + ldap_int_ip_init(); sip = (struct selectinfo *)ld->ld_selectinfo; sip->si_use_readfds = sip->si_readfds; sip->si_use_writefds = sip->si_writefds; - return( select( tblsize, &sip->si_use_readfds, &sip->si_use_writefds, - NULL, timeout )); + return( select( ldap_int_tblsize, + &sip->si_use_readfds, &sip->si_use_writefds, + NULL, timeout )); } -#endif /* LDAP_REFERRALS */