Skip to contentSkip to conversation

iptables: fix wording in DNPT target

PATCH In review Ulrich Weber 3 participants 4 messages Jan 2, 2013 – Jan 3, 2013 netfilter

lore
Share & tools
lore

Ulrich Weber

author
#0 lore raw

PATCH 1/1 iptables: fix wording in DNPT target

replaces SNPT by DNPT

Signed-off-by Ulrich Weber <[email protected]>
---
 extensions/libip6t_DNPT.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
extensions/libip6t_DNPT.c +9 -9
index 9e4dc5c..7439816 100644
@@ -8,7 +8,7 @@ enum {
 	O_DST_PFX	= 1 << 1,
 };
 
-static const struct xt_option_entry SNPT_options[] = {
+static const struct xt_option_entry DNPT_options[] = {
 	{ .name = "src-pfx", .id = O_SRC_PFX, .type = XTTYPE_HOSTMASK,
 	  .flags = XTOPT_MAND },
 	{ .name = "dst-pfx", .id = O_DST_PFX, .type = XTTYPE_HOSTMASK,

@@ -16,16 +16,16 @@ static const struct xt_option_entry SNPT_options[] = {
 	{ }
 };
 
-static void SNPT_help(void)
+static void DNPT_help(void)
 {
-	printf("SNPT target options:"
+	printf("DNPT target options:"
 	       "\n"
 	       " --src-pfx prefix/length\n"
 	       " --dst-pfx prefix/length\n"
 	       "\n");
 }
 
-static void SNPT_parse(struct xt_option_call *cb)
+static void DNPT_parse(struct xt_option_call *cb)
 {
 	struct ip6t_npt_tginfo *npt = cb->data;
 

@@ -42,7 +42,7 @@ static void SNPT_parse(struct xt_option_call *cb)
 	}
 }
 
-static void SNPT_print(const void *ip, const struct xt_entry_target *target,
+static void DNPT_print(const void *ip, const struct xt_entry_target *target,
 		       int numeric)
 {
 	const struct ip6t_npt_tginfo *npt = (const void *)target->data;

@@ -59,10 +59,10 @@ static struct xtables_target snpt_tg_reg = {
 	.family		= NFPROTO_IPV6,
 	.size		= XT_ALIGN(sizeof(struct ip6t_npt_tginfo)),
 	.userspacesize	= offsetof(struct ip6t_npt_tginfo, adjustment),
-	.help		= SNPT_help,
-	.x6_parse	= SNPT_parse,
-	.print		= SNPT_print,
-	.x6_options	= SNPT_options,
+	.help		= DNPT_help,
+	.x6_parse	= DNPT_parse,
+	.print		= DNPT_print,
+	.x6_options	= DNPT_options,
 };
 
 void _init(void)
Signature · 1 line
1.8.0.2
author
#1 lore raw

PATCH v2 1/1 iptables: merge libip6t SNPT and DNPT to NPT

Was to quick ;) Please find proper fix attached,
merging DNPT and SNPT into new NPT file.

Cheers
Ulrich

Quoted 1 line

From fcc5be86597dc9d66b13e42d756a3b2747d0fb2e Mon Sep 17 00:00:00 2001

From: Ulrich Weber <[email protected]>
Date: Wed, 2 Jan 2013 17:37:50 +0100
Subject: [PATCH] iptables: merge libip6t SNPT and DNPT to NPT

Signed-off-by Ulrich Weber <[email protected]>
---
 extensions/GNUmakefile.in |    6 ++-
 extensions/libip6t_DNPT.c |   71 ----------------------------------
 extensions/libip6t_NPT.c  |   94 +++++++++++++++++++++++++++++++++++++++++++++
 extensions/libip6t_SNPT.c |   71 ----------------------------------
 4 files changed, 99 insertions(+), 143 deletions(-)
 delete mode 100644 extensions/libip6t_DNPT.c
 create mode 100644 extensions/libip6t_NPT.c
 delete mode 100644 extensions/libip6t_SNPT.c
extensions/GNUmakefile.in +5 -1
index e71e3ff..afb7e3c 100644
@@ -41,7 +41,7 @@ endif
 pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c)))
 pfx_symlinks  := NOTRACK state
 @ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c)))
-@ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c)))
+@ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c))) SNPT DNPT
 pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
 pf4_build_mod := $(filter-out @blacklist_modules@,${pf4_build_mod})
 pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})

@@ -99,6 +99,10 @@ libxt_NOTRACK.so: libxt_CT.so
 	ln -fs $< $@
 libxt_state.so: libxt_conntrack.so
 	ln -fs $< $@
+libip6t_SNPT.so: libip6t_NPT.so
+	ln -fs $< $@
+libip6t_DNPT.so: libip6t_NPT.so
+	ln -fs $< $@
 
 # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
 ip6t_NETMAP_LIBADD  = -lip6tc
extensions/libip6t_DNPT.c deleted +0 -71

71 lines not on this page · raw message

extensions/libip6t_NPT.c new file +94 -0

94 lines not on this page · raw message

extensions/libip6t_SNPT.c deleted +0 -71

71 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw

Re: [PATCH v2] iptables: merge libip6t SNPT and DNPT to NPT

Quoted 2 lines · Ulrich Weber

Was to quick ;) Please find proper fix attached,
merging DNPT and SNPT into new NPT file.

Now, if you also use xtables_register_targets (i.e. the plural form function), that would also be cool.