mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

For Windows, use getsockopt() to retrieve error if connect() fails.

Browse Source 
Don't use ldap_pvt_is_socket_ready() at all on Windows, it is
totally unneeded and getpeername() misbehaves on W2K.
This commit is contained in:
Howard Chu 2002-01-10 05:12:11 +00:00
parent cadecfaae1
commit 627d354b98
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/libldap/os-ip.c
View File

@ -130,6 +130,8 @@ ldap_int_prepare_socket(LDAP *ld, int s, int proto )
return 0;
}
#ifndef HAVE_WINSOCK
#undef TRACE
#define TRACE do { \
osip_debug(ld, \
@ -174,9 +176,6 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
{
/* 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;
}
@ -187,6 +186,8 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
}
#undef TRACE
#endif /* HAVE_WINSOCK */
static int
ldap_pvt_connect(LDAP *ld, ber_socket_t s,
struct sockaddr *sin, socklen_t addrlen,
@ -262,15 +263,25 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
#ifdef HAVE_WINSOCK
/* This means the connection failed */
if ( FD_ISSET(s, &efds) ) {
ldap_pvt_set_errno(WSAECONNREFUSED);
int so_errno;
int dummy = sizeof(so_errno);
if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &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;
}
#endif
if ( FD_ISSET(s, &wfds) ) {
#ifndef HAVE_WINSOCK
if ( ldap_pvt_is_socket_ready(ld, s) == -1 )
return ( -1 );
#endif
if ( ldap_pvt_ndelay_off(ld, s) == -1 )
return ( -1 );
return ( 0 );