From e2cca72bdc02a1d4bbf75ec2c98b9105e425a558 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 7 Oct 2001 02:40:16 +0000 Subject: [PATCH] Fix ntohs/htons issues --- libraries/libldap/open.c | 4 ++-- libraries/libldap/os-ip.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index a634cce5a7..25e0519edf 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -266,7 +266,7 @@ ldap_int_open_connection( switch ( proto = ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) { case LDAP_PROTO_TCP: - port = htons( (short) srv->lud_port ); + port = srv->lud_port; addr = 0; if ( srv->lud_host == NULL || *srv->lud_host == 0 ) { @@ -294,7 +294,7 @@ ldap_int_open_connection( break; #ifdef LDAP_CONNECTIONLESS case LDAP_PROTO_UDP: - port = htons( (short) srv->lud_port ); + port = srv->lud_port; addr = 0; if ( srv->lud_host == NULL || *srv->lud_host == 0 ) { diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index f1bf7559a6..02006651cb 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -298,7 +298,7 @@ int ldap_connect_to_host(LDAP *ld, Sockbuf *sb, int proto, 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; @@ -327,7 +327,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, hints.ai_family = AF_UNSPEC; hints.ai_socktype = socktype; - snprintf(serv, sizeof serv, "%d", ntohs(port)); + snprintf(serv, sizeof serv, "%d", port ); if ( err = getaddrinfo(host, serv, &hints, &res) ) { osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n", AC_GAI_STRERROR(err), 0, 0); @@ -410,7 +410,6 @@ 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 ) { - s = ldap_int_socket( ld, PF_INET, socktype ); if ( s == AC_SOCKET_INVALID ) { /* use_hp ? continue : break; */ @@ -424,13 +423,13 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, (void)memset((char *)&sin, '\0', sizeof(struct sockaddr_in)); sin.sin_family = AF_INET; - sin.sin_port = port; + sin.sin_port = htons((short) port); p = (char *)&sin.sin_addr; q = use_hp ? (char *)hp->h_addr_list[i] : (char *)&address; AC_MEMCPY(p, q, sizeof(sin.sin_addr) ); osip_debug(ld, "ldap_connect_to_host: Trying %s:%d\n", - inet_ntoa(sin.sin_addr),ntohs(sin.sin_port),0); + inet_ntoa(sin.sin_addr),port,0); rc = ldap_pvt_connect(ld, s, (struct sockaddr *)&sin, sizeof(struct sockaddr_in), -- 2.39.5