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

Reduce vertical whitespace in sendQueueTransmit()

Browse Source
This commit is contained in:
Srivats P 2023-03-16 12:10:42 +05:30
parent 159cd7c0da
commit 3c98900092
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/pcaptxthread.cpp
View File

@ -414,29 +414,23 @@ int PcapTxThread::sendQueueTransmit(pcap_t *p,
char *end = queue->buffer + queue->len; char *end = queue->buffer + queue->len;
ts = hdr->ts; ts = hdr->ts;
getTimeStamp(&ovrStart); getTimeStamp(&ovrStart);
while((char*) hdr < end) while((char*) hdr < end) {
{
uchar *pkt = (uchar*)hdr + sizeof(*hdr); uchar *pkt = (uchar*)hdr + sizeof(*hdr);
int pktLen = hdr->caplen; int pktLen = hdr->caplen;
if (sync) if (sync) {
{
long usec = (hdr->ts.tv_sec - ts.tv_sec) * 1000000 + long usec = (hdr->ts.tv_sec - ts.tv_sec) * 1000000 +
(hdr->ts.tv_usec - ts.tv_usec); (hdr->ts.tv_usec - ts.tv_usec);
getTimeStamp(&ovrEnd); getTimeStamp(&ovrEnd);
overHead -= udiffTimeStamp(&ovrStart, &ovrEnd); overHead -= udiffTimeStamp(&ovrStart, &ovrEnd);
Q_ASSERT(overHead <= 0); Q_ASSERT(overHead <= 0);
usec += overHead; usec += overHead;
if (usec > 0) if (usec > 0) {
{
(*udelayFn_)(usec); (*udelayFn_)(usec);
overHead = 0; overHead = 0;
} } else
else
overHead = usec; overHead = usec;
ts = hdr->ts; ts = hdr->ts;
@ -453,12 +447,10 @@ int PcapTxThread::sendQueueTransmit(pcap_t *p,
hdr = (struct pcap_pkthdr*) (pkt + pktLen); hdr = (struct pcap_pkthdr*) (pkt + pktLen);
pkt = (uchar*) ((uchar*)hdr + sizeof(*hdr)); // FIXME: superfluous? pkt = (uchar*) ((uchar*)hdr + sizeof(*hdr)); // FIXME: superfluous?
if (stop_) if (stop_) {
{
return -2; return -2;
} }
} }
return 0; return 0;
} }