Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 03:06:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added GUI to display authenticated tunnel info. Added counting of data sent/recvd.

Browse source
This commit is contained in:
csoler 2015-12-01 23:40:35 -05:00
parent 60d948b509
commit 81b196d38d
5 changed files with 100 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

61
retroshare-gui/src/gui/statistics/TurtleRouterDialog.cpp
View file

@ -1,6 +1,7 @@
#include <QObject>
#include <retroshare/rsturtle.h>
#include <retroshare/rspeers.h>
#include <retroshare/rsgxstunnel.h>
#include "TurtleRouterDialog.h"
#include <QPainter>
#include <QStylePainter>
@ -222,7 +223,7 @@ QTreeWidgetItem *TurtleRouterDialog::findParentHashItem(const std::string& hash)
GxsTunnelsDialog::GxsTunnelsDialog(QWidget *parent)
: RsAutoUpdatePage(2000,parent)
{
setupUi(this) ;
// setupUi(this) ;
m_bProcessSettings = false;
@ -230,7 +231,7 @@ GxsTunnelsDialog::GxsTunnelsDialog(QWidget *parent)
float fact = fontHeight/14.0;
maxWidth = 200 ;
maxHeight = 0 ;
maxHeight = 200 ;
// load settings
processSettings(true);
@ -262,36 +263,68 @@ void GxsTunnelsDialog::processSettings(bool bLoad)
void GxsTunnelsDialog::updateDisplay()
{
// Request info about ongoing tunnels
std::vector<RsGxsTunnelService::GxsTunnelInfo> tunnel_infos ;
rsGxsTunnel->getTunnelsInfo(tunnel_infos) ;
// // Tunnel information
//
// GxsTunnelId tunnel_id ; // GXS Id we're talking to
// RsGxsId destination_gxs_id ; // GXS Id we're talking to
// RsGxsId source_gxs_id ; // GXS Id we're using to talk
// uint32_t tunnel_status ; // active, requested, DH pending, etc.
// uint32_t total_size_sent ; // total bytes sent through that tunnel since openned (including management).
// uint32_t total_size_received ; // total bytes received through that tunnel since openned (including management).
// // Data packets
// uint32_t pending_data_packets; // number of packets not acknowledged by other side, still on their way. Should be 0 unless something bad happens.
// uint32_t total_data_packets_sent ; // total number of data packets sent (does not include tunnel management)
// uint32_t total_data_packets_received ; // total number of data packets received (does not include tunnel management)
// now draw the shit
QPixmap tmppixmap(maxWidth, maxHeight);
tmppixmap.fill(Qt::transparent);
setFixedHeight(maxHeight);
//setFixedHeight(maxHeight);
QPainter painter(&tmppixmap);
painter.initFrom(this);
// extracts the height of the fonts in pixels. This is used to callibrate the size of the objects to draw.
// extracts the height of the fonts in pixels. This is used to calibrate the size of the objects to draw.
float fontHeight = QFontMetricsF(font()).height();
float fact = fontHeight/14.0;
maxHeight = 500*fact ;
//maxHeight = 500*fact ;
int cellx = 6*fact ;
int celly = (10+4)*fact ;
int ox=5*fact,oy=5*fact ;
// std::cerr << "Drawing into pixmap of size " << maxWidth << "x" << maxHeight << std::endl;
// draw...
int ox=5*fact,oy=5*fact ;
// painter.setPen(QColor::fromRgb(70,70,70)) ;
// painter.drawLine(0,oy,maxWidth,oy) ;
// oy += celly ;
painter.setPen(QColor::fromRgb(0,0,0)) ;
painter.drawText(ox+2*cellx,oy+celly,tr("Authenticated tunnels:")) ; oy += celly ;
for(uint32_t i=0;i<tunnel_infos.size();++i)
{
// std::cerr << "Drawing into pixmap of size " << maxWidth << "x" << maxHeight << std::endl;
// draw...
painter.drawText(ox+4*cellx,oy+celly,tr("Tunnel ID: %1").arg(QString::fromStdString(tunnel_infos[i].tunnel_id.toStdString()))) ; oy += celly ;
painter.drawText(ox+6*cellx,oy+celly,tr("from: %1").arg(QString::fromStdString(tunnel_infos[i].source_gxs_id.toStdString()))) ; oy += celly ;
painter.drawText(ox+6*cellx,oy+celly,tr("to: %1").arg(QString::fromStdString(tunnel_infos[i].destination_gxs_id.toStdString()))) ; oy += celly ;
painter.drawText(ox+6*cellx,oy+celly,tr("status: %1").arg(QString::number(tunnel_infos[i].tunnel_status))) ; oy += celly ;
painter.drawText(ox+6*cellx,oy+celly,tr("total sent: %1 bytes").arg(QString::number(tunnel_infos[i].total_size_sent))) ; oy += celly ;
painter.drawText(ox+6*cellx,oy+celly,tr("total recv: %1 bytes").arg(QString::number(tunnel_infos[i].total_size_received))) ; oy += celly ;
// painter.drawLine(0,oy,maxWidth,oy) ;
// oy += celly ;
}
// update the pixmap
//
pixmap = tmppixmap;
maxHeight = oy ;
maxHeight = std::max(oy,10*celly);
}
QString GxsTunnelsDialog::getPeerName(const RsPeerId &peer_id)

3
retroshare-gui/src/gui/statistics/TurtleRouterDialog.h
View file

@ -3,6 +3,7 @@
#include <retroshare/rsturtle.h>
#include <retroshare/rstypes.h>
#include "ui_TurtleRouterDialog.h"
#include "ui_TurtleRouterStatistics.h"
#include "RsAutoUpdatePage.h"
@ -36,7 +37,7 @@ class TurtleRouterDialog: public RsAutoUpdatePage, public Ui::TurtleRouterDialog
} ;
class GxsTunnelsDialog: public RsAutoUpdatePage, public Ui::TurtleRouterDialogForm
class GxsTunnelsDialog: public RsAutoUpdatePage
{
Q_OBJECT