From f244d7ab4518a1119c624be453fc95e1344ed49d Mon Sep 17 00:00:00 2001 From: dgw Date: Mon, 10 Feb 2014 20:53:45 +0400 Subject: [PATCH 1/3] Add socket traffic stats to listsockets response Not yet added to Web interface though. --- modules/listsockets.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/listsockets.cpp b/modules/listsockets.cpp index 67a59075..8892e7fa 100644 --- a/modules/listsockets.cpp +++ b/modules/listsockets.cpp @@ -118,6 +118,7 @@ public: Row["SSL"] = pSocket->GetSSL() ? "Yes" : "No"; Row["Local"] = GetLocalHost(pSocket, true); Row["Remote"] = GetRemoteHost(pSocket, true); + // TODO: Traffic stats } return true; @@ -222,6 +223,8 @@ public: #endif Table.AddColumn("Local"); Table.AddColumn("Remote"); + Table.AddColumn("In"); + Table.AddColumn("Out"); while (!socks.empty()) { Csock* pSocket = socks.top().GetSock(); @@ -238,6 +241,8 @@ public: Table.SetCell("Local", GetLocalHost(pSocket, bShowHosts)); Table.SetCell("Remote", GetRemoteHost(pSocket, bShowHosts)); + Table.SetCell("In", CString::ToByteStr(pSocket->GetBytesRead())); + Table.SetCell("Out", CString::ToByteStr(pSocket->GetBytesWritten())); } PutModule(Table); From b98ae214b2d5864d6aeb74a153f31205e2fc9433 Mon Sep 17 00:00:00 2001 From: dgw Date: Mon, 10 Feb 2014 21:52:18 +0400 Subject: [PATCH 2/3] Add traffic stats to listsockets webadmin table Table is not displaying, however. Odd. --- modules/listsockets.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/listsockets.cpp b/modules/listsockets.cpp index 8892e7fa..93bb2177 100644 --- a/modules/listsockets.cpp +++ b/modules/listsockets.cpp @@ -118,7 +118,8 @@ public: Row["SSL"] = pSocket->GetSSL() ? "Yes" : "No"; Row["Local"] = GetLocalHost(pSocket, true); Row["Remote"] = GetRemoteHost(pSocket, true); - // TODO: Traffic stats + Row["In"] = CString::ToByteStr(pSocket->GetBytesRead()); + Row["Out"] = CString::ToByteStr(pSocket->GetBytesWritten()); } return true; From f33212b9021ab24339529fd2d644205a682d03f8 Mon Sep 17 00:00:00 2001 From: dgw Date: Mon, 10 Feb 2014 23:25:31 +0400 Subject: [PATCH 3/3] Add new columns to listsockets tmpl --- modules/data/listsockets/tmpl/index.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/data/listsockets/tmpl/index.tmpl b/modules/data/listsockets/tmpl/index.tmpl index 01c90822..12a030fc 100644 --- a/modules/data/listsockets/tmpl/index.tmpl +++ b/modules/data/listsockets/tmpl/index.tmpl @@ -9,6 +9,8 @@ SSL Local Remote + Data In + Data Out @@ -20,6 +22,8 @@ + +