Merge commit 'refs/pull/488/head' of github.com:znc/znc

This commit is contained in:
Alexey Sokolov
2014-02-10 20:58:11 +00:00
2 changed files with 10 additions and 0 deletions
+4
View File
@@ -9,6 +9,8 @@
<td>SSL</td>
<td>Local</td>
<td>Remote</td>
<td>Data In</td>
<td>Data Out</td>
</tr>
</thead>
<tbody>
@@ -20,6 +22,8 @@
<td><? VAR SSL ?></td>
<td><? VAR Local ?></td>
<td><? VAR Remote ?></td>
<td><? VAR In ?></td>
<td><? VAR Out ?></td>
</tr>
<? ENDLOOP ?>
</tbody>
+6
View File
@@ -118,6 +118,8 @@ public:
Row["SSL"] = pSocket->GetSSL() ? "Yes" : "No";
Row["Local"] = GetLocalHost(pSocket, true);
Row["Remote"] = GetRemoteHost(pSocket, true);
Row["In"] = CString::ToByteStr(pSocket->GetBytesRead());
Row["Out"] = CString::ToByteStr(pSocket->GetBytesWritten());
}
return true;
@@ -222,6 +224,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 +242,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);