Skip to content

Commit 3b76d35

Browse files
committed
Compatible with low version c-ares library
1 parent 5b2a926 commit 3b76d35

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

src/core/base.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,9 @@ static void swoole_fatal_error(int code, const char *format, ...) {
805805
exit(1);
806806
}
807807

808-
size_t swDataHead::dump(char *_buf, size_t _len) {
808+
namespace swoole {
809+
//-------------------------------------------------------------------------------
810+
size_t DataHead::dump(char *_buf, size_t _len) {
809811
return sw_snprintf(_buf,
810812
_len,
811813
"swDataHead[%p]\n"
@@ -826,8 +828,6 @@ size_t swDataHead::dump(char *_buf, size_t _len) {
826828
server_fd);
827829
}
828830

829-
namespace swoole {
830-
//-------------------------------------------------------------------------------
831831
std::string dirname(const std::string &file) {
832832
size_t index = file.find_last_of('/');
833833
if (index == std::string::npos) {

src/network/dns.cc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,26 @@ std::vector<std::string> dns_lookup_impl_with_cares(const char *domain, int fami
429429
}
430430

431431
if (!SwooleG.dns_server_host.empty()) {
432+
#if (ARES_VERSION >= 0x010b00)
432433
struct ares_addr_port_node servers;
433434
servers.family = AF_INET;
434435
servers.next = nullptr;
435436
inet_pton(AF_INET, SwooleG.dns_server_host.c_str(), &servers.addr.addr4);
436437
servers.tcp_port = 0;
437438
servers.udp_port = SwooleG.dns_server_port;
438439
ares_set_servers_ports(ctx.channel, &servers);
440+
#elif (ARES_VERSION >= 0x010701)
441+
struct ares_addr_node servers;
442+
servers.family = AF_INET;
443+
servers.next = nullptr;
444+
inet_pton(AF_INET, SwooleG.dns_server_host.c_str(), &servers.addr.addr4);
445+
ares_set_servers(ctx.channel, &servers);
446+
if (dns_server_port != SW_DNS_SERVER_PORT) {
447+
swWarn("not support to set port of dns server");
448+
}
449+
#else
450+
swWarn("not support to set dns server");
451+
#endif
439452
}
440453

441454
ares_gethostbyname(

0 commit comments

Comments
 (0)