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

Fix compile errors due to now-explicit IPAddr ctors and global IPFamily enum.

Browse source
This commit is contained in:
Jon Siwek 2012-03-30 12:40:31 -05:00
parent 256c0af98e
commit 6e7faafdb7
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/IP.cc
View file

@ -74,8 +74,8 @@ RecordVal* IPv6_Hdr::BuildRecordVal(VectorVal* chain) const
rv->Assign(2, new Val(ntohs(ip6->ip6_plen), TYPE_COUNT)); rv->Assign(2, new Val(ntohs(ip6->ip6_plen), TYPE_COUNT));
rv->Assign(3, new Val(ip6->ip6_nxt, TYPE_COUNT)); rv->Assign(3, new Val(ip6->ip6_nxt, TYPE_COUNT));
rv->Assign(4, new Val(ip6->ip6_hlim, TYPE_COUNT)); rv->Assign(4, new Val(ip6->ip6_hlim, TYPE_COUNT));
rv->Assign(5, new AddrVal(ip6->ip6_src)); rv->Assign(5, new AddrVal(IPAddr(ip6->ip6_src)));
rv->Assign(6, new AddrVal(ip6->ip6_dst)); rv->Assign(6, new AddrVal(IPAddr(ip6->ip6_dst)));
if ( ! chain ) if ( ! chain )
chain = new VectorVal(new VectorType( chain = new VectorVal(new VectorType(
hdrType(ip6_ext_hdr_type, "ip6_ext_hdr")->Ref())); hdrType(ip6_ext_hdr_type, "ip6_ext_hdr")->Ref()));
@ -314,7 +314,7 @@ void IPv6_Hdr_Chain::Init(const struct ip6_hdr* ip6, bool set_next, uint16 next)
if ( ((const struct ip6_rthdr*)hdrs)->ip6r_segleft > 0 ) if ( ((const struct ip6_rthdr*)hdrs)->ip6r_segleft > 0 )
{ {
const in6_addr* a = (const in6_addr*)(hdrs+len-16); const in6_addr* a = (const in6_addr*)(hdrs+len-16);
reporter->Weird(src, *a, "routing0_segleft"); reporter->Weird(src, IPAddr(*a), "routing0_segleft");
} }
else else
{ {

2
src/bro.bif
View file

@ -2070,7 +2070,7 @@ function routing0_data_to_addrs%(s: string%): addr_vec
while ( len > 0 ) while ( len > 0 )
{ {
IPAddr a(IPAddr::IPv6, (const uint32*) bytes, IPAddr::Network); IPAddr a(IPv6, (const uint32*) bytes, IPAddr::Network);
rval->Assign(rval->Size(), new AddrVal(a), 0); rval->Assign(rval->Size(), new AddrVal(a), 0);
bytes += 16; bytes += 16;
len -= 16; len -= 16;