From patchwork Thu Oct 3 11:28:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Bursztyka X-Patchwork-Id: 280268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 65A3F2C007E for ; Thu, 3 Oct 2013 21:28:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752367Ab3JCL2M (ORCPT ); Thu, 3 Oct 2013 07:28:12 -0400 Received: from mga09.intel.com ([134.134.136.24]:25708 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871Ab3JCL2M (ORCPT ); Thu, 3 Oct 2013 07:28:12 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 03 Oct 2013 04:25:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,1025,1371106800"; d="scan'208";a="404732996" Received: from rd-180.fi.intel.com ([10.237.68.49]) by fmsmga001.fm.intel.com with ESMTP; 03 Oct 2013 04:28:08 -0700 From: Tomasz Bursztyka To: netfilter-devel@vger.kernel.org Cc: Tomasz Bursztyka Subject: [iptables-nftables PATCH] lixtables: Fixes option issues in libxt_mangle.c Date: Thu, 3 Oct 2013 14:28:05 +0300 Message-Id: <1380799685-11091-1-git-send-email-tomasz.bursztyka@linux.intel.com> X-Mailer: git-send-email 1.8.3.2 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org - use proper option IDs - remove irrelevant flags on setting options mandatory Signed-off-by: Tomasz Bursztyka --- extensions/libxt_mangle.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/extensions/libxt_mangle.c b/extensions/libxt_mangle.c index 822033c..4b20feb 100644 --- a/extensions/libxt_mangle.c +++ b/extensions/libxt_mangle.c @@ -33,22 +33,21 @@ static void mangle_help(void) ); } -#define MANGLE_IPS '1' -#define MANGLE_IPT '2' -#define MANGLE_DEVS '3' -#define MANGLE_DEVT '4' -#define MANGLE_TARGET '5' +enum { + MANGLE_IPS = 0, + MANGLE_IPT = 1, + MANGLE_DEVS = 2, + MANGLE_DEVT = 3, + MANGLE_TARGET = 4, +}; + static const struct xt_option_entry mangle_opts[] = { - { .name = "mangle-ip-s", .id = MANGLE_IPS, .type = XTTYPE_STRING, - .flags = XTOPT_MAND }, - { .name = "mangle-ip-d", .id = MANGLE_IPT, .type = XTTYPE_STRING, - .flags = XTOPT_MAND }, - { .name = "mangle-mac-s", .id = MANGLE_DEVS, .type = XTTYPE_STRING, - .flags = XTOPT_MAND }, - { .name = "mangle-mac-d", .id = MANGLE_DEVT, .type = XTTYPE_STRING, - .flags = XTOPT_MAND }, - { .name = "mangle-target", .id = MANGLE_TARGET, .type = XTTYPE_STRING, - .flags = XTOPT_MAND }, + { .name = "mangle-ip-s", .id = MANGLE_IPS, .type = XTTYPE_STRING }, + { .name = "mangle-ip-d", .id = MANGLE_IPT, .type = XTTYPE_STRING }, + { .name = "mangle-mac-s", .id = MANGLE_DEVS, .type = XTTYPE_STRING }, + { .name = "mangle-mac-d", .id = MANGLE_DEVT, .type = XTTYPE_STRING }, + { .name = "mangle-target", .id = MANGLE_TARGET, + .type = XTTYPE_STRING }, XTOPT_TABLEEND, };