X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fos-ip.c;h=4b7de9e690f362c5b72c7c56b3a777f6d315e48a;hb=de01a6e3d791d3458549d2ceeccf4d7e0477ff78;hp=460f0a1862929018e481fab394f2d417c6508eb3;hpb=86c216d10cad596eb8ca37bd9263f56b8dc1042a;p=openldap diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index 460f0a1862..4b7de9e690 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2007 The OpenLDAP Foundation. * Portions Copyright 1999 Lars Uffmann. * All rights reserved. * @@ -63,7 +63,7 @@ do { \ static void ldap_pvt_set_errno(int err) { - errno = err; + sock_errset(err); } int @@ -123,20 +123,31 @@ ldap_pvt_close_socket(LDAP *ld, int s) static int ldap_int_prepare_socket(LDAP *ld, int s, int proto ) { - osip_debug(ld, "ldap_prepare_socket: %d\n", s,0,0); + osip_debug( ld, "ldap_prepare_socket: %d\n", s, 0, 0 ); -#ifdef TCP_NODELAY - if( proto == LDAP_PROTO_TCP ) { +#if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY ) + if ( proto == LDAP_PROTO_TCP ) { int dummy = 1; +#ifdef SO_KEEPALIVE + if ( setsockopt( s, SOL_SOCKET, SO_KEEPALIVE, + (char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR ) + { + osip_debug( ld, "ldap_prepare_socket: " + "setsockopt(%d, SO_KEEPALIVE) failed (ignored).\n", + s, 0, 0 ); + } +#endif /* SO_KEEPALIVE */ +#ifdef TCP_NODELAY if ( setsockopt( s, IPPROTO_TCP, TCP_NODELAY, (char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR ) { - osip_debug(ld, "ldap_prepare_socket: " + osip_debug( ld, "ldap_prepare_socket: " "setsockopt(%d, TCP_NODELAY) failed (ignored).\n", - s, 0, 0); + s, 0, 0 ); } +#endif /* TCP_NODELAY */ } -#endif +#endif /* SO_KEEPALIVE || TCP_NODELAY */ return 0; } @@ -203,148 +214,207 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s) #endif /* HAVE_WINSOCK */ -static int -ldap_pvt_connect(LDAP *ld, ber_socket_t s, - struct sockaddr *sin, socklen_t addrlen, - int async) +/* NOTE: this is identical to analogous code in os-local.c */ +int +ldap_int_poll( + LDAP *ld, + ber_socket_t s, + struct timeval *tvp ) { - int rc; - struct timeval tv, *opt_tv=NULL; - -#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 ); + int rc; + - 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 - if ( async ) return ( -2 ); -#endif + osip_debug(ld, "ldap_int_poll: fd: %d tm: %ld\n", + s, tvp ? tvp->tv_sec : -1L, 0); #ifdef HAVE_POLL { struct pollfd fd; int timeout = INFTIM; - if( opt_tv != NULL ) timeout = TV2MILLISEC( &tv ); - fd.fd = s; - fd.events = POLLOUT; + fd.events = POLL_WRITE; + if ( tvp != NULL ) { + timeout = TV2MILLISEC( tvp ); + } do { fd.revents = 0; rc = poll( &fd, 1, timeout ); - } while( rc == AC_SOCKET_ERROR && errno == EINTR && - LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART )); + + } while ( rc == AC_SOCKET_ERROR && errno == EINTR && + LDAP_BOOL_GET( &ld->ld_options, LDAP_BOOL_RESTART ) ); + + if ( rc == AC_SOCKET_ERROR ) { + return rc; + } + + if ( timeout == 0 && rc == 0 ) { + return -2; + } - if( rc == AC_SOCKET_ERROR ) return rc; + if ( fd.revents & POLL_WRITE ) { + if ( ldap_pvt_is_socket_ready( ld, s ) == -1 ) { + return -1; + } - if( fd.revents & POLLOUT ) { - if ( ldap_pvt_is_socket_ready(ld, s) == -1 ) return -1; - if ( ldap_pvt_ndelay_off(ld, s) == -1 ) return -1; - return ( 0 ); + if ( ldap_pvt_ndelay_off( ld, s ) == -1 ) { + return -1; + } + return 0; } } #else { - fd_set wfds, *z=NULL; + fd_set wfds, *z = NULL; #ifdef HAVE_WINSOCK fd_set efds; #endif - FD_ZERO(&wfds); - FD_SET(s, &wfds ); + struct timeval tv = { 0 }; -#ifdef HAVE_WINSOCK - FD_ZERO(&efds); - FD_SET(s, &efds ); +#if defined( FD_SETSIZE ) && !defined( HAVE_WINSOCK ) + if ( s >= FD_SETSIZE ) { + rc = AC_SOCKET_ERROR; + tcp_close( s ); + ldap_pvt_set_errno( EMFILE ); + return rc; + } #endif + if ( tvp != NULL ) { + tv = *tvp; + } + do { - rc = select(ldap_int_tblsize, z, &wfds, + FD_ZERO(&wfds); + FD_SET(s, &wfds ); + +#ifdef HAVE_WINSOCK + FD_ZERO(&efds); + FD_SET(s, &efds ); +#endif + + rc = select( ldap_int_tblsize, z, &wfds, #ifdef HAVE_WINSOCK &efds, #else z, #endif - opt_tv ? &tv : NULL); - } while( rc == AC_SOCKET_ERROR && errno == EINTR && - LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART )); + tvp ? &tv : NULL ); + } while ( rc == AC_SOCKET_ERROR && errno == EINTR && + LDAP_BOOL_GET( &ld->ld_options, LDAP_BOOL_RESTART ) ); - if( rc == AC_SOCKET_ERROR ) return rc; + if ( rc == AC_SOCKET_ERROR ) { + return rc; + } + + if ( rc == 0 && tvp && tvp->tv_sec == 0 && tvp->tv_usec == 0 ) { + return -2; + } #ifdef HAVE_WINSOCK /* This means the connection failed */ if ( FD_ISSET(s, &efds) ) { - int so_errno; - int dummy = sizeof(so_errno); - if ( getsockopt( s, SOL_SOCKET, SO_ERROR, + int so_errno; + int dummy = sizeof(so_errno); + if ( getsockopt( s, SOL_SOCKET, SO_ERROR, (char *) &so_errno, &dummy ) == AC_SOCKET_ERROR || !so_errno ) - { - /* impossible */ - so_errno = WSAGetLastError(); - } - ldap_pvt_set_errno(so_errno); - osip_debug(ld, "ldap_pvt_connect: error on socket %d: " - "errno: %d (%s)\n", s, errno, sock_errstr(errno)); - return -1; + { + /* impossible */ + so_errno = WSAGetLastError(); + } + ldap_pvt_set_errno( so_errno ); + osip_debug(ld, "ldap_int_poll: error on socket %d: " + "errno: %d (%s)\n", s, errno, sock_errstr( errno )); + return -1; } #endif if ( FD_ISSET(s, &wfds) ) { #ifndef HAVE_WINSOCK - if ( ldap_pvt_is_socket_ready(ld, s) == -1 ) return -1; + if ( ldap_pvt_is_socket_ready( ld, s ) == -1 ) { + return -1; + } #endif - if ( ldap_pvt_ndelay_off(ld, s) == -1 ) return -1; + if ( ldap_pvt_ndelay_off(ld, s) == -1 ) { + return -1; + } return 0; } } #endif - osip_debug(ld, "ldap_connect_timeout: timed out\n",0,0,0); + osip_debug(ld, "ldap_int_poll: timed out\n",0,0,0); ldap_pvt_set_errno( ETIMEDOUT ); return -1; } +static int +ldap_pvt_connect(LDAP *ld, ber_socket_t s, + struct sockaddr *sin, socklen_t addrlen, + int async) +{ + int rc, err; + struct timeval tv, *opt_tv = NULL; + +#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 ( ld->ld_options.ldo_tm_net.tv_sec >= 0 ) { + tv = ld->ld_options.ldo_tm_net; + opt_tv = &tv; + } + + osip_debug(ld, "ldap_pvt_connect: fd: %d tm: %ld async: %d\n", + s, opt_tv ? tv.tv_sec : -1L, async); + + if ( opt_tv && ldap_pvt_ndelay_on(ld, s) == -1 ) + return ( -1 ); + + if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) { + if ( opt_tv && ldap_pvt_ndelay_off(ld, s) == -1 ) + return ( -1 ); + return ( 0 ); + } + + err = sock_errno(); + if ( err != EINPROGRESS && err != EWOULDBLOCK ) { + return ( -1 ); + } + + if ( async ) { + /* caller will call ldap_int_poll() as appropriate? */ + return ( -2 ); + } + + rc = ldap_int_poll( ld, s, opt_tv ); + + osip_debug(ld, "ldap_pvt_connect: %d\n", rc, 0, 0); + + return rc; +} + #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; + +#ifdef INADDR_NONE + if ( u == INADDR_NONE ) return 0; +#endif + if ( u == 0xffffffffUL || u == (unsigned long) -1L ) return 0; + + in->s_addr = u; + return 1; } #endif @@ -460,7 +530,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, rc = ldap_pvt_connect( ld, s, sai->ai_addr, sai->ai_addrlen, async ); - if ( (rc == 0) || (rc == -2) ) { + if ( rc == 0 || rc == -2 ) { ber_sockbuf_ctrl( sb, LBER_SB_OPT_SET_FD, &s ); break; } @@ -515,8 +585,18 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, sizeof(sin.sin_addr) ); } +#ifdef HAVE_INET_NTOA_B + { + /* for VxWorks */ + char address[INET_ADDR_LEN]; + inet_ntoa_b(sin.sin_address, address); + osip_debug(ld, "ldap_connect_to_host: Trying %s:%d\n", + address, port, 0); + } +#else osip_debug(ld, "ldap_connect_to_host: Trying %s:%d\n", inet_ntoa(sin.sin_addr), port, 0); +#endif rc = ldap_pvt_connect(ld, s, (struct sockaddr *)&sin, sizeof(sin), @@ -537,8 +617,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, return rc; } -#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND ) || \ - defined( HAVE_CYRUS_SASL ) +#if defined( HAVE_CYRUS_SASL ) char * ldap_host_connected_to( Sockbuf *sb, const char *host ) { @@ -664,7 +743,7 @@ ldap_mark_select_write( LDAP *ld, Sockbuf *sb ) int i; for(i=0; i < sip->si_maxfd; i++) { if( sip->si_fds[i].fd == sd ) { - sip->si_fds[i].events |= POLLIN; + sip->si_fds[i].events |= POLL_WRITE; return; } if( empty==-1 && sip->si_fds[i].fd == -1 ) { @@ -681,7 +760,7 @@ ldap_mark_select_write( LDAP *ld, Sockbuf *sb ) } sip->si_fds[empty].fd = sd; - sip->si_fds[empty].events = POLLOUT; + sip->si_fds[empty].events = POLL_WRITE; } #else /* for UNIX select(2) */ @@ -709,7 +788,7 @@ ldap_mark_select_read( LDAP *ld, Sockbuf *sb ) int i; for(i=0; i < sip->si_maxfd; i++) { if( sip->si_fds[i].fd == sd ) { - sip->si_fds[i].events |= POLLIN; + sip->si_fds[i].events |= POLL_READ; return; } if( empty==-1 && sip->si_fds[i].fd == -1 ) { @@ -726,7 +805,7 @@ ldap_mark_select_read( LDAP *ld, Sockbuf *sb ) } sip->si_fds[empty].fd = sd; - sip->si_fds[empty].events = POLLIN; + sip->si_fds[empty].events = POLL_READ; } #else /* for UNIX select(2) */ @@ -781,7 +860,7 @@ ldap_is_write_ready( LDAP *ld, Sockbuf *sb ) int i; for(i=0; i < sip->si_maxfd; i++) { if( sip->si_fds[i].fd == sd ) { - return sip->si_fds[i].revents == POLLOUT; + return sip->si_fds[i].revents & POLL_WRITE; } } @@ -810,7 +889,7 @@ ldap_is_read_ready( LDAP *ld, Sockbuf *sb ) int i; for(i=0; i < sip->si_maxfd; i++) { if( sip->si_fds[i].fd == sd ) { - return sip->si_fds[i].revents == POLLIN; + return sip->si_fds[i].revents & POLL_READ; } } @@ -858,14 +937,14 @@ int ldap_int_tblsize = 0; void ldap_int_ip_init( void ) { - int tblsize; - #if defined( HAVE_SYSCONF ) - tblsize = sysconf( _SC_OPEN_MAX ); + long tblsize = sysconf( _SC_OPEN_MAX ); + if( tblsize > INT_MAX ) tblsize = INT_MAX; + #elif defined( HAVE_GETDTABLESIZE ) - tblsize = getdtablesize(); + int tblsize = getdtablesize(); #else - tblsize = FD_SETSIZE; + int tblsize = FD_SETSIZE; #endif /* !USE_SYSCONF */ #ifdef FD_SETSIZE @@ -890,6 +969,7 @@ ldap_int_select( LDAP *ld, struct timeval *timeout ) #endif sip = (struct selectinfo *)ld->ld_selectinfo; + assert( sip != NULL ); #ifdef HAVE_POLL { @@ -902,7 +982,7 @@ ldap_int_select( LDAP *ld, struct timeval *timeout ) rc = select( ldap_int_tblsize, &sip->si_use_readfds, &sip->si_use_writefds, - NULL, timeout )); + NULL, timeout ); #endif return rc;