0094f618d3
-------------------------- - AbstractProtocol Constructor and Factory function now take an optional (default NULL) "parent" abstract protocol in addition to the stream; this "parent" protocol is non-NULL for protocols which are aggregated in a ComboProtocol - All subclasses of AbstractProtocol modified as per the above interface change - ProtocolManager also modifed as per the above interface change - new data members in AbstractProtocol - prev, next; the AbstractProtocol implementation now uses these members to traverse protocols on the list instead of ProtocolListIterator; this change required for ComboProtocol - ProtocolListIterator updates these new members - prev/next on insert/remove/replace - ComboProtocol and ProtocolListIterator classes made friends of AbstractProtocol - ComboProtocol implemented as a template class (completed) - Dot2LLc implemented as a combo of Dot3Raw and LLC - Dot2Snap implemented as a combo of Dot2Llc and SNAP - VlanStack implemented as a combo of VLAN + VLAN - ProtocolManager now uses the ProtocolId enums rather than hardcoded values Stream Config Dialog -------------------- - "None" radio button added to all protocol levels - Protocol Level 1 added with 'mac' as the only valid protocol in the "simple" mode widget - With Dot2Llc, Dot2Snap and VlanStack implemented as "combo" protocols, the protocol choice radiobuttons in the "simple" mode are now 1:1 with a protocol; this has the following implications/advantages: - Updates of the "simple" mode widget from/to stream's protocolList is simpler; this code has now been rewritten to take advantage of 1:1 - This paves the way for exporting tunneled protocols 4over4, 4over6, 6over4 etc. in the "simple" mode - This should also (hopefully) require less changes when adding a new protocol; more work needs to be done to reach this goal Fixes ----- - Dot3Protocol now derives "length" correctly for VLAN tagged packets - StreamBase now uses the ProtocolListIterator to append the default protocols in a stream instead of directly manipulating ProtocolList; also in protoDataCopyFrom() Others (Client/Server) ---------------------- - Port Packet Capture implemented; "view capture" is pending (hack put in place now for testing)
162 lines
3.9 KiB
C++
162 lines
3.9 KiB
C++
|
|
#include "portstatswindow.h"
|
|
#include "portstatsmodel.h"
|
|
#include "portstatsfilterdialog.h"
|
|
|
|
#include "QHeaderView"
|
|
|
|
PortStatsWindow::PortStatsWindow(PortGroupList *pgl, QWidget *parent)
|
|
: QWidget(parent)
|
|
{
|
|
setupUi(this);
|
|
|
|
this->pgl = pgl;
|
|
model = pgl->getPortStatsModel();
|
|
tvPortStats->setModel(model);
|
|
|
|
tvPortStats->verticalHeader()->setHighlightSections(false);
|
|
tvPortStats->verticalHeader()->setDefaultSectionSize(
|
|
tvPortStats->verticalHeader()->minimumSectionSize());
|
|
|
|
}
|
|
|
|
PortStatsWindow::~PortStatsWindow()
|
|
{
|
|
}
|
|
|
|
/* ------------- SLOTS -------------- */
|
|
|
|
void PortStatsWindow::on_tbStartTransmit_clicked()
|
|
{
|
|
QList<PortStatsModel::PortGroupAndPortList> pgpl;
|
|
|
|
// Get selected ports
|
|
model->portListFromIndex(tvPortStats->selectionModel()->selectedColumns(),
|
|
pgpl);
|
|
|
|
// Clear selected ports, portgroup by portgroup
|
|
for (int i = 0; i < pgpl.size(); i++)
|
|
{
|
|
pgl->portGroupByIndex(pgpl.at(i).portGroupId).
|
|
startTx(&pgpl[i].portList);
|
|
}
|
|
}
|
|
|
|
void PortStatsWindow::on_tbStopTransmit_clicked()
|
|
{
|
|
QList<PortStatsModel::PortGroupAndPortList> pgpl;
|
|
|
|
// Get selected ports
|
|
model->portListFromIndex(tvPortStats->selectionModel()->selectedColumns(),
|
|
pgpl);
|
|
|
|
// Clear selected ports, portgroup by portgroup
|
|
for (int i = 0; i < pgpl.size(); i++)
|
|
{
|
|
pgl->portGroupByIndex(pgpl.at(i).portGroupId).
|
|
stopTx(&pgpl[i].portList);
|
|
}
|
|
}
|
|
|
|
void PortStatsWindow::on_tbStartCapture_clicked()
|
|
{
|
|
// TODO(MED)
|
|
QList<PortStatsModel::PortGroupAndPortList> pgpl;
|
|
|
|
// Get selected ports
|
|
model->portListFromIndex(tvPortStats->selectionModel()->selectedColumns(),
|
|
pgpl);
|
|
|
|
// Clear selected ports, portgroup by portgroup
|
|
for (int i = 0; i < pgpl.size(); i++)
|
|
{
|
|
pgl->portGroupByIndex(pgpl.at(i).portGroupId).
|
|
startCapture(&pgpl[i].portList);
|
|
}
|
|
}
|
|
|
|
void PortStatsWindow::on_tbStopCapture_clicked()
|
|
{
|
|
// TODO(MED)
|
|
QList<PortStatsModel::PortGroupAndPortList> pgpl;
|
|
|
|
// Get selected ports
|
|
model->portListFromIndex(tvPortStats->selectionModel()->selectedColumns(),
|
|
pgpl);
|
|
|
|
// Clear selected ports, portgroup by portgroup
|
|
for (int i = 0; i < pgpl.size(); i++)
|
|
{
|
|
pgl->portGroupByIndex(pgpl.at(i).portGroupId).
|
|
stopCapture(&pgpl[i].portList);
|
|
}
|
|
}
|
|
|
|
void PortStatsWindow::on_tbViewCapture_clicked()
|
|
{
|
|
// TODO(MED)
|
|
QList<PortStatsModel::PortGroupAndPortList> pgpl;
|
|
|
|
// Get selected ports
|
|
model->portListFromIndex(tvPortStats->selectionModel()->selectedColumns(),
|
|
pgpl);
|
|
|
|
// Clear selected ports, portgroup by portgroup
|
|
for (int i = 0; i < pgpl.size(); i++)
|
|
{
|
|
pgl->portGroupByIndex(pgpl.at(i).portGroupId).
|
|
viewCapture(&pgpl[i].portList);
|
|
}
|
|
}
|
|
|
|
void PortStatsWindow::on_tbClear_clicked()
|
|
{
|
|
QList<PortStatsModel::PortGroupAndPortList> portList;
|
|
|
|
// Get selected ports
|
|
model->portListFromIndex(tvPortStats->selectionModel()->selectedColumns(),
|
|
portList);
|
|
|
|
// Clear selected ports, portgroup by portgroup
|
|
for (int i = 0; i < portList.size(); i++)
|
|
{
|
|
pgl->portGroupByIndex(portList.at(i).portGroupId).
|
|
clearPortStats(&portList[i].portList);
|
|
}
|
|
}
|
|
|
|
void PortStatsWindow::on_tbClearAll_clicked()
|
|
{
|
|
for (int i = 0; i < pgl->numPortGroups(); i++)
|
|
{
|
|
pgl->portGroupByIndex(0).clearPortStats();
|
|
}
|
|
}
|
|
|
|
void PortStatsWindow::on_tbFilter_clicked()
|
|
{
|
|
bool ok;
|
|
QList<uint> currentColumns, newColumns;
|
|
PortStatsFilterDialog dialog;
|
|
|
|
for(int i = 0; i < model->columnCount(); i++)
|
|
if (!tvPortStats->isColumnHidden(i))
|
|
currentColumns.append(i);
|
|
|
|
newColumns = dialog.getItemList(&ok, model, Qt::Horizontal, currentColumns);
|
|
|
|
if (ok)
|
|
{
|
|
// hide/show sections first ...
|
|
for(int i = 0; i < model->columnCount(); i++)
|
|
tvPortStats->setColumnHidden(i, !newColumns.contains(i));
|
|
|
|
// ... then for the 'shown' columns, set the visual index
|
|
for(int i = 0; i < newColumns.size(); i++)
|
|
{
|
|
tvPortStats->horizontalHeader()->moveSection(tvPortStats->
|
|
horizontalHeader()->visualIndex(newColumns.at(i)), i);
|
|
}
|
|
}
|
|
}
|