]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
extensions: add NPT extension
authorPatrick McHardy <kaber@trash.net>
Wed, 22 Aug 2012 10:27:17 +0000 (12:27 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 10 Sep 2012 09:55:14 +0000 (11:55 +0200)
Add extensions for the SNPT and DNPT stateless IPv6-to-IPv6 Network Prefix
Translation targets.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
extensions/libip6t_DNPT.c [new file with mode: 0644]
extensions/libip6t_SNPT.c [new file with mode: 0644]
include/linux/netfilter_ipv6/ip6t_NPT.h [new file with mode: 0644]

diff --git a/extensions/libip6t_DNPT.c b/extensions/libip6t_DNPT.c
new file mode 100644 (file)
index 0000000..9e4dc5c
--- /dev/null
@@ -0,0 +1,71 @@
+#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_SNPT.c b/extensions/libip6t_SNPT.c
new file mode 100644 (file)
index 0000000..26a86c5
--- /dev/null
@@ -0,0 +1,71 @@
+#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);
+}
diff --git a/include/linux/netfilter_ipv6/ip6t_NPT.h b/include/linux/netfilter_ipv6/ip6t_NPT.h
new file mode 100644 (file)
index 0000000..f763355
--- /dev/null
@@ -0,0 +1,16 @@
+#ifndef __NETFILTER_IP6T_NPT
+#define __NETFILTER_IP6T_NPT
+
+#include <linux/types.h>
+#include <linux/netfilter.h>
+
+struct ip6t_npt_tginfo {
+       union nf_inet_addr      src_pfx;
+       union nf_inet_addr      dst_pfx;
+       __u8                    src_pfx_len;
+       __u8                    dst_pfx_len;
+       /* Used internally by the kernel */
+       __sum16                 adjustment;
+};
+
+#endif /* __NETFILTER_IP6T_NPT */