Change the ai_addrlen type of struct addrinfo from size_t to socklen_t, per RFC 3493.

diff --git a/ares/ares_ipv6.h b/ares/ares_ipv6.h
index a6d980fe73ce633e82b830173e4605fe0be0cdc8..afc98320b3a8fc1afbc9a220fcf3f73f1909a651 100644 (file)
--- a/ares/ares_ipv6.h
+++ b/ares/ares_ipv6.h
@@ -40,14 +40,14 @@ struct sockaddr_in6
 #endif
 
 #ifndef HAVE_STRUCT_ADDRINFO
-struct addrinfo
+struct addrinfo 
 {
-  int ai_flags;
-  int ai_family;
-  int ai_socktype;
-  int ai_protocol;
-  size_t ai_addrlen;
-  char *ai_cannonname;
+  int              ai_flags;
+  int              ai_family;
+  int              ai_socktype;
+  int              ai_protocol;
+  socklen_t        ai_addrlen;   /* Follow rfc3493 struct addrinfo */
+  char            *ai_canonname;
   struct sockaddr *ai_addr;
   struct addrinfo *ai_next;
 };

diff --git a/lib/connect.c b/lib/connect.c
index 0b404aed762b5e0e6aacdc9f6f26d36d6de8c78f..b12cf8b84b544135cb172a690e3d029d5f9c62c0 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -713,7 +713,7 @@ singleipconnect(struct connectdata *conn,
 
   /* Connect TCP sockets, bind UDP */
   if(conn->socktype == SOCK_STREAM)
-    rc = connect(sockfd, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+    rc = connect(sockfd, ai->ai_addr, ai->ai_addrlen);
   else
     rc = 0;
 

diff --git a/lib/hostip.h b/lib/hostip.h
index ade5efa28b3c7f356eaa8f78326866ba7e7d2dc6..2205aac0860a1dc950847fff6b00fb71d77f0903 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -94,13 +94,13 @@ typedef struct addrinfo Curl_addrinfo;
 /* OK, so some ipv4-only include tree probably have the addrinfo struct, but
    to work even on those that don't, we provide our own look-alike! */
 struct Curl_addrinfo {
-  int     ai_flags;
-  int     ai_family;
-  int     ai_socktype;
-  int     ai_protocol;
-  size_t  ai_addrlen;
-  struct sockaddr *ai_addr;
-  char   *ai_canonname;
+  int                   ai_flags;
+  int                   ai_family;
+  int                   ai_socktype;
+  int                   ai_protocol;
+  socklen_t             ai_addrlen;   /* Follow rfc3493 struct addrinfo */
+  char                 *ai_canonname;
+  struct sockaddr      *ai_addr;
   struct Curl_addrinfo *ai_next;
 };
 typedef struct Curl_addrinfo Curl_addrinfo;

diff --git a/lib/hostip4.c b/lib/hostip4.c
index 51eca67fe8bc0d58cbeae53c7e4bef7351ef0010..bba9fb1dc5c38721f465c4d33a3ffd78fdb46665 100644 (file)
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -370,28 +370,34 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn,
  * Curl_he2ai() translates from a hostent struct to a Curl_addrinfo struct.
  * The Curl_addrinfo is meant to work like the addrinfo struct does for IPv6
  * stacks, but for all hosts and environments.
-
-struct Curl_addrinfo {
-  int     ai_flags;
-  int     ai_family;
-  int     ai_socktype;
-  int     ai_protocol;
-  size_t  ai_addrlen;
-  struct sockaddr *ai_addr;
-  char   *ai_canonname;
-  struct addrinfo *ai_next;
-};
-
-struct hostent {
-  char    *h_name;        * official name of host *
-  char    **h_aliases;    * alias list *
-  int     h_addrtype;     * host address type *
-  int     h_length;       * length of address *
-  char    **h_addr_list;  * list of addresses *
-}
-#define h_addr  h_addr_list[0]  * for backward compatibility *
-
-*/
+ *      
+ *   Curl_addrinfo defined in "lib/hostip.h"
+ *      
+ *     struct Curl_addrinfo {
+ *       int                   ai_flags;
+ *       int                   ai_family;
+ *       int                   ai_socktype;
+ *       int                   ai_protocol;
+ *       socklen_t             ai_addrlen;   * Follow rfc3493 struct addrinfo *
+ *       char                 *ai_canonname;
+ *       struct sockaddr      *ai_addr;
+ *       struct Curl_addrinfo *ai_next;
+ *     };
+ *      
+ *   hostent defined in <netdb.h>
+ *      
+ *     struct hostent {
+ *       char    *h_name;
+ *       char    **h_aliases;
+ *       int     h_addrtype;
+ *       int     h_length;
+ *       char    **h_addr_list;
+ *     };
+ *      
+ *   for backward compatibility:
+ *      
+ *     #define h_addr  h_addr_list[0]
+ */
 
 Curl_addrinfo *Curl_he2ai(struct hostent *he, int port)
 {