Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use vectors instead of sets in RuleMatcher iterations for canonical o… #50

Closed
wants to merge 2 commits into from
Closed

Use vectors instead of sets in RuleMatcher iterations for canonical o… #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aadc16
Use vectors instead of sets in RuleMatcher iterations for canonical o…
ckreibich Nov 15, 2024
7da4909
make ci run
ckreibich Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ builds_only_if_template: &BUILDS_ONLY_IF_TEMPLATE
only_if: >
( $CIRRUS_CRON == '' ) &&
( ( $CIRRUS_PR != '' && $CIRRUS_BRANCH !=~ 'dependabot/.*' ) ||
( ( $CIRRUS_REPO_NAME == 'zeek' || $CIRRUS_REPO_NAME == 'zeek-security' ) &&
(
( (
$CIRRUS_BRANCH == 'master' ||
$CIRRUS_BRANCH =~ 'release/.*'
)
Expand Down
12 changes: 6 additions & 6 deletions src/RuleMatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,18 +658,18 @@ RuleMatcher::MIME_Matches* RuleMatcher::Match(RuleFileMagicState* state, const u
}

// Find rules for which patterns have matched.
set<Rule*> rule_matches;
vector<Rule*> rule_matches;

for ( AcceptingMatchSet::const_iterator it = accepted_matches.begin(); it != accepted_matches.end(); ++it ) {
auto [aidx, mpos] = *it;

Rule* r = Rule::rule_table[aidx - 1];

if ( AllRulePatternsMatched(r, mpos, accepted_matches) )
rule_matches.insert(r);
rule_matches.emplace_back(r);
}

for ( set<Rule*>::const_iterator it = rule_matches.begin(); it != rule_matches.end(); ++it ) {
for ( vector<Rule*>::const_iterator it = rule_matches.begin(); it != rule_matches.end(); ++it ) {
Rule* r = *it;

for ( const auto& action : r->actions ) {
Expand Down Expand Up @@ -842,7 +842,7 @@ void RuleMatcher::Match(RuleEndpointState* state, Rule::PatternType type, const
// matched patterns per connection (which is a plausible assumption).

// Find rules for which patterns have matched.
set<pair<Rule*, MatchPos>> rule_matches;
vector<pair<Rule*, MatchPos>> rule_matches;

for ( AcceptingMatchSet::const_iterator it = accepted_matches.begin(); it != accepted_matches.end(); ++it ) {
AcceptIdx aidx = it->first;
Expand All @@ -851,12 +851,12 @@ void RuleMatcher::Match(RuleEndpointState* state, Rule::PatternType type, const
Rule* r = Rule::rule_table[aidx - 1];

if ( AllRulePatternsMatched(r, mpos, accepted_matches) )
rule_matches.insert(make_pair(r, mpos));
rule_matches.emplace_back(make_pair(r, mpos));
}

// Check which of the matching rules really belong to any of our nodes.

for ( set<pair<Rule*, MatchPos>>::const_iterator it = rule_matches.begin(); it != rule_matches.end(); ++it ) {
for ( vector<pair<Rule*, MatchPos>>::const_iterator it = rule_matches.begin(); it != rule_matches.end(); ++it ) {
auto [r, match_end_pos] = *it;

DBG_LOG(DBG_RULES, "Accepted rule: %s", r->id);
Expand Down
Loading