Use type aliases for IntrusivePtr definitions

This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:46:34 -04:00
parent f6a251cdac
commit ec9eff0bd5
180 changed files with 2026 additions and 1893 deletions

View file

@ -21,6 +21,10 @@ class Func;
class EventHandler;
class DNS_Mgr_Request;
using ValPtr = zeek::IntrusivePtr<Val>;
using ListValPtr = zeek::IntrusivePtr<ListVal>;
using TableValPtr = zeek::IntrusivePtr<TableVal>;
ZEEK_FORWARD_DECLARE_NAMESPACED(RecordType, zeek);
typedef PList<DNS_Mgr_Request> DNS_mgr_request_list;
@ -50,9 +54,9 @@ public:
// Looks up the address or addresses of the given host, and returns
// a set of addr.
zeek::IntrusivePtr<TableVal> LookupHost(const char* host);
TableValPtr LookupHost(const char* host);
zeek::IntrusivePtr<Val> LookupAddr(const IPAddr& addr);
ValPtr LookupAddr(const IPAddr& addr);
// Define the directory where to store the data.
void SetDir(const char* arg_dir) { dir = copy_string(arg_dir); }
@ -62,7 +66,7 @@ public:
bool Save();
const char* LookupAddrInCache(const IPAddr& addr);
zeek::IntrusivePtr<TableVal> LookupNameInCache(const std::string& name);
TableValPtr LookupNameInCache(const std::string& name);
const char* LookupTextInCache(const std::string& name);
// Support for async lookups.
@ -100,14 +104,14 @@ protected:
void Event(EventHandlerPtr e, DNS_Mapping* dm);
void Event(EventHandlerPtr e, DNS_Mapping* dm,
zeek::IntrusivePtr<ListVal> l1, zeek::IntrusivePtr<ListVal> l2);
ListValPtr l1, ListValPtr l2);
void Event(EventHandlerPtr e, DNS_Mapping* old_dm, DNS_Mapping* new_dm);
zeek::IntrusivePtr<Val> BuildMappingVal(DNS_Mapping* dm);
ValPtr BuildMappingVal(DNS_Mapping* dm);
void AddResult(DNS_Mgr_Request* dr, struct nb_dns_result* r);
void CompareMappings(DNS_Mapping* prev_dm, DNS_Mapping* new_dm);
zeek::IntrusivePtr<ListVal> AddrListDelta(ListVal* al1, ListVal* al2);
ListValPtr AddrListDelta(ListVal* al1, ListVal* al2);
void DumpAddrList(FILE* f, ListVal* al);
typedef std::map<std::string, std::pair<DNS_Mapping*, DNS_Mapping*> > HostMap;
@ -151,7 +155,7 @@ protected:
bool did_init;
zeek::IntrusivePtr<zeek::RecordType> dm_rec;
zeek::RecordTypePtr dm_rec;
typedef std::list<LookupCallback*> CallbackList;