From patchwork Wed Jul 11 22:52:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TcOhdMOpIEVja2w=?= X-Patchwork-Id: 942728 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W3n4lqW9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41QvTs3KS1z9s2g for ; Thu, 12 Jul 2018 08:52:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390677AbeGKW7F (ORCPT ); Wed, 11 Jul 2018 18:59:05 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:44237 "EHLO mail-wr1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387885AbeGKW7E (ORCPT ); Wed, 11 Jul 2018 18:59:04 -0400 Received: by mail-wr1-f54.google.com with SMTP id r16-v6so19723435wrt.11 for ; Wed, 11 Jul 2018 15:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hRLAi/zAvygQT1oSEQWf3Fhoig9ZnfYJdDccj1YOlwY=; b=W3n4lqW97JVGsBYL2aylgxOkcUuwXOJlD1mebPG5KA48ZOUj2J0BqAwzRH9nCpYf4F F5qIepYBVakCpjrM8NzNrtn+IuDowU1ya3cTTajCbRgPd6GJkf9E5z5gSWNwOLo7eJQL dpDt0ZT7WOTNKQbsOvaYRnSwO3tF4ghiq38udL2vWAK7CC7rkDU+a/rXUOSUK167nANG lxs91tbTqLkVY9f8oK3zvAtg0RrpCG78GrZkWpyYH7JRVyEbxjtmX8oEcSF8jDn3hpJ7 a9Knc/UR0Sm+2jgoZ5G1XZ4BNQnhwwBfPz4lt2YhmkhZh6V1+tdgrbQUkLYZyxxlZ1pt 64zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hRLAi/zAvygQT1oSEQWf3Fhoig9ZnfYJdDccj1YOlwY=; b=FD+tO1C3B4mLyKOXYVXzuD91QOPxE15Zisg3Cpf2cl/YjDpwNk1ArCvtw0R/+7ScvO Lf4/NAFat0NmLRwRQ/J66KkMgtH/LN/aZvV2OHwhDOUFTi4W24xCKtUlV/E5Q9p4OD5E ilVcsZJY9hbN83iQQVTcy7ScXFZ9t0kxCBt3pkjbDCkEnyYqE9PcLO0z3hMDGCAfYQ/m JQcmGhFsYYQYIuvS/0uIlsrZQzqM5mNBUWMQtCyx1rZmac9KRbq7jrgqvrrF/IMZ0UZD evChi3cBMKSYizFSdkifrj3PorKBexsASOfWlN2bHq+MZHpuj9pZA/E79ZDjfKqTrbJ7 7muA== X-Gm-Message-State: AOUpUlEmUJ1m/5q/GyYkQxe7Dml/KxfraKqqwRWPSE4tCUuyR2mb8Pn0 uBSppq8hk7/EoEhV86IjgArmXVv7 X-Google-Smtp-Source: AAOMgpdmr9fM/XrmPeg/ugz944APdzp4aadspki9/Pho1uqVw0PgeJKRkdwmEWOGNrflSrKCkFk0NA== X-Received: by 2002:adf:8bd7:: with SMTP id w23-v6mr311570wra.208.1531349550519; Wed, 11 Jul 2018 15:52:30 -0700 (PDT) Received: from ecklm-lapos.localdomain (ecklm-pi.sch.bme.hu. [152.66.179.182]) by smtp.gmail.com with ESMTPSA id z62-v6sm2553387wmc.10.2018.07.11.15.52.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 15:52:30 -0700 (PDT) From: =?utf-8?b?TcOhdMOpIEVja2w=?= To: netfilter-devel@vger.kernel.org Subject: [PATCH libnftnl] Expose socket mark via socket expression Date: Thu, 12 Jul 2018 00:52:14 +0200 Message-Id: <20180711225214.5515-1-ecklm94@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180711225018.dqknqgi2hif2n5cb@sch.bme.hu> References: <20180711225018.dqknqgi2hif2n5cb@sch.bme.hu> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Máté Eckl --- include/linux/netfilter/nf_tables.h | 4 +++- src/expr/socket.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 91449ef..eef157d 100644 --- 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 db160a1..5fa2ef2 100644 --- 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)