commit 1c06f9c0d9fce33229da228868427ba58c9c0d60
author Maciej Żenczykowski <maze@google.com> Fri Mar 29 23:19:19 2019 -0700
committer Maciej Żenczykowski <maze@google.com> Sat Mar 30 02:20:04 2019 -0700
tree e8cd6e29e19d3a1751599c41fd775af9692eb3a9
parent c8c38aa8af2de90e34af4380944bb6476daf6964

ClatdController::ClatdTracker - rename 'dst' to 'pfx96'

Whether something is dst or src depends on direction,
but 96-bit prefix is always meaningful for clat translation.

Test: atest netd_unit_test
Bug: 65674744
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id7d2177d5282709db865b2a86e6c9b7cb6778e80

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index b5988c8..06e6d8c 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -195,12 +195,12 @@
     // Validate the prefix and strip off the prefix length.
     uint8_t family;
     uint8_t prefixLen;
-    int res = parsePrefix(nat64Prefix.c_str(), &family, &dst, sizeof(dst), &prefixLen);
+    int res = parsePrefix(nat64Prefix.c_str(), &family, &pfx96, sizeof(pfx96), &prefixLen);
     // clatd only supports /96 prefixes.
-    if (res != sizeof(dst)) return res;
+    if (res != sizeof(pfx96)) return res;
     if (family != AF_INET6) return -EAFNOSUPPORT;
     if (prefixLen != 96) return -EINVAL;
-    if (!inet_ntop(AF_INET6, &dst, dstString, sizeof(dstString))) return -errno;
+    if (!inet_ntop(AF_INET6, &pfx96, pfx96String, sizeof(pfx96String))) return -errno;
 
     // Pick an IPv4 address.
     // TODO: this picks the address based on other addresses that are assigned to interfaces, but
@@ -215,13 +215,13 @@
     if (!inet_ntop(AF_INET, &v4, v4Str, sizeof(v4Str))) return -errno;
 
     // Generate a checksum-neutral IID.
-    if (generateIpv6Address(iface, v4, dst, &v6)) {
-        ALOGE("Unable to find global source address on %s for %s", iface, dstString);
+    if (generateIpv6Address(iface, v4, pfx96, &v6)) {
+        ALOGE("Unable to find global source address on %s for %s", iface, pfx96String);
         return -EADDRNOTAVAIL;
     }
     if (!inet_ntop(AF_INET6, &v6, v6Str, sizeof(v6Str))) return -errno;
 
-    ALOGD("starting clatd on %s v4=%s v6=%s dst=%s", iface, v4Str, v6Str, dstString);
+    ALOGD("starting clatd on %s v4=%s v6=%s pfx96=%s", iface, v4Str, v6Str, pfx96String);
     return 0;
 }
 
@@ -247,7 +247,7 @@
                     (char*) "-i", tracker.iface,
                     (char*) "-n", tracker.netIdString,
                     (char*) "-m", tracker.fwmarkString,
-                    (char*) "-p", tracker.dstString,
+                    (char*) "-p", tracker.pfx96String,
                     (char*) "-4", tracker.v4Str,
                     (char*) "-6", tracker.v6Str,
                     nullptr};