moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

Revert "connect.c/ftp.c: Fixed dereferencing pointer breakin strict-aliasing"

Browse Source 
This reverts commit 9c94236e6cc078a0dc5a78b6e2fefc1403e5375e.

It didn't server its purpose, so lets go back to long-time working code.
This commit is contained in:
Yang Tse 2012-06-12 13:12:09 +02:00
parent 1e8e6057ea
commit d95b8e0627
2 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/connect.c
View File

@ -253,16 +253,12 @@ static CURLcode bindlocal(struct connectdata *conn,
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
struct Curl_sockaddr_storage sa; struct Curl_sockaddr_storage sa;
struct sockaddr *sock = (struct sockaddr *)&sa; /* bind to this address */
curl_socklen_t sizeof_sa = 0; /* size of the data sock points to */ curl_socklen_t sizeof_sa = 0; /* size of the data sock points to */
struct sockaddr_in *si4 = (struct sockaddr_in *)&sa;
union sockaddr_u {
struct sockaddr sa;
struct sockaddr_in sa4;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
struct sockaddr_in6 sa6; struct sockaddr_in6 *si6 = (struct sockaddr_in6 *)&sa;
#endif #endif
};
union sockaddr_u *sock = (union sockaddr_u *)&sa; /* bind to this address */
struct Curl_dns_entry *h=NULL; struct Curl_dns_entry *h=NULL;
unsigned short port = data->set.localport; /* use this port number, 0 for unsigned short port = data->set.localport; /* use this port number, 0 for
@ -377,18 +373,18 @@ static CURLcode bindlocal(struct connectdata *conn,
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
/* ipv6 address */ /* ipv6 address */
if((af == AF_INET6) && if((af == AF_INET6) &&
(Curl_inet_pton(AF_INET6, myhost, &sock->sa6.sin6_addr) > 0)) { (Curl_inet_pton(AF_INET6, myhost, &si6->sin6_addr) > 0)) {
sock->sa6.sin6_family = AF_INET6; si6->sin6_family = AF_INET6;
sock->sa6.sin6_port = htons(port); si6->sin6_port = htons(port);
sizeof_sa = sizeof(struct sockaddr_in6); sizeof_sa = sizeof(struct sockaddr_in6);
} }
else else
#endif #endif
/* ipv4 address */ /* ipv4 address */
if((af == AF_INET) && if((af == AF_INET) &&
(Curl_inet_pton(AF_INET, myhost, &sock->sa4.sin_addr) > 0)) { (Curl_inet_pton(AF_INET, myhost, &si4->sin_addr) > 0)) {
sock->sa4.sin_family = AF_INET; si4->sin_family = AF_INET;
sock->sa4.sin_port = htons(port); si4->sin_port = htons(port);
sizeof_sa = sizeof(struct sockaddr_in); sizeof_sa = sizeof(struct sockaddr_in);
} }
} }
@ -402,21 +398,21 @@ static CURLcode bindlocal(struct connectdata *conn,
/* no device was given, prepare sa to match af's needs */ /* no device was given, prepare sa to match af's needs */
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
if(af == AF_INET6) { if(af == AF_INET6) {
sock->sa6.sin6_family = AF_INET6; si6->sin6_family = AF_INET6;
sock->sa6.sin6_port = htons(port); si6->sin6_port = htons(port);
sizeof_sa = sizeof(struct sockaddr_in6); sizeof_sa = sizeof(struct sockaddr_in6);
} }
else else
#endif #endif
if(af == AF_INET) { if(af == AF_INET) {
sock->sa4.sin_family = AF_INET; si4->sin_family = AF_INET;
sock->sa4.sin_port = htons(port); si4->sin_port = htons(port);
sizeof_sa = sizeof(struct sockaddr_in); sizeof_sa = sizeof(struct sockaddr_in);
} }
} }
for(;;) { for(;;) {
if(bind(sockfd, &sock->sa, sizeof_sa) >= 0) { if(bind(sockfd, sock, sizeof_sa) >= 0) {
/* we succeeded to bind */ /* we succeeded to bind */
struct Curl_sockaddr_storage add; struct Curl_sockaddr_storage add;
curl_socklen_t size = sizeof(add); curl_socklen_t size = sizeof(add);
@ -436,11 +432,11 @@ static CURLcode bindlocal(struct connectdata *conn,
infof(data, "Bind to local port %hu failed, trying next\n", port); infof(data, "Bind to local port %hu failed, trying next\n", port);
port++; /* try next port */ port++; /* try next port */
/* We re-use/clobber the port variable here below */ /* We re-use/clobber the port variable here below */
if(sock->sa.sa_family == AF_INET) if(sock->sa_family == AF_INET)
sock->sa4.sin_port = ntohs(port); si4->sin_port = ntohs(port);
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
else else
sock->sa6.sin6_port = ntohs(port); si6->sin6_port = ntohs(port);
#endif #endif
} }
else else

50
lib/ftp.c
View File

@ -955,18 +955,14 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
char myhost[256] = ""; char myhost[256] = "";
struct Curl_sockaddr_storage ss; struct Curl_sockaddr_storage ss;
union sockaddr_u {
struct sockaddr sa;
struct sockaddr_in sa4;
#ifdef ENABLE_IPV6
struct sockaddr_in6 sa6;
#endif
};
union sockaddr_u *sock = (union sockaddr_u *)&ss;
Curl_addrinfo *res, *ai; Curl_addrinfo *res, *ai;
curl_socklen_t sslen; curl_socklen_t sslen;
char hbuf[NI_MAXHOST]; char hbuf[NI_MAXHOST];
struct sockaddr *sa=(struct sockaddr *)&ss;
struct sockaddr_in * const sa4 = (void *)sa;
#ifdef ENABLE_IPV6
struct sockaddr_in6 * const sa6 = (void *)sa;
#endif
char tmp[1024]; char tmp[1024];
static const char mode[][5] = { "EPRT", "PORT" }; static const char mode[][5] = { "EPRT", "PORT" };
int rc; int rc;
@ -1021,7 +1017,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
else if((ip_end = strchr(string_ftpport, ':')) != NULL) { else if((ip_end = strchr(string_ftpport, ':')) != NULL) {
/* either ipv6 or (ipv4|domain|interface):port(-range) */ /* either ipv6 or (ipv4|domain|interface):port(-range) */
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
if(Curl_inet_pton(AF_INET6, string_ftpport, &sock->sa6) == 1) { if(Curl_inet_pton(AF_INET6, string_ftpport, sa6) == 1) {
/* ipv6 */ /* ipv6 */
port_min = port_max = 0; port_min = port_max = 0;
strcpy(addr, string_ftpport); strcpy(addr, string_ftpport);
@ -1077,22 +1073,20 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
the IP from the control connection */ the IP from the control connection */
sslen = sizeof(ss); sslen = sizeof(ss);
if(getsockname(conn->sock[FIRSTSOCKET], &sock->sa, &sslen)) { if(getsockname(conn->sock[FIRSTSOCKET], sa, &sslen)) {
failf(data, "getsockname() failed: %s", failf(data, "getsockname() failed: %s",
Curl_strerror(conn, SOCKERRNO) ); Curl_strerror(conn, SOCKERRNO) );
Curl_safefree(addr); Curl_safefree(addr);
return CURLE_FTP_PORT_FAILED; return CURLE_FTP_PORT_FAILED;
} }
switch(sock->sa.sa_family) { switch(sa->sa_family) {
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
Curl_inet_ntop(sock->sa.sa_family, &sock->sa6.sin6_addr, hbuf, Curl_inet_ntop(sa->sa_family, &sa6->sin6_addr, hbuf, sizeof(hbuf));
sizeof(hbuf));
break; break;
#endif #endif
default: default:
Curl_inet_ntop(sock->sa.sa_family, &sock->sa4.sin_addr, hbuf, Curl_inet_ntop(sa->sa_family, &sa4->sin_addr, hbuf, sizeof(hbuf));
sizeof(hbuf));
break; break;
} }
host = hbuf; /* use this host name */ host = hbuf; /* use this host name */
@ -1140,18 +1134,18 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
/* step 3, bind to a suitable local address */ /* step 3, bind to a suitable local address */
memcpy(&sock->sa, ai->ai_addr, ai->ai_addrlen); memcpy(sa, ai->ai_addr, ai->ai_addrlen);
sslen = ai->ai_addrlen; sslen = ai->ai_addrlen;
for(port = port_min; port <= port_max;) { for(port = port_min; port <= port_max;) {
if(sock->sa.sa_family == AF_INET) if(sa->sa_family == AF_INET)
sock->sa4.sin_port = htons(port); sa4->sin_port = htons(port);
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
else else
sock->sa6.sin6_port = htons(port); sa6->sin6_port = htons(port);
#endif #endif
/* Try binding the given address. */ /* Try binding the given address. */
if(bind(portsock, &sock->sa, sslen) ) { if(bind(portsock, sa, sslen) ) {
/* It failed. */ /* It failed. */
error = SOCKERRNO; error = SOCKERRNO;
if(possibly_non_local && (error == EADDRNOTAVAIL)) { if(possibly_non_local && (error == EADDRNOTAVAIL)) {
@ -1163,7 +1157,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
Curl_strerror(conn, error) ); Curl_strerror(conn, error) );
sslen = sizeof(ss); sslen = sizeof(ss);
if(getsockname(conn->sock[FIRSTSOCKET], &sock->sa, &sslen)) { if(getsockname(conn->sock[FIRSTSOCKET], sa, &sslen)) {
failf(data, "getsockname() failed: %s", failf(data, "getsockname() failed: %s",
Curl_strerror(conn, SOCKERRNO) ); Curl_strerror(conn, SOCKERRNO) );
Curl_closesocket(conn, portsock); Curl_closesocket(conn, portsock);
@ -1196,7 +1190,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
/* get the name again after the bind() so that we can extract the /* get the name again after the bind() so that we can extract the
port number it uses now */ port number it uses now */
sslen = sizeof(ss); sslen = sizeof(ss);
if(getsockname(portsock, (struct sockaddr *)&sock->sa, &sslen)) { if(getsockname(portsock, (struct sockaddr *)sa, &sslen)) {
failf(data, "getsockname() failed: %s", failf(data, "getsockname() failed: %s",
Curl_strerror(conn, SOCKERRNO) ); Curl_strerror(conn, SOCKERRNO) );
Curl_closesocket(conn, portsock); Curl_closesocket(conn, portsock);
@ -1230,17 +1224,17 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
/* if disabled, goto next */ /* if disabled, goto next */
continue; continue;
if((PORT == fcmd) && sock->sa.sa_family != AF_INET) if((PORT == fcmd) && sa->sa_family != AF_INET)
/* PORT is ipv4 only */ /* PORT is ipv4 only */
continue; continue;
switch (sock->sa.sa_family) { switch (sa->sa_family) {
case AF_INET: case AF_INET:
port = ntohs(sock->sa4.sin_port); port = ntohs(sa4->sin_port);
break; break;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
port = ntohs(sock->sa6.sin6_port); port = ntohs(sa6->sin6_port);
break; break;
#endif #endif
default: default:
@ -1257,7 +1251,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
*/ */
result = Curl_pp_sendf(&ftpc->pp, "%s |%d|%s|%hu|", mode[fcmd], result = Curl_pp_sendf(&ftpc->pp, "%s |%d|%s|%hu|", mode[fcmd],
sock->sa.sa_family == AF_INET?1:2, sa->sa_family == AF_INET?1:2,
myhost, port); myhost, port);
if(result) { if(result) {
failf(data, "Failure sending EPRT command: %s", failf(data, "Failure sending EPRT command: %s",