From b050402e627f6227c835fa039c450129f159bde0 Mon Sep 17 00:00:00 2001 From: Beth Griggs Date: Tue, 3 Aug 2021 20:14:56 +0100 Subject: [PATCH] deps: reflect c-ares source tree c-ares refactored their source tree in 1.17.0 which we did not apply in our update to 1.17.1. This commit syncs our source with their new structure for easier maintenance going forward. cares.gyp is updated accordingly. Refs: https://github.com/c-ares/c-ares/pull/349 Refs: https://github.com/nodejs/node/pull/36207 PR-URL: https://github.com/nodejs/node/pull/39653 Reviewed-By: Richard Lau Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- deps/cares/{src => }/AUTHORS | 0 deps/cares/{src => }/NEWS | 0 deps/cares/{src => }/README.cares | 0 deps/cares/{src => }/README.md | 0 deps/cares/{src => }/README.msvc | 0 deps/cares/{src => }/RELEASE-NOTES | 0 deps/cares/{src => }/TODO | 0 deps/cares/cares.gyp | 158 +++++++++--------- deps/cares/{src => include}/ares_dns.h | 0 .../cares/src/{ => lib}/ares__close_sockets.c | 0 deps/cares/src/{ => lib}/ares__get_hostent.c | 0 .../src/{ => lib}/ares__parse_into_addrinfo.c | 0 deps/cares/src/{ => lib}/ares__read_line.c | 0 deps/cares/src/{ => lib}/ares__readaddrinfo.c | 0 deps/cares/src/{ => lib}/ares__sortaddrinfo.c | 0 deps/cares/src/{ => lib}/ares__timeval.c | 0 deps/cares/src/{ => lib}/ares_android.c | 0 deps/cares/src/{ => lib}/ares_android.h | 0 deps/cares/src/{ => lib}/ares_cancel.c | 0 deps/cares/src/{ => lib}/ares_create_query.c | 0 deps/cares/src/{ => lib}/ares_data.c | 0 deps/cares/src/{ => lib}/ares_data.h | 0 deps/cares/src/{ => lib}/ares_destroy.c | 0 deps/cares/src/{ => lib}/ares_expand_name.c | 0 deps/cares/src/{ => lib}/ares_expand_string.c | 0 deps/cares/src/{ => lib}/ares_fds.c | 0 deps/cares/src/{ => lib}/ares_free_hostent.c | 0 deps/cares/src/{ => lib}/ares_free_string.c | 0 deps/cares/src/{ => lib}/ares_freeaddrinfo.c | 0 deps/cares/src/{ => lib}/ares_getaddrinfo.c | 0 deps/cares/src/{ => lib}/ares_getenv.c | 0 deps/cares/src/{ => lib}/ares_getenv.h | 0 deps/cares/src/{ => lib}/ares_gethostbyaddr.c | 0 deps/cares/src/{ => lib}/ares_gethostbyname.c | 0 deps/cares/src/{ => lib}/ares_getnameinfo.c | 0 deps/cares/src/{ => lib}/ares_getsock.c | 0 deps/cares/src/{ => lib}/ares_inet_net_pton.h | 0 deps/cares/src/{ => lib}/ares_init.c | 0 deps/cares/src/{ => lib}/ares_iphlpapi.h | 0 deps/cares/src/{ => lib}/ares_ipv6.h | 0 deps/cares/src/{ => lib}/ares_library_init.c | 0 deps/cares/src/{ => lib}/ares_library_init.h | 0 deps/cares/src/{ => lib}/ares_llist.c | 0 deps/cares/src/{ => lib}/ares_llist.h | 0 deps/cares/src/{ => lib}/ares_mkquery.c | 0 deps/cares/src/{ => lib}/ares_nowarn.c | 0 deps/cares/src/{ => lib}/ares_nowarn.h | 0 deps/cares/src/{ => lib}/ares_options.c | 0 deps/cares/src/{ => lib}/ares_parse_a_reply.c | 0 .../src/{ => lib}/ares_parse_aaaa_reply.c | 0 .../src/{ => lib}/ares_parse_caa_reply.c | 0 .../cares/src/{ => lib}/ares_parse_mx_reply.c | 0 .../src/{ => lib}/ares_parse_naptr_reply.c | 0 .../cares/src/{ => lib}/ares_parse_ns_reply.c | 0 .../src/{ => lib}/ares_parse_ptr_reply.c | 0 .../src/{ => lib}/ares_parse_soa_reply.c | 0 .../src/{ => lib}/ares_parse_srv_reply.c | 0 .../src/{ => lib}/ares_parse_txt_reply.c | 0 deps/cares/src/{ => lib}/ares_platform.c | 0 deps/cares/src/{ => lib}/ares_platform.h | 0 deps/cares/src/{ => lib}/ares_private.h | 0 deps/cares/src/{ => lib}/ares_process.c | 0 deps/cares/src/{ => lib}/ares_query.c | 0 deps/cares/src/{ => lib}/ares_search.c | 0 deps/cares/src/{ => lib}/ares_send.c | 0 deps/cares/src/{ => lib}/ares_setup.h | 0 deps/cares/src/{ => lib}/ares_strcasecmp.c | 0 deps/cares/src/{ => lib}/ares_strcasecmp.h | 0 deps/cares/src/{ => lib}/ares_strdup.c | 0 deps/cares/src/{ => lib}/ares_strdup.h | 0 deps/cares/src/{ => lib}/ares_strerror.c | 0 deps/cares/src/{ => lib}/ares_strsplit.c | 0 deps/cares/src/{ => lib}/ares_strsplit.h | 0 deps/cares/src/{ => lib}/ares_timeout.c | 0 deps/cares/src/{ => lib}/ares_version.c | 0 deps/cares/src/{ => lib}/ares_writev.c | 0 deps/cares/src/{ => lib}/ares_writev.h | 0 deps/cares/src/{ => lib}/bitncmp.c | 0 deps/cares/src/{ => lib}/bitncmp.h | 0 deps/cares/src/{ => lib}/config-win32.h | 0 deps/cares/src/{ => lib}/inet_net_pton.c | 0 deps/cares/src/{ => lib}/inet_ntop.c | 0 deps/cares/{include => src/lib}/nameser.h | 0 deps/cares/src/{ => lib}/setup_once.h | 0 deps/cares/src/{ => lib}/windows_port.c | 0 deps/cares/src/{ => tools}/ares_getopt.c | 0 deps/cares/src/{ => tools}/ares_getopt.h | 0 87 files changed, 79 insertions(+), 79 deletions(-) rename deps/cares/{src => }/AUTHORS (100%) rename deps/cares/{src => }/NEWS (100%) rename deps/cares/{src => }/README.cares (100%) rename deps/cares/{src => }/README.md (100%) rename deps/cares/{src => }/README.msvc (100%) rename deps/cares/{src => }/RELEASE-NOTES (100%) rename deps/cares/{src => }/TODO (100%) rename deps/cares/{src => include}/ares_dns.h (100%) rename deps/cares/src/{ => lib}/ares__close_sockets.c (100%) rename deps/cares/src/{ => lib}/ares__get_hostent.c (100%) rename deps/cares/src/{ => lib}/ares__parse_into_addrinfo.c (100%) rename deps/cares/src/{ => lib}/ares__read_line.c (100%) rename deps/cares/src/{ => lib}/ares__readaddrinfo.c (100%) rename deps/cares/src/{ => lib}/ares__sortaddrinfo.c (100%) rename deps/cares/src/{ => lib}/ares__timeval.c (100%) rename deps/cares/src/{ => lib}/ares_android.c (100%) rename deps/cares/src/{ => lib}/ares_android.h (100%) rename deps/cares/src/{ => lib}/ares_cancel.c (100%) rename deps/cares/src/{ => lib}/ares_create_query.c (100%) rename deps/cares/src/{ => lib}/ares_data.c (100%) rename deps/cares/src/{ => lib}/ares_data.h (100%) rename deps/cares/src/{ => lib}/ares_destroy.c (100%) rename deps/cares/src/{ => lib}/ares_expand_name.c (100%) rename deps/cares/src/{ => lib}/ares_expand_string.c (100%) rename deps/cares/src/{ => lib}/ares_fds.c (100%) rename deps/cares/src/{ => lib}/ares_free_hostent.c (100%) rename deps/cares/src/{ => lib}/ares_free_string.c (100%) rename deps/cares/src/{ => lib}/ares_freeaddrinfo.c (100%) rename deps/cares/src/{ => lib}/ares_getaddrinfo.c (100%) rename deps/cares/src/{ => lib}/ares_getenv.c (100%) rename deps/cares/src/{ => lib}/ares_getenv.h (100%) rename deps/cares/src/{ => lib}/ares_gethostbyaddr.c (100%) rename deps/cares/src/{ => lib}/ares_gethostbyname.c (100%) rename deps/cares/src/{ => lib}/ares_getnameinfo.c (100%) rename deps/cares/src/{ => lib}/ares_getsock.c (100%) rename deps/cares/src/{ => lib}/ares_inet_net_pton.h (100%) rename deps/cares/src/{ => lib}/ares_init.c (100%) rename deps/cares/src/{ => lib}/ares_iphlpapi.h (100%) rename deps/cares/src/{ => lib}/ares_ipv6.h (100%) rename deps/cares/src/{ => lib}/ares_library_init.c (100%) rename deps/cares/src/{ => lib}/ares_library_init.h (100%) rename deps/cares/src/{ => lib}/ares_llist.c (100%) rename deps/cares/src/{ => lib}/ares_llist.h (100%) rename deps/cares/src/{ => lib}/ares_mkquery.c (100%) rename deps/cares/src/{ => lib}/ares_nowarn.c (100%) rename deps/cares/src/{ => lib}/ares_nowarn.h (100%) rename deps/cares/src/{ => lib}/ares_options.c (100%) rename deps/cares/src/{ => lib}/ares_parse_a_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_aaaa_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_caa_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_mx_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_naptr_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_ns_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_ptr_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_soa_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_srv_reply.c (100%) rename deps/cares/src/{ => lib}/ares_parse_txt_reply.c (100%) rename deps/cares/src/{ => lib}/ares_platform.c (100%) rename deps/cares/src/{ => lib}/ares_platform.h (100%) rename deps/cares/src/{ => lib}/ares_private.h (100%) rename deps/cares/src/{ => lib}/ares_process.c (100%) rename deps/cares/src/{ => lib}/ares_query.c (100%) rename deps/cares/src/{ => lib}/ares_search.c (100%) rename deps/cares/src/{ => lib}/ares_send.c (100%) rename deps/cares/src/{ => lib}/ares_setup.h (100%) rename deps/cares/src/{ => lib}/ares_strcasecmp.c (100%) rename deps/cares/src/{ => lib}/ares_strcasecmp.h (100%) rename deps/cares/src/{ => lib}/ares_strdup.c (100%) rename deps/cares/src/{ => lib}/ares_strdup.h (100%) rename deps/cares/src/{ => lib}/ares_strerror.c (100%) rename deps/cares/src/{ => lib}/ares_strsplit.c (100%) rename deps/cares/src/{ => lib}/ares_strsplit.h (100%) rename deps/cares/src/{ => lib}/ares_timeout.c (100%) rename deps/cares/src/{ => lib}/ares_version.c (100%) rename deps/cares/src/{ => lib}/ares_writev.c (100%) rename deps/cares/src/{ => lib}/ares_writev.h (100%) rename deps/cares/src/{ => lib}/bitncmp.c (100%) rename deps/cares/src/{ => lib}/bitncmp.h (100%) rename deps/cares/src/{ => lib}/config-win32.h (100%) rename deps/cares/src/{ => lib}/inet_net_pton.c (100%) rename deps/cares/src/{ => lib}/inet_ntop.c (100%) rename deps/cares/{include => src/lib}/nameser.h (100%) rename deps/cares/src/{ => lib}/setup_once.h (100%) rename deps/cares/src/{ => lib}/windows_port.c (100%) rename deps/cares/src/{ => tools}/ares_getopt.c (100%) rename deps/cares/src/{ => tools}/ares_getopt.h (100%) 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 100% rename from deps/cares/src/README.msvc rename to deps/cares/README.msvc diff --git a/deps/cares/src/RELEASE-NOTES b/deps/cares/RELEASE-NOTES similarity index 100% rename from deps/cares/src/RELEASE-NOTES rename to deps/cares/RELEASE-NOTES 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 100% rename from deps/cares/src/ares_dns.h rename to deps/cares/include/ares_dns.h 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