commit 97ec1d8ebb2e8efc7cba6fb1d66c6f80bf2c3faa
author Maciej Żenczykowski <maze@google.com> Tue Dec 17 12:11:21 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Tue Dec 17 16:03:18 2019 -0800
tree 221aa60e2d3ab751bb9c1fcf86d1031f4c1ad4bc
parent 1ca9592c36ec924fcc0352182309beefbb078862

ClatdController - add oifIsEthernet field to struct ClatEgressValue

Afterwards on a phone with both cellular and wifi ipv6 only connectivity:

$ adb shell dumpsys netd | sed -rn '/^  ClatdController$/,/^$/p'

  ClatdController
    Trackers: iif[iface] nat64Prefix v6Addr -> v4Addr v4iif[v4iface] [netId]
      11[rmnet_data1] 2607:7700:0:1c:0:1::/96 2607:fb90:271f:f614:2732:a1bf:4c29:cef8 -> 192.0.0.4 33[v4-rmnet_data1] [101]
      30[wlan0] 64:ff9b::/96 2401:fa00:480:13d:9ba4:e8a9:1e01:f9f6 -> 192.0.0.5 34[v4-wlan0] [100]
    BPF ingress map: iif(iface) nat64Prefix v6Addr -> v4Addr oif(iface)
      30(wlan0) 64:ff9b::/96 2401:fa00:480:13d:9ba4:e8a9:1e01:f9f6 -> 192.0.0.5 34(v4-wlan0)
      11(rmnet_data1) 2607:7700:0:1c:0:1::/96 2607:fb90:271f:f614:2732:a1bf:4c29:cef8 -> 192.0.0.4 33(v4-rmnet_data1)
    BPF egress map: iif(iface) v4Addr -> v6Addr nat64Prefix oif(iface)
      34(v4-wlan0) 192.0.0.5 -> 2401:fa00:480:13d:9ba4:e8a9:1e01:f9f6 64:ff9b::/96 30(wlan0) ether
      33(v4-rmnet_data1) 192.0.0.4 -> 2607:fb90:271f:f614:2732:a1bf:4c29:cef8 2607:7700:0:1c:0:1::/96 11(rmnet_data1) rawip

Test: compiles, atest, flashed to phone on wifi/cellular ipv6 only
      network and observed dumpsys netd printout
Bug: 139396664
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I98ec30cd2fd282997aadc4582f472a224a02c607

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 379e857..cc34b65 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -307,6 +307,7 @@
             .oif = tracker.ifIndex,
             .local6 = tracker.v6,
             .pfx96 = tracker.pfx96,
+            .oifIsEthernet = isEthernet,
     };
 
     auto ret = mClatEgressMap.writeValue(txKey, txValue, BPF_ANY);
@@ -681,8 +682,8 @@
         inet_ntop(AF_INET6, &value.pfx96, pfx96Str, sizeof(pfx96Str));
         if_indextoname(value.oif, oifStr);
 
-        dw.println("%u(%s) %s -> %s %s/96 %u(%s)", key.iif, iifStr, local4Str, local6Str, pfx96Str,
-                   value.oif, oifStr);
+        dw.println("%u(%s) %s -> %s %s/96 %u(%s) %s", key.iif, iifStr, local4Str, local6Str,
+                   pfx96Str, value.oif, oifStr, value.oifIsEthernet ? "ether" : "rawip");
         return netdutils::status::ok;
     };
     auto res = configMap.iterateWithValue(printClatMap);