osip_debug(ld, "ldap_prepare_socket: %d\n", s,0,0);
#ifdef TCP_NODELAY
- if( proto = LDAP_PROTO_TCP ) {
+ if( proto == LDAP_PROTO_TCP ) {
int dummy = 1;
if ( setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
(char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR )
{
int so_errno;
int dummy = sizeof(so_errno);
- if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy ) == -1 ) {
+ if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy )
+ == AC_SOCKET_ERROR )
+ {
return -1;
}
if ( so_errno ) {
struct sockaddr_in sin;
char ch;
int dummy = sizeof(sin);
- if ( getpeername( s, (struct sockaddr *) &sin, &dummy ) == -1 ) {
+ 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
if ( ldap_pvt_ndelay_on(ld, s) == -1 )
return ( -1 );
- if ( connect(s, sin, addrlen) == 0 )
+ if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR )
{
if ( ldap_pvt_ndelay_off(ld, s) == -1 )
return ( -1 );
#else
z,
#endif
- opt_tv ? &tv : NULL) == -1)
+ opt_tv ? &tv : NULL) == AC_SOCKET_ERROR )
+ {
return ( -1 );
+ }
#ifdef HAVE_WINSOCK
/* This means the connection failed */
- if (FD_ISSET(s, &efds))
- {
+ 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));
unsigned long address, int port, int async)
{
struct sockaddr_in sin;
- struct in_addr in;
ber_socket_t s = AC_SOCKET_INVALID;
int rc, i, use_hp = 0;
- struct hostent *hp, he_buf;
- int local_h_errno;
+ struct hostent *hp = NULL;
char *ha_buf=NULL, *p, *q;
osip_debug(ld, "ldap_connect_to_host\n",0,0,0);
if (host != NULL) {
#ifdef HAVE_GETADDRINFO
char serv[7];
+ int err;
struct addrinfo hints, *res, *sai;
memset( &hints, '\0', sizeof(hints) );
hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = proto == LDAP_PROTO_UDP
- ? SOCK_DGRAM : SOCK_STREAM;
+ hints.ai_socktype = SOCK_STREAM;
snprintf(serv, sizeof serv, "%d", ntohs(port));
- if ( getaddrinfo(host, serv, &hints, &res) ) {
- osip_debug(ld, "ldap_connect_to_host:getaddrinfo failed\n",0,0,0);
+ 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;
}
sai = res;
rc = -1;
do {
/* we assume AF_x and PF_x are equal for all x */
- s = ldap_int_socket( ld, sai->ai_family,
- proto == LDAP_PROTO_UDP ? SOCK_DGRAM : SOCK_STREAM );
- if ( s == -1 ) {
+ s = ldap_int_socket( ld, sai->ai_family, SOCK_STREAM );
+ if ( s == AC_SOCKET_INVALID ) {
continue;
}
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);
rc = s = -1;
for ( i = 0; !use_hp || (hp->h_addr_list[i] != 0); ++i, rc = -1 ) {
- s = ldap_int_socket( ld, PF_INET,
- proto == LDAP_PROTO_UDP ? SOCK_DGRAM : SOCK_STREAM );
- if ( s == -1 ) {
+ s = ldap_int_socket( ld, PF_INET, SOCK_STREAM );
+ if ( s == AC_SOCKET_INVALID ) {
/* use_hp ? continue : break; */
break;
}
{
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;