2581562ec5
- Queued RPC calls would cause crashes due to invalid pointers to request/response and/or controller; this has been fixed
- PbRpcController now takes ownership of request and response messages and
will delete them when it itself is being deleted
- This design mandates that request and response messages for each RPC call
have to be allocated on the heap.
- The convention for the Closure 'done' call now is to allocate and pass a
pointer to the controller object to it which will delete it after use;
this requires that controller itself be also allocated on the heap
(NOTE: this is just a convention - not mandatory)
- All existing RPC calls (in portgroup.cpp) have been changed to follow the
above convention
- Reordering of queued RPC calls has been fixed
- PortManager is now destroyed at exit; because of this fix the per port temporary capture files are auto-removed at exit
- WinPcapPort destructor no longer deletes the monitor threads because the parent class PcapPort already does it
- Capture does not automatically (and incorrectly) stop after one packet if started immediately after a View Capture operation
- User is prompted to stop transmit on a port first if he tries to apply configuration changes on a port in 'transmit' state
110 lines
2.9 KiB
C++
110 lines
2.9 KiB
C++
#include "portgrouplist.h"
|
|
|
|
// TODO(LOW): Remove
|
|
#include <modeltest.h>
|
|
|
|
PortGroupList::PortGroupList()
|
|
: mPortGroupListModel(this),
|
|
mStreamListModel(this),
|
|
mPortStatsModel(this, this)
|
|
{
|
|
PortGroup *pg;
|
|
|
|
// TODO(LOW): Remove
|
|
streamModelTester_ = new ModelTest(getStreamModel());
|
|
portModelTester_ = new ModelTest(getPortModel());
|
|
portStatsModelTester_ = new ModelTest(getPortStatsModel());
|
|
|
|
// Add the "Local" Port Group
|
|
pg = new PortGroup;
|
|
addPortGroup(*pg);
|
|
}
|
|
|
|
PortGroupList::~PortGroupList()
|
|
{
|
|
delete portStatsModelTester_;
|
|
delete portModelTester_;
|
|
delete streamModelTester_;
|
|
|
|
while (!mPortGroups.isEmpty())
|
|
delete mPortGroups.takeFirst();
|
|
|
|
}
|
|
|
|
bool PortGroupList::isPortGroup(const QModelIndex& index)
|
|
{
|
|
return mPortGroupListModel.isPortGroup(index);
|
|
}
|
|
|
|
bool PortGroupList::isPort(const QModelIndex& index)
|
|
{
|
|
return mPortGroupListModel.isPort(index);
|
|
}
|
|
|
|
PortGroup& PortGroupList::portGroup(const QModelIndex& index)
|
|
{
|
|
Q_ASSERT(mPortGroupListModel.isPortGroup(index));
|
|
|
|
return *(mPortGroups[index.row()]);
|
|
}
|
|
|
|
Port& PortGroupList::port(const QModelIndex& index)
|
|
{
|
|
Q_ASSERT(mPortGroupListModel.isPort(index));
|
|
return (*mPortGroups.at(index.parent().row())->mPorts[index.row()]);
|
|
}
|
|
|
|
void PortGroupList::addPortGroup(PortGroup &portGroup)
|
|
{
|
|
mPortGroupListModel.portGroupAboutToBeAppended();
|
|
|
|
connect(&portGroup, SIGNAL(portGroupDataChanged(int, int)),
|
|
&mPortGroupListModel, SLOT(when_portGroupDataChanged(int, int)));
|
|
#if 0
|
|
connect(&portGroup, SIGNAL(portListAboutToBeChanged(quint32)),
|
|
&mPortGroupListModel, SLOT(triggerLayoutAboutToBeChanged()));
|
|
connect(&portGroup, SIGNAL(portListChanged(quint32)),
|
|
&mPortGroupListModel, SLOT(triggerLayoutChanged()));
|
|
#endif
|
|
connect(&portGroup, SIGNAL(portListChanged(quint32)),
|
|
&mPortGroupListModel, SLOT(when_portListChanged()));
|
|
|
|
connect(&portGroup, SIGNAL(portListChanged(quint32)),
|
|
&mPortStatsModel, SLOT(when_portListChanged()));
|
|
|
|
connect(&portGroup, SIGNAL(statsChanged(quint32)),
|
|
&mPortStatsModel, SLOT(when_portGroup_stats_update(quint32)));
|
|
|
|
mPortGroups.append(&portGroup);
|
|
portGroup.connectToHost();
|
|
|
|
mPortGroupListModel.portGroupAppended();
|
|
|
|
mPortStatsModel.when_portListChanged();
|
|
}
|
|
|
|
void PortGroupList::removePortGroup(PortGroup &portGroup)
|
|
{
|
|
mPortGroupListModel.portGroupAboutToBeRemoved(&portGroup);
|
|
|
|
PortGroup* pg = mPortGroups.takeAt(mPortGroups.indexOf(&portGroup));
|
|
qDebug("after takeAt()");
|
|
mPortGroupListModel.portGroupRemoved();
|
|
|
|
delete pg;
|
|
|
|
mPortStatsModel.when_portListChanged();
|
|
}
|
|
|
|
//....................
|
|
// Private Methods
|
|
//....................
|
|
int PortGroupList::indexOfPortGroup(quint32 portGroupId)
|
|
{
|
|
for (int i = 0; i < mPortGroups.size(); i++) {
|
|
if (mPortGroups.value(i)->id() == portGroupId)
|
|
return i;
|
|
}
|
|
return -1;
|
|
}
|