external: android-clat: fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.
Bug: 139945549
Test: mm
Change-Id: I5d94739894a5882f571c1e0ddf069725f0c246e8
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
diff --git a/clatd_test.cpp b/clatd_test.cpp
index 9709890..f01f49d 100644
--- a/clatd_test.cpp
+++ b/clatd_test.cpp
@@ -563,8 +563,8 @@
static tun_data makeTunData() {
// Create some fake but realistic-looking sockets so update_clat_ipv6_address doesn't balk.
return {
- .write_fd6 = socket(AF_INET6, SOCK_RAW | SOCK_NONBLOCK, IPPROTO_RAW),
.read_fd6 = socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6)),
+ .write_fd6 = socket(AF_INET6, SOCK_RAW | SOCK_NONBLOCK, IPPROTO_RAW),
.fd4 = socket(AF_UNIX, SOCK_DGRAM, 0),
};
}
@@ -1092,8 +1092,8 @@
TEST_F(ClatdTest, Ipv6AddressChanged) {
// Configure the clat IPv6 address.
struct tun_data tunnel = {
- .write_fd6 = socket(AF_INET6, SOCK_RAW | SOCK_NONBLOCK, IPPROTO_RAW),
.read_fd6 = socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6)),
+ .write_fd6 = socket(AF_INET6, SOCK_RAW | SOCK_NONBLOCK, IPPROTO_RAW),
};
const char *ifname = sTun.name().c_str();
ASSERT_EQ(1, configure_clat_ipv6_address(&tunnel, ifname, nullptr));