netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 5/8] libip6t_dst: remove unimplemented --dst-not-strict
Date: Sat, 19 Feb 2011 20:04:15 +0100	[thread overview]
Message-ID: <1298142259-11213-6-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1298142259-11213-1-git-send-email-jengelh@medozas.de>

This was never ever implemented in the kernel, so just remove it.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/libip6t_dst.c |   18 ------------------
 1 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index 8b656a6..74f6029 100644
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -25,7 +25,6 @@ IP6T_OPTS_OPTSNR);
 static const struct option dst_opts[] = {
 	{.name = "dst-len",        .has_arg = true, .val = '1'},
 	{.name = "dst-opts",       .has_arg = true, .val = '2'},
-	{.name = "dst-not-strict", .has_arg = true, .val = '3'},
 	XT_GETOPT_TABLEEND,
 };
 
@@ -135,17 +134,6 @@ static int dst_parse(int c, char **argv, int invert, unsigned int *flags,
 		optinfo->flags |= IP6T_OPTS_OPTS;
 		*flags |= IP6T_OPTS_OPTS;
 		break;
-	case '3':
-		if (*flags & IP6T_OPTS_NSTRICT)
-			xtables_error(PARAMETER_PROBLEM,
-				   "Only one `--dst-not-strict' allowed");
-		if ( !(*flags & IP6T_OPTS_OPTS) )
-			xtables_error(PARAMETER_PROBLEM,
-				   "`--dst-opts ...' required before "
-				   "`--dst-not-strict'");
-		optinfo->flags |= IP6T_OPTS_NSTRICT;
-		*flags |= IP6T_OPTS_NSTRICT;
-		break;
 	}
 
 	return 1;
@@ -183,9 +171,6 @@ static void dst_print(const void *ip, const struct xt_entry_match *match,
 
 	print_options(optinfo->optsnr, (uint16_t *)optinfo->opts);
 
-	if (optinfo->flags & IP6T_OPTS_NSTRICT)
-		printf(" not-strict");
-
 	if (optinfo->invflags & ~IP6T_OPTS_INV_MASK)
 		printf(" Unknown invflags: 0x%X",
 		       optinfo->invflags & ~IP6T_OPTS_INV_MASK);
@@ -205,9 +190,6 @@ static void dst_save(const void *ip, const struct xt_entry_match *match)
 		printf(" --dst-opts");
 
 	print_options(optinfo->optsnr, (uint16_t *)optinfo->opts);
-
-	if (optinfo->flags & IP6T_OPTS_NSTRICT)
-		printf(" --dst-not-strict");
 }
 
 static struct xtables_match dst_mt6_reg = {
-- 
1.7.1


  parent reply	other threads:[~2011-02-19 19:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-19 19:04 iptables: misc option edits Jan Engelhardt
2011-02-19 19:04 ` [PATCH 1/8] doc: fix wrong sentence about negation in xt_limit Jan Engelhardt
2011-02-19 19:04 ` [PATCH 2/8] doc: fix misspelling of "field" Jan Engelhardt
2011-02-19 19:04 ` [PATCH 3/8] extensions: remove redundant init functions Jan Engelhardt
2011-02-19 19:04 ` [PATCH 4/8] Remove unused CVS expanded keywords Jan Engelhardt
2011-02-19 19:04 ` Jan Engelhardt [this message]
2011-02-19 19:04 ` [PATCH 6/8] libip6t_hbh: remove unimplemented --hbh-not-strict Jan Engelhardt
2011-02-19 19:04 ` [PATCH 7/8] extensions: add missing checks for specific flags Jan Engelhardt
2011-02-19 19:04 ` [PATCH 8/8] libipt_ECN: set proper option flags Jan Engelhardt
2011-02-23 16:40 ` iptables: misc option edits Patrick McHardy

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=1298142259-11213-6-git-send-email-jengelh@medozas.de \
    --to=jengelh@medozas.de \
    --cc=kaber@trash.net \
    --cc=netfilter-devel@vger.kernel.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).