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

Fix failing test due to patricia change

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-07-23 12:26:09 -07:00
parent 083e0c5bdc
commit 802dfd80c1
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Val.cc
View file

@ -1991,7 +1991,7 @@ bool TableVal::Contains(const IPAddr& addr) const
return false;
}
return (subnets->Lookup(addr, true) != 0);
return (subnets->Lookup(addr, 128, false) != 0);
}
VectorValPtr TableVal::LookupSubnets(const SubNetVal* search)

5
src/patricia.c
View file

@ -763,12 +763,9 @@ patricia_search_best2 (patricia_tree_t *patricia, prefix_t *prefix, int inclusiv
fprintf (stderr, "patricia_search_best: pop %s/%d\n",
prefix_toa (node->prefix), node->prefix->bitlen);
#endif /* PATRICIA_DEBUG */
/* Zeek TODO: something about the commented out section of this if statement
* causes our test to fail. I left it commented out for now.
*/
if (comp_with_mask (prefix_tochar (node->prefix),
prefix_tochar (prefix),
node->prefix->bitlen) /*&& node->prefix->bitlen <= bitlen*/) {
node->prefix->bitlen) && node->prefix->bitlen <= bitlen) {
#ifdef PATRICIA_DEBUG
fprintf (stderr, "patricia_search_best: found %s/%d\n",
prefix_toa (node->prefix), node->prefix->bitlen);