vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-19 07:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replaced pcap_next with pcap_next_ex

Browse source
This commit is contained in:
Luca Deri 2015-10-03 08:56:05 +02:00
parent 429eacec89
commit 7359b5889d
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/PcapInterface.cpp
View file

@ -148,20 +148,22 @@ static void* packetPollLoop(void* ptr) {
&& iface->isRunning()
&& (!ntop->getGlobals()->isShutdown())) {
const u_char *pkt;
struct pcap_pkthdr hdr;
struct pcap_pkthdr *hdr;
int rc;
while(iface->idle()) { iface->purgeIdle(time(NULL)); sleep(1); }
if((pkt = pcap_next(pd, &hdr)) != NULL) {
if((hdr.caplen > 0) && (hdr.len > 0)) {
if((rc = pcap_next_ex(pd, &hdr, &pkt)) > 0) {
if((rc > 0) && (pkt != NULL) && (hdr->caplen > 0)) {
int a, b;
iface->packet_dissector(&hdr, pkt, &a, &b);
iface->packet_dissector(hdr, pkt, &a, &b);
}
} else {
} else if(rc < 0) {
if(iface->read_from_pcap_dump())
break;
} else {
/* No packet received before the timeout */
iface->purgeIdle(time(NULL));
}
} /* while */