Skip to content
This repository
Browse code

Upgrade C-Ares to 1.7.3

  • Loading branch information...
commit 9c85357846fddebcd755df90ec37b8aa37c0a535 1 parent d127d15
ry ry authored

Showing 67 changed files with 495 additions and 119 deletions. Show diff stats Hide diff stats

  1. +24 1 deps/c-ares/CHANGES
  2. +1 1  deps/c-ares/README
  3. +0 1  deps/c-ares/README.msvc
  4. +1 1  deps/c-ares/README.node
  5. +4 10 deps/c-ares/RELEASE-NOTES
  6. +0 1  deps/c-ares/ares.h
  7. +0 1  deps/c-ares/ares__close_sockets.c
  8. +0 1  deps/c-ares/ares__get_hostent.c
  9. +0 1  deps/c-ares/ares__read_line.c
  10. +0 1  deps/c-ares/ares__timeval.c
  11. +0 1  deps/c-ares/ares_cancel.c
  12. +0 1  deps/c-ares/ares_data.c
  13. +0 1  deps/c-ares/ares_data.h
  14. +0 1  deps/c-ares/ares_destroy.c
  15. +0 1  deps/c-ares/ares_dns.h
  16. +0 1  deps/c-ares/ares_expand_name.c
  17. +0 1  deps/c-ares/ares_expand_string.c
  18. +0 1  deps/c-ares/ares_fds.c
  19. +0 1  deps/c-ares/ares_free_hostent.c
  20. +0 1  deps/c-ares/ares_free_string.c
  21. +6 5 deps/c-ares/ares_gethostbyaddr.c
  22. +19 17 deps/c-ares/ares_gethostbyname.c
  23. +22 13 deps/c-ares/ares_getnameinfo.c
  24. +0 1  deps/c-ares/ares_getopt.c
  25. +0 1  deps/c-ares/ares_getsock.c
  26. +12 3 deps/c-ares/ares_init.c
  27. +0 1  deps/c-ares/ares_ipv6.h
  28. +0 1  deps/c-ares/ares_library_init.c
  29. +0 1  deps/c-ares/ares_library_init.h
  30. +0 1  deps/c-ares/ares_llist.c
  31. +0 1  deps/c-ares/ares_llist.h
  32. +0 1  deps/c-ares/ares_mkquery.c
  33. +0 1  deps/c-ares/ares_nowarn.c
  34. +0 1  deps/c-ares/ares_nowarn.h
  35. +0 1  deps/c-ares/ares_options.c
  36. +0 1  deps/c-ares/ares_parse_a_reply.c
  37. +0 1  deps/c-ares/ares_parse_aaaa_reply.c
  38. +0 1  deps/c-ares/ares_parse_ptr_reply.c
  39. +0 1  deps/c-ares/ares_parse_srv_reply.c
  40. +0 1  deps/c-ares/ares_parse_txt_reply.c
  41. +0 1  deps/c-ares/ares_private.h
  42. +1 2  deps/c-ares/ares_process.c
  43. +0 1  deps/c-ares/ares_query.c
  44. +0 1  deps/c-ares/ares_rules.h
  45. +0 1  deps/c-ares/ares_search.c
  46. +0 1  deps/c-ares/ares_send.c
  47. +0 1  deps/c-ares/ares_strcasecmp.c
  48. +0 1  deps/c-ares/ares_strcasecmp.h
  49. +0 1  deps/c-ares/ares_strdup.c
  50. +0 1  deps/c-ares/ares_strdup.h
  51. +0 1  deps/c-ares/ares_strerror.c
  52. +0 1  deps/c-ares/ares_timeout.c
  53. +0 1  deps/c-ares/ares_version.c
  54. +2 3 deps/c-ares/ares_version.h
  55. +0 1  deps/c-ares/ares_writev.c
  56. +0 1  deps/c-ares/ares_writev.h
  57. +0 1  deps/c-ares/bitncmp.c
  58. +0 1  deps/c-ares/bitncmp.h
  59. +353 0 deps/c-ares/config-win32.h
  60. +0 1  deps/c-ares/get_ver.awk
  61. +0 1  deps/c-ares/inet_net_pton.c
  62. +0 1  deps/c-ares/inet_net_pton.h
  63. +0 1  deps/c-ares/inet_ntop.c
  64. +0 1  deps/c-ares/inet_ntop.h
  65. +0 1  deps/c-ares/nameser.h
  66. +50 8 deps/c-ares/setup_once.h
  67. +0 1  deps/c-ares/windows_port.c
25 deps/c-ares/CHANGES
... ... @@ -1,7 +1,30 @@
1 1 Changelog for the c-ares project
2 2
  3 +Version 1.7.3 (June 11, 2010)
  4 +
  5 +Fixed:
  6 +
  7 + o builds on Android
  8 + o now includes all files necessary to build it (1.7.2 lacked a file)
  9 +
  10 +Version 1.7.2 (June 10, 2010)
  11 +
  12 +Changed:
  13 +
  14 + o Added ares_parse_mx_reply()
  15 +
  16 +Fixed:
  17 +
  18 + o ares_init: Last, not first instance of domain or search should win
  19 + o improve alternative definition of bool
  20 + o fix VS2010 compiler warnings
  21 +
  22 +
3 23 Version 1.7.1 (Mar 23, 2010)
4 24
  25 +* May 31, 2010 (Jakub Hrozek)
  26 +- Use the last instance of domain/search, not the first one
  27 +
