datatype: maintain table of all datatypes and add registration/lookup function

Add a table containing all available datatypes and registration/lookup functions.
This will be used to associate a stand-alone set in the kernel with the correct
type without parsing the entire ruleset.

Additionally it would now be possible to remove the global declarations for the
core types. Not done yet though.

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 13 insertions, 3 deletions

diff --git a/src/ct.c b/src/ct.c
index ea97d6ad..b077a5f9 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -40,7 +40,8 @@ static const struct symbol_table ct_state_tbl = {
 
 static const struct datatype ct_state_type = {
 	.type		= TYPE_CT_STATE,
-	.name		= "conntrack state",
+	.name		= "ct_state",
+	.desc		= "conntrack state",
 	.basetype	= &bitmask_type,
 	.sym_tbl	= &ct_state_tbl,
 };
@@ -57,7 +58,8 @@ static const struct symbol_table ct_dir_tbl = {
 
 static const struct datatype ct_dir_type = {
 	.type		= TYPE_CT_DIR,
-	.name		= "conntrack direction",
+	.name		= "ct_dir",
+	.desc		= "conntrack direction",
 	.basetype	= &bitmask_type,
 	.sym_tbl	= &ct_dir_tbl,
 };
@@ -82,7 +84,8 @@ static const struct symbol_table ct_status_tbl = {
 
 static const struct datatype ct_status_type = {
 	.type		= TYPE_CT_STATUS,
-	.name		= "conntrack status",
+	.name		= "ct_status",
+	.desc		= "conntrack status",
 	.basetype	= &bitmask_type,
 	.sym_tbl	= &ct_status_tbl,
 };
@@ -153,3 +156,10 @@ struct expr *ct_expr_alloc(const struct location *loc, enum nft_ct_keys key)
 	expr->ct.key = key;
 	return expr;
 }
+
+static void __init ct_init(void)
+{
+	datatype_register(&ct_state_type);
+	datatype_register(&ct_dir_type);
+	datatype_register(&ct_status_type);
+}