diff options
| author | Florian Westphal <fw@strlen.de> | 2017-05-24 20:05:54 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2017-09-27 20:01:54 +0200 |
| commit | 14fd3ad720f6ea629814b8e9307169010f596f6b (patch) | |
| tree | f5d4dc764d3aed0d174d6cbfaa7abff5649e25df /include | |
| parent | 25831cdef94b4b86d12e3eec134dd029c37c479e (diff) | |
src: prepare for future ct timeout policy support
Change all places that expect ct helper tokens (ct helper configuration)
to CT HELPER. ct_obj_kind is removed.
When we add ct timeout support, we will add a new ct_timeout_block,
plus extra rules. We won't extend ct_block, it prevents the parser
from detecting bogus syntax that only makes sense for ct helper but
not for something else for instance.
ct_block should be renamed to ct_helper_block, will be done in
followup patch.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ct.h | 2 | ||||
| -rw-r--r-- | include/rule.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/ct.h b/include/ct.h index 895a6ee3..d9a11a3f 100644 --- a/include/ct.h +++ b/include/ct.h @@ -27,8 +27,6 @@ extern struct expr *ct_expr_alloc(const struct location *loc, enum nft_ct_keys key, int8_t direction); extern void ct_expr_update_type(struct proto_ctx *ctx, struct expr *expr); -extern struct error_record *ct_objtype_parse(const struct location *loc, const char *str, int *type); - extern struct stmt *notrack_stmt_alloc(const struct location *loc); extern const struct datatype ct_dir_type; diff --git a/include/rule.h b/include/rule.h index e2a5c87b..6f52b17f 100644 --- a/include/rule.h +++ b/include/rule.h @@ -463,7 +463,7 @@ extern struct cmd *cmd_alloc(enum cmd_ops op, enum cmd_obj obj, extern void nft_cmd_expand(struct cmd *cmd); extern struct cmd *cmd_alloc_obj_ct(enum cmd_ops op, int type, const struct handle *h, - const struct location *loc, void *data); + const struct location *loc, struct obj *obj); extern void cmd_free(struct cmd *cmd); #include <payload.h> |