Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 18:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/deprecate-int-types'

Browse source 
* origin/topic/timw/deprecate-int-types:
  Deprecate the internal int/uint types in favor of the cstdint types they were based on

Merge adjustments:
  * A bpf type mistakenly got replaced (inside an unlikely #ifdef)
  * Did a few substitutions that got missed (likely due to
    pre-processing out of DEBUG macros)
This commit is contained in:
Jon Siwek 2019-08-14 15:38:02 -07:00
commit 47235b57a6
222 changed files with 1343 additions and 1327 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ void PcapSource::OpenLive()
}
// Determine network and netmask.
uint32 net;
uint32_t net;
if ( pcap_lookupnet(props.path.c_str(), &net, &props.netmask, tmp_errbuf) < 0 )
{
// ### The lookup can fail if no address is assigned to