summaryrefslogtreecommitdiffstats
path: root/clatd_test.cpp
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-06-02 01:41:54 -0700
committerMaciej Żenczykowski <maze@google.com>2020-06-02 15:56:28 -0700
commitba667df1c1f52c77c8bfefa55957c7e270b6e842 (patch)
tree78403ff0b4e610944bcedce389485e4e759d58c2 /clatd_test.cpp
parent98864456ede004f9877e3c46f471390b1442dd2f (diff)
downloadplatform_external_android-clat-ba667df1c1f52c77c8bfefa55957c7e270b6e842.tar.gz
platform_external_android-clat-ba667df1c1f52c77c8bfefa55957c7e270b6e842.tar.bz2
platform_external_android-clat-ba667df1c1f52c77c8bfefa55957c7e270b6e842.zip
cleanup - read_config() and ipv4_local_prefixlen
Test: git grep 'read_config|ipv4_local_prefixlen|default_pdp_interface' comes up empty Bug: 144730808 Test: atest clatd_test netd_integration_test Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I67b70fe298f69ac51dfbc5daf4078b842fb62808
Diffstat (limited to 'clatd_test.cpp')
-rw-r--r--clatd_test.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/clatd_test.cpp b/clatd_test.cpp
index e24b036..514aaa8 100644
--- a/clatd_test.cpp
+++ b/clatd_test.cpp
@@ -585,7 +585,7 @@ class ClatdTest : public ::testing::Test {
inet_pton(AF_INET, kIPv4LocalAddr, &Global_Clatd_Config.ipv4_local_subnet);
inet_pton(AF_INET6, kIPv6PlatSubnet, &Global_Clatd_Config.plat_subnet);
memset(&Global_Clatd_Config.ipv6_local_subnet, 0, sizeof(in6_addr));
- Global_Clatd_Config.default_pdp_interface = const_cast<char *>(sTun.name().c_str());
+ Global_Clatd_Config.native_ipv6_interface = const_cast<char *>(sTun.name().c_str());
}
// Static because setting up the tun interface takes about 40ms.
@@ -631,8 +631,6 @@ TEST_F(ClatdTest, DetectMtu) {
}
TEST_F(ClatdTest, ConfigureTunIpManual) {
- Global_Clatd_Config.ipv4_local_prefixlen = 29;
-
// Create an interface for configure_tun_ip to configure and bring up.
TunInterface v4Iface;
ASSERT_EQ(0, v4Iface.init());