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

Fixed BSD/OSX compilation issue

Browse Source
This commit is contained in:
Srivats P. 2012-04-15 20:32:13 +05:30
parent 64a82f9b2c
commit 3931245463
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/bsdport.cpp
View File

@ -43,6 +43,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
QList<BsdPort*> BsdPort::allPorts_; QList<BsdPort*> BsdPort::allPorts_;
BsdPort::StatsMonitor *BsdPort::monitor_; BsdPort::StatsMonitor *BsdPort::monitor_;
const quint32 kMaxValue32 = 0xffffffff;
BsdPort::BsdPort(int id, const char *device) BsdPort::BsdPort(int id, const char *device)
: PcapPort(id, device) : PcapPort(id, device)
{ {
@ -293,25 +295,25 @@ void BsdPort::StatsMonitor::run()
in_packets = ifd->ifi_ipackets + ifd->ifi_noproto; in_packets = ifd->ifi_ipackets + ifd->ifi_noproto;
stats->rxPps = stats->rxPps =
((in_packets >= stats->rxPkts) ? ((in_packets >= stats->rxPkts) ?
in_packets - stats_->rxPkts : in_packets - stats->rxPkts :
in_packets + (maxStatsValue_ - stats_->rxPkts)) in_packets + (kMaxValue32 - stats->rxPkts))
/ kRefreshFreq_; / kRefreshFreq_;
stats->rxBps = stats->rxBps =
((ifd->ifi_ibytes >= stats->rxBytes) > ((ifd->ifi_ibytes >= stats->rxBytes) ?
ifd->ifi_ibytes - stats->rxBytes : ifd->ifi_ibytes - stats->rxBytes :
ifd->ifi_ibytes + (maxStatsValue_ - stats->rxBytes)) ifd->ifi_ibytes + (kMaxValue32 - stats->rxBytes))
/ kRefreshFreq_; / kRefreshFreq_;
stats->rxPkts = in_packets; stats->rxPkts = in_packets;
stats->rxBytes = ifd->ifi_ibytes; stats->rxBytes = ifd->ifi_ibytes;
stats->txPps = stats->txPps =
((ifd->ifi_opackets >= stats->rxPkts) > ((ifd->ifi_opackets >= stats->rxPkts) ?
ifd->ifi_opackets - stats->rxPkts : ifd->ifi_opackets - stats->rxPkts :
ifd->ifi_opackets + (maxStatsValue_ - stats->rxPkts)) ifd->ifi_opackets + (kMaxValue32 - stats->rxPkts))
/ kRefreshFreq_; / kRefreshFreq_;
stats->txBps = stats->txBps =
((ifd->ifi_obytes >= stats->rxBytes) > ((ifd->ifi_obytes >= stats->rxBytes) ?
ifd->ifi_obytes - stats->rxBytes : ifd->ifi_obytes - stats->rxBytes :
ifd->ifi_obytes + (maxStatsValue_ - stats->rxBytes)) ifd->ifi_obytes + (kMaxValue32 - stats->rxBytes))
/ kRefreshFreq_; / kRefreshFreq_;
stats->txPkts = ifd->ifi_opackets; stats->txPkts = ifd->ifi_opackets;
stats->txBytes = ifd->ifi_obytes; stats->txBytes = ifd->ifi_obytes;