5 28 * March 23, 2010 (Daniel Stenberg)
6 29 - We switched from CVS to git. See http://github.com/bagder/c-ares
7 30
@@ -27,7 +50,7 @@ Version 1.7.1 (Mar 23, 2010)
27 50 functions do not support IPv6 name servers. This implies that if the user
28 51 is capable of defining or providing an IPv6 name server, and the app is
29 52 using ares_init_options() or ares_save_options() at some point to handle
30   - the name servers, the app will likely loose IPv6 name servers.
  53 + the name servers, the app will likely lose IPv6 name servers.
31 54
32 55 * January 28, 2010 (Daniel Stenberg)
33 56 - Tommie Gannert pointed out a silly bug in ares_process_fd() since it didn't
2  deps/c-ares/README
@@ -44,7 +44,7 @@ The following notes apply to c-ares version 1.7.0 and later.
44 44 * If you intend to distribute an already compiled c-ares library you _MUST_
45 45 also distribute along with it the generated ares_build.h which has been
46 46 used to compile it. Otherwise the library will be of no use for the users of
47   - the library that you have built. It is _your_ responsability to provide this
  47 + the library that you have built. It is _your_ responsibility to provide this
48 48 file. No one at the c-ares project can know how you have built the library.
49 49
50 50 * File ares_build.h includes platform and configuration dependent info,
1  deps/c-ares/README.msvc
... ... @@ -1,4 +1,3 @@
1   - $Id$
2 1
3 2
4 3 ___ __ _ _ __ ___ ___
2  deps/c-ares/README.node
... ... @@ -1,6 +1,6 @@
1 1 Library: c-ares, DNS resolver
2 2
3   -Version: 1.7.1 (23 march, 2010)
  3 +Version: 1.7.3 (11 June, 2010)
4 4
5 5 Authors: Greg Hudson, Daniel Stenberg
6 6
14 deps/c-ares/RELEASE-NOTES
... ... @@ -1,18 +1,12 @@
1   -This is what's new and changed in the c-ares 1.7.1 release:
2   -
3   -Changed:
4   -
5   - o added IPv6 name servers support
  1 +c-ares version 1.7.3
6 2
7 3 Fixed:
8 4
9   - o closing of sockets on Windows systems
10   - o MSVC deprecated compiler options warnings
11   - o ares_process_fd() didn't check broken connections
  5 + o builds on Android
  6 + o now includes all files necessary to build it (1.7.2 lacked a file)
12 7
13 8 Thanks go to these friendly people for their efforts and contributions:
14 9
15   - Ingmar Runge, Laszlo Tamas Szabo, Yang Tse, Tommie Gannert, Gregor Jasny,
16   - Phil Blundell, Cedric Bail, Jakub Hrozek
  10 + Yang Tse, Bogdan Vatra
17 11
18 12 Have fun!
1  deps/c-ares/ares.h
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998, 2009 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2007-2010 by Daniel Stenberg
1  deps/c-ares/ares__close_sockets.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares__get_hostent.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998, 2010 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares__read_line.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares__timeval.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (C) 2008 by Daniel Stenberg et al
4 3 *
1  deps/c-ares/ares_cancel.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (C) 2004 by Daniel Stenberg et al
4 3 *
1  deps/c-ares/ares_data.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (C) 2009-2010 by Daniel Stenberg
4 3 *
1  deps/c-ares/ares_data.h
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (C) 2009-2010 by Daniel Stenberg
4 3 *
1  deps/c-ares/ares_destroy.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2004-2010 by Daniel Stenberg
1  deps/c-ares/ares_dns.h
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_expand_name.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_expand_string.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_fds.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_free_hostent.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_free_string.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 2000 by the Massachusetts Institute of Technology.
4 3 *
11 deps/c-ares/ares_gethostbyaddr.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
@@ -191,8 +190,8 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
191 190 char tmp[MAX_PATH];
192 191 HKEY hkeyHosts;
193 192
194   - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
195   - == ERROR_SUCCESS)
  193 + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ,
  194 + &hkeyHosts) == ERROR_SUCCESS)
196 195 {
197 196 DWORD dwLength = MAX_PATH;
198 197 RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
@@ -241,12 +240,14 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
241 240 }
242 241 if (addr->family == AF_INET)
243 242 {
244   - if (memcmp((*host)->h_addr, &addr->addrV4, sizeof(addr->addrV4)) == 0)
  243 + if (memcmp((*host)->h_addr, &addr->addrV4,
  244 + sizeof(addr->addrV4)) == 0)
245 245 break;
246 246 }
247 247 else if (addr->family == AF_INET6)
248 248 {
249   - if (memcmp((*host)->h_addr, &addr->addrV6, sizeof(addr->addrV6)) == 0)
  249 + if (memcmp((*host)->h_addr, &addr->addrV6,
  250 + sizeof(addr->addrV6)) == 0)
250 251 break;
251 252 }
252 253 ares_free_hostent(*host);
36 deps/c-ares/ares_gethostbyname.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
@@ -151,8 +150,8 @@ static void next_lookup(struct host_query *hquery, int status_code)
151 150 }
152 151 else {
153 152 hquery->sent_family = AF_INET;
154   - ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
155   - hquery);
  153 + ares_search(hquery->channel, hquery->name, C_IN, T_A,
  154 + host_callback, hquery);
