Unverified Commit 8020a0c6 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl_setup: provide a CURL_SA_FAMILY_T type if none exists 

... and use this type instead of 'sa_family_t' in the code since several
platforms don't have it.

Closes #2463
parent a19fefb0

lib/curl_addrinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ Curl_he2ai(const struct hostent *he, int port) 
      addr = (void *)ai->ai_addr; /* storage area for this info */



      memcpy(&addr->sin_addr, curr, sizeof(struct in_addr));

      addr->sin_family = (sa_family_t)(he->h_addrtype);

      addr->sin_family = (CURL_SA_FAMILY_T)(he->h_addrtype);

      addr->sin_port = htons((unsigned short)port);

      break;
@@ -354,7 +354,7 @@ Curl_he2ai(const struct hostent *he, int port) 
      addr6 = (void *)ai->ai_addr; /* storage area for this info */



      memcpy(&addr6->sin6_addr, curr, sizeof(struct in6_addr));

      addr6->sin6_family = (sa_family_t)(he->h_addrtype);

      addr6->sin6_family = (CURL_SA_FAMILY_T)(he->h_addrtype);

      addr6->sin6_port = htons((unsigned short)port);

      break;

#endif

lib/curl_setup.h

+5 −0
Original line number Diff line number Diff line
@@ -795,4 +795,9 @@ endings either CRLF or LF so 't' is appropriate. 
#  endif

# endif



/* for systems that don't detect this in configure, use a sensible default */

#ifndef CURL_SA_FAMILY_T

#define CURL_SA_FAMILY_T unsigned short

#endif



#endif /* HEADER_CURL_SETUP_H */

lib/tftp.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -1010,7 +1010,7 @@ static CURLcode tftp_connect(struct connectdata *conn, bool *done) 
  state->requested_blksize = blksize;



  ((struct sockaddr *)&state->local_addr)->sa_family =

    (sa_family_t)(conn->ip_addr->ai_family);

    (CURL_SA_FAMILY_T)(conn->ip_addr->ai_family);



  tftp_set_timeouts(state);