commit cbaa36b325a363bed6de3a8f4623d59908273ea1
author Hugo Benichi <hugobenichi@google.com> Wed Jan 17 12:11:43 2018 +0900
committer Hugo Benichi <hugobenichi@google.com> Wed Jan 17 12:56:43 2018 +0900
tree 30c8a4056e4a145324188eb7ee025031784fc41e
parent 7b314e1b017de35e7552d452aa5645029b39b199

Add Fwmark to TCP socket dumps interface

This allows TcpSocketMonitor to prints netid and mark values for all
sockets dumped.

Bug: 64147860
Test: manual tests with newly introduced commands
Change-Id: Id9ec716be5933615b2532dffb10267770e9ae101

server/TcpSocketMonitor.cpp

diff --git a/server/TcpSocketMonitor.cpp b/server/TcpSocketMonitor.cpp
index 3af7990..3eb8014 100644
--- a/server/TcpSocketMonitor.cpp
+++ b/server/TcpSocketMonitor.cpp
@@ -19,6 +19,7 @@
 #include "TcpSocketMonitor.h"
 #include "DumpWriter.h"
 
+#include "Fwmark.h"
 #include "SockDiag.h"
 
 #include <arpa/inet.h>
@@ -57,7 +58,7 @@
     }
 }
 
-static void tcpInfoPrint(DumpWriter &dw, const struct inet_diag_msg *sockinfo,
+static void tcpInfoPrint(DumpWriter &dw, Fwmark mark, const struct inet_diag_msg *sockinfo,
                          const struct tcp_info *tcpinfo) {
   char saddr[INET6_ADDRSTRLEN] = {};
   char daddr[INET6_ADDRSTRLEN] = {};
@@ -65,9 +66,11 @@
   inet_ntop(sockinfo->idiag_family, &(sockinfo->id.idiag_dst), daddr, sizeof(daddr));
 
   dw.println(
-      "uid=%u saddr=%s daddr=%s sport=%u dport=%u tcp_state=%s(%u) "
+      "netId=%d uid=%u mark=0x%x saddr=%s daddr=%s sport=%u dport=%u tcp_state=%s(%u) "
       "rqueue=%u wqueue=%u  rtt=%gms var_rtt=%gms rcv_rtt=%gms unacked=%u snd_cwnd=%u",
+      mark.netId,
       sockinfo->idiag_uid,
+      mark.intValue,
       saddr,
       daddr,
       ntohs(sockinfo->id.idiag_sport),
@@ -94,9 +97,9 @@
        return;
     }
 
-    const auto tcpInfoReader = [&dw](const struct inet_diag_msg *sockinfo,
+    const auto tcpInfoReader = [&dw](Fwmark mark, const struct inet_diag_msg *sockinfo,
                                      const struct tcp_info *tcpinfo) {
-        tcpInfoPrint(dw, sockinfo, tcpinfo);
+        tcpInfoPrint(dw, mark, sockinfo, tcpinfo);
     };
 
     if (int ret = sd.getLiveTcpInfos(tcpInfoReader)) {