diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-06 18:03:27 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-09 14:10:58 +0200 |
| commit | 788687b03e3708221cd5721fe90da300aca90522 (patch) | |
| tree | 63bdcf5724d894d014c6a722b74d9d15b881a197 /include/rule.h | |
| parent | fc53d1b6b93d9ca194334c43931753e19bcb127b (diff) | |
src: interpret the event type from the evaluation step
Postpone the event type interpretation to the evaluation step.
This patch also fixes the combination of event and object types,
which was broken. The export code needed to be adjusted too.
The new and destroy are not tokens that can be recognized by
the scanner anymore, so this also implicitly restores 'ct state'.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/rule.h')
| -rw-r--r-- | include/rule.h | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/include/rule.h b/include/rule.h index a1d58900..936177b9 100644 --- a/include/rule.h +++ b/include/rule.h @@ -252,6 +252,8 @@ enum cmd_ops { * @CMD_OBJ_TABLE: table * @CMD_OBJ_RULESET: ruleset * @CMD_OBJ_EXPR: expression + * @CMD_OBJ_MONITOR: monitor + * @CMD_OBJ_EXPORT: export */ enum cmd_obj { CMD_OBJ_INVALID, @@ -263,8 +265,38 @@ enum cmd_obj { CMD_OBJ_TABLE, CMD_OBJ_RULESET, CMD_OBJ_EXPR, + CMD_OBJ_MONITOR, + CMD_OBJ_EXPORT, }; +struct export { + uint32_t format; +}; + +struct export *export_alloc(uint32_t format); +void export_free(struct export *e); + +enum { + CMD_MONITOR_OBJ_ANY, + CMD_MONITOR_OBJ_TABLES, + CMD_MONITOR_OBJ_CHAINS, + CMD_MONITOR_OBJ_RULES, + CMD_MONITOR_OBJ_SETS, + CMD_MONITOR_OBJ_ELEMS, + CMD_MONITOR_OBJ_MAX +}; + +struct monitor { + struct location location; + uint32_t format; + uint32_t flags; + uint32_t type; + const char *event; +}; + +struct monitor *monitor_alloc(uint32_t format, uint32_t type, const char *event); +void monitor_free(struct monitor *m); + /** * struct cmd - command statement * @@ -292,10 +324,10 @@ struct cmd { struct rule *rule; struct chain *chain; struct table *table; + struct monitor *monitor; + struct export *export; }; const void *arg; - uint32_t format; - uint32_t monitor_flags; }; extern struct cmd *cmd_alloc(enum cmd_ops op, enum cmd_obj obj, |