joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

clatd: remove ipv6 address monitoring

Browse source 
This code/logic is spurious, because the majority of packets
are translated by eBPF, so whether the daemon runs or not,
usually just doesn't matter - bpf will handle them anyway.

As such what we actually care about is that the daemon
is terminated at the same time as the bpf map configuration
is removed.  This is done by jni native code stopClatdProcess()
which is called from ClatCoordinator java code immediately
after maybeStopBpf().

Additionally on ipv6 address change we don't even terminate
the daemon - we simply stop the event loop, but still block
in main() until we receive SIGTERM/SIGKILL.

(This was done a while ago to fix a bunch of issues with
daemon dieing and being killed racing with each other)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I86d203a244838166ed1fbec1bc48a680e433f9fa
This commit is contained in:
Maciej Żenczykowski 2023-03-15 17:40:45 +00:00
commit ca9466c768
1 changed files with 1 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

53
clatd_test.cpp
View file

@ -33,7 +33,6 @@ extern "C" {
#include "checksum.h"
#include "clatd.h"
#include "config.h"
#include "getaddr.h"
#include "translate.h"
}
@ -836,55 +835,3 @@ TEST_F(ClatdTest, TranslateChecksumNeutral) {
check_translate_checksum_neutral(udp_ipv4, sizeof(udp_ipv4), sizeof(udp_ipv4) + 20,
"UDP/IPv4 -> UDP/IPv6 checksum neutral");
}
TEST_F(ClatdTest, GetInterfaceIpV4) {
TunInterface v4Iface;
ASSERT_EQ(0, v4Iface.init());
EXPECT_EQ(0, v4Iface.addAddress("192.0.2.1", 32));
union anyip *ip = getinterface_ip(v4Iface.name().c_str(), AF_INET);
ASSERT_NE(nullptr, ip);
EXPECT_EQ(inet_addr("192.0.2.1"), ip->ip4.s_addr);
free(ip);
v4Iface.destroy();
}
TEST_F(ClatdTest, GetInterfaceIpV6) {
union anyip *ip = getinterface_ip(sTun.name().c_str(), AF_INET6);
ASSERT_NE(nullptr, ip);
in6_addr expected = sTun.srcAddr();
in6_addr actual = ip->ip6;
expect_ipv6_addr_equal(&expected, &actual);
}
TEST_F(ClatdTest, Ipv6AddressChanged) {
// Configure the clat IPv6 address.
const char *ifname = sTun.name().c_str();
in6_addr myaddr = sTun.srcAddr();
gen_random_iid(&myaddr, &Global_Clatd_Config.ipv4_local_subnet, &Global_Clatd_Config.plat_subnet);
char addrstr[INET6_ADDRSTRLEN];
ASSERT_NE(nullptr, inet_ntop(AF_INET6, &myaddr, addrstr, sizeof(addrstr)));
Global_Clatd_Config.ipv6_local_subnet = myaddr;
EXPECT_EQ(0, ipv6_address_changed(ifname));
EXPECT_EQ(0, ipv6_address_changed(ifname));
// Change the IP address on the tun interface to a new prefix.
char srcaddr[INET6_ADDRSTRLEN];
char dstaddr[INET6_ADDRSTRLEN];
ASSERT_NE(nullptr, inet_ntop(AF_INET6, &sTun.srcAddr(), srcaddr, sizeof(srcaddr)));
ASSERT_NE(nullptr, inet_ntop(AF_INET6, &sTun.dstAddr(), dstaddr, sizeof(dstaddr)));
EXPECT_EQ(0, ifc_del_address(ifname, srcaddr, 64));
EXPECT_EQ(0, ifc_del_address(ifname, dstaddr, 64));
// Check that we can tell that the address has changed.
EXPECT_EQ(0, ifc_add_address(ifname, "2001:db8::1:2", 64));
EXPECT_EQ(1, ipv6_address_changed(ifname));
EXPECT_EQ(1, ipv6_address_changed(ifname));
// Restore the tun interface configuration.
sTun.destroy();
ASSERT_EQ(0, sTun.init());
}