diff options
| author | Maciej Żenczykowski <maze@google.com> | 2021-01-26 16:06:06 -0800 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2021-01-27 01:05:58 +0000 |
| commit | f5dc8f9e32a7c32e28252ecccc75d0b87d6f837c (patch) | |
| tree | ecd83128c0da2bd2505043fad50c71308e0ed3d6 /server/TetherController.cpp | |
| parent | 916636c858254f16de23315279030c6114d0a1f3 (diff) | |
merge Tether{Up,Down}stream6Value -> Tether6Value
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id7738586b6c57f2d14ec94d2eb03e1ac82a41338
Diffstat (limited to 'server/TetherController.cpp')
| -rw-r--r-- | server/TetherController.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server/TetherController.cpp b/server/TetherController.cpp index 334991a4..28b2cb57 100644 --- a/server/TetherController.cpp +++ b/server/TetherController.cpp @@ -888,7 +888,7 @@ Result<void> TetherController::addOffloadRule(const TetherOffloadRuleParcel& rul .neigh6 = *(const in6_addr*)rule.destination.data(), }; - TetherDownstream6Value value = { + Tether6Value value = { .oif = static_cast<uint32_t>(rule.outputInterfaceIndex), .macHeader = hdr, .pmtu = static_cast<uint16_t>(rule.pmtu), @@ -1277,8 +1277,8 @@ void TetherController::dumpBpf(DumpWriter& dw) { "BPF downstream ipv6 map: iif(iface) v6addr -> oif(iface) srcmac dstmac ethertype " "[pmtu]"); const auto printDownstream6Map = - [&dw](const TetherDownstream6Key& key, const TetherDownstream6Value& value, - const BpfMap<TetherDownstream6Key, TetherDownstream6Value>&) { + [&dw](const TetherDownstream6Key& key, const Tether6Value& value, + const BpfMap<TetherDownstream6Key, Tether6Value>&) { char addr[INET6_ADDRSTRLEN]; std::string src = l2ToString(value.macHeader.h_source, sizeof(value.macHeader.h_source)); @@ -1305,9 +1305,8 @@ void TetherController::dumpBpf(DumpWriter& dw) { dw.decIndent(); dw.println("BPF upstream ipv6 map: iif(iface) -> oif(iface) srcmac dstmac ethertype [pmtu]"); - const auto printUpstream6Map = [&dw](const TetherUpstream6Key& key, - const TetherUpstream6Value& value, - const BpfMap<TetherUpstream6Key, TetherUpstream6Value>&) { + const auto printUpstream6Map = [&dw](const TetherUpstream6Key& key, const Tether6Value& value, + const BpfMap<TetherUpstream6Key, Tether6Value>&) { std::string src = l2ToString(value.macHeader.h_source, sizeof(value.macHeader.h_source)); std::string dst = l2ToString(value.macHeader.h_dest, sizeof(value.macHeader.h_dest)); |