* [PATCH] iptables: fix wording in DNPT target
@ 2013-01-02 16:03 Ulrich Weber
2013-01-02 16:58 ` [PATCH v2] iptables: merge libip6t SNPT and DNPT to NPT Ulrich Weber
2013-01-03 0:14 ` [PATCH] iptables: fix wording in DNPT target Pablo Neira Ayuso
0 siblings, 2 replies; 4+ messages in thread
From: Ulrich Weber @ 2013-01-02 16:03 UTC (permalink / raw)
To: netfilter-devel
replaces SNPT by DNPT
Signed-off-by: Ulrich Weber <ulrich.weber@sophos.com>
---
extensions/libip6t_DNPT.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/extensions/libip6t_DNPT.c b/extensions/libip6t_DNPT.c
index 9e4dc5c..7439816 100644
--- a/extensions/libip6t_DNPT.c
+++ b/extensions/libip6t_DNPT.c
@@ -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)
--
1.8.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] iptables: merge libip6t SNPT and DNPT to NPT
2013-01-02 16:03 [PATCH] iptables: fix wording in DNPT target Ulrich Weber
@ 2013-01-02 16:58 ` Ulrich Weber
2013-01-02 18:27 ` Jan Engelhardt
2013-01-03 0:14 ` [PATCH] iptables: fix wording in DNPT target Pablo Neira Ayuso
1 sibling, 1 reply; 4+ messages in thread
From: Ulrich Weber @ 2013-01-02 16:58 UTC (permalink / raw)
To: netfilter-devel
[-- Attachment #1: Type: text/plain, Size: 107 bytes --]
Was to quick ;) Please find proper fix attached,
merging DNPT and SNPT into new NPT file.
Cheers
Ulrich
[-- Attachment #2: 0001-iptables-merge-libip6t-SNPT-and-DNPT-to-NPT.patch --]
[-- Type: text/x-patch, Size: 8294 bytes --]
>From fcc5be86597dc9d66b13e42d756a3b2747d0fb2e Mon Sep 17 00:00:00 2001
From: Ulrich Weber <ulrich.weber@sophos.com>
Date: Wed, 2 Jan 2013 17:37:50 +0100
Subject: [PATCH] iptables: merge libip6t SNPT and DNPT to NPT
Signed-off-by: Ulrich Weber <ulrich.weber@sophos.com>
---
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
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index e71e3ff..afb7e3c 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -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
diff --git a/extensions/libip6t_DNPT.c b/extensions/libip6t_DNPT.c
deleted file mode 100644
index 9e4dc5c..0000000
--- a/extensions/libip6t_DNPT.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <stdio.h>
-#include <xtables.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
-#include <linux/netfilter_ipv6/ip6t_NPT.h>
-
-enum {
- O_SRC_PFX = 1 << 0,
- O_DST_PFX = 1 << 1,
-};
-
-static const struct xt_option_entry SNPT_options[] = {
- { .name = "src-pfx", .id = O_SRC_PFX, .type = XTTYPE_HOSTMASK,
- .flags = XTOPT_MAND },
- { .name = "dst-pfx", .id = O_DST_PFX, .type = XTTYPE_HOSTMASK,
- .flags = XTOPT_MAND },
- { }
-};
-
-static void SNPT_help(void)
-{
- printf("SNPT target options:"
- "\n"
- " --src-pfx prefix/length\n"
- " --dst-pfx prefix/length\n"
- "\n");
-}
-
-static void SNPT_parse(struct xt_option_call *cb)
-{
- struct ip6t_npt_tginfo *npt = cb->data;
-
- xtables_option_parse(cb);
- switch (cb->entry->id) {
- case O_SRC_PFX:
- npt->src_pfx = cb->val.haddr;
- npt->src_pfx_len = cb->val.hlen;
- break;
- case O_DST_PFX:
- npt->dst_pfx = cb->val.haddr;
- npt->dst_pfx_len = cb->val.hlen;
- break;
- }
-}
-
-static void SNPT_print(const void *ip, const struct xt_entry_target *target,
- int numeric)
-{
- const struct ip6t_npt_tginfo *npt = (const void *)target->data;
-
- printf("src-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->src_pfx.in6),
- npt->src_pfx_len);
- printf("dst-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->dst_pfx.in6),
- npt->dst_pfx_len);
-}
-
-static struct xtables_target snpt_tg_reg = {
- .name = "DNPT",
- .version = XTABLES_VERSION,
- .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,
-};
-
-void _init(void)
-{
- xtables_register_target(&snpt_tg_reg);
-}
diff --git a/extensions/libip6t_NPT.c b/extensions/libip6t_NPT.c
new file mode 100644
index 0000000..56e6f43
--- /dev/null
+++ b/extensions/libip6t_NPT.c
@@ -0,0 +1,94 @@
+#include <stdio.h>
+#include <xtables.h>
+#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <linux/netfilter_ipv6/ip6t_NPT.h>
+
+enum {
+ O_SRC_PFX = 1 << 0,
+ O_DST_PFX = 1 << 1,
+};
+
+static const struct xt_option_entry NPT_options[] = {
+ { .name = "src-pfx", .id = O_SRC_PFX, .type = XTTYPE_HOSTMASK,
+ .flags = XTOPT_MAND },
+ { .name = "dst-pfx", .id = O_DST_PFX, .type = XTTYPE_HOSTMASK,
+ .flags = XTOPT_MAND },
+ { }
+};
+
+static void SNPT_help(void)
+{
+ printf("SNPT target options:"
+ "\n"
+ " --src-pfx prefix/length\n"
+ " --dst-pfx prefix/length\n"
+ "\n");
+}
+
+static void DNPT_help(void)
+{
+ printf("DNPT target options:"
+ "\n"
+ " --src-pfx prefix/length\n"
+ " --dst-pfx prefix/length\n"
+ "\n");
+}
+
+static void NPT_parse(struct xt_option_call *cb)
+{
+ struct ip6t_npt_tginfo *npt = cb->data;
+
+ xtables_option_parse(cb);
+ switch (cb->entry->id) {
+ case O_SRC_PFX:
+ npt->src_pfx = cb->val.haddr;
+ npt->src_pfx_len = cb->val.hlen;
+ break;
+ case O_DST_PFX:
+ npt->dst_pfx = cb->val.haddr;
+ npt->dst_pfx_len = cb->val.hlen;
+ break;
+ }
+}
+
+static void NPT_print(const void *ip, const struct xt_entry_target *target,
+ int numeric)
+{
+ const struct ip6t_npt_tginfo *npt = (const void *)target->data;
+
+ printf("src-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->src_pfx.in6),
+ npt->src_pfx_len);
+ printf("dst-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->dst_pfx.in6),
+ npt->dst_pfx_len);
+}
+
+static struct xtables_target snpt_tg_reg = {
+ .name = "SNPT",
+ .version = XTABLES_VERSION,
+ .family = NFPROTO_IPV6,
+ .size = XT_ALIGN(sizeof(struct ip6t_npt_tginfo)),
+ .userspacesize = offsetof(struct ip6t_npt_tginfo, adjustment),
+ .help = SNPT_help,
+ .x6_parse = NPT_parse,
+ .print = NPT_print,
+ .x6_options = NPT_options,
+};
+
+static struct xtables_target dnpt_tg_reg = {
+ .name = "DNPT",
+ .version = XTABLES_VERSION,
+ .family = NFPROTO_IPV6,
+ .size = XT_ALIGN(sizeof(struct ip6t_npt_tginfo)),
+ .userspacesize = offsetof(struct ip6t_npt_tginfo, adjustment),
+ .help = DNPT_help,
+ .x6_parse = NPT_parse,
+ .print = NPT_print,
+ .x6_options = NPT_options,
+};
+
+
+void _init(void)
+{
+ xtables_register_target(&snpt_tg_reg);
+ xtables_register_target(&dnpt_tg_reg);
+}
diff --git a/extensions/libip6t_SNPT.c b/extensions/libip6t_SNPT.c
deleted file mode 100644
index 26a86c5..0000000
--- a/extensions/libip6t_SNPT.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <stdio.h>
-#include <xtables.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
-#include <linux/netfilter_ipv6/ip6t_NPT.h>
-
-enum {
- O_SRC_PFX = 1 << 0,
- O_DST_PFX = 1 << 1,
-};
-
-static const struct xt_option_entry SNPT_options[] = {
- { .name = "src-pfx", .id = O_SRC_PFX, .type = XTTYPE_HOSTMASK,
- .flags = XTOPT_MAND },
- { .name = "dst-pfx", .id = O_DST_PFX, .type = XTTYPE_HOSTMASK,
- .flags = XTOPT_MAND },
- { }
-};
-
-static void SNPT_help(void)
-{
- printf("SNPT target options:"
- "\n"
- " --src-pfx prefix/length\n"
- " --dst-pfx prefix/length\n"
- "\n");
-}
-
-static void SNPT_parse(struct xt_option_call *cb)
-{
- struct ip6t_npt_tginfo *npt = cb->data;
-
- xtables_option_parse(cb);
- switch (cb->entry->id) {
- case O_SRC_PFX:
- npt->src_pfx = cb->val.haddr;
- npt->src_pfx_len = cb->val.hlen;
- break;
- case O_DST_PFX:
- npt->dst_pfx = cb->val.haddr;
- npt->dst_pfx_len = cb->val.hlen;
- break;
- }
-}
-
-static void SNPT_print(const void *ip, const struct xt_entry_target *target,
- int numeric)
-{
- const struct ip6t_npt_tginfo *npt = (const void *)target->data;
-
- printf("src-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->src_pfx.in6),
- npt->src_pfx_len);
- printf("dst-pfx %s/%u ", xtables_ip6addr_to_numeric(&npt->dst_pfx.in6),
- npt->dst_pfx_len);
-}
-
-static struct xtables_target snpt_tg_reg = {
- .name = "SNPT",
- .version = XTABLES_VERSION,
- .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,
-};
-
-void _init(void)
-{
- xtables_register_target(&snpt_tg_reg);
-}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] iptables: merge libip6t SNPT and DNPT to NPT
2013-01-02 16:58 ` [PATCH v2] iptables: merge libip6t SNPT and DNPT to NPT Ulrich Weber
@ 2013-01-02 18:27 ` Jan Engelhardt
0 siblings, 0 replies; 4+ messages in thread
From: Jan Engelhardt @ 2013-01-02 18:27 UTC (permalink / raw)
To: Ulrich Weber; +Cc: netfilter-devel
On Wednesday 2013-01-02 17:58, Ulrich Weber wrote:
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iptables: fix wording in DNPT target
2013-01-02 16:03 [PATCH] iptables: fix wording in DNPT target Ulrich Weber
2013-01-02 16:58 ` [PATCH v2] iptables: merge libip6t SNPT and DNPT to NPT Ulrich Weber
@ 2013-01-03 0:14 ` Pablo Neira Ayuso
1 sibling, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2013-01-03 0:14 UTC (permalink / raw)
To: Ulrich Weber; +Cc: netfilter-devel
On Wed, Jan 02, 2013 at 05:03:49PM +0100, Ulrich Weber wrote:
> replaces SNPT by DNPT
This one applied, thanks Ulrich.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-03 0:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-02 16:03 [PATCH] iptables: fix wording in DNPT target Ulrich Weber
2013-01-02 16:58 ` [PATCH v2] iptables: merge libip6t SNPT and DNPT to NPT Ulrich Weber
2013-01-02 18:27 ` Jan Engelhardt
2013-01-03 0:14 ` [PATCH] iptables: fix wording in DNPT target Pablo Neira Ayuso
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).