Test: Add connectivity check for DoHFFITest SmokeTest
The test will be skipped if there is no network connected and it
will connect to IPv4 or IPv6 server based on the connectivity.
Probe timeout and idle timeout are extended to 10 seconds.
So far, doh_ffi_test isn't in presubmit, so we need to specify
the test name (atest doh_ffi_test) to run it.
Bug: 237767883
Test: atest doh_ffi_test
Change-Id: I7d2977acc5c80cb960ce510a4d3bb53c9628d033
diff --git a/tests/doh_ffi_test.cpp b/tests/doh_ffi_test.cpp
index aa85446..f6c37bf 100644
--- a/tests/doh_ffi_test.cpp
+++ b/tests/doh_ffi_test.cpp
@@ -23,30 +23,79 @@
#include <resolv.h>
#include <NetdClient.h>
+#include <android-base/unique_fd.h>
#include <gmock/gmock-matchers.h>
#include <gtest/gtest.h>
#include <netdutils/NetNativeTestBase.h>
-static const char* GOOGLE_SERVER_IP = "8.8.8.8";
-static const int TIMEOUT_MS = 3000;
+constexpr char GOOGLE_SERVER_IP[] = "8.8.8.8";
+constexpr char GOOGLE_SERVER_IPV6[] = "2001:4860:4860::8888";
+static const int TIMEOUT_MS = 10000;
constexpr int MAXPACKET = (8 * 1024);
constexpr unsigned int MINIMAL_NET_ID = 100;
+using android::base::unique_fd;
+
+// TODO: Move to DoHFFITest class.
std::mutex m;
std::condition_variable cv;
unsigned int dnsNetId;
-class DoHFFITest : public NetNativeTestBase {};
+namespace {
+
+bool haveIpv4() {
+ const sockaddr_in server = {
+ .sin_family = AF_INET,
+ .sin_addr.s_addr = __constant_htonl(0x08080808L) // 8.8.8.8
+ };
+ unique_fd sock(socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP));
+ if (sock == -1) {
+ PLOG(INFO) << "Failed to create socket";
+ return false;
+ }
+ return connect(sock, reinterpret_cast<const sockaddr*>(&server), sizeof(server)) == 0;
+}
+
+bool haveIpv6() {
+ const sockaddr_in6 server = {
+ .sin6_family = AF_INET6,
+ .sin6_addr.s6_addr = {0x20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} // 2000::
+ };
+ unique_fd sock(socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP));
+ if (sock == -1) {
+ PLOG(INFO) << "Failed to create socket";
+ return false;
+ }
+ return connect(sock, reinterpret_cast<const sockaddr*>(&server), sizeof(server)) == 0;
+}
+
+} // namespace
+
+class DoHFFITest : public NetNativeTestBase {
+ public:
+ static void SetUpTestSuite() { doh_init_logger(DOH_LOG_LEVEL_DEBUG); }
+};
TEST_F(DoHFFITest, SmokeTest) {
getNetworkForDns(&dnsNetId);
- // To ensure that we have a real network.
- ASSERT_GE(dnsNetId, MINIMAL_NET_ID) << "No available networks";
+ if (dnsNetId < MINIMAL_NET_ID) {
+ GTEST_SKIP() << "No available networks";
+ }
+
+ LOG(INFO) << "dnsNetId: " << dnsNetId;
+
+ const bool have_ipv4 = haveIpv4();
+ const bool have_ipv6 = haveIpv6();
+ if (!have_ipv4 && !have_ipv6) {
+ GTEST_SKIP() << "No connectivity on network " << dnsNetId;
+ }
+
+ const static char* server_ip = have_ipv6 ? GOOGLE_SERVER_IPV6 : GOOGLE_SERVER_IP;
auto validation_cb = [](uint32_t netId, bool success, const char* ip_addr, const char* host) {
EXPECT_EQ(netId, dnsNetId);
EXPECT_TRUE(success);
- EXPECT_STREQ(ip_addr, GOOGLE_SERVER_IP);
+ EXPECT_STREQ(ip_addr, server_ip);
EXPECT_STREQ(host, "");
cv.notify_one();
};
@@ -63,11 +112,10 @@
.enable_early_data = true,
};
- // TODO: Use a local server instead of dns.google.
// sk_mark doesn't matter here because this test doesn't have permission to set sk_mark.
// The DNS packet would be sent via default network.
- EXPECT_EQ(doh_net_new(doh, dnsNetId, "https://dns.google/dns-query", /* domain */ "",
- GOOGLE_SERVER_IP, /* sk_mark */ 0, /* cert_path */ "", &flags),
+ EXPECT_EQ(doh_net_new(doh, dnsNetId, "https://dns.google/dns-query", /* domain */ "", server_ip,
+ /* sk_mark */ 0, /* cert_path */ "", &flags),
0);
{
std::unique_lock<std::mutex> lk(m);
diff --git a/tests/resolv_test_utils.h b/tests/resolv_test_utils.h
index fef81cc..99b436b 100644
--- a/tests/resolv_test_utils.h
+++ b/tests/resolv_test_utils.h
@@ -234,4 +234,4 @@
const struct addrinfo* hints);
void SetMdnsRoute();
-void RemoveMdnsRoute();
\ No newline at end of file
+void RemoveMdnsRoute();
