From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 08/10] xtables-arp: Drop some unused variables
Date: Mon, 28 Oct 2019 15:04:29 +0100 [thread overview]
Message-ID: <20191028140431.13882-9-phil@nwl.cc> (raw)
In-Reply-To: <20191028140431.13882-1-phil@nwl.cc>
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
iptables/xtables-arp.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c
index e4614b57a437f..11ca7f869730e 100644
--- a/iptables/xtables-arp.c
+++ b/iptables/xtables-arp.c
@@ -53,10 +53,6 @@
#include "nft-arp.h"
#include <linux/netfilter_arp/arp_tables.h>
-typedef char arpt_chainlabel[32];
-
-#define OPTION_OFFSET 256
-
#define NUMBER_OF_OPT 16
static const char optflags[NUMBER_OF_OPT]
= { 'n', 's', 'd', 2, 3, 7, 8, 4, 5, 6, 'j', 'v', 'i', 'o', '0', 'c'};
@@ -102,8 +98,6 @@ static struct option original_opts[] = {
{ 0 }
};
-int RUNTIME_NF_ARP_NUMHOOKS = 3;
-
#define opts xt_params->opts
extern void xtables_exit_error(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3)));
@@ -135,17 +129,6 @@ static int inverse_for_options[NUMBER_OF_OPT] =
/* -c */ 0,
};
-/* Primitive headers... */
-/* defined in netinet/in.h */
-#if 0
-#ifndef IPPROTO_ESP
-#define IPPROTO_ESP 50
-#endif
-#ifndef IPPROTO_AH
-#define IPPROTO_AH 51
-#endif
-#endif
-
/***********************************************/
/* ARPTABLES SPECIFIC NEW FUNCTIONS ADDED HERE */
/***********************************************/
--
2.23.0
next prev parent reply other threads:[~2019-10-28 14:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 14:04 [iptables PATCH 00/10] Reduce code size around arptables-nft Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 01/10] ip6tables, xtables-arp: Drop unused struct pprot Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 02/10] xshared: Share a common add_command() implementation Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 03/10] xshared: Share a common implementation of parse_rulenumber() Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 04/10] Merge CMD_* defines Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 05/10] xtables-arp: Drop generic_opt_check() Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 06/10] Replace TRUE/FALSE with true/false Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 07/10] xtables-arp: Integrate OPT_* defines into xshared.h Phil Sutter
2019-10-28 14:04 ` Phil Sutter [this message]
2019-10-28 14:04 ` [iptables PATCH 09/10] xtables-arp: Use xtables_parse_interface() Phil Sutter
2019-10-28 14:04 ` [iptables PATCH 10/10] nft-arp: Use xtables_print_mac_and_mask() Phil Sutter
2019-10-28 14:17 ` [iptables PATCH 00/10] Reduce code size around arptables-nft Pablo Neira Ayuso
2019-10-28 14:28 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028140431.13882-9-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).