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

Fix DNS_Mgr iterator mismatch.

Browse source 
But not really since the global dns_mgr should be equal to "this" while
in all the member funcs.  Still, better that they always refer to their
own instance instead of the global one.
This commit is contained in:
Jon Siwek 2013-09-20 11:37:19 -05:00
parent f9b8de8436
commit dbbbea312c
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/DNS_Mgr.cc
View file

@ -928,7 +928,7 @@ void DNS_Mgr::Save(FILE* f, const HostMap& m)
const char* DNS_Mgr::LookupAddrInCache(const IPAddr& addr) const char* DNS_Mgr::LookupAddrInCache(const IPAddr& addr)
{ {
AddrMap::iterator it = dns_mgr->addr_mappings.find(addr); AddrMap::iterator it = addr_mappings.find(addr);
if ( it == addr_mappings.end() ) if ( it == addr_mappings.end() )
return 0; return 0;
@ -937,7 +937,7 @@ const char* DNS_Mgr::LookupAddrInCache(const IPAddr& addr)
if ( d->Expired() ) if ( d->Expired() )
{ {
dns_mgr->addr_mappings.erase(it); addr_mappings.erase(it);
delete d; delete d;
return 0; return 0;
} }
@ -949,10 +949,10 @@ const char* DNS_Mgr::LookupAddrInCache(const IPAddr& addr)
TableVal* DNS_Mgr::LookupNameInCache(string name) TableVal* DNS_Mgr::LookupNameInCache(string name)
{ {
HostMap::iterator it = dns_mgr->host_mappings.find(name); HostMap::iterator it = host_mappings.find(name);
if ( it == dns_mgr->host_mappings.end() ) if ( it == host_mappings.end() )
{ {
it = dns_mgr->host_mappings.begin(); it = host_mappings.begin();
return 0; return 0;
} }
@ -964,7 +964,7 @@ TableVal* DNS_Mgr::LookupNameInCache(string name)
if ( d4->Expired() || d6->Expired() ) if ( d4->Expired() || d6->Expired() )
{ {
dns_mgr->host_mappings.erase(it); host_mappings.erase(it);
delete d4; delete d4;
delete d6; delete d6;
return 0; return 0;
@ -979,15 +979,15 @@ TableVal* DNS_Mgr::LookupNameInCache(string name)
const char* DNS_Mgr::LookupTextInCache(string name) const char* DNS_Mgr::LookupTextInCache(string name)
{ {
TextMap::iterator it = dns_mgr->text_mappings.find(name); TextMap::iterator it = text_mappings.find(name);
if ( it == dns_mgr->text_mappings.end() ) if ( it == text_mappings.end() )
return 0; return 0;
DNS_Mapping* d = it->second; DNS_Mapping* d = it->second;
if ( d->Expired() ) if ( d->Expired() )
{ {
dns_mgr->text_mappings.erase(it); text_mappings.erase(it);
delete d; delete d;
return 0; return 0;
} }