Move Dictionary/PDict, List/PList, and Queue/PQueue to zeek namespace

This commit is contained in:
Tim Wojtulewicz 2020-06-23 13:25:43 -07:00
parent 4a1e17f4e0
commit 464efbe66a
30 changed files with 172 additions and 138 deletions

View file

@ -57,9 +57,9 @@ struct MaskedValue {
uint32_t mask;
};
typedef PList<MaskedValue> maskedvalue_list;
typedef PList<char> string_list;
typedef PList<BroString> bstr_list;
using maskedvalue_list = zeek::PList<MaskedValue>;
using string_list = zeek::PList<char>;
using bstr_list = zeek::PList<BroString>;
// Get values from Bro's script-level variables.
extern void id_to_maskedvallist(const char* id, maskedvalue_list* append_to,
@ -117,7 +117,7 @@ private:
int_list ids; // (only needed for debugging)
};
typedef PList<PatternSet> pattern_set_list;
using pattern_set_list = zeek::PList<PatternSet>;
pattern_set_list psets[Rule::TYPES];
// List of rules belonging to this node.
@ -131,7 +131,7 @@ private:
RuleHdrTest* child;
};
typedef PList<RuleHdrTest> rule_hdr_test_list;
using rule_hdr_test_list = zeek::PList<RuleHdrTest>;
// RuleEndpointState keeps the per-stream matching state of one
// connection endpoint.
@ -166,7 +166,7 @@ private:
Rule::PatternType type;
};
typedef PList<Matcher> matcher_list;
using matcher_list = zeek::PList<Matcher>;
analyzer::Analyzer* analyzer;
RuleEndpointState* opposite;
@ -205,8 +205,7 @@ private:
RE_Match_State* state;
};
typedef PList<Matcher> matcher_list;
using matcher_list = zeek::PList<Matcher>;
matcher_list matchers;
};