X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fos-ip.c;h=b17e71a58fd78657f56154c5ff8152dd75ce43c2;hb=c8e37af0ca8302c276e8c6af84eca4f926171261;hp=7105dc1c776d56ebc0764243cdd714c08abe348b;hpb=5b62482fac5183d5a137f7e99b23012df16d4793;p=openldap diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index 7105dc1c77..b17e71a58f 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -1,4 +1,8 @@ /* + * Copyright 1998-1999 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. * @@ -8,7 +12,8 @@ #include "portable.h" #include -#include + +#include #include #include @@ -26,57 +31,69 @@ #include #endif -#include "lber.h" -#include "ldap.h" #include "ldap-int.h" int -ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address, +ldap_connect_to_host( Sockbuf *sb, const char *host, unsigned long address, int port, int async ) /* * 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) + * async is only used ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS (non-0 means don't wait for connect) * XXX async is not used yet! */ { - int rc, i, s = 0; + int rc, i; + ber_socket_t s = AC_SOCKET_INVALID; int connected, use_hp; struct sockaddr_in sin; struct hostent *hp = NULL; #ifdef notyet -#ifdef LDAP_REFERRALS - int status; /* for ioctl call */ -#endif /* LDAP_REFERRALS */ + ioctl_t status; /* for ioctl call */ #endif /* notyet */ - + + /* buffers for ldap_pvt_gethostbyname_a */ + struct hostent he_buf; + int local_h_errno; + char *ha_buf=NULL; +#define DO_RETURN(x) if (ha_buf) LDAP_FREE(ha_buf); return (x); + Debug( LDAP_DEBUG_TRACE, "ldap_connect_to_host: %s:%d\n", ( host == NULL ) ? "(by address)" : host, (int) ntohs( (short) port ), 0 ); connected = use_hp = 0; - if ( host != NULL && ( address = inet_addr( host )) == -1 ) { - if ( (hp = gethostbyname( host )) == NULL ) { + if ( host != NULL ) { + address = inet_addr( host ); + /* This was just a test for -1 until OSF1 let inet_addr return + unsigned int, which is narrower than 'unsigned long address' */ + if ( address == 0xffffffff || address == (unsigned long) -1 ) { + if ( ( ldap_pvt_gethostbyname_a( host, &he_buf, &ha_buf, + &hp, &local_h_errno) < 0) || (hp==NULL)) + { +#ifdef HAVE_WINSOCK + errno = WSAGetLastError(); +#else errno = EHOSTUNREACH; /* not exactly right, but... */ - return( -1 ); +#endif + DO_RETURN( -1 ); } use_hp = 1; + } } 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 ); + DO_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 ); } -#endif /* LDAP_REFERRALS */ #endif /* notyet */ (void)memset( (char *)&sin, 0, sizeof( struct sockaddr_in )); sin.sin_family = AF_INET; @@ -91,8 +108,10 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address, rc = 0; break; } else { +#ifdef HAVE_WINSOCK + errno = WSAGetLastError(); +#endif #ifdef notyet -#ifdef LDAP_REFERRALS #ifdef EAGAIN if ( errno == EINPROGRESS || errno == EAGAIN ) { #else /* EAGAIN */ @@ -103,7 +122,6 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address, rc = -2; break; } -#endif /* LDAP_REFERRALS */ #endif /* notyet */ #ifdef LDAP_DEBUG @@ -111,42 +129,43 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address, perror( (char *)inet_ntoa( sin.sin_addr )); } #endif - close( s ); + tcp_close( s ); if ( !use_hp ) { break; } } } - sb->sb_sd = s; + ber_pvt_sb_set_desc( sb, 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 ); } -#endif /* LDAP_REFERRALS */ #endif /* notyet */ Debug( LDAP_DEBUG_TRACE, "sd %d connected to: %s\n", - s, inet_ntoa( sin.sin_addr ), 0 ); + s, (char *) inet_ntoa( sin.sin_addr ), 0 ); } - return( rc ); + DO_RETURN( rc ); } + +#undef DO_RETURN void ldap_close_connection( Sockbuf *sb ) { - tcp_close( sb->sb_sd ); + ber_pvt_sb_close( sb ); } -#ifdef HAVE_KERBEROS +#if defined( HAVE_KERBEROS ) || defined( HAVE_TLS ) char * ldap_host_connected_to( Sockbuf *sb ) { @@ -155,9 +174,16 @@ ldap_host_connected_to( Sockbuf *sb ) int len; struct sockaddr_in sin; + /* buffers for gethostbyaddr_r */ + struct hostent he_buf; + int local_h_errno; + char *ha_buf=NULL; +#define DO_RETURN(x) if (ha_buf) LDAP_FREE(ha_buf); return (x); + (void)memset( (char *)&sin, 0, sizeof( struct sockaddr_in )); len = sizeof( sin ); - if ( getpeername( sb->sb_sd, (struct sockaddr *)&sin, &len ) == -1 ) { + + if ( getpeername( ber_pvt_sb_get_desc(sb), (struct sockaddr *)&sin, &len ) == -1 ) { return( NULL ); } @@ -166,19 +192,24 @@ 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 ((ldap_pvt_gethostbyaddr_a( (char *) &sin.sin_addr, + sizeof( sin.sin_addr ), + AF_INET, &he_buf, &ha_buf, + &hp,&local_h_errno ) ==0 ) && (hp != NULL) ) + { if ( hp->h_name != NULL ) { - return( strdup( hp->h_name )); + char *host = LDAP_STRDUP( hp->h_name ); + DO_RETURN( host ); } } - return( NULL ); + DO_RETURN( NULL ); } -#endif /* HAVE_KERBEROS */ +#undef DO_RETURN + +#endif /* HAVE_KERBEROS || HAVE_TLS */ -#ifdef LDAP_REFERRALS /* for UNIX */ struct selectinfo { fd_set si_readfds; @@ -194,8 +225,8 @@ ldap_mark_select_write( LDAP *ld, Sockbuf *sb ) struct selectinfo *sip; sip = (struct selectinfo *)ld->ld_selectinfo; - - if ( !FD_ISSET( sb->sb_sd, &sip->si_writefds )) { + + if ( !FD_ISSET( ber_pvt_sb_get_desc(sb), &sip->si_writefds )) { FD_SET( (u_int) sb->sb_sd, &sip->si_writefds ); } } @@ -208,7 +239,7 @@ ldap_mark_select_read( LDAP *ld, Sockbuf *sb ) sip = (struct selectinfo *)ld->ld_selectinfo; - if ( !FD_ISSET( sb->sb_sd, &sip->si_readfds )) { + if ( !FD_ISSET( ber_pvt_sb_get_desc(sb), &sip->si_readfds )) { FD_SET( (u_int) sb->sb_sd, &sip->si_readfds ); } } @@ -221,8 +252,8 @@ ldap_mark_select_clear( LDAP *ld, Sockbuf *sb ) sip = (struct selectinfo *)ld->ld_selectinfo; - FD_CLR( (u_int) sb->sb_sd, &sip->si_writefds ); - FD_CLR( (u_int) sb->sb_sd, &sip->si_readfds ); + FD_CLR( (u_int) ber_pvt_sb_get_desc(sb), &sip->si_writefds ); + FD_CLR( (u_int) ber_pvt_sb_get_desc(sb), &sip->si_readfds ); } @@ -233,7 +264,7 @@ ldap_is_write_ready( LDAP *ld, Sockbuf *sb ) sip = (struct selectinfo *)ld->ld_selectinfo; - return( FD_ISSET( sb->sb_sd, &sip->si_use_writefds )); + return( FD_ISSET( ber_pvt_sb_get_desc(sb), &sip->si_use_writefds )); } @@ -244,16 +275,16 @@ ldap_is_read_ready( LDAP *ld, Sockbuf *sb ) sip = (struct selectinfo *)ld->ld_selectinfo; - return( FD_ISSET( sb->sb_sd, &sip->si_use_readfds )); + return( FD_ISSET( ber_pvt_sb_get_desc(sb), &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 ); @@ -266,7 +297,7 @@ ldap_new_select_info() void ldap_free_select_info( void *sip ) { - free( sip ); + LDAP_FREE( sip ); } @@ -283,6 +314,8 @@ do_ldap_select( LDAP *ld, struct timeval *timeout ) tblsize = sysconf( _SC_OPEN_MAX ); #elif defined( HAVE_GETDTABLESIZE ) tblsize = getdtablesize(); +#else + tblsize = FD_SETSIZE; #endif /* !USE_SYSCONF */ #ifdef FD_SETSIZE @@ -299,4 +332,3 @@ do_ldap_select( LDAP *ld, struct timeval *timeout ) return( select( tblsize, &sip->si_use_readfds, &sip->si_use_writefds, NULL, timeout )); } -#endif /* LDAP_REFERRALS */