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

Merge remote-tracking branch 'security/topic/timw/150-dns-expiration'

Browse source 
* security/topic/timw/150-dns-expiration:
  Stop skipping expiration of empty DNS mappings
This commit is contained in:
Tim Wojtulewicz 2023-04-11 15:16:39 -07:00
commit 0cc1d672b5
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.341 | 2023-04-11 15:16:39 -0700
* Stop skipping expiration of empty DNS mappings (Tim Wojtulewicz, Corelight)
6.0.0-dev.339 | 2023-04-11 15:16:15 -0700 6.0.0-dev.339 | 2023-04-11 15:16:15 -0700
* smtp: Validate mail transaction and disable SMTP analyzer if excessive (Arne Welzel, Corelight) * smtp: Validate mail transaction and disable SMTP analyzer if excessive (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.339 6.0.0-dev.341

8
src/DNS_Mapping.h
View file

@ -46,13 +46,7 @@ public:
bool Failed() const { return failed; } bool Failed() const { return failed; }
bool Valid() const { return ! failed; } bool Valid() const { return ! failed; }
bool Expired() const bool Expired() const { return util::current_time() > (creation_time + req_ttl); }
{
if ( ! req_host.empty() && addrs.empty() )
return false; // nothing to expire
return util::current_time() > (creation_time + req_ttl);
}
void Merge(const DNS_MappingPtr& other); void Merge(const DNS_MappingPtr& other);