From 14fd3ad720f6ea629814b8e9307169010f596f6b Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 24 May 2017 20:05:54 +0200 Subject: 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 Acked-by: Pablo Neira Ayuso --- include/ct.h | 2 -- include/rule.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'include') 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 -- cgit v1.2.3