upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some more sockaddr_in v sockaddr_storage cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2002-08-10 03:48:09 +00:00
parent 07ebdca237
commit ca5aa3b615
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/libldap/os-ip.c
View file

@ -176,7 +176,11 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
#else #else
{ {
/* error slippery */ /* error slippery */
#ifdef LDAP_PF_INET6
struct sockaddr_storage sin;
#else
struct sockaddr_in sin; struct sockaddr_in sin;
#endif
char ch; char ch;
socklen_t dummy = sizeof(sin); socklen_t dummy = sizeof(sin);
if ( getpeername( s, (struct sockaddr *) &sin, &dummy ) if ( getpeername( s, (struct sockaddr *) &sin, &dummy )
@ -321,7 +325,6 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
const char *host, const char *host,
unsigned long address, int port, int async ) unsigned long address, int port, int async )
{ {
struct sockaddr_in sin;
ber_socket_t s = AC_SOCKET_INVALID; ber_socket_t s = AC_SOCKET_INVALID;
int rc, i, use_hp = 0; int rc, i, use_hp = 0;
struct hostent *hp = NULL; struct hostent *hp = NULL;
@ -436,6 +439,8 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
rc = s = -1; rc = s = -1;
for ( i = 0; !use_hp || (hp->h_addr_list[i] != 0); ++i, rc = -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 ); s = ldap_int_socket( ld, PF_INET, socktype );
if ( s == AC_SOCKET_INVALID ) { if ( s == AC_SOCKET_INVALID ) {
/* use_hp ? continue : break; */ /* use_hp ? continue : break; */
@ -447,7 +452,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
break; break;
} }
(void)memset((char *)&sin, '\0', sizeof(struct sockaddr_in)); (void)memset((char *)&sin, '\0', sizeof sin);
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
sin.sin_port = htons((short) port); sin.sin_port = htons((short) port);
p = (char *)&sin.sin_addr; p = (char *)&sin.sin_addr;