156 155 }
157 156 return;
158 157
@@ -195,9 +194,10 @@ static void host_callback(void *arg, int status, int timeouts,
195 194 {
196 195 status = ares_parse_aaaa_reply(abuf, alen, &host, NULL, NULL);
197 196 if (status == ARES_ENODATA || status == ARES_EBADRESP) {
198   - /* The query returned something but either there were no AAAA records (e.g. just CNAME)
199   - or the response was malformed. Try looking up A instead.
200   - We should possibly limit this attempt-next logic to AF_UNSPEC lookups only. */
  197 + /* The query returned something but either there were no AAAA
  198 + records (e.g. just CNAME) or the response was malformed. Try
  199 + looking up A instead. We should possibly limit this
  200 + attempt-next logic to AF_UNSPEC lookups only. */
201 201 hquery->sent_family = AF_INET;
202 202 ares_search(hquery->channel, hquery->name, C_IN, T_A,
203 203 host_callback, hquery);
@@ -208,10 +208,12 @@ static void host_callback(void *arg, int status, int timeouts,
208 208 }
209 209 end_hquery(hquery, status, host);
210 210 }
211   - else if ((status == ARES_ENODATA || status == ARES_EBADRESP || status == ARES_ETIMEOUT) && hquery->sent_family == AF_INET6)
  211 + else if ((status == ARES_ENODATA || status == ARES_EBADRESP ||
  212 + status == ARES_ETIMEOUT) && hquery->sent_family == AF_INET6)
212 213 {
213   - /* The AAAA query yielded no useful result. Now look up an A instead.
214   - We should possibly limit this attempt-next logic to AF_UNSPEC lookups only. */
  214 + /* The AAAA query yielded no useful result. Now look up an A instead.
  215 + We should possibly limit this attempt-next logic to AF_UNSPEC lookups
  216 + only. */
215 217 hquery->sent_family = AF_INET;
216 218 ares_search(hquery->channel, hquery->name, C_IN, T_A, host_callback,
217 219 hquery);
@@ -235,8 +237,8 @@ static void end_hquery(struct host_query *hquery, int status,
235 237 /* If the name looks like an IP address, fake up a host entry, end the
236 238 * query immediately, and return true. Otherwise return false.
237 239 */
238   -static int fake_hostent(const char *name, int family, ares_host_callback callback,
239   - void *arg)
  240 +static int fake_hostent(const char *name, int family,
  241 + ares_host_callback callback, void *arg)
240 242 {
241 243 struct hostent hostent;
242 244 char *aliases[1] = { NULL };
@@ -346,8 +348,8 @@ static int file_lookup(const char *name, int family, struct hostent **host)
346 348 char tmp[MAX_PATH];
347 349 HKEY hkeyHosts;
348 350
349   - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hkeyHosts)
350   - == ERROR_SUCCESS)
  351 + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ,
  352 + &hkeyHosts) == ERROR_SUCCESS)
351 353 {
352 354 DWORD dwLength = MAX_PATH;
353 355 RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
@@ -408,8 +410,8 @@ static int file_lookup(const char *name, int family, struct hostent **host)
408 410 return status;
409 411 }
410 412
411   -static void sort_addresses(struct hostent *host, const struct apattern *sortlist,
412   - int nsort)
  413 +static void sort_addresses(struct hostent *host,
  414 + const struct apattern *sortlist, int nsort)
413 415 {
414 416 struct in_addr a1, a2;
415 417 int i1, i2, ind1, ind2;
@@ -464,8 +466,8 @@ static int get_address_index(const struct in_addr *addr,
464 466 return i;
465 467 }
466 468
467   -static void sort6_addresses(struct hostent *host, const struct apattern *sortlist,
468   - int nsort)
  469 +static void sort6_addresses(struct hostent *host,
  470 + const struct apattern *sortlist, int nsort)
469 471 {
470 472 struct ares_in6_addr a1, a2;
471 473 int i1, i2, ind1, ind2;
35 deps/c-ares/ares_getnameinfo.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 2005 by Dominick Meglio
4 3 *
@@ -81,7 +80,8 @@ struct nameinfo_query {
81 80 (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"))
82 81 #endif
83 82
84   -static void nameinfo_callback(void *arg, int status, int timeouts, struct hostent *host);
  83 +static void nameinfo_callback(void *arg, int status, int timeouts,
  84 + struct hostent *host);
85 85 static char *lookup_service(unsigned short port, int flags,
86 86 char *buf, size_t buflen);
87 87 #ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
@@ -202,7 +202,8 @@ void ares_getnameinfo(ares_channel channel, const struct sockaddr *sa,
202 202 }
203 203 }
204 204
205   -static void nameinfo_callback(void *arg, int status, int timeouts, struct hostent *host)
  205 +static void nameinfo_callback(void *arg, int status, int timeouts,
  206 + struct hostent *host)
206 207 {
207 208 struct nameinfo_query *niquery = (struct nameinfo_query *) arg;
208 209 char srvbuf[33];
@@ -221,8 +222,8 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
221 222 service = lookup_service(niquery->addr.addr6.sin6_port,
222 223 niquery->flags, srvbuf, sizeof(srvbuf));
223 224 }
224   - /* NOFQDN means we have to strip off the domain name portion.
225   - We do this by determining our own domain name, then searching the string
  225 + /* NOFQDN means we have to strip off the domain name portion. We do
  226 + this by determining our own domain name, then searching the string
226 227 for this domain name and removing it.
227 228 */
228 229 #ifdef HAVE_GETHOSTNAME
@@ -239,7 +240,8 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
239 240 }
240 241 }
241 242 #endif
242   - niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts, (char *)(host->h_name),
  243 + niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts,
  244 + (char *)(host->h_name),
243 245 service);
244 246 return;
245 247 }
@@ -248,12 +250,15 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
248 250 {
249 251 char ipbuf[IPBUFSIZ];
250 252 if (niquery->family == AF_INET)
251   - ares_inet_ntop(AF_INET, &niquery->addr.addr4.sin_addr, ipbuf, IPBUFSIZ);
  253 + ares_inet_ntop(AF_INET, &niquery->addr.addr4.sin_addr, ipbuf,
  254 + IPBUFSIZ);
252 255 else
253 256 {
254   - ares_inet_ntop(AF_INET6, &niquery->addr.addr6.sin6_addr, ipbuf, IPBUFSIZ);
  257 + ares_inet_ntop(AF_INET6, &niquery->addr.addr6.sin6_addr, ipbuf,
  258 + IPBUFSIZ);
255 259 #ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
256   - append_scopeid(&niquery->addr.addr6, niquery->flags, ipbuf, sizeof(ipbuf));
  260 + append_scopeid(&niquery->addr.addr6, niquery->flags, ipbuf,
  261 + sizeof(ipbuf));
257 262 #endif
258 263 }
259 264 /* They want a service too */
@@ -266,7 +271,8 @@ static void nameinfo_callback(void *arg, int status, int timeouts, struct hosten
266 271 service = lookup_service(niquery->addr.addr6.sin6_port,
267 272 niquery->flags, srvbuf, sizeof(srvbuf));
268 273 }
269   - niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts, ipbuf, service);
  274 + niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts, ipbuf,
  275 + service);
