Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace use of deprecated pcap_lookupdev()

Browse source 
libpcap 1.9.0 has started deprecating this function in favor
of pcap_findalldevs()
This commit is contained in:
Jon Siwek 2019-08-06 18:04:10 -07:00
parent 7521fec5b3
commit 6af1bf18ac
1 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/iosource/pcap/Source.cc
View file

@ -56,15 +56,38 @@ void PcapSource::OpenLive()
char tmp_errbuf[PCAP_ERRBUF_SIZE]; char tmp_errbuf[PCAP_ERRBUF_SIZE];
// Determine interface if not specified. // Determine interface if not specified.
if ( props.path.empty() )
props.path = pcap_lookupdev(tmp_errbuf);
if ( props.path.empty() ) if ( props.path.empty() )
{ {
safe_snprintf(errbuf, sizeof(errbuf), pcap_if_t* devs;
"pcap_lookupdev: %s", tmp_errbuf);
Error(errbuf); if ( pcap_findalldevs(&devs, tmp_errbuf) < 0 )
return; {
safe_snprintf(errbuf, sizeof(errbuf),
"pcap_findalldevs: %s", tmp_errbuf);
Error(errbuf);
return;
}
if ( devs )
{
props.path = devs->name;
pcap_freealldevs(devs);
if ( props.path.empty() )
{
safe_snprintf(errbuf, sizeof(errbuf),
"pcap_findalldevs: empty device name");
Error(errbuf);
return;
}
}
else
{
safe_snprintf(errbuf, sizeof(errbuf),
"pcap_findalldevs: no devices found");
Error(errbuf);
return;
}
} }
// Determine network and netmask. // Determine network and netmask.