Skip to content

Commit 13c7470

Browse files
rvaggBridgeAR
rvagg
authored and
BridgeAR
committed
deps: upgrade to c-ares v1.13.0
PR-URL: #15378 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent d0d1eba commit 13c7470

34 files changed

+828
-282
lines changed

‎deps/cares/config/aix/ares_config.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
/* Defined for build with symbol hiding. */
1717
/* #undef CARES_SYMBOL_HIDING */
1818

19+
/* the signed version of size_t */
20+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
21+
1922
/* Definition to make a library symbol externally visible. */
2023
/* #undef CARES_SYMBOL_SCOPE_EXTERN */
2124

@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */

‎deps/cares/config/android/ares_config.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/* Definition to make a library symbol externally visible. */
2020
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((__visibility__ ("default")))
2121

22+
/* the signed version of size_t */
23+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
24+
2225
/* Use resolver library to configure cares */
2326
/* #undef CARES_USE_LIBRESOLV */
2427

@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */

‎deps/cares/config/cygwin/ares_config.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
/* Definition to make a library symbol externally visible. */
2323
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((visibility ("default")))
2424

25+
/* the signed version of size_t */
26+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
27+
2528
/* if a /etc/inet dir is being used */
2629
/* #undef ETC_INET */
2730

@@ -364,7 +367,7 @@
364367
#define PACKAGE_NAME "c-ares"
365368

366369
/* Define to the full name and version of this package. */
367-
#define PACKAGE_STRING "c-ares 1.7.1"
370+
#define PACKAGE_STRING "c-ares 1.13.0"
368371

369372
/* Define to the one symbol short name of this package. */
370373
#define PACKAGE_TARNAME "c-ares"
@@ -373,7 +376,7 @@
373376
#define PACKAGE_URL ""
374377

375378
/* Define to the version of this package. */
376-
#define PACKAGE_VERSION "1.7.1"
379+
#define PACKAGE_VERSION "1.13.0"
377380

378381
/* a suitable file/device to read random data from */
379382
#define RANDOM_FILE "/dev/urandom"

‎deps/cares/config/darwin/ares_config.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/* Definition to make a library symbol externally visible. */
2020
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((__visibility__ ("default")))
2121

22+
/* the signed version of size_t */
23+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
24+
2225
/* Use resolver library to configure cares */
2326
/* #undef CARES_USE_LIBRESOLV */
2427

@@ -351,7 +354,7 @@
351354
/* #undef NEED_THREAD_SAFE */
352355

353356
/* cpu-machine-OS */
354-
#define OS "x86_64-apple-darwin14.5.0"
357+
#define OS "x86_64-apple-darwin16.7.0"
355358

356359
/* Name of package */
357360
#define PACKAGE "c-ares"
@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */
@@ -497,6 +500,3 @@
497500

498501
/* Define to `unsigned int' if <sys/types.h> does not define. */
499502
/* #undef size_t */
500-
501-
/* the signed version of size_t */
502-
/* #undef ssize_t */

‎deps/cares/config/freebsd/ares_config.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/* Definition to make a library symbol externally visible. */
2020
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((__visibility__ ("default")))
2121

22+
/* the signed version of size_t */
23+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
24+
2225
/* Use resolver library to configure cares */
2326
/* #undef CARES_USE_LIBRESOLV */
2427

@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */

‎deps/cares/config/linux/ares_config.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/* Definition to make a library symbol externally visible. */
2020
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((__visibility__ ("default")))
2121

22+
/* the signed version of size_t */
23+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
24+
2225
/* Use resolver library to configure cares */
2326
/* #undef CARES_USE_LIBRESOLV */
2427

@@ -351,7 +354,7 @@
351354
/* #undef NEED_THREAD_SAFE */
352355

353356
/* cpu-machine-OS */
354-
#define OS "i686-pc-linux-gnu"
357+
#define OS "x86_64-pc-linux-gnu"
355358

356359
/* Name of package */
357360
#define PACKAGE "c-ares"
@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */
@@ -497,6 +500,3 @@
497500

