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

Rename RuleConditionTCPState::TCPState enum values

Browse source
This commit is contained in:
Jon Siwek 2020-10-09 12:56:23 -07:00
parent 7b77c7e523
commit 7556beac20
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/RuleCondition.cc
View file

@ -32,16 +32,16 @@ bool RuleConditionTCPState::DoMatch(Rule* rule, RuleEndpointState* state,
auto* ta = static_cast<analyzer::tcp::TCP_Analyzer*>(root); auto* ta = static_cast<analyzer::tcp::TCP_Analyzer*>(root);
if ( tcpstates & STATE_STATELESS ) if ( tcpstates & RULE_STATE_STATELESS )
return true; return true;
if ( (tcpstates & STATE_ORIG) && ! state->IsOrig() ) if ( (tcpstates & RULE_STATE_ORIG) && ! state->IsOrig() )
return false; return false;
if ( (tcpstates & STATE_RESP) && state->IsOrig() ) if ( (tcpstates & RULE_STATE_RESP) && state->IsOrig() )
return false; return false;
if ( (tcpstates & STATE_ESTABLISHED ) && if ( (tcpstates & RULE_STATE_ESTABLISHED ) &&
! (is_established(ta->Orig()) && ! (is_established(ta->Orig()) &&
is_established(ta->Resp()))) is_established(ta->Resp())))
return false; return false;

14
src/RuleCondition.h
View file

@ -22,16 +22,16 @@ public:
virtual void PrintDebug() = 0; virtual void PrintDebug() = 0;
}; };
enum RuleStateKind {
RULE_STATE_ESTABLISHED = 1,
RULE_STATE_ORIG = 2,
RULE_STATE_RESP = 4,
RULE_STATE_STATELESS = 8
};
// Implements the "tcp-state" keyword. // Implements the "tcp-state" keyword.
class RuleConditionTCPState : public RuleCondition { class RuleConditionTCPState : public RuleCondition {
public: public:
enum TCPState {
STATE_ESTABLISHED = 1,
STATE_ORIG = 2,
STATE_RESP = 4,
STATE_STATELESS = 8
};
explicit RuleConditionTCPState(int arg_tcpstates) explicit RuleConditionTCPState(int arg_tcpstates)
{ tcpstates = arg_tcpstates; } { tcpstates = arg_tcpstates; }

8
src/rule-scan.l
View file

@ -75,22 +75,22 @@ true { rules_lval.val = true; return TOK_BOOL; }
false { rules_lval.val = false; return TOK_BOOL; } false { rules_lval.val = false; return TOK_BOOL; }
established { established {
rules_lval.val = zeek::detail::RuleConditionTCPState::STATE_ESTABLISHED; rules_lval.val = zeek::detail::RULE_STATE_ESTABLISHED;
return TOK_STATE_SYM; return TOK_STATE_SYM;
} }
originator { originator {
rules_lval.val = zeek::detail::RuleConditionTCPState::STATE_ORIG; rules_lval.val = zeek::detail::RULE_STATE_ORIG;
return TOK_STATE_SYM; return TOK_STATE_SYM;
} }
responder { responder {
rules_lval.val = zeek::detail::RuleConditionTCPState::STATE_RESP; rules_lval.val = zeek::detail::RULE_STATE_RESP;
return TOK_STATE_SYM; return TOK_STATE_SYM;
} }
stateless { stateless {
rules_lval.val = zeek::detail::RuleConditionTCPState::STATE_STATELESS; rules_lval.val = zeek::detail::RULE_STATE_STATELESS;
return TOK_STATE_SYM; return TOK_STATE_SYM;
} }