Optimize DNS API, Optimize core-tests code

matyhtf · matyhtf · commit d780f307342c · 2021-07-13T17:09:59.000+08:00
diff --git a/core-tests/src/coroutine/async.cpp b/core-tests/src/coroutine/async.cpp
@@ -55,7 +55,7 @@ TEST(coroutine_async, gethostbyname) {
 
 TEST(coroutine_async, error) {
     coroutine::run([](void *arg) {
-        int retval;
+        int retval = 0x7009501;
         const char *test_file = "/tmp/swoole_core_test_file_not_exists";
         swoole::coroutine::async([&](void) { retval = open(test_file, O_RDONLY); }, -1);
         ASSERT_EQ(retval, -1);
diff --git a/core-tests/src/network/dns.cpp b/core-tests/src/network/dns.cpp
@@ -90,3 +90,10 @@ TEST(dns, getaddrinfo) {
         ASSERT_TRUE(swoole::network::Address::verify_ip(AF_INET, ip));
     }
 }
+
+TEST(dns, load_resolv_conf) {
+    ASSERT_TRUE(swoole_load_resolv_conf());
+    auto dns_server = swoole_get_dns_server();
+    ASSERT_FALSE(dns_server.first.empty());
+    ASSERT_NE(dns_server.second, 0);
+}
diff --git a/include/swoole.h b/include/swoole.h
@@ -700,6 +700,8 @@ SW_API void swoole_throw_error(int code);
 SW_API void swoole_set_log_level(int level);
 SW_API void swoole_set_trace_flags(int flags);
 SW_API void swoole_set_dns_server(const std::string server);
+SW_API std::pair<std::string, int> swoole_get_dns_server();
+SW_API bool swoole_load_resolv_conf();
 
 //-----------------------------------------------
 static sw_inline void sw_spinlock(sw_atomic_t *lock) {
diff --git a/include/swoole_config.h b/include/swoole_config.h
@@ -191,7 +191,6 @@
 
 #define SW_DNS_HOST_BUFFER_SIZE 16
 #define SW_DNS_SERVER_PORT 53
-#define SW_DNS_DEFAULT_SERVER "8.8.8.8"
 #define SW_DNS_RESOLV_CONF "/etc/resolv.conf"
 
 #define SW_Z_BEST_SPEED 1
diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -24,7 +24,7 @@
 #define SWOOLE_EXTRA_VERSION "dev"
 #define SWOOLE_VERSION "4.7.0-dev"
 #define SWOOLE_VERSION_ID 40700
-#define SWOOLE_API_VERSION_ID 0x202012a
+#define SWOOLE_API_VERSION_ID 0x202107a
 
 #define SWOOLE_BUG_REPORT                                                                                              \
     "A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"                                                \
diff --git a/src/core/base.cc b/src/core/base.cc
@@ -262,6 +262,18 @@ SW_API void swoole_set_dns_server(const std::string server) {
     SwooleG.dns_server_port = dns_server_port;
 }
 
+SW_API std::pair<std::string, int> swoole_get_dns_server() {
+    std::pair<std::string, int> result;
+    if (SwooleG.dns_server_host.empty()) {
+        result.first = "";
+        result.second = 0;
+    } else {
+        result.first = SwooleG.dns_server_host;
+        result.second = SwooleG.dns_server_port;
+    }
+    return result;
+}
+
 bool swoole_set_task_tmpdir(const std::string &dir) {
     if (dir.at(0) != '/') {
         swWarn("wrong absolute path '%s'", dir.c_str());
diff --git a/src/network/dns.cc b/src/network/dns.cc
@@ -25,7 +25,31 @@
 #include <ares.h>
 #endif
 
-#define SW_DNS_SERVER_NUM 2
+bool swoole_load_resolv_conf() {
+    FILE *fp;
+    char line[100];
+    char buf[16] = {};
+
+    if ((fp = fopen(SwooleG.dns_resolvconf_path.c_str(), "rt")) == nullptr) {
+        swSysWarn("fopen(%s) failed", SwooleG.dns_resolvconf_path.c_str());
+        return false;
+    }
+
+    while (fgets(line, 100, fp)) {
+        if (strncmp(line, "nameserver", 10) == 0) {
+            strcpy(buf, strtok(line, " "));
+            strcpy(buf, strtok(nullptr, "\n"));
+            break;
+        }
+    }
+    fclose(fp);
+
+    if (strlen(buf) == 0) {
+        return false;
+    }
+    swoole_set_dns_server(buf);
+    return true;
+}
 
 namespace swoole {
 namespace coroutine {
@@ -77,37 +101,8 @@ static uint16_t dns_request_id = 1;
 
 static int domain_encode(const char *src, int n, char *dest);
 static void domain_decode(char *str);
-static int get_dns_server();
 static std::string parse_ip_address(void *vaddr, int type);
 
-static int get_dns_server() {
-    FILE *fp;
-    char line[100];
-    char buf[16] = {};
-
-    if ((fp = fopen(SwooleG.dns_resolvconf_path.c_str(), "rt")) == nullptr) {
-        swSysWarn("fopen(%s) failed", SwooleG.dns_resolvconf_path.c_str());
-        return SW_ERR;
-    }
-
-    while (fgets(line, 100, fp)) {
-        if (strncmp(line, "nameserver", 10) == 0) {
-            strcpy(buf, strtok(line, " "));
-            strcpy(buf, strtok(nullptr, "\n"));
-            break;
-        }
-    }
-    fclose(fp);
-
-    if (strlen(buf) == 0) {
-        swoole_set_dns_server(SW_DNS_DEFAULT_SERVER);
-    } else {
-        swoole_set_dns_server(buf);
-    }
-
-    return SW_OK;
-}
-
 static std::string parse_ip_address(void *vaddr, int type) {
     auto addr = reinterpret_cast<unsigned char *>(vaddr);
     std::string ip_addr;
@@ -138,11 +133,9 @@ std::vector<std::string> dns_lookup_impl_with_socket(const char *domain, int fam
     int steps = 0;
     std::vector<std::string> result;
 
-    if (SwooleG.dns_server_host.empty()) {
-        if (get_dns_server() < 0) {
-            swoole_set_last_error(SW_ERROR_DNSLOOKUP_NO_SERVER);
-            return result;
-        }
+    if (SwooleG.dns_server_host.empty() && !swoole_load_resolv_conf()) {
+        swoole_set_last_error(SW_ERROR_DNSLOOKUP_NO_SERVER);
+        return result;
     }
 
     header = (RecordHeader *) packet;

Original file line number	Diff line number	Diff line change
`@@ -90,3 +90,10 @@ TEST(dns, getaddrinfo) {`
`90`	`90`	`ASSERT_TRUE(swoole::network::Address::verify_ip(AF_INET, ip));`
`91`	`91`	`}`
`92`	`92`	`}`
	`93`	`+`
	`94`	`+TEST(dns, load_resolv_conf) {`
	`95`	`+ ASSERT_TRUE(swoole_load_resolv_conf());`
	`96`	`+ auto dns_server = swoole_get_dns_server();`
	`97`	`+ ASSERT_FALSE(dns_server.first.empty());`
	`98`	`+ ASSERT_NE(dns_server.second, 0);`
	`99`	`+}`