diff options
author | Fedor Indutny <fedor@indutny.com> | 2016-02-04 16:34:47 -0500 |
---|---|---|
committer | Fedor Indutny <fedor@indutny.com> | 2016-02-08 14:44:19 -0500 |
commit | 1258b0166dc6e68c2592be3410e54d5cb19bc04b (patch) | |
tree | 5f21d4a0c2789b78c231e6b2c9fbd6ac29ddac4c /deps/cares/src/ares_private.h | |
parent | 106c6cfe98db21cc62d339056710491550f69565 (diff) | |
download | android-node-v8-1258b0166dc6e68c2592be3410e54d5cb19bc04b.tar.gz android-node-v8-1258b0166dc6e68c2592be3410e54d5cb19bc04b.tar.bz2 android-node-v8-1258b0166dc6e68c2592be3410e54d5cb19bc04b.zip |
deps: sync with upstream bagder/c-ares@2bae2d5
PR-URL: https://github.com/nodejs/node/pull/5090
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
Diffstat (limited to 'deps/cares/src/ares_private.h')
-rw-r--r-- | deps/cares/src/ares_private.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/deps/cares/src/ares_private.h b/deps/cares/src/ares_private.h index 8f486a449a..45f34ab72d 100644 --- a/deps/cares/src/ares_private.h +++ b/deps/cares/src/ares_private.h @@ -43,6 +43,13 @@ #define INADDR_NONE 0xffffffff #endif +#ifdef CARES_EXPOSE_STATICS +/* Make some internal functions visible for testing */ +#define STATIC_TESTABLE +#else +#define STATIC_TESTABLE static +#endif + #if defined(WIN32) && !defined(WATT32) #define WIN_NS_9X "System\\CurrentControlSet\\Services\\VxD\\MSTCP" @@ -86,10 +93,7 @@ # define getenv(ptr) ares_getenv(ptr) #endif -#ifndef HAVE_STRDUP -# include "ares_strdup.h" -# define strdup(ptr) ares_strdup(ptr) -#endif +#include "ares_strdup.h" #ifndef HAVE_STRCASECMP # include "ares_strcasecmp.h" @@ -119,6 +123,8 @@ struct ares_addr { struct in_addr addr4; struct ares_in6_addr addr6; } addr; + int udp_port; /* stored in network order */ + int tcp_port; /* stored in network order */ }; #define addrV4 addr.addr4 #define addrV6 addr.addr6 @@ -251,8 +257,8 @@ struct ares_channeldata { int tries; int ndots; int rotate; /* if true, all servers specified are used */ - int udp_port; - int tcp_port; + int udp_port; /* stored in network order */ + int tcp_port; /* stored in network order */ int socket_send_buffer_size; int socket_receive_buffer_size; char **domains; @@ -307,12 +313,15 @@ struct ares_channeldata { void *sock_create_cb_data; }; +/* Memory management functions */ +extern void *(*ares_malloc)(size_t size); +extern void *(*ares_realloc)(void *ptr, size_t size); +extern void (*ares_free)(void *ptr); + /* return true if now is exactly check time or later */ int ares__timedout(struct timeval *now, struct timeval *check); -/* returns ARES_SUCCESS if library has been initialized */ -int ares_library_initialized(void); void ares__send_query(ares_channel channel, struct query *query, struct timeval *now); void ares__close_sockets(ares_channel channel, struct server_state *server); |