expr: remove secmark from ct and meta expression

The secctx should be used instead of the secmark. Remove for now.

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

diff --git a/src/ct.c b/src/ct.c
index b8f76325a3dc8f3250cf8652f1c8097717c1b2ef..f893df9aee8923a40aeda161f379ba90de348546 100644 (file)
--- a/src/ct.c
+++ b/src/ct.c
@@ -104,9 +104,6 @@ static const struct ct_template ct_templates[] = {
        [NFT_CT_MARK]           = CT_TEMPLATE("mark",       &mark_type,
                                              BYTEORDER_HOST_ENDIAN,
                                              4 * BITS_PER_BYTE),
-       [NFT_CT_SECMARK]        = CT_TEMPLATE("secmark",    &integer_type,
-                                             BYTEORDER_HOST_ENDIAN,
-                                             4 * BITS_PER_BYTE),
        [NFT_CT_EXPIRATION]     = CT_TEMPLATE("expiration", &time_type,
                                              BYTEORDER_HOST_ENDIAN,
                                              4 * BITS_PER_BYTE),

diff --git a/src/meta.c b/src/meta.c
index d7b024b68cb75ff6e00eb3bf2b5ec88a674b029a..6d4252555954ff3ae4b5f20e397a1adc77ff6b42 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -331,8 +331,6 @@ static const struct meta_template meta_templates[] = {
                                                1    , BYTEORDER_HOST_ENDIAN),
        [NFT_META_RTCLASSID]    = META_TEMPLATE("rtclassid", &realm_type,
                                                4 * 8, BYTEORDER_HOST_ENDIAN),
-       [NFT_META_SECMARK]      = META_TEMPLATE("secmark",   &integer_type,
-                                               4 * 8, BYTEORDER_HOST_ENDIAN),
 };
 
 static void meta_expr_print(const struct expr *expr)

diff --git a/src/parser.y b/src/parser.y
index 7c18875dc406ef99bd43f13ba6b63bf8997562be..2e5f6c12e1861ac753fcaf13d9fbd48ddf03d2ab 100644 (file)
--- a/src/parser.y
+++ b/src/parser.y
@@ -294,7 +294,6 @@ static void location_update(struct location *loc, struct location *rhs, int n)
 %token SKGID                   "skgid"
 %token NFTRACE                 "nftrace"
 %token RTCLASSID               "rtclassid"
-%token SECMARK                 "secmark"
 
 %token CT                      "ct"
 %token DIRECTION               "direction"
@@ -1393,7 +1392,6 @@ meta_key          :       LENGTH          { $$ = NFT_META_LEN; }
                        |       SKGID           { $$ = NFT_META_SKGID; }
                        |       NFTRACE         { $$ = NFT_META_NFTRACE; }
                        |       RTCLASSID       { $$ = NFT_META_RTCLASSID; }
-                       |       SECMARK         { $$ = NFT_META_SECMARK; }
                        ;
 
 meta_stmt              :       META    meta_key        SET     expr
@@ -1412,7 +1410,6 @@ ct_key                    :       STATE           { $$ = NFT_CT_STATE; }
                        |       DIRECTION       { $$ = NFT_CT_DIRECTION; }
                        |       STATUS          { $$ = NFT_CT_STATUS; }
                        |       MARK            { $$ = NFT_CT_MARK; }
-                       |       SECMARK         { $$ = NFT_CT_SECMARK; }
                        |       EXPIRATION      { $$ = NFT_CT_EXPIRATION; }
                        |       HELPER          { $$ = NFT_CT_HELPER; }
                        |       L3PROTOCOL      { $$ = NFT_CT_L3PROTOCOL; }

diff --git a/src/scanner.l b/src/scanner.l
index 0b8abacbe8a6d84fd9513f354b8b78abf3c0b5d2..e813140c790d36740a639563a263057100ded48a 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -384,7 +384,6 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 "skgid"                        { return SKGID; }
 "nftrace"              { return NFTRACE; }
 "rtclassid"            { return RTCLASSID; }
-"secmark"              { return SECMARK; }
 
 "ct"                   { return CT; }
 "direction"            { return DIRECTION; }