498501
/* Define to `unsigned int' if <sys/types.h> does not define. */
499502
/* #undef size_t */
500-
501-
/* the signed version of size_t */
502-
/* #undef ssize_t */

‎deps/cares/config/netbsd/ares_config.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
/* Defined for build with symbol hiding. */
1717
/* #undef CARES_SYMBOL_HIDING */
1818

19+
/* the signed version of size_t */
20+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
21+
1922
/* Definition to make a library symbol externally visible. */
2023
/* #undef CARES_SYMBOL_SCOPE_EXTERN */
2124

@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */

‎deps/cares/config/openbsd/ares_config.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
/* Defined for build with symbol hiding. */
1717
/* #undef CARES_SYMBOL_HIDING */
1818

19+
/* the signed version of size_t */
20+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
21+
1922
/* Definition to make a library symbol externally visible. */
2023
/* #undef CARES_SYMBOL_SCOPE_EXTERN */
2124

@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */

‎deps/cares/config/sunos/ares_config.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
/* Definition to make a library symbol externally visible. */
2020
#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((__visibility__ ("default")))
2121

22+
/* the signed version of size_t */
23+
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
24+
2225
/* Use resolver library to configure cares */
2326
/* #undef CARES_USE_LIBRESOLV */
2427

@@ -363,7 +366,7 @@
363366
#define PACKAGE_NAME "c-ares"
364367

365368
/* Define to the full name and version of this package. */
366-
#define PACKAGE_STRING "c-ares 1.12.0"
369+
#define PACKAGE_STRING "c-ares 1.13.0"
367370

368371
/* Define to the one symbol short name of this package. */
369372
#define PACKAGE_TARNAME "c-ares"
@@ -372,7 +375,7 @@
372375
#define PACKAGE_URL ""
373376

374377
/* Define to the version of this package. */
375-
#define PACKAGE_VERSION "1.12.0"
378+
#define PACKAGE_VERSION "1.13.0"
376379

377380
/* a suitable file/device to read random data from */
378381
#define RANDOM_FILE "/dev/urandom"
@@ -456,7 +459,7 @@
456459
/* #undef USE_BLOCKING_SOCKETS */
457460

458461
/* Version number of package */
459-
#define VERSION "1.12.0"
462+
#define VERSION "1.13.0"
460463

461464
/* Define to avoid automatic inclusion of winsock.h */
462465
/* #undef WIN32_LEAN_AND_MEAN */

‎deps/cares/include/ares.h

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
require it! */
3939
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
4040
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
41-
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__)
41+
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
42+
defined(__QNXNTO__)
4243
#include <sys/select.h>
4344
#endif
4445
#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
@@ -356,6 +357,27 @@ CARES_EXTERN void ares_set_socket_configure_callback(ares_channel channel,
356357
CARES_EXTERN int ares_set_sortlist(ares_channel channel,
357358
const char *sortstr);
358359

360+
/*
361+
* Virtual function set to have user-managed socket IO.
362+
* Note that all functions need to be defined, and when
363+
* set, the library will not do any bind nor set any
364+
* socket options, assuming the client handles these
365+
* through either socket creation or the
366+
* ares_sock_config_callback call.
367+
*/
368+
struct iovec;
369+
struct ares_socket_functions {
370+
ares_socket_t(*asocket)(int, int, int, void *);
371+
int(*aclose)(ares_socket_t, void *);
372+
int(*aconnect)(ares_socket_t, const struct sockaddr *, ares_socklen_t, void *);
373+
ares_ssize_t(*arecvfrom)(ares_socket_t, void *, size_t, int, struct sockaddr *, ares_socklen_t *, void *);
374+
ares_ssize_t(*asendv)(ares_socket_t, const struct iovec *, int, void *);
375+
};
376+
377+
CARES_EXTERN void ares_set_socket_functions(ares_channel channel,
378+
const struct ares_socket_functions * funcs,
379+
void *user_data);
380+
359381
CARES_EXTERN void ares_send(ares_channel channel,
360382
const unsigned char *qbuf,
361383
int qlen,

0 commit comments

Comments
 (0)