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

Fix MacOS build break

Browse Source 
For some reason udiffTimeStamp is not defined for MacOS. To be investigated
later.
This commit is contained in:
Srivats P 2023-03-22 16:28:41 +05:30
parent 072dfcdc3b
commit f1cfaa6e89
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/pcaptxthread.cpp
View File

@ -159,9 +159,16 @@ bool PcapTxThread::appendToPacketList(long sec, long nsec,
// If not enough space, update usecDelay and alloc a new seq // If not enough space, update usecDelay and alloc a new seq
if (!currentPacketSequence_->hasFreeSpace(2*sizeof(pcap_pkthdr)+length)) if (!currentPacketSequence_->hasFreeSpace(2*sizeof(pcap_pkthdr)+length))
{ {
#if 0 // FIXME: temporary MacOS build fix
currentPacketSequence_->usecDelay_ = udiffTimeStamp( currentPacketSequence_->usecDelay_ = udiffTimeStamp(
&currentPacketSequence_->lastPacket_->ts, &pktHdr.ts); &currentPacketSequence_->lastPacket_->ts, &pktHdr.ts);
#else
struct timeval diff;
timersub(&pktHdr.ts, &currentPacketSequence_->lastPacket_->ts, &diff);
currentPacketSequence_->usecDelay_ = diff.tv_usec;
if (diff.tv_sec)
currentPacketSequence_->usecDelay_ += diff.tv_sec*1e6;
#endif
//! \todo (LOW): calculate sendqueue size //! \todo (LOW): calculate sendqueue size
currentPacketSequence_ = new PacketSequence(trackStreamStats_); currentPacketSequence_ = new PacketSequence(trackStreamStats_);
packetSequenceList_.append(currentPacketSequence_); packetSequenceList_.append(currentPacketSequence_);