matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged NOX with latest HEAD

Browse Source
This commit is contained in:
Srivats P. 2014-05-10 11:27:16 +05:30
commit 34d9da4a42
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/portstatsmodel.cpp
View File

@ -200,6 +200,8 @@ QVariant PortStatsModel::headerData(int section, Qt::Orientation orientation, in
QString notes; QString notes;
uint portGroupIdx, portIdx; uint portGroupIdx, portIdx;
if (numPorts.isEmpty() || section >= numPorts.last())
return QVariant();
getDomainIndexes(index(0, section), portGroupIdx, portIdx); getDomainIndexes(index(0, section), portGroupIdx, portIdx);
notes = pgl->mPortGroups.at(portGroupIdx)->mPorts[portIdx]->notes(); notes = pgl->mPortGroups.at(portGroupIdx)->mPorts[portIdx]->notes();
if (!notes.isEmpty()) if (!notes.isEmpty())
@ -219,8 +221,12 @@ QVariant PortStatsModel::headerData(int section, Qt::Orientation orientation, in
uint portGroupIdx, portIdx; uint portGroupIdx, portIdx;
QString portName; QString portName;
if (numPorts.isEmpty() || section >= numPorts.last())
return QVariant();
getDomainIndexes(index(0, section), portGroupIdx, portIdx); getDomainIndexes(index(0, section), portGroupIdx, portIdx);
portName = QString("Port %1-%2").arg(portGroupIdx).arg(portIdx); portName = QString("Port %1-%2")
.arg(pgl->mPortGroups.at(portGroupIdx)->id())
.arg(pgl->mPortGroups.at(portGroupIdx)->mPorts.at(portIdx)->id());
if (portGroupIdx < (uint) pgl->mPortGroups.size() if (portGroupIdx < (uint) pgl->mPortGroups.size()
&& portIdx < (uint) pgl->mPortGroups.at(portGroupIdx)->mPorts.size()) && portIdx < (uint) pgl->mPortGroups.at(portGroupIdx)->mPorts.size())
{ {

7
server/linuxport.cpp
View File

@ -437,6 +437,10 @@ int LinuxPort::StatsMonitor::netlinkStats()
return -1; return -1;
} }
count = 0;
_retry:
// Find required size of buffer and resize accordingly // Find required size of buffer and resize accordingly
while (1) while (1)
{ {
@ -486,9 +490,6 @@ int LinuxPort::StatsMonitor::netlinkStats()
} }
} }
count = 0;
_retry:
msg.msg_flags = 0; msg.msg_flags = 0;
// Actually receive the reply now // Actually receive the reply now

6
server/pcapport.cpp
View File

@ -502,7 +502,8 @@ void PcapPort::PortTransmitter::run()
packetSequenceList_.at(i)->usecDuration_); packetSequenceList_.at(i)->usecDuration_);
} }
for(i = 0; i < packetSequenceList_.size(); i++) i = 0;
while (i < packetSequenceList_.size())
{ {
_restart: _restart:
@ -566,6 +567,9 @@ _restart:
} }
} }
} }
// Move to the next Packet Set
i += rptSz;
} }
if (returnToQIdx_ >= 0) if (returnToQIdx_ >= 0)