270 276 return;
271 277 }
272 278 niquery->callback(niquery->arg, status, niquery->timeouts, NULL, NULL);
@@ -301,10 +307,12 @@ static char *lookup_service(unsigned short port, int flags,
301 307 sep = &se;
302 308 memset(tmpbuf, 0, sizeof(tmpbuf));
303 309 #if GETSERVBYPORT_R_ARGS == 6
304   - if (getservbyport_r(port, proto, &se, (void *)tmpbuf, sizeof(tmpbuf), &sep) != 0)
  310 + if (getservbyport_r(port, proto, &se, (void *)tmpbuf,
  311 + sizeof(tmpbuf), &sep) != 0)
305 312 sep = NULL;
306 313 #elif GETSERVBYPORT_R_ARGS == 5
307   - sep = getservbyport_r(port, proto, &se, (void *)tmpbuf, sizeof(tmpbuf));
  314 + sep = getservbyport_r(port, proto, &se, (void *)tmpbuf,
  315 + sizeof(tmpbuf));
308 316 #elif GETSERVBYPORT_R_ARGS == 4
309 317 if (getservbyport_r(port, proto, &se, (void *)tmpbuf) != 0)
310 318 sep = NULL;
@@ -350,7 +358,8 @@ static void append_scopeid(struct sockaddr_in6 *addr6, unsigned int flags,
350 358 char fmt_lu[] = "%lu";
351 359 char tmpbuf[IF_NAMESIZE + 2];
352 360 size_t bufl;
353   - char *fmt = (sizeof(addr6->sin6_scope_id) > sizeof(unsigned int))?fmt_lu:fmt_u;
  361 + char *fmt = (sizeof(addr6->sin6_scope_id) > sizeof(unsigned int))?
  362 + fmt_lu:fmt_u;
354 363
355 364 tmpbuf[0] = '%';
356 365
1  deps/c-ares/ares_getopt.c
@@ -3,7 +3,6 @@
3 3 * on 2007-04-11. Lifted from version 5.2 of the 'Open Mash' project with
4 4 * the modified BSD license, BSD license without the advertising clause.
5 5 *
6   - * $Id$
7 6 */
8 7
9 8 /*
1  deps/c-ares/ares_getsock.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (C) 2005 - 2010, Daniel Stenberg
4 3 *
15 deps/c-ares/ares_init.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2007-2010 by Daniel Stenberg
@@ -70,6 +69,10 @@
70 69 #include "ares_library_init.h"
71 70 #include "ares_private.h"
72 71
  72 +#ifdef ANDROID
  73 +#include <sys/system_properties.h>
  74 +#endif
  75 +
73 76 #ifdef WATT32
74 77 #undef WIN32 /* Redefined in MingW/MSVC headers */
75 78 #endif
@@ -825,6 +828,12 @@ DhcpNameServer
825 828 servers[i].addr.addrV4.s_addr = htonl(def_nameservers[i]);
826 829 status = ARES_EOF;
827 830
  831 +#elif defined(ANDROID)
  832 + char value[PROP_VALUE_MAX]="";
  833 + __system_property_get("net.dns1", value);
  834 + status = config_nameserver(&servers, &nservers, value);
  835 + if (status == ARES_SUCCESS)
  836 + status = ARES_EOF;
828 837 #else
829 838 {
830 839 char *p;
@@ -840,11 +849,11 @@ DhcpNameServer
840 849 if (fp) {
841 850 while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS)
842 851 {
843   - if ((p = try_config(line, "domain")) && channel->ndomains == -1)
  852 + if ((p = try_config(line, "domain")))
844 853 status = config_domain(channel, p);
845 854 else if ((p = try_config(line, "lookup")) && !channel->lookups)
846 855 status = config_lookup(channel, p, "bind", "file");
847   - else if ((p = try_config(line, "search")) && channel->ndomains == -1)
  856 + else if ((p = try_config(line, "search")))
848 857 status = set_search(channel, p);
849 858 else if ((p = try_config(line, "nameserver")) && channel->nservers == -1)
850 859 status = config_nameserver(&servers, &nservers, p);
1  deps/c-ares/ares_ipv6.h
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (C) 2005 by Dominick Meglio
4 3 *
1  deps/c-ares/ares_library_init.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2004-2009 by Daniel Stenberg
1  deps/c-ares/ares_library_init.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef HEADER_CARES_LIBRARY_INIT_H
2 2 #define HEADER_CARES_LIBRARY_INIT_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright 1998 by the Massachusetts Institute of Technology.
7 6 * Copyright (C) 2004-2009 by Daniel Stenberg
1  deps/c-ares/ares_llist.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_llist.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef __ARES_LLIST_H
2 2 #define __ARES_LLIST_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright 1998 by the Massachusetts Institute of Technology.
7 6 *
1  deps/c-ares/ares_mkquery.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_nowarn.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (C) 2010 by Daniel Stenberg
4 3 *
1  deps/c-ares/ares_nowarn.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef HEADER_CARES_NOWARN_H
2 2 #define HEADER_CARES_NOWARN_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright (C) 2010 by Daniel Stenberg
7 6 *
1  deps/c-ares/ares_options.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2008-2010 by Daniel Stenberg
1  deps/c-ares/ares_parse_a_reply.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_parse_aaaa_reply.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright 2005 Dominick Meglio
1  deps/c-ares/ares_parse_ptr_reply.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_parse_srv_reply.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2009 by Jakub Hrozek <jhrozek@redhat.com>
1  deps/c-ares/ares_parse_txt_reply.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2009 by Jakub Hrozek <jhrozek@redhat.com>
1  deps/c-ares/ares_private.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef __ARES_PRIVATE_H
2 2 #define __ARES_PRIVATE_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright 1998 by the Massachusetts Institute of Technology.
7 6 * Copyright (C) 2004-2010 by Daniel Stenberg
3  deps/c-ares/ares_process.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 * Copyright (C) 2004-2010 by Daniel Stenberg
@@ -948,7 +947,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
948 947 * Disable the Nagle algorithm (only relevant for TCP sockets, and thus not
949 948 * in configure_socket). In general, in DNS lookups we're pretty much
950 949 * interested in firing off a single request and then waiting for a reply,
951   - * so batching isn't very interesting in general.
  950 + * so batching isn't very interesting.
952 951 */
953 952 opt = 1;
954 953 if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY,
1  deps/c-ares/ares_query.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_rules.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef __CARES_RULES_H
2 2 #define __CARES_RULES_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright (C) 2009 by Daniel Stenberg et al
7 6 *
1  deps/c-ares/ares_search.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_send.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_strcasecmp.c
... ... @@ -1,5 +1,4 @@
1 1
2   -/* $Id$ */
3 2
4 3 /* Copyright 1998 by the Massachusetts Institute of Technology.
5 4 *
1  deps/c-ares/ares_strcasecmp.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef HEADER_CARES_STRCASECMP_H
2 2 #define HEADER_CARES_STRCASECMP_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright 1998 by the Massachusetts Institute of Technology.
7 6 *
1  deps/c-ares/ares_strdup.c
... ... @@ -1,5 +1,4 @@
1 1
2   -/* $Id$ */
3 2
4 3 /* Copyright 1998 by the Massachusetts Institute of Technology.
5 4 *
1  deps/c-ares/ares_strdup.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef HEADER_CARES_STRDUP_H
2 2 #define HEADER_CARES_STRDUP_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright 1998 by the Massachusetts Institute of Technology.
7 6 *
1  deps/c-ares/ares_strerror.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_timeout.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright 1998 by the Massachusetts Institute of Technology.
4 3 *
1  deps/c-ares/ares_version.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 #include "ares_setup.h"
4 3 #include "ares.h"
5 deps/c-ares/ares_version.h
... ... @@ -1,15 +1,14 @@
1   -/* $Id$ */
2 1
3 2 #ifndef ARES__VERSION_H
4 3 #define ARES__VERSION_H
5 4
6 5 #define ARES_VERSION_MAJOR 1
7 6 #define ARES_VERSION_MINOR 7
8   -#define ARES_VERSION_PATCH 1
  7 +#define ARES_VERSION_PATCH 3
9 8 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
10 9 (ARES_VERSION_MINOR<<8)|\
11 10 (ARES_VERSION_PATCH))
12   -#define ARES_VERSION_STR "1.7.1"
  11 +#define ARES_VERSION_STR "1.7.3"
13 12
14 13 #if (ARES_VERSION >= 0x010700)
15 14 # define CARES_HAVE_ARES_LIBRARY_INIT 1
1  deps/c-ares/ares_writev.c
... ... @@ -1,5 +1,4 @@
1 1
2   -/* $Id$ */
3 2
4 3 /* Copyright 1998 by the Massachusetts Institute of Technology.
5 4 *
1  deps/c-ares/ares_writev.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef HEADER_CARES_WRITEV_H
2 2 #define HEADER_CARES_WRITEV_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright 1998 by the Massachusetts Institute of Technology.
7 6 *
1  deps/c-ares/bitncmp.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /*
4 3 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
1  deps/c-ares/bitncmp.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef __ARES_BITNCMP_H
2 2 #define __ARES_BITNCMP_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright (C) 2005 by Dominick Meglio
7 6 *
353 deps/c-ares/config-win32.h
... ... @@ -0,0 +1,353 @@
  1 +#ifndef __ARES_CONFIG_WIN32_H
  2 +#define __ARES_CONFIG_WIN32_H
  3 +
  4 +
  5 +/* Copyright (C) 2004 - 2008 by Daniel Stenberg et al
  6 + *
  7 + * Permission to use, copy, modify, and distribute this software and its
  8 + * documentation for any purpose and without fee is hereby granted, provided
  9 + * that the above copyright notice appear in all copies and that both that
  10 + * copyright notice and this permission notice appear in supporting
  11 + * documentation, and that the name of M.I.T. not be used in advertising or
  12 + * publicity pertaining to distribution of the software without specific,
  13 + * written prior permission. M.I.T. makes no representations about the
  14 + * suitability of this software for any purpose. It is provided "as is"
  15 + * without express or implied warranty.
  16 + */
  17 +
  18 +/* ================================================================ */
  19 +/* ares/config-win32.h - Hand crafted config file for Windows */
  20 +/* ================================================================ */
  21 +
  22 +/* ---------------------------------------------------------------- */
  23 +/* HEADER FILES */
  24 +/* ---------------------------------------------------------------- */
  25 +
  26 +/* Define if you have the <getopt.h> header file. */
  27 +#if defined(__MINGW32__) || defined(__POCC__)
  28 +#define HAVE_GETOPT_H 1
  29 +#endif
  30 +
  31 +/* Define if you have the <limits.h> header file. */
  32 +#define HAVE_LIMITS_H 1
  33 +
  34 +/* Define if you have the <process.h> header file. */
  35 +#ifndef __SALFORDC__
  36 +#define HAVE_PROCESS_H 1
  37 +#endif
  38 +
  39 +/* Define if you have the <signal.h> header file. */
  40 +#define HAVE_SIGNAL_H 1
  41 +
  42 +/* Define if you have the <sys/time.h> header file */
  43 +/* #define HAVE_SYS_TIME_H 1 */
  44 +
  45 +/* Define if you have the <time.h> header file. */
  46 +#define HAVE_TIME_H 1
  47 +
  48 +/* Define if you have the <unistd.h> header file. */
  49 +#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \
  50 + defined(__POCC__)
  51 +#define HAVE_UNISTD_H 1
  52 +#endif
  53 +
  54 +/* Define if you have the <windows.h> header file. */
  55 +#define HAVE_WINDOWS_H 1
  56 +
  57 +/* Define if you have the <winsock.h> header file. */
  58 +#define HAVE_WINSOCK_H 1
  59 +
  60 +/* Define if you have the <winsock2.h> header file. */
  61 +#ifndef __SALFORDC__
  62 +#define HAVE_WINSOCK2_H 1
  63 +#endif
  64 +
  65 +/* Define if you have the <ws2tcpip.h> header file. */
  66 +#ifndef __SALFORDC__
  67 +#define HAVE_WS2TCPIP_H 1
  68 +#endif
  69 +
  70 +/* ---------------------------------------------------------------- */
  71 +/* OTHER HEADER INFO */
  72 +/* ---------------------------------------------------------------- */
  73 +
  74 +/* Define if sig_atomic_t is an available typedef. */
  75 +#define HAVE_SIG_ATOMIC_T 1
  76 +
  77 +/* Define if you have the ANSI C header files. */
  78 +#define STDC_HEADERS 1
  79 +
  80 +/* Define if you can safely include both <sys/time.h> and <time.h>. */
  81 +/* #define TIME_WITH_SYS_TIME 1 */
  82 +
  83 +/* ---------------------------------------------------------------- */
  84 +/* FUNCTIONS */
  85 +/* ---------------------------------------------------------------- */
  86 +
  87 +/* Define if you have the closesocket function. */
  88 +#define HAVE_CLOSESOCKET 1
  89 +
  90 +/* Define if you have the gethostname function. */
  91 +#define HAVE_GETHOSTNAME 1
  92 +
  93 +/* Define if you have the ioctlsocket function. */
  94 +#define HAVE_IOCTLSOCKET 1
  95 +
  96 +/* Define if you have a working ioctlsocket FIONBIO function. */
  97 +#define HAVE_IOCTLSOCKET_FIONBIO 1
  98 +
  99 +/* Define if you have the strcasecmp function. */
  100 +/* #define HAVE_STRCASECMP 1 */
  101 +
  102 +/* Define if you have the strdup function. */
  103 +#define HAVE_STRDUP 1
  104 +
  105 +/* Define if you have the stricmp function. */
  106 +#define HAVE_STRICMP 1
  107 +
  108 +/* Define if you have the strncasecmp function. */
  109 +/* #define HAVE_STRNCASECMP 1 */
  110 +
  111 +/* Define if you have the strnicmp function. */
  112 +#define HAVE_STRNICMP 1
  113 +
  114 +/* Define if you have the recv function. */
  115 +#define HAVE_RECV 1
  116 +
  117 +/* Define to the type of arg 1 for recv. */
  118 +#define RECV_TYPE_ARG1 SOCKET
  119 +
  120 +/* Define to the type of arg 2 for recv. */
  121 +#define RECV_TYPE_ARG2 char *
  122 +
  123 +/* Define to the type of arg 3 for recv. */
  124 +#define RECV_TYPE_ARG3 int
  125 +
  126 +/* Define to the type of arg 4 for recv. */
  127 +#define RECV_TYPE_ARG4 int
  128 +
  129 +/* Define to the function return type for recv. */
  130 +#define RECV_TYPE_RETV int
  131 +
  132 +/* Define if you have the recvfrom function. */
  133 +#define HAVE_RECVFROM 1
  134 +
  135 +/* Define to the type of arg 1 for recvfrom. */
  136 +#define RECVFROM_TYPE_ARG1 SOCKET
  137 +
  138 +/* Define to the type pointed by arg 2 for recvfrom. */
  139 +#define RECVFROM_TYPE_ARG2 char
  140 +
  141 +/* Define to the type of arg 3 for recvfrom. */
  142 +#define RECVFROM_TYPE_ARG3 int
  143 +
  144 +/* Define to the type of arg 4 for recvfrom. */
  145 +#define RECVFROM_TYPE_ARG4 int
  146 +
  147 +/* Define to the type pointed by arg 5 for recvfrom. */
  148 +#define RECVFROM_TYPE_ARG5 struct sockaddr
  149 +
  150 +/* Define to the type pointed by arg 6 for recvfrom. */
  151 +#define RECVFROM_TYPE_ARG6 int
  152 +
  153 +/* Define to the function return type for recvfrom. */
  154 +#define RECVFROM_TYPE_RETV int
  155 +
  156 +/* Define if you have the send function. */
  157 +#define HAVE_SEND 1
  158 +
  159 +/* Define to the type of arg 1 for send. */
  160 +#define SEND_TYPE_ARG1 SOCKET
  161 +
  162 +/* Define to the type qualifier of arg 2 for send. */
  163 +#define SEND_QUAL_ARG2 const
  164 +
  165 +/* Define to the type of arg 2 for send. */
  166 +#define SEND_TYPE_ARG2 char *
  167 +
  168 +/* Define to the type of arg 3 for send. */
  169 +#define SEND_TYPE_ARG3 int
  170 +
  171 +/* Define to the type of arg 4 for send. */
  172 +#define SEND_TYPE_ARG4 int
  173 +
  174 +/* Define to the function return type for send. */
  175 +#define SEND_TYPE_RETV int
  176 +
  177 +/* Specifics for the Watt-32 tcp/ip stack */
  178 +#ifdef WATT32
  179 + #define SOCKET int
  180 + #define NS_INADDRSZ 4
  181 + #define HAVE_ARPA_NAMESER_H 1
  182 + #define HAVE_ARPA_INET_H 1
  183 + #define HAVE_NETDB_H 1
  184 + #define HAVE_NETINET_IN_H 1
  185 + #define HAVE_SYS_SOCKET_H 1
  186 + #define HAVE_NETINET_TCP_H 1
  187 + #define HAVE_AF_INET6 1
  188 + #define HAVE_PF_INET6 1
  189 + #define HAVE_STRUCT_IN6_ADDR 1
  190 + #define HAVE_STRUCT_SOCKADDR_IN6 1
  191 + #undef HAVE_WINSOCK_H
  192 + #undef HAVE_WINSOCK2_H
  193 + #undef HAVE_WS2TCPIP_H
  194 +#endif
  195 +
  196 +/* ---------------------------------------------------------------- */
  197 +/* TYPEDEF REPLACEMENTS */
  198 +/* ---------------------------------------------------------------- */
  199 +
  200 +/* Define this if in_addr_t is not an available 'typedefed' type */
  201 +#define in_addr_t unsigned long
  202 +
  203 +/* Define as the return type of signal handlers (int or void). */
  204 +#define RETSIGTYPE void
  205 +
  206 +/* Define ssize_t if it is not an available 'typedefed' type */
  207 +#ifndef _SSIZE_T_DEFINED
  208 +# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \
  209 + defined(__POCC__) || \
  210 + defined(__MINGW32__)
  211 +# elif defined(_WIN64)
  212 +# define _SSIZE_T_DEFINED
  213 +# define ssize_t __int64
  214 +# else
  215 +# define _SSIZE_T_DEFINED
  216 +# define ssize_t int
  217 +# endif
  218 +#endif
  219 +
  220 +/* ---------------------------------------------------------------- */
  221 +/* TYPE SIZES */
  222 +/* ---------------------------------------------------------------- */
  223 +
  224 +/* The size of `int', as computed by sizeof. */
  225 +#define SIZEOF_INT 4
  226 +
  227 +/* The size of `short', as computed by sizeof. */
  228 +#define SIZEOF_SHORT 2
  229 +
  230 +/* ---------------------------------------------------------------- */
  231 +/* STRUCT RELATED */
  232 +/* ---------------------------------------------------------------- */
  233 +
  234 +/* Define this if you have struct addrinfo */
  235 +#define HAVE_STRUCT_ADDRINFO 1
  236 +
  237 +/* Define this if you have struct sockaddr_storage */
  238 +#ifndef __SALFORDC__
  239 +#define HAVE_STRUCT_SOCKADDR_STORAGE 1
  240 +#endif
  241 +
  242 +/* Define this if you have struct timeval */
  243 +#define HAVE_STRUCT_TIMEVAL 1
  244 +
  245 +/* ---------------------------------------------------------------- */
  246 +/* COMPILER SPECIFIC */
  247 +/* ---------------------------------------------------------------- */
  248 +
  249 +/* Define to avoid VS2005 complaining about portable C functions */
  250 +#if defined(_MSC_VER) && (_MSC_VER >= 1400)
  251 +#define _CRT_SECURE_NO_DEPRECATE 1
  252 +#define _CRT_NONSTDC_NO_DEPRECATE 1
  253 +#endif
  254 +
  255 +/* Officially, Microsoft's Windows SDK versions 6.X do not support Windows
  256 + 2000 as a supported build target. VS2008 default installations provide an
  257 + embedded Windows SDK v6.0A along with the claim that Windows 2000 is a
  258 + valid build target for VS2008. Popular belief is that binaries built using
  259 + Windows SDK versions 6.X and Windows 2000 as a build target are functional */
  260 +#if defined(_MSC_VER) && (_MSC_VER >= 1500)
  261 +# define VS2008_MINIMUM_TARGET 0x0500
  262 +#endif
  263 +
  264 +/* When no build target is specified VS2008 default build target is Windows
  265 + Vista, which leaves out even Winsows XP. If no build target has been given
  266 + for VS2008 we will target the minimum Officially supported build target,
  267 + which happens to be Windows XP. */
  268 +#if defined(_MSC_VER) && (_MSC_VER >= 1500)
  269 +# define VS2008_DEFAULT_TARGET 0x0501
  270 +#endif
  271 +
  272 +/* VS2008 default target settings and minimum build target check */
  273 +#if defined(_MSC_VER) && (_MSC_VER >= 1500)
  274 +# ifndef _WIN32_WINNT
  275 +# define _WIN32_WINNT VS2008_DEFAULT_TARGET
  276 +# endif
  277 +# ifndef WINVER
  278 +# define WINVER VS2008_DEFAULT_TARGET
  279 +# endif
  280 +# if (_WIN32_WINNT < VS2008_MINIMUM_TARGET) || (WINVER < VS2008_MINIMUM_TARGET)
  281 +# error VS2008 does not support Windows build targets prior to Windows 2000
  282 +# endif
  283 +#endif
  284 +
  285 +/* When no build target is specified Pelles C 5.00 and later default build
  286 + target is Windows Vista. We override default target to be Windows 2000. */
  287 +#if defined(__POCC__) && (__POCC__ >= 500)
  288 +# ifndef _WIN32_WINNT
  289 +# define _WIN32_WINNT 0x0500
  290 +# endif
  291 +# ifndef WINVER
  292 +# define WINVER 0x0500
  293 +# endif
  294 +#endif
  295 +
  296 +/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is
  297 + quite convoluted, compiler dependent and even build target dependent. */
  298 +#if defined(HAVE_WS2TCPIP_H)
  299 +# if defined(__POCC__)
  300 +# define HAVE_FREEADDRINFO 1
  301 +# define HAVE_GETADDRINFO 1
  302 +# define HAVE_GETNAMEINFO 1
  303 +# elif defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
  304 +# define HAVE_FREEADDRINFO 1
  305 +# define HAVE_GETADDRINFO 1
  306 +# define HAVE_GETNAMEINFO 1
  307 +# elif defined(_MSC_VER) && (_MSC_VER >= 1200)
  308 +# define HAVE_FREEADDRINFO 1
  309 +# define HAVE_GETADDRINFO 1
  310 +# define HAVE_GETNAMEINFO 1
  311 +# endif
  312 +#endif
  313 +
  314 +#if defined(__POCC__)
  315 +# ifndef _MSC_VER
  316 +# error Microsoft extensions /Ze compiler option is required
  317 +# endif
  318 +# ifndef __POCC__OLDNAMES
  319 +# error Compatibility names /Go compiler option is required
  320 +# endif
  321 +#endif
  322 +
  323 +/* ---------------------------------------------------------------- */
  324 +/* IPV6 COMPATIBILITY */
  325 +/* ---------------------------------------------------------------- */
  326 +
  327 +/* Define this if you have address family AF_INET6 */
  328 +#ifdef HAVE_WINSOCK2_H
  329 +#define HAVE_AF_INET6 1
  330 +#endif
  331 +
  332 +/* Define this if you have protocol family PF_INET6 */
  333 +#ifdef HAVE_WINSOCK2_H
  334 +#define HAVE_PF_INET6 1
  335 +#endif
  336 +
  337 +/* Define this if you have struct in6_addr */
  338 +#ifdef HAVE_WS2TCPIP_H
  339 +#define HAVE_STRUCT_IN6_ADDR 1
  340 +#endif
  341 +
  342 +/* Define this if you have struct sockaddr_in6 */
  343 +#ifdef HAVE_WS2TCPIP_H
  344 +#define HAVE_STRUCT_SOCKADDR_IN6 1
  345 +#endif
  346 +
  347 +/* Define this if you have sockaddr_in6 with scopeid */
  348 +#ifdef HAVE_WS2TCPIP_H
  349 +#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
  350 +#endif
  351 +
  352 +
  353 +#endif /* __ARES_CONFIG_WIN32_H */
1  deps/c-ares/get_ver.awk
... ... @@ -1,7 +1,6 @@
1 1 # ***************************************************************************
2 2 # * Project: c-ares
3 3 # *
4   -# * $Id$
5 4 # ***************************************************************************
6 5 # awk script which fetches c-ares version number and string from input
7 6 # file and writes them to STDOUT. Here you can get an awk version for Win32:
1  deps/c-ares/inet_net_pton.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /*
4 3 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
1  deps/c-ares/inet_net_pton.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef __ARES_INET_NET_PTON_H
2 2 #define __ARES_INET_NET_PTON_H
3 3
4   -/* $Id$ */
5 4
6 5 /* Copyright (C) 2005 by Daniel Stenberg
7 6 *
1  deps/c-ares/inet_ntop.c
... ... @@ -1,4 +1,3 @@
1   -/* $Id$ */
2 1
3 2 /* Copyright (c) 1996 by Internet Software Consortium.
4 3 *
1  deps/c-ares/inet_ntop.h
... ... @@ -1,7 +1,6 @@
1 1 #ifndef __ARES_INET_NTOP_H
2