diff --git a/deps/cares/src/AUTHORS b/deps/cares/AUTHORS similarity index 100% rename from deps/cares/src/AUTHORS rename to deps/cares/AUTHORS diff --git a/deps/cares/src/NEWS b/deps/cares/NEWS similarity index 100% rename from deps/cares/src/NEWS rename to deps/cares/NEWS diff --git a/deps/cares/src/README.cares b/deps/cares/README.cares similarity index 100% rename from deps/cares/src/README.cares rename to deps/cares/README.cares diff --git a/deps/cares/src/README.md b/deps/cares/README.md similarity index 100% rename from deps/cares/src/README.md rename to deps/cares/README.md diff --git a/deps/cares/src/README.msvc b/deps/cares/README.msvc similarity index 66% rename from deps/cares/src/README.msvc rename to deps/cares/README.msvc index 4ff8700cb89a10..396f497db40873 100644 --- a/deps/cares/src/README.msvc +++ b/deps/cares/README.msvc @@ -1,6 +1,6 @@ - ___ __ _ _ __ ___ ___ + ___ __ _ _ __ ___ ___ / __| ___ / _` | '__/ _ \/ __| | (_ |___| (_| | | | __/\__ \ \___| \__,_|_| \___||___/ @@ -64,46 +64,6 @@ to c-ares source folder where Makefile.msvc file is located. - How to build using Visual Studio 6 IDE - -------------------------------------- - - A VC++ 6.0 reference workspace (vc6aws.dsw) is available within the 'vc' - folder to allow proper building of the library and sample programs. - - 1) Open the vc6aws.dsw workspace with MSVC6's IDE. - 2) Select 'Build' from top menu. - 3) Select 'Batch Build' from dropdown menu. - 4) Make sure that the sixteen project configurations are 'checked'. - 5) Click on the 'Build' button. - 6) Once the sixteen project configurations are built you are done. - - Dynamic and static c-ares libraries are built in debug and release flavours, - and can be located each one in its own subdirectory, dll-debug, dll-release, - lib-debug and lib-release, all of them below the 'vc\cares' subdirectory. - - In the same way four executable versions of each sample program are built, - each using its respective library. The resulting sample executables are - located in its own subdirectory, dll-debug, dll-release, lib-debug and - lib-release, below the 'vc\acountry', 'vc\adig' and 'vc\ahost'folders. - - These reference VC++ 6.0 configurations are generated using the dynamic CRT. - - - How to build using Visual Studio 2003 or newer IDE - -------------------------------------------------- - - First you have to convert the VC++ 6.0 reference workspace and project files - to the Visual Studio IDE version you are using, following next steps: - - 1) Open vc\vc6aws.dsw with VS20XX. - 2) Allow VS20XX to update all projects and workspaces. - 3) Save ALL and close VS20XX. - 4) Open vc\vc6aws.sln with VS20XX. - 5) Select batch build, check 'all' projects and click 'build' button. - - Same comments relative to generated files and folders as done above for - Visual Studio 6 IDE apply here. - Relationship between c-ares library file names and versions ----------------------------------------------------------- @@ -139,4 +99,4 @@ Have Fun! - + diff --git a/deps/cares/RELEASE-NOTES b/deps/cares/RELEASE-NOTES new file mode 100644 index 00000000000000..e1885425ae35e6 --- /dev/null +++ b/deps/cares/RELEASE-NOTES @@ -0,0 +1,68 @@ +c-ares version 1.17.1 + +Due to a packaging issue with 1.17.0, we have released 1.17.1 to address that +issue. See 1.17.0 release notes below.. + + +c-ares version 1.17.0 + +Security: + o avoid read-heap-buffer-overflow in ares_parse_soa_reply found during + fuzzing [2] [3] + o Avoid theoretical buffer overflow in RC4 loop comparison [5] + o Empty hquery->name could lead to invalid memory access [15] + o ares_parse_{a,aaaa}_reply() could return a larger *naddrttls than was + passed in [17] + +Changes: + o Update help information for adig, acountry, and ahost [4] + o Test Suite now uses dynamic system-assigned ports rather than hardcoded + ports to prevent failures in containers [10] + o Detect remote DNS server does not support EDNS using rules from RFC 6891 [12] + o Source tree has been reorganized to use a more modern layout [13] + o Allow parsing of CAA Resource Record [14] + +Bug fixes: + o readaddrinfo bad sizeof() [1] + o Test cases should honor HAVE_WRITEV flag, not depend on WIN32 [6] + o FQDN with trailing period should be queried first [7] + o ares_getaddrinfo() was returning members of the struct as garbage values if + unset, and was not honoring ai_socktype and ai_protocol hints. [8] [9] + o ares_gethostbyname() with AF_UNSPEC and an ip address would fail [11] + o Properly document ares_set_local_ip4() uses host byte order [16] + +Thanks go to these friendly people for their efforts and contributions: + @anonymoushelpishere + Anthony Penniston (@apenn-msft) + Brad House (@bradh352) + Bulat Gaifullin (@bgaifullin) + Daniela Sonnenschein (@lxdicted) + Daniel Stenberg (@bagder) + David Hotham (@dimbleby) + Fionn Fitzmaurice (@fionn) + Gisle Vanem (@gavenm) + Ivan Baidakou (@basiliscos) + Jonathan Maye-Hobbs (@wheelpharoah) + Łukasz Marszał (@lmarszal) + lutianxiong (@ltx2018) + Seraphime Kirkovski (@Seraphime) +(14 contributors) + +References to bug reports and discussions on issues: + [1] = https://github.com/c-ares/c-ares/pull/331 + [2] = https://github.com/c-ares/c-ares/pull/332 + [3] = https://github.com/c-ares/c-ares/issues/333 + [4] = https://github.com/c-ares/c-ares/pull/334 + [5] = https://github.com/c-ares/c-ares/pull/336 + [6] = https://github.com/c-ares/c-ares/pull/344 + [7] = https://github.com/c-ares/c-ares/pull/345 + [8] = https://github.com/c-ares/c-ares/issues/343 + [9] = https://github.com/c-ares/c-ares/issues/317 + [10] = https://github.com/c-ares/c-ares/pull/346 + [11] = https://github.com/c-ares/c-ares/pull/204 + [12] = https://github.com/c-ares/c-ares/pull/244 + [13] = https://github.com/c-ares/c-ares/pull/349 + [14] = https://github.com/c-ares/c-ares/pull/360 + [15] = https://github.com/c-ares/c-ares/pull/367 + [16] = https://github.com/c-ares/c-ares/pull/368 + [17] = https://github.com/c-ares/c-ares/issues/371 diff --git a/deps/cares/src/TODO b/deps/cares/TODO similarity index 100% rename from deps/cares/src/TODO rename to deps/cares/TODO diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp index 0dc4ff9317745c..15673e2375ff70 100644 --- a/deps/cares/cares.gyp +++ b/deps/cares/cares.gyp @@ -30,86 +30,86 @@ { 'target_name': 'cares', 'type': '<(library)', - 'include_dirs': [ 'include', 'src' ], + 'include_dirs': [ 'include', 'src/lib' ], 'direct_dependent_settings': { - 'include_dirs': [ 'include' ] + 'include_dirs': [ 'include', 'src/lib' ] }, 'sources': [ 'include/ares.h', + 'include/ares_dns.h', 'include/ares_rules.h', 'include/ares_version.h', - 'include/nameser.h', - 'src/ares_android.c', - 'src/ares_cancel.c', - 'src/ares__close_sockets.c', - 'src/ares_create_query.c', - 'src/ares_data.c', - 'src/ares_data.h', - 'src/ares_destroy.c', - 'src/ares_dns.h', - 'src/ares_expand_name.c', - 'src/ares_expand_string.c', - 'src/ares_fds.c', - 'src/ares_free_hostent.c', - 'src/ares_free_string.c', - 'src/ares_freeaddrinfo.c', - 'src/ares_getenv.h', - 'src/ares_getaddrinfo.c', - 'src/ares_gethostbyaddr.c', - 'src/ares_gethostbyname.c', - 'src/ares__get_hostent.c', - 'src/ares_getnameinfo.c', - 'src/ares_getopt.c', - 'src/ares_getopt.h', - 'src/ares_getsock.c', - 'src/ares_init.c', - 'src/ares_ipv6.h', - 'src/ares_library_init.c', - 'src/ares_library_init.h', - 'src/ares_llist.c', - 'src/ares_llist.h', - 'src/ares_mkquery.c', - 'src/ares_nowarn.c', - 'src/ares_nowarn.h', - 'src/ares_options.c', - 'src/ares__parse_into_addrinfo.c', - 'src/ares_parse_aaaa_reply.c', - 'src/ares_parse_a_reply.c', - 'src/ares_parse_caa_reply.c', - 'src/ares_parse_mx_reply.c', - 'src/ares_parse_naptr_reply.c', - 'src/ares_parse_ns_reply.c', - 'src/ares_parse_ptr_reply.c', - 'src/ares_parse_soa_reply.c', - 'src/ares_parse_srv_reply.c', - 'src/ares_parse_txt_reply.c', - 'src/ares_platform.h', - 'src/ares_private.h', - 'src/ares_process.c', - 'src/ares_query.c', - 'src/ares__read_line.c', - 'src/ares__readaddrinfo.c', - 'src/ares_search.c', - 'src/ares_send.c', - 'src/ares_setup.h', - 'src/ares__sortaddrinfo.c', - 'src/ares_strcasecmp.c', - 'src/ares_strcasecmp.h', - 'src/ares_strdup.c', - 'src/ares_strdup.h', - 'src/ares_strerror.c', - 'src/ares_strsplit.c', - 'src/ares_timeout.c', - 'src/ares__timeval.c', - 'src/ares_version.c', - 'src/ares_writev.c', - 'src/ares_writev.h', - 'src/bitncmp.c', - 'src/bitncmp.h', - 'src/inet_net_pton.c', - 'src/inet_ntop.c', - 'src/ares_inet_net_pton.h', - 'src/setup_once.h', + 'src/lib/ares_android.c', + 'src/lib/ares_cancel.c', + 'src/lib/ares__close_sockets.c', + 'src/lib/ares_create_query.c', + 'src/lib/ares_data.c', + 'src/lib/ares_data.h', + 'src/lib/ares_destroy.c', + 'src/lib/ares_expand_name.c', + 'src/lib/ares_expand_string.c', + 'src/lib/ares_fds.c', + 'src/lib/ares_free_hostent.c', + 'src/lib/ares_free_string.c', + 'src/lib/ares_freeaddrinfo.c', + 'src/lib/ares_getenv.h', + 'src/lib/ares_getaddrinfo.c', + 'src/lib/ares_gethostbyaddr.c', + 'src/lib/ares_gethostbyname.c', + 'src/lib/ares__get_hostent.c', + 'src/lib/ares_getnameinfo.c', + 'src/lib/ares_getsock.c', + 'src/lib/ares_init.c', + 'src/lib/ares_ipv6.h', + 'src/lib/ares_library_init.c', + 'src/lib/ares_library_init.h', + 'src/lib/ares_llist.c', + 'src/lib/ares_llist.h', + 'src/lib/ares_mkquery.c', + 'src/lib/ares_nowarn.c', + 'src/lib/ares_nowarn.h', + 'src/lib/ares_options.c', + 'src/lib/ares__parse_into_addrinfo.c', + 'src/lib/ares_parse_aaaa_reply.c', + 'src/lib/ares_parse_a_reply.c', + 'src/lib/ares_parse_caa_reply.c', + 'src/lib/ares_parse_mx_reply.c', + 'src/lib/ares_parse_naptr_reply.c', + 'src/lib/ares_parse_ns_reply.c', + 'src/lib/ares_parse_ptr_reply.c', + 'src/lib/ares_parse_soa_reply.c', + 'src/lib/ares_parse_srv_reply.c', + 'src/lib/ares_parse_txt_reply.c', + 'src/lib/ares_platform.h', + 'src/lib/ares_private.h', + 'src/lib/ares_process.c', + 'src/lib/ares_query.c', + 'src/lib/ares__read_line.c', + 'src/lib/ares__readaddrinfo.c', + 'src/lib/ares_search.c', + 'src/lib/ares_send.c', + 'src/lib/ares_setup.h', + 'src/lib/ares__sortaddrinfo.c', + 'src/lib/ares_strcasecmp.c', + 'src/lib/ares_strcasecmp.h', + 'src/lib/ares_strdup.c', + 'src/lib/ares_strdup.h', + 'src/lib/ares_strerror.c', + 'src/lib/ares_strsplit.c', + 'src/lib/ares_timeout.c', + 'src/lib/ares__timeval.c', + 'src/lib/ares_version.c', + 'src/lib/ares_writev.c', + 'src/lib/ares_writev.h', + 'src/lib/bitncmp.c', + 'src/lib/bitncmp.h', + 'src/lib/inet_net_pton.c', + 'src/lib/inet_ntop.c', + 'src/lib/ares_inet_net_pton.h', + 'src/lib/nameser.h', + 'src/lib/setup_once.h', + 'src/tools/ares_getopt.c', + 'src/tools/ares_getopt.h', ], 'conditions': [ [ 'library=="static_library"', { @@ -124,11 +124,11 @@ ], 'include_dirs': [ 'config/win32' ], 'sources': [ - 'src/config-win32.h', - 'src/windows_port.c', - 'src/ares_getenv.c', - 'src/ares_iphlpapi.h', - 'src/ares_platform.c' + 'src/lib/config-win32.h', + 'src/lib/windows_port.c', + 'src/lib/ares_getenv.c', + 'src/lib/ares_iphlpapi.h', + 'src/lib/ares_platform.c' ], 'libraries': [ '-lws2_32.lib', diff --git a/deps/cares/src/ares_dns.h b/deps/cares/include/ares_dns.h similarity index 95% rename from deps/cares/src/ares_dns.h rename to deps/cares/include/ares_dns.h index 79f993b9048d08..bc8aa7b1091de6 100644 --- a/deps/cares/src/ares_dns.h +++ b/deps/cares/include/ares_dns.h @@ -16,6 +16,15 @@ * without express or implied warranty. */ +/* + * NOTE TO INTEGRATORS: + * + * This header is made public due to legacy projects relying on it. + * Please do not use the macros within this header, or include this + * header in your project as it may be removed in the future. + */ + + /* * Macro DNS__16BIT reads a network short (16 bit) given in network * byte order, and returns its value as an unsigned short. diff --git a/deps/cares/src/RELEASE-NOTES b/deps/cares/src/RELEASE-NOTES deleted file mode 100644 index 7a9d75fe788e84..00000000000000 --- a/deps/cares/src/RELEASE-NOTES +++ /dev/null @@ -1,30 +0,0 @@ -c-ares version 1.16.1 - -Security: - o Prevent possible use-after-free and double-free in ares_getaddrinfo() if - ares_destroy() is called prior to ares_getaddrinfo() completing. Reported - by Jann Horn at Google Project Zero. - -Changes: - o Allow TXT records on CHAOS qclass. Used for retriving things like - version.bind, version.server, authoris.bind, hostname.bind, and id.server. - [3] - -Bug fixes: - o Fix Windows Unicode incompatibilities with ares_getaddrinfo() [1] - o Silence false cast-align compiler warnings due to valid casts of - struct sockaddr to struct sockaddr_in and struct sockaddr_in6. - o MacOS should use libresolv for retrieving DNS servers, like iOS - o CMake build system should populate the INCLUDE_DIRECTORIES property of - installed targets [2] - o Correct macros in use for the ares_getaddrinfo.3 man page - -Thanks go to these friendly people for their efforts and contributions: - Brad House (@bradh352), Daniel Stenberg (@bagder), Dmitry Igrishin (@dmitigr), - Jann Horn, Shelly Vohr, Teemu R (@rytilahti) - (6 contributors) - -References to bug reports and discussions on issues: - [1] = https://github.com/c-ares/c-ares/pull/328 - [2] = https://github.com/c-ares/c-ares/pull/323 - [3] = https://github.com/c-ares/c-ares/pull/321 diff --git a/deps/cares/src/ares__close_sockets.c b/deps/cares/src/lib/ares__close_sockets.c similarity index 100% rename from deps/cares/src/ares__close_sockets.c rename to deps/cares/src/lib/ares__close_sockets.c diff --git a/deps/cares/src/ares__get_hostent.c b/deps/cares/src/lib/ares__get_hostent.c similarity index 100% rename from deps/cares/src/ares__get_hostent.c rename to deps/cares/src/lib/ares__get_hostent.c diff --git a/deps/cares/src/ares__parse_into_addrinfo.c b/deps/cares/src/lib/ares__parse_into_addrinfo.c similarity index 100% rename from deps/cares/src/ares__parse_into_addrinfo.c rename to deps/cares/src/lib/ares__parse_into_addrinfo.c diff --git a/deps/cares/src/ares__read_line.c b/deps/cares/src/lib/ares__read_line.c similarity index 100% rename from deps/cares/src/ares__read_line.c rename to deps/cares/src/lib/ares__read_line.c diff --git a/deps/cares/src/ares__readaddrinfo.c b/deps/cares/src/lib/ares__readaddrinfo.c similarity index 100% rename from deps/cares/src/ares__readaddrinfo.c rename to deps/cares/src/lib/ares__readaddrinfo.c diff --git a/deps/cares/src/ares__sortaddrinfo.c b/deps/cares/src/lib/ares__sortaddrinfo.c similarity index 100% rename from deps/cares/src/ares__sortaddrinfo.c rename to deps/cares/src/lib/ares__sortaddrinfo.c diff --git a/deps/cares/src/ares__timeval.c b/deps/cares/src/lib/ares__timeval.c similarity index 100% rename from deps/cares/src/ares__timeval.c rename to deps/cares/src/lib/ares__timeval.c diff --git a/deps/cares/src/ares_android.c b/deps/cares/src/lib/ares_android.c similarity index 100% rename from deps/cares/src/ares_android.c rename to deps/cares/src/lib/ares_android.c diff --git a/deps/cares/src/ares_android.h b/deps/cares/src/lib/ares_android.h similarity index 100% rename from deps/cares/src/ares_android.h rename to deps/cares/src/lib/ares_android.h diff --git a/deps/cares/src/ares_cancel.c b/deps/cares/src/lib/ares_cancel.c similarity index 100% rename from deps/cares/src/ares_cancel.c rename to deps/cares/src/lib/ares_cancel.c diff --git a/deps/cares/src/ares_create_query.c b/deps/cares/src/lib/ares_create_query.c similarity index 100% rename from deps/cares/src/ares_create_query.c rename to deps/cares/src/lib/ares_create_query.c diff --git a/deps/cares/src/ares_data.c b/deps/cares/src/lib/ares_data.c similarity index 100% rename from deps/cares/src/ares_data.c rename to deps/cares/src/lib/ares_data.c diff --git a/deps/cares/src/ares_data.h b/deps/cares/src/lib/ares_data.h similarity index 100% rename from deps/cares/src/ares_data.h rename to deps/cares/src/lib/ares_data.h diff --git a/deps/cares/src/ares_destroy.c b/deps/cares/src/lib/ares_destroy.c similarity index 100% rename from deps/cares/src/ares_destroy.c rename to deps/cares/src/lib/ares_destroy.c diff --git a/deps/cares/src/ares_expand_name.c b/deps/cares/src/lib/ares_expand_name.c similarity index 100% rename from deps/cares/src/ares_expand_name.c rename to deps/cares/src/lib/ares_expand_name.c diff --git a/deps/cares/src/ares_expand_string.c b/deps/cares/src/lib/ares_expand_string.c similarity index 100% rename from deps/cares/src/ares_expand_string.c rename to deps/cares/src/lib/ares_expand_string.c diff --git a/deps/cares/src/ares_fds.c b/deps/cares/src/lib/ares_fds.c similarity index 100% rename from deps/cares/src/ares_fds.c rename to deps/cares/src/lib/ares_fds.c diff --git a/deps/cares/src/ares_free_hostent.c b/deps/cares/src/lib/ares_free_hostent.c similarity index 100% rename from deps/cares/src/ares_free_hostent.c rename to deps/cares/src/lib/ares_free_hostent.c diff --git a/deps/cares/src/ares_free_string.c b/deps/cares/src/lib/ares_free_string.c similarity index 100% rename from deps/cares/src/ares_free_string.c rename to deps/cares/src/lib/ares_free_string.c diff --git a/deps/cares/src/ares_freeaddrinfo.c b/deps/cares/src/lib/ares_freeaddrinfo.c similarity index 100% rename from deps/cares/src/ares_freeaddrinfo.c rename to deps/cares/src/lib/ares_freeaddrinfo.c diff --git a/deps/cares/src/ares_getaddrinfo.c b/deps/cares/src/lib/ares_getaddrinfo.c similarity index 100% rename from deps/cares/src/ares_getaddrinfo.c rename to deps/cares/src/lib/ares_getaddrinfo.c diff --git a/deps/cares/src/ares_getenv.c b/deps/cares/src/lib/ares_getenv.c similarity index 100% rename from deps/cares/src/ares_getenv.c rename to deps/cares/src/lib/ares_getenv.c diff --git a/deps/cares/src/ares_getenv.h b/deps/cares/src/lib/ares_getenv.h similarity index 100% rename from deps/cares/src/ares_getenv.h rename to deps/cares/src/lib/ares_getenv.h diff --git a/deps/cares/src/ares_gethostbyaddr.c b/deps/cares/src/lib/ares_gethostbyaddr.c similarity index 100% rename from deps/cares/src/ares_gethostbyaddr.c rename to deps/cares/src/lib/ares_gethostbyaddr.c diff --git a/deps/cares/src/ares_gethostbyname.c b/deps/cares/src/lib/ares_gethostbyname.c similarity index 100% rename from deps/cares/src/ares_gethostbyname.c rename to deps/cares/src/lib/ares_gethostbyname.c diff --git a/deps/cares/src/ares_getnameinfo.c b/deps/cares/src/lib/ares_getnameinfo.c similarity index 100% rename from deps/cares/src/ares_getnameinfo.c rename to deps/cares/src/lib/ares_getnameinfo.c diff --git a/deps/cares/src/ares_getsock.c b/deps/cares/src/lib/ares_getsock.c similarity index 100% rename from deps/cares/src/ares_getsock.c rename to deps/cares/src/lib/ares_getsock.c diff --git a/deps/cares/src/ares_inet_net_pton.h b/deps/cares/src/lib/ares_inet_net_pton.h similarity index 100% rename from deps/cares/src/ares_inet_net_pton.h rename to deps/cares/src/lib/ares_inet_net_pton.h diff --git a/deps/cares/src/ares_init.c b/deps/cares/src/lib/ares_init.c similarity index 100% rename from deps/cares/src/ares_init.c rename to deps/cares/src/lib/ares_init.c diff --git a/deps/cares/src/ares_iphlpapi.h b/deps/cares/src/lib/ares_iphlpapi.h similarity index 100% rename from deps/cares/src/ares_iphlpapi.h rename to deps/cares/src/lib/ares_iphlpapi.h diff --git a/deps/cares/src/ares_ipv6.h b/deps/cares/src/lib/ares_ipv6.h similarity index 100% rename from deps/cares/src/ares_ipv6.h rename to deps/cares/src/lib/ares_ipv6.h diff --git a/deps/cares/src/ares_library_init.c b/deps/cares/src/lib/ares_library_init.c similarity index 100% rename from deps/cares/src/ares_library_init.c rename to deps/cares/src/lib/ares_library_init.c diff --git a/deps/cares/src/ares_library_init.h b/deps/cares/src/lib/ares_library_init.h similarity index 100% rename from deps/cares/src/ares_library_init.h rename to deps/cares/src/lib/ares_library_init.h diff --git a/deps/cares/src/ares_llist.c b/deps/cares/src/lib/ares_llist.c similarity index 100% rename from deps/cares/src/ares_llist.c rename to deps/cares/src/lib/ares_llist.c diff --git a/deps/cares/src/ares_llist.h b/deps/cares/src/lib/ares_llist.h similarity index 100% rename from deps/cares/src/ares_llist.h rename to deps/cares/src/lib/ares_llist.h diff --git a/deps/cares/src/ares_mkquery.c b/deps/cares/src/lib/ares_mkquery.c similarity index 100% rename from deps/cares/src/ares_mkquery.c rename to deps/cares/src/lib/ares_mkquery.c diff --git a/deps/cares/src/ares_nowarn.c b/deps/cares/src/lib/ares_nowarn.c similarity index 100% rename from deps/cares/src/ares_nowarn.c rename to deps/cares/src/lib/ares_nowarn.c diff --git a/deps/cares/src/ares_nowarn.h b/deps/cares/src/lib/ares_nowarn.h similarity index 100% rename from deps/cares/src/ares_nowarn.h rename to deps/cares/src/lib/ares_nowarn.h diff --git a/deps/cares/src/ares_options.c b/deps/cares/src/lib/ares_options.c similarity index 100% rename from deps/cares/src/ares_options.c rename to deps/cares/src/lib/ares_options.c diff --git a/deps/cares/src/ares_parse_a_reply.c b/deps/cares/src/lib/ares_parse_a_reply.c similarity index 100% rename from deps/cares/src/ares_parse_a_reply.c rename to deps/cares/src/lib/ares_parse_a_reply.c diff --git a/deps/cares/src/ares_parse_aaaa_reply.c b/deps/cares/src/lib/ares_parse_aaaa_reply.c similarity index 100% rename from deps/cares/src/ares_parse_aaaa_reply.c rename to deps/cares/src/lib/ares_parse_aaaa_reply.c diff --git a/deps/cares/src/ares_parse_caa_reply.c b/deps/cares/src/lib/ares_parse_caa_reply.c similarity index 100% rename from deps/cares/src/ares_parse_caa_reply.c rename to deps/cares/src/lib/ares_parse_caa_reply.c diff --git a/deps/cares/src/ares_parse_mx_reply.c b/deps/cares/src/lib/ares_parse_mx_reply.c similarity index 100% rename from deps/cares/src/ares_parse_mx_reply.c rename to deps/cares/src/lib/ares_parse_mx_reply.c diff --git a/deps/cares/src/ares_parse_naptr_reply.c b/deps/cares/src/lib/ares_parse_naptr_reply.c similarity index 100% rename from deps/cares/src/ares_parse_naptr_reply.c rename to deps/cares/src/lib/ares_parse_naptr_reply.c diff --git a/deps/cares/src/ares_parse_ns_reply.c b/deps/cares/src/lib/ares_parse_ns_reply.c similarity index 100% rename from deps/cares/src/ares_parse_ns_reply.c rename to deps/cares/src/lib/ares_parse_ns_reply.c diff --git a/deps/cares/src/ares_parse_ptr_reply.c b/deps/cares/src/lib/ares_parse_ptr_reply.c similarity index 100% rename from deps/cares/src/ares_parse_ptr_reply.c rename to deps/cares/src/lib/ares_parse_ptr_reply.c diff --git a/deps/cares/src/ares_parse_soa_reply.c b/deps/cares/src/lib/ares_parse_soa_reply.c similarity index 100% rename from deps/cares/src/ares_parse_soa_reply.c rename to deps/cares/src/lib/ares_parse_soa_reply.c diff --git a/deps/cares/src/ares_parse_srv_reply.c b/deps/cares/src/lib/ares_parse_srv_reply.c similarity index 100% rename from deps/cares/src/ares_parse_srv_reply.c rename to deps/cares/src/lib/ares_parse_srv_reply.c diff --git a/deps/cares/src/ares_parse_txt_reply.c b/deps/cares/src/lib/ares_parse_txt_reply.c similarity index 100% rename from deps/cares/src/ares_parse_txt_reply.c rename to deps/cares/src/lib/ares_parse_txt_reply.c diff --git a/deps/cares/src/ares_platform.c b/deps/cares/src/lib/ares_platform.c similarity index 100% rename from deps/cares/src/ares_platform.c rename to deps/cares/src/lib/ares_platform.c diff --git a/deps/cares/src/ares_platform.h b/deps/cares/src/lib/ares_platform.h similarity index 100% rename from deps/cares/src/ares_platform.h rename to deps/cares/src/lib/ares_platform.h diff --git a/deps/cares/src/ares_private.h b/deps/cares/src/lib/ares_private.h similarity index 100% rename from deps/cares/src/ares_private.h rename to deps/cares/src/lib/ares_private.h diff --git a/deps/cares/src/ares_process.c b/deps/cares/src/lib/ares_process.c similarity index 100% rename from deps/cares/src/ares_process.c rename to deps/cares/src/lib/ares_process.c diff --git a/deps/cares/src/ares_query.c b/deps/cares/src/lib/ares_query.c similarity index 100% rename from deps/cares/src/ares_query.c rename to deps/cares/src/lib/ares_query.c diff --git a/deps/cares/src/ares_search.c b/deps/cares/src/lib/ares_search.c similarity index 100% rename from deps/cares/src/ares_search.c rename to deps/cares/src/lib/ares_search.c diff --git a/deps/cares/src/ares_send.c b/deps/cares/src/lib/ares_send.c similarity index 100% rename from deps/cares/src/ares_send.c rename to deps/cares/src/lib/ares_send.c diff --git a/deps/cares/src/ares_setup.h b/deps/cares/src/lib/ares_setup.h similarity index 100% rename from deps/cares/src/ares_setup.h rename to deps/cares/src/lib/ares_setup.h diff --git a/deps/cares/src/ares_strcasecmp.c b/deps/cares/src/lib/ares_strcasecmp.c similarity index 100% rename from deps/cares/src/ares_strcasecmp.c rename to deps/cares/src/lib/ares_strcasecmp.c diff --git a/deps/cares/src/ares_strcasecmp.h b/deps/cares/src/lib/ares_strcasecmp.h similarity index 100% rename from deps/cares/src/ares_strcasecmp.h rename to deps/cares/src/lib/ares_strcasecmp.h diff --git a/deps/cares/src/ares_strdup.c b/deps/cares/src/lib/ares_strdup.c similarity index 100% rename from deps/cares/src/ares_strdup.c rename to deps/cares/src/lib/ares_strdup.c diff --git a/deps/cares/src/ares_strdup.h b/deps/cares/src/lib/ares_strdup.h similarity index 100% rename from deps/cares/src/ares_strdup.h rename to deps/cares/src/lib/ares_strdup.h diff --git a/deps/cares/src/ares_strerror.c b/deps/cares/src/lib/ares_strerror.c similarity index 100% rename from deps/cares/src/ares_strerror.c rename to deps/cares/src/lib/ares_strerror.c diff --git a/deps/cares/src/ares_strsplit.c b/deps/cares/src/lib/ares_strsplit.c similarity index 100% rename from deps/cares/src/ares_strsplit.c rename to deps/cares/src/lib/ares_strsplit.c diff --git a/deps/cares/src/ares_strsplit.h b/deps/cares/src/lib/ares_strsplit.h similarity index 100% rename from deps/cares/src/ares_strsplit.h rename to deps/cares/src/lib/ares_strsplit.h diff --git a/deps/cares/src/ares_timeout.c b/deps/cares/src/lib/ares_timeout.c similarity index 100% rename from deps/cares/src/ares_timeout.c rename to deps/cares/src/lib/ares_timeout.c diff --git a/deps/cares/src/ares_version.c b/deps/cares/src/lib/ares_version.c similarity index 100% rename from deps/cares/src/ares_version.c rename to deps/cares/src/lib/ares_version.c diff --git a/deps/cares/src/ares_writev.c b/deps/cares/src/lib/ares_writev.c similarity index 100% rename from deps/cares/src/ares_writev.c rename to deps/cares/src/lib/ares_writev.c diff --git a/deps/cares/src/ares_writev.h b/deps/cares/src/lib/ares_writev.h similarity index 100% rename from deps/cares/src/ares_writev.h rename to deps/cares/src/lib/ares_writev.h diff --git a/deps/cares/src/bitncmp.c b/deps/cares/src/lib/bitncmp.c similarity index 100% rename from deps/cares/src/bitncmp.c rename to deps/cares/src/lib/bitncmp.c diff --git a/deps/cares/src/bitncmp.h b/deps/cares/src/lib/bitncmp.h similarity index 100% rename from deps/cares/src/bitncmp.h rename to deps/cares/src/lib/bitncmp.h diff --git a/deps/cares/src/config-win32.h b/deps/cares/src/lib/config-win32.h similarity index 100% rename from deps/cares/src/config-win32.h rename to deps/cares/src/lib/config-win32.h diff --git a/deps/cares/src/inet_net_pton.c b/deps/cares/src/lib/inet_net_pton.c similarity index 100% rename from deps/cares/src/inet_net_pton.c rename to deps/cares/src/lib/inet_net_pton.c diff --git a/deps/cares/src/inet_ntop.c b/deps/cares/src/lib/inet_ntop.c similarity index 100% rename from deps/cares/src/inet_ntop.c rename to deps/cares/src/lib/inet_ntop.c diff --git a/deps/cares/include/nameser.h b/deps/cares/src/lib/nameser.h similarity index 100% rename from deps/cares/include/nameser.h rename to deps/cares/src/lib/nameser.h diff --git a/deps/cares/src/setup_once.h b/deps/cares/src/lib/setup_once.h similarity index 100% rename from deps/cares/src/setup_once.h rename to deps/cares/src/lib/setup_once.h diff --git a/deps/cares/src/windows_port.c b/deps/cares/src/lib/windows_port.c similarity index 100% rename from deps/cares/src/windows_port.c rename to deps/cares/src/lib/windows_port.c diff --git a/deps/cares/src/ares_getopt.c b/deps/cares/src/tools/ares_getopt.c similarity index 100% rename from deps/cares/src/ares_getopt.c rename to deps/cares/src/tools/ares_getopt.c diff --git a/deps/cares/src/ares_getopt.h b/deps/cares/src/tools/ares_getopt.h similarity index 100% rename from deps/cares/src/ares_getopt.h rename to deps/cares/src/tools/ares_getopt.h