aaa

Author: pymumu

Diff for: test/cases/test-ping.cc

@@ -54,6 +54,13 @@ TEST_F(Ping, icmp)
 {
 	struct ping_host_struct *ping_host;
 	int count = 0;
+	
+	if (smartdns::IsICMPAvailable() == false) {
+		tlog(TLOG_INFO, "ICMP is not available, skip this test.");
+		GTEST_SKIP();
+		return;
+	}
+
 	ping_host = fast_ping_start(PING_TYPE_ICMP, "127.0.0.1", 1, 1, 200, ping_result_callback, &count);
 	ASSERT_NE(ping_host, nullptr);
 	usleep(10000);

Diff for: test/cases/test-speed-check.cc

@@ -55,7 +55,9 @@ domain-rules /a.com/ -r fastest-response
 	std::cout << client.GetResult() << std::endl;
 	ASSERT_EQ(client.GetAnswerNum(), 1);
 	EXPECT_EQ(client.GetStatus(), "NOERROR");
-	EXPECT_GT(client.GetQueryTime(), 100);
+	if (smartdns::IsICMPAvailable()) {
+		EXPECT_GT(client.GetQueryTime(), 100);
+	}
 	EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
 	EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
 
@@ -131,7 +133,10 @@ domain-rules /a.com/ -c none
 	std::cout << client.GetResult() << std::endl;
 	ASSERT_EQ(client.GetAnswerNum(), 1);
 	EXPECT_EQ(client.GetStatus(), "NOERROR");
-	EXPECT_GT(client.GetQueryTime(), 200);
+	if (smartdns::IsICMPAvailable()) {
+		EXPECT_GT(client.GetQueryTime(), 200);
+	}
+
 	EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
 	EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
 

Diff for: test/include/utils.h

@@ -109,5 +109,7 @@ int ParserArg(const std::string &cmd, std::vector<std::string> &args);
 
 std::vector<std::string> GetAvailableIPAddresses();
 
+bool IsICMPAvailable();
+
 } // namespace smartdns
 #endif // _SMARTDNS_TEST_UTILS_

Diff for: test/server.cc

@@ -325,21 +325,6 @@ void Server::StartPost(void *arg)
 		fast_ping_fake_ip_add(it.type, it.host.c_str(), it.ttl, it.time);
 	}
 
-	int fd = -1;
-	if (has_unprivileged_ping()) {
-		fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
-	} else {
-		fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
-	}
-
-	if (fd > 0) {
-		close(fd);
-	} else {
-		fast_ping_fake_ip_add(PING_TYPE_ICMP, "127.0.0.1", 64, 10);
-		fast_ping_fake_ip_add(PING_TYPE_TCP, "127.0.0.1:80", 64, 10);
-		fast_ping_fake_ip_add(PING_TYPE_TCP, "127.0.0.1:443", 64, 10);
-	}
-
 	tlog(TLOG_ERROR, "add mock ping %d\n", has_ipv6);
 	if (has_ipv6 == true) {
 		fast_ping_fake_ip_add(PING_TYPE_ICMP, "2001::", 64, 10);

Diff for: test/utils.cc

@@ -1,4 +1,5 @@
 #include "include/utils.h"
+#include "util.h"
 #include <arpa/inet.h>
 #include <ifaddrs.h>
 #include <netinet/in.h>
@@ -305,4 +306,22 @@ std::vector<std::string> GetAvailableIPAddresses()
 	return ipAddresses;
 }
 
+bool IsICMPAvailable()
+{
+	int fd = -1;
+	if (has_unprivileged_ping()) {
+		fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
+	} else {
+		fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+	}
+
+	if (fd < 0) {
+		return false;
+	}
+
+	close(fd);
+
+	return true;
+}
+
 } // namespace smartdns