X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fos-ip.c;h=738e97f930ed903ef16a9dce65a04476d669ce7e;hb=a26cca88ddf591e00ea7287e288fcbf56e08582b;hp=0084743d8498fe922a32e9aade7835416abbe656;hpb=4a8ab5dbf2ba037b0824d64bb3217ca06671884a;p=openldap

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 0084743d84..738e97f930 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -30,6 +30,14 @@
 
 int ldap_int_tblsize = 0;
 
+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
+#  ifdef LDAP_PF_INET6
+int ldap_int_inet4or6 = AF_UNSPEC;
+#  else
+int ldap_int_inet4or6 = AF_INET;
+#  endif
+#endif
+
 /*
  * nonblock connect code
  * written by Lars Uffmann, <lars.uffmann@mediaway.net>.
@@ -168,7 +176,11 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #else
 {
 	/* error slippery */
+#ifdef LDAP_PF_INET6
+	struct sockaddr_storage sin;
+#else
 	struct sockaddr_in sin;
+#endif
 	char ch;
 	socklen_t dummy = sizeof(sin);
 	if ( getpeername( s, (struct sockaddr *) &sin, &dummy )
@@ -193,6 +205,7 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
 	struct sockaddr *sin, socklen_t addrlen,
 	int async)
 {
+	int rc;
 	struct timeval	tv, *opt_tv=NULL;
 	fd_set		wfds, *z=NULL;
 #ifdef HAVE_WINSOCK
@@ -222,8 +235,7 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
 	if ( ldap_pvt_ndelay_on(ld, s) == -1 )
 		return ( -1 );
 
-	if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR )
-	{
+	if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) {
 		if ( ldap_pvt_ndelay_off(ld, s) == -1 )
 			return ( -1 );
 		return ( 0 );
@@ -249,16 +261,18 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
 	FD_SET(s, &efds );
 #endif
 
-	if ( select(ldap_int_tblsize, z, &wfds,
+	do {
+		rc = select(ldap_int_tblsize, z, &wfds,
 #ifdef HAVE_WINSOCK
-		    &efds,
+			&efds,
 #else
-		    z,
+			z,
 #endif
-		    opt_tv ? &tv : NULL) == AC_SOCKET_ERROR )
-	{
-		return ( -1 );
-	}
+			opt_tv ? &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;
 
 #ifdef HAVE_WINSOCK
 	/* This means the connection failed */
@@ -311,10 +325,12 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 	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;
+#if !defined( HAVE_GETADDRINFO ) || !defined( HAVE_INET_NTOP )
+	struct hostent he_buf;
+#endif
 	char   			*ha_buf=NULL, *p, *q;
 	int			socktype;
 
@@ -324,7 +340,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 		osip_debug(ld, "ldap_connect_to_host: TCP %s:%d\n",host,port,0);
 		break;
 	case LDAP_PROTO_UDP: socktype = SOCK_DGRAM;
-		osip_debug(ld, "ldap_connect_to_host: TCP %s:%d\n",host,port,0);
+		osip_debug(ld, "ldap_connect_to_host: UDP %s:%d\n",host,port,0);
 		break;
 
 	default:
@@ -340,11 +356,23 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 		struct addrinfo hints, *res, *sai;
 
 		memset( &hints, '\0', sizeof(hints) );
-		hints.ai_family = AF_UNSPEC;
+		hints.ai_family = ldap_int_inet4or6;
 		hints.ai_socktype = socktype;
 
 		snprintf(serv, sizeof serv, "%d", port );
-		if ( ( err = getaddrinfo(host, serv, &hints, &res) ) ) {
+
+#ifdef LDAP_R_COMPILE
+		/* most getaddrinfo(3) use non-threadsafe resolver libraries */
+		ldap_pvt_thread_mutex_lock(&ldap_int_resolv_mutex);
+#endif
+
+		err = getaddrinfo( host, serv, &hints, &res );
+
+#ifdef LDAP_R_COMPILE
+		ldap_pvt_thread_mutex_unlock(&ldap_int_resolv_mutex);
+#endif
+
+		if ( err != 0 ) {
 			osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n",
 				AC_GAI_STRERROR(err), 0, 0);
 			return -1;
@@ -404,7 +432,6 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 		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);
 
@@ -426,6 +453,8 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 
 	rc = s = -1;
 	for ( i = 0; !use_hp || (hp->h_addr_list[i] != 0); ++i, rc = -1 ) {
+		struct sockaddr_in	sin;
+
 		s = ldap_int_socket( ld, PF_INET, socktype );
 		if ( s == AC_SOCKET_INVALID ) {
 			/* use_hp ? continue : break; */
@@ -437,7 +466,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 			break;
 		}
 
-		(void)memset((char *)&sin, '\0', sizeof(struct sockaddr_in));
+		(void)memset((char *)&sin, '\0', sizeof sin);
 		sin.sin_family = AF_INET;
 		sin.sin_port = htons((short) port);
 		p = (char *)&sin.sin_addr;
@@ -470,23 +499,23 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 char *
 ldap_host_connected_to( Sockbuf *sb )
 {
-	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;
+#ifdef LDAP_PF_INET6
+	struct sockaddr_storage sabuf;
+#else
+	struct sockaddr sabuf;
+#endif
+	struct sockaddr	*sa = (struct sockaddr *) &sabuf;
+	char			*host = NULL, *herr;
+	char hbuf[NI_MAXHOST];
+	int rc;
 	ber_socket_t	sd;
 
-	(void)memset( (char *)&sa, '\0', sizeof( struct sockaddr ));
-	len = sizeof( sa );
+	(void)memset( (char *)sa, '\0', sizeof sabuf );
+	len = sizeof sabuf;
 
 	ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
-	if ( getpeername( sd, &sa, &len ) == -1 ) {
+	if ( getpeername( sd, sa, &len ) == -1 ) {
 		return( NULL );
 	}
 
@@ -496,38 +525,39 @@ ldap_host_connected_to( Sockbuf *sb )
 	 * hostname is used as the kerberos instance.
 	 */
 
-	switch (sa.sa_family) {
+	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 );
+		{
+			struct in6_addr localhost = IN6ADDR_LOOPBACK_INIT;
+			if( memcmp ( &((struct sockaddr_in6 *)sa)->sin6_addr,
+				&localhost, sizeof(localhost)) == 0 )
+			{
+				return LDAP_STRDUP( ldap_int_hostname );
+			}
+		}
 		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 );
+			struct in_addr localhost;
+			localhost.s_addr = htonl( INADDR_ANY );
 
-			if( memcmp ( &localhost.sin_addr,
-				&((struct sockaddr_in *)&sa)->sin_addr,
-				sizeof(localhost.sin_addr) ) == 0 )
+			if( memcmp ( &((struct sockaddr_in *)sa)->sin_addr,
+				&localhost, sizeof(localhost) ) == 0 )
 			{
 				return LDAP_STRDUP( ldap_int_hostname );
 			}
 
 #ifdef INADDR_LOOPBACK
-			localhost.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
+			localhost.s_addr = htonl( INADDR_LOOPBACK );
 
-			if( memcmp ( &localhost.sin_addr,
-				&((struct sockaddr_in *)&sa)->sin_addr,
-				sizeof(localhost.sin_addr) ) == 0 )
+			if( memcmp ( &((struct sockaddr_in *)sa)->sin_addr,
+				&localhost, sizeof(localhost) ) == 0 )
 			{
 				return LDAP_STRDUP( ldap_int_hostname );
 			}
@@ -540,16 +570,13 @@ ldap_host_connected_to( Sockbuf *sb )
 		break;
 	}
 
-	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 ) )
+	hbuf[0] = 0;
+	if (ldap_pvt_get_hname( sa, len, hbuf, sizeof(hbuf), &herr ) == 0 &&
+		hbuf[0] ) 
 	{
-		host = LDAP_STRDUP( hp->h_name );   
+		host = LDAP_STRDUP( hbuf );   
 	}
 
-	LDAP_FREE( ha_buf );
 	return host;
 }
 #endif
@@ -682,7 +709,7 @@ ldap_int_select( LDAP *ld, struct timeval *timeout )
 	struct selectinfo	*sip;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG (( "os-ip", LDAP_LEVEL_ENTRY, "ldap_int_select\n" ));
+	LDAP_LOG ( CONNECTION, ENTRY, "ldap_int_select\n", 0, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "ldap_int_select\n", 0, 0, 0 );
 #endif