socket: Expose socket mark via socket expression

Signed-off-by: Máté Eckl <ecklm94@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 91449ef1a3a33224d1eff3a4fcd146dc4bf60b15..eef157d42dc37a0ac4fc737b652f77a5ea2b9f09 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -921,10 +921,12 @@ enum nft_socket_attributes {
 /*
  * enum nft_socket_keys - nf_tables socket expression keys
  *
- * @NFT_SOCKET_TRANSPARENT: Value of the IP(V6)_TRANSPARENT socket option_
+ * @NFT_SOCKET_TRANSPARENT: Value of the IP(V6)_TRANSPARENT socket option
+ * @NFT_SOCKET_MARK: Value of the socket mark
  */
 enum nft_socket_keys {
        NFT_SOCKET_TRANSPARENT,
+       NFT_SOCKET_MARK,
        __NFT_SOCKET_MAX
 };
 #define NFT_SOCKET_MAX (__NFT_SOCKET_MAX - 1)

diff --git a/src/expr/socket.c b/src/expr/socket.c
index db160a1b6912fbc3ebe2014c826488da5d1f8dcb..5fa2ef2ec2f32c67005cf5f3a755dc63c168309d 100644 (file)
--- a/src/expr/socket.c
+++ b/src/expr/socket.c
@@ -114,6 +114,7 @@ nftnl_expr_socket_parse(struct nftnl_expr *e, struct nlattr *attr)
 
 static const char *socket_key2str_array[NFT_SOCKET_MAX + 1] = {
        [NFT_SOCKET_TRANSPARENT] = "transparent",
+       [NFT_SOCKET_MARK] = "mark",
 };
 
 static const char *socket_key2str(uint8_t key)