diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-13 09:12:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-13 09:12:28 +0000 |
| commit | 77a055372ea8cab07e3fa761be76989a5b2a81be (patch) | |
| tree | 1ccf032457b1e164e6db6765ad9413a46c1bc2ba /server/TetherController.cpp | |
| parent | 28ad77b1acced85f9aa38e797587b519acbb387c (diff) | |
| parent | e9d5ed23c6d0cea361b261266712faadd500c868 (diff) | |
Merge "TetherController - use %u not %d for uint32_t formatting"
Diffstat (limited to 'server/TetherController.cpp')
| -rw-r--r-- | server/TetherController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/TetherController.cpp b/server/TetherController.cpp index dd8622bb..09eb1ecb 100644 --- a/server/TetherController.cpp +++ b/server/TetherController.cpp @@ -1142,7 +1142,7 @@ void TetherController::dumpBpf(DumpWriter& dw) { std::string dst = l2ToString(value.macHeader.h_dest, sizeof(value.macHeader.h_dest)); inet_ntop(AF_INET6, &key.neigh6, addr, sizeof(addr)); - dw.println("%d %s -> %d %s %s %04x", key.iif, addr, value.oif, src.c_str(), dst.c_str(), + dw.println("%u %s -> %u %s %s %04x", key.iif, addr, value.oif, src.c_str(), dst.c_str(), ntohs(value.macHeader.h_proto)); return Result<void>(); @@ -1158,7 +1158,7 @@ void TetherController::dumpBpf(DumpWriter& dw) { dw.println("BPF stats (downlink): iif -> packets bytes errors"); const auto printStatsMap = [&dw](const uint32_t& key, const TetherStatsValue& value, const BpfMap<uint32_t, TetherStatsValue>&) { - dw.println("%d -> %" PRIu64 " %" PRIu64 " %" PRIu64, key, value.rxPackets, value.rxBytes, + dw.println("%u -> %" PRIu64 " %" PRIu64 " %" PRIu64, key, value.rxPackets, value.rxBytes, value.rxErrors); return Result<void>(); |