commit 8452f3f65229a25fb99da23019e732f4b169b566
author Maciej Żenczykowski <maze@google.com> Wed Jun 03 02:31:51 2020 +0000
committer Maciej Zenczykowski <maze@google.com> Thu Jun 04 09:52:08 2020 +0000
tree 04b595394e39ae6bcae22ac69242e906e5425161
parent 36f4665ab429bcb2a698cb49acf541f202747730

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>
Original-Change: https://android-review.googlesource.com/1322226
Merged-In: I67b70fe298f69ac51dfbc5daf4078b842fb62808
Change-Id: I67b70fe298f69ac51dfbc5daf4078b842fb62808

clatd_test.cpp

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 @@
     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, 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());