]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
xtables: bootstrap ARP compatibility layer for nftables
authorGiuseppe Longo <giuseppelng@gmail.com>
Mon, 9 Sep 2013 10:54:04 +0000 (12:54 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 30 Dec 2013 22:50:46 +0000 (23:50 +0100)
This patch bootstraps ARP support for the compatibility layer:

1) copy original arptables code into xtables-arp.c
2) adapt it to fit into the existing nft infrastructure.
3) add the builtin table/chains for ARP.
4) add necessary parts so xtables-multi can provide xtables-arp.
5) add basic support for rule addition (-A), insertion (-I) and
   listing (-L).

[ This was originally posted in a series of patches with interdependencies
  that I have collapsed to leave the repository in consistent state. This
  patch includes the following changes I made:

* Rename from xtables-arptables to xtables-arp, previous name too long.
* Remove nft-arptables.c, now we have one single nft-arp.c file. Moved
  specific ARP functions to nft.c. Those should go away at some point as
  some refactorization should allow to accomodate those functions to the
  existing infrastructure.
* Fix --opcode Request/Reply, so we can do something useful with this
  like dropping ARP request/replies.

--pablo ]

Signed-off-by: Giuseppe Longo <giuseppelng@gmail.com>
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
etc/xtables.conf
iptables/Makefile.am
iptables/nft-arp.c [new file with mode: 0644]
iptables/nft-shared.c
iptables/nft-shared.h
iptables/nft.c
iptables/nft.h
iptables/xtables-arp-standalone.c [new file with mode: 0644]
iptables/xtables-arp.c [new file with mode: 0644]
iptables/xtables-multi.c
iptables/xtables-multi.h

index 7b2b8e5f1d9a4b270124394dea8a50cef92cd3f0..d37b0d7ca9ab38a69b1c3f4303630015539fa209 100644 (file)
@@ -65,3 +65,11 @@ family ipv6 {
                chain OUTPUT hook NF_INET_LOCAL_OUT prio 50
        }
 }
+
+family arp {
+       table filter {
+               chain INPUT hook NF_ARP_IN prio 0
+               chain FORWARD hook NF_ARP_FORWARD prio 0
+               chain OUTPUT hook NF_ARP_OUT prio 0
+       }
+}
\ No newline at end of file
index 5cbd8ff92225b8e19ec4d2a1ae5731e7908c124e..b9a9743e5816c6805a692458df77f8eeb31a63a7 100644 (file)
@@ -31,8 +31,9 @@ if HAVE_LIBNFTABLES
 xtables_multi_SOURCES += xtables-config-parser.y xtables-config-syntax.l
 xtables_multi_SOURCES += xtables-save.c xtables-restore.c \
                         xtables-standalone.c xtables.c nft.c \
-                        nft-shared.c nft-ipv4.c nft-ipv6.c \
-                        xtables-config.c xtables-events.c
+                        nft-shared.c nft-ipv4.c nft-ipv6.c nft-arp.c \
+                        xtables-config.c xtables-events.c \
+                        xtables-arp-standalone.c xtables-arp.c
 xtables_multi_LDADD   += -lmnl -lnftables ${libmnl_LIBS} ${libnftables_LIBS}
 xtables_multi_CFLAGS  += -DENABLE_NFTABLES
 # yacc and lex generate dirty code
@@ -57,7 +58,7 @@ v6_sbin_links  = ip6tables ip6tables-restore ip6tables-save
 endif
 if ENABLE_NFTABLES
 x_sbin_links  = xtables xtables-restore xtables-save xtables-config \
-               xtables-events
+               xtables-events xtables-arp
 endif
 
 iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c
new file mode 100644 (file)
index 0000000..09b939d
--- /dev/null
@@ -0,0 +1,549 @@
+/*
+ * (C) 2013 by Giuseppe Longo <giuseppelng@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <netdb.h>
+#include <net/if_arp.h>
+
+#include <xtables.h>
+#include <net/if_arp.h>
+#include <if_ether.h>
+
+#include <linux/netfilter_arp/arp_tables.h>
+#include <linux/netfilter/nf_tables.h>
+
+#include "nft-shared.h"
+
+/* a few names */
+char *opcodes[] =
+{
+       "Request",
+       "Reply",
+       "Request_Reverse",
+       "Reply_Reverse",
+       "DRARP_Request",
+       "DRARP_Reply",
+       "DRARP_Error",
+       "InARP_Request",
+       "ARP_NAK",
+};
+
+static char *
+addr_to_dotted(const struct in_addr *addrp)
+{
+       static char buf[20];
+       const unsigned char *bytep;
+
+       bytep = (const unsigned char *) &(addrp->s_addr);
+       sprintf(buf, "%d.%d.%d.%d", bytep[0], bytep[1], bytep[2], bytep[3]);
+       return buf;
+}
+
+static char *
+addr_to_host(const struct in_addr *addr)
+{
+       struct hostent *host;
+
+       if ((host = gethostbyaddr((char *) addr,
+                                       sizeof(struct in_addr), AF_INET)) != NULL)
+               return (char *) host->h_name;
+
+       return (char *) NULL;
+}
+
+static char *
+addr_to_network(const struct in_addr *addr)
+{
+       struct netent *net;
+
+       if ((net = getnetbyaddr((long) ntohl(addr->s_addr), AF_INET)) != NULL)
+               return (char *) net->n_name;
+
+       return (char *) NULL;
+}
+
+static char *
+addr_to_anyname(const struct in_addr *addr)
+{
+       char *name;
+
+       if ((name = addr_to_host(addr)) != NULL ||
+               (name = addr_to_network(addr)) != NULL)
+               return name;
+
+       return addr_to_dotted(addr);
+}
+
+static char *
+mask_to_dotted(const struct in_addr *mask)
+{
+       int i;
+       static char buf[20];
+       u_int32_t maskaddr, bits;
+
+       maskaddr = ntohl(mask->s_addr);
+
+       if (maskaddr == 0xFFFFFFFFL)
+               /* we don't want to see "/32" */
+               return "";
+
+       i = 32;
+       bits = 0xFFFFFFFEL;
+       while (--i >= 0 && maskaddr != bits)
+               bits <<= 1;
+       if (i >= 0)
+               sprintf(buf, "/%d", i);
+       else
+               /* mask was not a decent combination of 1's and 0's */
+               sprintf(buf, "/%s", addr_to_dotted(mask));
+
+       return buf;
+}
+
+static void print_mac(const unsigned char *mac, int l)
+{
+       int j;
+
+       for (j = 0; j < l; j++)
+               printf("%02x%s", mac[j],
+                       (j==l-1) ? "" : ":");
+}
+
+static void print_mac_and_mask(const unsigned char *mac, const unsigned char *mask, int l)
+{
+       int i;
+
+       print_mac(mac, l);
+       for (i = 0; i < l ; i++)
+               if (mask[i] != 255)
+                       break;
+       if (i == l)
+               return;
+       printf("/");
+       print_mac(mask, l);
+}
+
+static uint8_t arpt_to_ipt_flags(uint16_t invflags)
+{
+       uint8_t result = 0;
+
+       if (invflags & ARPT_INV_VIA_IN)
+               result |= IPT_INV_VIA_IN;
+
+       if (invflags & ARPT_INV_VIA_OUT)
+               result |= IPT_INV_VIA_OUT;
+
+       if (invflags & ARPT_INV_SRCIP)
+               result |= IPT_INV_SRCIP;
+
+       if (invflags & ARPT_INV_TGTIP)
+               result |= IPT_INV_DSTIP;
+
+       if (invflags & ARPT_INV_ARPPRO)
+               result |= IPT_INV_PROTO;
+
+       if (invflags & ARPT_INV_MASK)
+               result |= IPT_INV_MASK;
+
+       return result;
+}
+
+static int nft_arp_add(struct nft_rule *r, void *data)
+{
+       struct arpt_entry *fw = data;
+       uint8_t flags = arpt_to_ipt_flags(fw->arp.invflags);
+
+       if (fw->arp.iniface[0] != '\0')
+               add_iniface(r, fw->arp.iniface, flags);
+
+       if (fw->arp.outiface[0] != '\0')
+               add_outiface(r, fw->arp.outiface, flags);
+
+       if (fw->arp.arhrd != 0) {
+               add_payload(r, offsetof(struct arphdr, ar_hrd), 2);
+               add_cmp_u16(r, fw->arp.arhrd, NFT_CMP_EQ);
+       }
+
+       if (fw->arp.arpro != 0) {
+               add_payload(r, offsetof(struct arphdr, ar_pro), 2);
+               add_cmp_u16(r, fw->arp.arpro, NFT_CMP_EQ);
+       }
+
+       if (fw->arp.arhln != 0)
+               add_proto(r, offsetof(struct arphdr, ar_hln), 1,
+                         fw->arp.arhln, flags);
+
+       add_proto(r, offsetof(struct arphdr, ar_pln), 1, 4, 0);
+
+       if (fw->arp.arpop != 0) {
+               add_payload(r, offsetof(struct arphdr, ar_op), 2);
+               add_cmp_u16(r, fw->arp.arpop, NFT_CMP_EQ);
+       }
+
+       if (fw->arp.src_devaddr.addr[0] != '\0') {
+               add_payload(r, sizeof(struct arphdr), fw->arp.arhln);
+               add_cmp_ptr(r, NFT_CMP_EQ, fw->arp.src_devaddr.addr, fw->arp.arhln);
+       }
+
+       if (fw->arp.src.s_addr != 0)
+               add_addr(r, sizeof(struct arphdr) + fw->arp.arhln,
+                        &fw->arp.src.s_addr, 4, flags);
+
+       if (fw->arp.tgt_devaddr.addr[0] != '\0') {
+               add_payload(r, sizeof(struct arphdr) + fw->arp.arhln + 4, fw->arp.arhln);
+               add_cmp_ptr(r, NFT_CMP_EQ, fw->arp.tgt_devaddr.addr, fw->arp.arhln);
+       }
+
+       if (fw->arp.tgt.s_addr != 0)
+               add_addr(r, sizeof(struct arphdr) + fw->arp.arhln + sizeof(struct in_addr),
+                        &fw->arp.tgt.s_addr, 4, flags);
+
+       return 0;
+}
+
+static uint16_t ipt_to_arpt_flags(uint8_t invflags)
+{
+       uint16_t result = 0;
+
+       if (invflags & IPT_INV_VIA_IN)
+               result |= ARPT_INV_VIA_IN;
+
+       if (invflags & IPT_INV_VIA_OUT)
+               result |= ARPT_INV_VIA_OUT;
+
+       if (invflags & IPT_INV_SRCIP)
+               result |= ARPT_INV_SRCIP;
+
+       if (invflags & IPT_INV_DSTIP)
+               result |= ARPT_INV_TGTIP;
+
+       if (invflags & IPT_INV_PROTO)
+               result |= ARPT_INV_ARPPRO;
+
+       if (invflags & IPT_INV_MASK)
+               result |= ARPT_INV_MASK;
+
+       return result;
+}
+
+static void nft_arp_parse_meta(struct nft_rule_expr *e, uint8_t key,
+                              void *data)
+{
+       struct arpt_entry *fw = data;
+       uint8_t flags;
+
+       parse_meta(e, key, fw->arp.iniface, fw->arp.iniface_mask,
+                  fw->arp.outiface, fw->arp.outiface_mask,
+                  &flags);
+
+       fw->arp.invflags |= ipt_to_arpt_flags(flags);
+}
+
+static void nft_arp_parse_target(struct xtables_target *t, void *data)
+{
+       struct arpt_entry *fw = data;
+       size_t size = sizeof(struct arpt_entry);
+       struct xt_entry_target **target;
+
+       fw->target_offset = size;
+       fw->next_offset = size + t->t->u.target_size;
+
+       target = (void *) fw + fw->target_offset;
+       *target = t->t;
+}
+
+static void nft_arp_parse_immediate(const char *jumpto, bool nft_goto,
+                                   void *data)
+{
+       struct xtables_target *target;
+       size_t size;
+
+       target = xtables_find_target(XT_STANDARD_TARGET,
+                                    XTF_LOAD_MUST_SUCCEED);
+       size = sizeof(struct xt_entry_target) + target->size;
+       target->t = xtables_calloc(1, size);
+       target->t->u.target_size = size;
+       strcpy(target->t->u.user.name, jumpto);
+
+       nft_arp_parse_target(target, data);
+}
+
+static void nft_arp_parse_payload(struct nft_rule_expr_iter *iter,
+                                 uint32_t offset, void *data)
+{
+       struct arpt_entry *fw = data;
+       struct in_addr addr;
+       unsigned short int ar_hrd, ar_pro, ar_op, ar_hln;
+       bool inv;
+
+       switch (offset) {
+       case offsetof(struct arphdr, ar_hrd):
+               get_cmp_data(iter, &ar_hrd, sizeof(ar_hrd), &inv);
+               fw->arp.arhrd = htons(ar_hrd);
+               fw->arp.arhrd_mask = htons(0xffff);
+               if (inv)
+                       fw->arp.invflags |= ARPT_INV_ARPHRD;
+               break;
+       case offsetof(struct arphdr, ar_pro):
+               get_cmp_data(iter, &ar_pro, sizeof(ar_pro), &inv);
+               fw->arp.arpro = htons(ar_pro);
+               fw->arp.arpro_mask = htons(0xffff);
+               if (inv)
+                       fw->arp.invflags |= ARPT_INV_ARPPRO;
+               break;
+       case offsetof(struct arphdr, ar_op):
+               get_cmp_data(iter, &ar_op, sizeof(ar_op), &inv);
+               fw->arp.arpop = htons(ar_op);
+               fw->arp.arpop_mask = htons(0xffff);
+               if (inv)
+                       fw->arp.invflags |= ARPT_INV_ARPOP;
+               break;
+       case offsetof(struct arphdr, ar_hln):
+               get_cmp_data(iter, &ar_hln, sizeof(ar_op), &inv);
+               fw->arp.arhln = ar_hln;
+               fw->arp.arhln_mask = 0xff;
+               if (inv)
+                       fw->arp.invflags |= ARPT_INV_ARPOP;
+               break;
+       default:
+               if (!fw->arp.arhln)
+                       break;
+
+               if (offset == sizeof(struct arphdr) + fw->arp.arhln) {
+                       get_cmp_data(iter, &addr, sizeof(addr), &inv);
+                       fw->arp.src.s_addr = addr.s_addr;
+                       fw->arp.smsk.s_addr = 0xffffffff;
+                       if (inv)
+                               fw->arp.invflags |= ARPT_INV_SRCIP;
+               } else if (offset == sizeof(struct arphdr) + fw->arp.arhln + sizeof(struct in_addr)) {
+                       get_cmp_data(iter, &addr, sizeof(addr), &inv);
+                       fw->arp.tgt.s_addr = addr.s_addr;
+                       fw->arp.tmsk.s_addr = 0xffffffff;
+                       if (inv)
+                               fw->arp.invflags |= ARPT_INV_TGTIP;
+               }
+               break;
+       }
+}
+
+static void nft_rule_to_arpt_entry(struct nft_rule *r, struct arpt_entry *fw)
+{
+       struct nft_rule_expr_iter *iter;
+       struct nft_rule_expr *expr;
+       int family = nft_rule_attr_get_u8(r, NFT_RULE_ATTR_FAMILY);
+
+       iter = nft_rule_expr_iter_create(r);
+       if (iter == NULL)
+               return;
+
+       expr = nft_rule_expr_iter_next(iter);
+       while (expr != NULL) {
+               const char *name =
+                       nft_rule_expr_get_str(expr, NFT_RULE_EXPR_ATTR_NAME);
+
+               if (strcmp(name, "counter") == 0)
+                       nft_parse_counter(expr, iter, &fw->counters);
+               else if (strcmp(name, "payload") == 0)
+                       nft_parse_payload(expr, iter, family, fw);
+               else if (strcmp(name, "meta") == 0)
+                       nft_parse_meta(expr, iter, family, fw);
+               else if (strcmp(name, "immediate") == 0)
+                       nft_parse_immediate(expr, iter, family, fw);
+               else if (strcmp(name, "target") == 0)
+                       nft_parse_target(expr, iter, family, fw);
+
+               expr = nft_rule_expr_iter_next(iter);
+       }
+
+       nft_rule_expr_iter_destroy(iter);
+}
+
+static void
+nft_arp_print_firewall(struct nft_rule *r, unsigned int num,
+                      unsigned int format)
+{
+       struct arpt_entry fw = {};
+       const char *targname;
+       struct xtables_target *target = NULL;
+       const struct xt_entry_target *t;
+       char buf[BUFSIZ];
+       int i;
+       char iface[IFNAMSIZ+2];
+       int print_iface = 0;
+
+       nft_rule_to_arpt_entry(r, &fw);
+
+       if (format & FMT_LINENUMBERS)
+               printf("%u ", num);
+
+       if (fw.target_offset) {
+               t = nft_arp_get_target(&fw);
+               targname = t->u.user.name;
+               target = xtables_find_target(targname, XTF_TRY_LOAD);
+               if (!(format & FMT_NOTARGET))
+                       printf("-j %s ", targname);
+       }
+
+       iface[0] = '\0';
+
+       if (fw.arp.iniface[0] != '\0') {
+               strcat(iface, fw.arp.iniface);
+               print_iface = 1;
+       }
+       else if (format & FMT_VIA) {
+               print_iface = 1;
+               if (format & FMT_NUMERIC) strcat(iface, "*");
+               else strcat(iface, "any");
+       }
+       if (print_iface)
+               printf("%s-i %s ", fw.arp.invflags & ARPT_INV_VIA_IN ? "! ": "", iface);
+
+       print_iface = 0;
+       iface[0] = '\0';
+
+       if (fw.arp.outiface[0] != '\0') {
+               strcat(iface, fw.arp.outiface);
+               print_iface = 1;
+       }
+       else if (format & FMT_VIA) {
+               print_iface = 1;
+               if (format & FMT_NUMERIC) strcat(iface, "*");
+               else strcat(iface, "any");
+       }
+       if (print_iface)
+               printf("%s-o %s ", fw.arp.invflags & ARPT_INV_VIA_OUT ? "! " : "", iface);
+
+       if (fw.arp.smsk.s_addr != 0L) {
+               printf("%s", fw.arp.invflags & ARPT_INV_SRCIP
+                       ? "! " : "");
+               if (format & FMT_NUMERIC)
+                       sprintf(buf, "%s", addr_to_dotted(&(fw.arp.src)));
+               else
+                       sprintf(buf, "%s", addr_to_anyname(&(fw.arp.src)));
+               strcat(buf, mask_to_dotted(&(fw.arp.smsk)));
+               printf("-s %s ", buf);
+       }
+
+       for (i = 0; i < ARPT_DEV_ADDR_LEN_MAX; i++)
+               if (fw.arp.src_devaddr.mask[i] != 0)
+                       break;
+       if (i == ARPT_DEV_ADDR_LEN_MAX)
+               goto after_devsrc;
+       printf("%s", fw.arp.invflags & ARPT_INV_SRCDEVADDR
+               ? "! " : "");
+       printf("--src-mac ");
+       print_mac_and_mask((unsigned char *)fw.arp.src_devaddr.addr,
+               (unsigned char *)fw.arp.src_devaddr.mask, ETH_ALEN);
+       printf(" ");
+after_devsrc:
+
+       if (fw.arp.tmsk.s_addr != 0L) {
+               printf("%s",fw.arp.invflags & ARPT_INV_TGTIP
+                       ? "! " : "");
+               if (format & FMT_NUMERIC)
+                       sprintf(buf, "%s", addr_to_dotted(&(fw.arp.tgt)));
+               else
+                       sprintf(buf, "%s", addr_to_anyname(&(fw.arp.tgt)));
+               strcat(buf, mask_to_dotted(&(fw.arp.tmsk)));
+               printf("-d %s ", buf);
+       }
+
+       for (i = 0; i <ARPT_DEV_ADDR_LEN_MAX; i++)
+               if (fw.arp.tgt_devaddr.mask[i] != 0)
+                       break;
+       if (i == ARPT_DEV_ADDR_LEN_MAX)
+               goto after_devdst;
+       printf("%s",fw.arp.invflags & ARPT_INV_TGTDEVADDR
+               ? "! " : "");
+       printf("--dst-mac ");
+       print_mac_and_mask((unsigned char *)fw.arp.tgt_devaddr.addr,
+               (unsigned char *)fw.arp.tgt_devaddr.mask, ETH_ALEN);
+       printf(" ");
+after_devdst:
+
+       if (fw.arp.arhln_mask != 0) {
+               printf("%s",fw.arp.invflags & ARPT_INV_ARPHLN
+                       ? "! " : "");
+               printf("--h-length %d", fw.arp.arhln);
+               if (fw.arp.arhln_mask != 255)
+                       printf("/%d", fw.arp.arhln_mask);
+               printf(" ");
+       }
+
+       if (fw.arp.arpop_mask != 0) {
+               int tmp = ntohs(fw.arp.arpop);
+
+               printf("%s",fw.arp.invflags & ARPT_INV_ARPOP
+                       ? "! " : "");
+               if (tmp <= NUMOPCODES && !(format & FMT_NUMERIC))
+                       printf("--opcode %s", opcodes[tmp-1]);
+               else
+                       printf("--opcode %d", tmp);
+               if (fw.arp.arpop_mask != 65535)
+                       printf("/%d", ntohs(fw.arp.arpop_mask));
+               printf(" ");
+       }
+
+       if (fw.arp.arhrd_mask != 0) {
+               uint16_t tmp = ntohs(fw.arp.arhrd);
+
+               printf("%s", fw.arp.invflags & ARPT_INV_ARPHRD
+                       ? "! " : "");
+               if (tmp == 1 && !(format & FMT_NUMERIC))
+                       printf("--h-type %s", "Ethernet");
+               else
+                       printf("--h-type %u", tmp);
+               if (fw.arp.arhrd_mask != 65535)
+                       printf("/%d", ntohs(fw.arp.arhrd_mask));
+               printf(" ");
+       }
+
+       if (fw.arp.arpro_mask != 0) {
+               int tmp = ntohs(fw.arp.arpro);
+
+               printf("%s", fw.arp.invflags & ARPT_INV_ARPPRO
+                       ? "! " : "");
+               if (tmp == 0x0800 && !(format & FMT_NUMERIC))
+                       printf("--proto-type %s", "IPv4");
+               else
+                       printf("--proto-type 0x%x", tmp);
+               if (fw.arp.arpro_mask != 65535)
+                       printf("/%x", ntohs(fw.arp.arpro_mask));
+               printf(" ");
+       }
+
+       if (target) {
+               if (target->print)
+                       /* Print the target information. */
+                       target->print(&fw.arp, t, format & FMT_NUMERIC);
+       }
+
+       if (!(format & FMT_NOCOUNTS)) {
+               printf(", pcnt=");
+               xtables_print_num(fw.counters.pcnt, format);
+               printf("-- bcnt=");
+               xtables_print_num(fw.counters.bcnt, format);
+       }
+
+       if (!(format & FMT_NONEWLINE))
+               fputc('\n', stdout);
+}
+
+struct nft_family_ops nft_family_ops_arp = {
+       .add                    = nft_arp_add,
+       .is_same                = NULL,
+       .print_payload          = NULL,
+       .parse_meta             = nft_arp_parse_meta,
+       .parse_payload          = nft_arp_parse_payload,
+       .parse_immediate        = nft_arp_parse_immediate,
+       .print_firewall         = nft_arp_print_firewall,
+       .post_parse             = NULL,
+};
index 5681e26430f479975f0049641645098da5da19e0..c1cb5a7f9ffe3c486b72754046abb952e8e9f89d 100644 (file)
@@ -30,6 +30,7 @@
 
 extern struct nft_family_ops nft_family_ops_ipv4;
 extern struct nft_family_ops nft_family_ops_ipv6;
+extern struct nft_family_ops nft_family_ops_arp;
 
 void add_meta(struct nft_rule *r, uint32_t key)
 {
@@ -281,8 +282,7 @@ void parse_meta(struct nft_rule_expr *e, uint8_t key, char *iniface,
        }
 }
 
-static void
-nft_parse_target(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
+void nft_parse_target(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
                 int family, void *data)
 {
        size_t tg_len;
@@ -381,7 +381,7 @@ void get_cmp_data(struct nft_rule_expr_iter *iter,
                *inv = false;
 }
 
-static void
+void
 nft_parse_meta(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
               int family, void *data)
 {
@@ -402,7 +402,7 @@ nft_parse_meta(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
        ops->parse_meta(e, key, data);
 }
 
-static void
+void
 nft_parse_payload(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
                  int family, void *data)
 {
@@ -414,7 +414,7 @@ nft_parse_payload(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
        ops->parse_payload(iter, offset, data);
 }
 
-static void
+void
 nft_parse_counter(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
                  struct xt_counters *counters)
 {
@@ -422,7 +422,7 @@ nft_parse_counter(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
        counters->bcnt = nft_rule_expr_get_u64(e, NFT_EXPR_CTR_BYTES);
 }
 
-static void
+void
 nft_parse_immediate(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
                    int family, void *data)
 {
@@ -649,6 +649,8 @@ struct nft_family_ops *nft_family_ops_lookup(int family)
                return &nft_family_ops_ipv4;
        case AF_INET6:
                return &nft_family_ops_ipv6;
+       case NFPROTO_ARP:
+               return &nft_family_ops_arp;
        default:
                break;
        }
index 3f1a9a4a87cd3631716f4a9906311e4eb0610854..375c714f32f09b9354b1999af7329236689cf51e 100644 (file)
@@ -84,6 +84,19 @@ void parse_meta(struct nft_rule_expr *e, uint8_t key, char *iniface,
 void print_proto(uint16_t proto, int invert);
 void get_cmp_data(struct nft_rule_expr_iter *iter,
                  void *data, size_t dlen, bool *inv);
+void nft_parse_target(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
+                     int family, void *data);
+void nft_parse_meta(struct nft_rule_expr *e, struct nft_rule_expr_iter *iter,
+                   int family, void *data);
+void nft_parse_payload(struct nft_rule_expr *e,
+                      struct nft_rule_expr_iter *iter,
+                      int family, void *data);
+void nft_parse_counter(struct nft_rule_expr *e,
+                      struct nft_rule_expr_iter *iter,
+                      struct xt_counters *counters);
+void nft_parse_immediate(struct nft_rule_expr *e,
+                        struct nft_rule_expr_iter *iter,
+                        int family, void *data);
 void nft_rule_to_iptables_command_state(struct nft_rule *r,
                                        struct iptables_command_state *cs);
 void print_firewall_details(const struct iptables_command_state *cs,
@@ -149,4 +162,21 @@ struct xtables_args {
 #define CMD_ZERO_NUM           0x2000U
 #define CMD_CHECK              0x4000U
 
+/*
+ * ARP
+ */
+extern char *opcodes[];
+#define NUMOPCODES 9
+
+#include <linux/netfilter_arp/arp_tables.h>
+
+static inline struct xt_entry_target *nft_arp_get_target(struct arpt_entry *fw) 
+{
+       struct xt_entry_target **target;
+
+       target = (void *) fw + fw->target_offset;
+
+       return *target;
+}
+
 #endif
index 49d345d2eda83e6b7d7316240972043d8576dcd7..28c5473de3a4033c633b0f41f888a68f725b2597 100644 (file)
@@ -53,9 +53,9 @@
 
 static void *nft_fn;
 
-static int mnl_talk(struct nft_handle *h, struct nlmsghdr *nlh,
-                   int (*cb)(const struct nlmsghdr *nlh, void *data),
-                   void *data)
+int mnl_talk(struct nft_handle *h, struct nlmsghdr *nlh,
+            int (*cb)(const struct nlmsghdr *nlh, void *data),
+            void *data)
 {
        int ret;
        char buf[MNL_SOCKET_BUFFER_SIZE];
@@ -210,7 +210,35 @@ struct builtin_table xtables_ipv4[TABLES_MAX] = {
        },
 };
 
-static int
+#include <linux/netfilter_arp.h>
+
+struct builtin_table xtables_arp[TABLES_MAX] = {
+       [FILTER] = {
+       .name   = "filter",
+       .chains = {
+                       {
+                               .name   = "INPUT",
+                               .type   = "filter",
+                               .prio   = NF_IP_PRI_FILTER,
+                               .hook   = NF_ARP_IN,
+                       },
+                       {
+                               .name   = "FORWARD",
+                               .type   = "filter",
+                               .prio   = NF_IP_PRI_FILTER,
+                               .hook   = NF_ARP_FORWARD,
+                       },
+                       {
+                               .name   = "OUTPUT",
+                               .type   = "filter",
+                               .prio   = NF_IP_PRI_FILTER,
+                               .hook   = NF_ARP_OUT,
+                       },
+               },
+       },
+};
+
+int
 nft_table_builtin_add(struct nft_handle *h, struct builtin_table *_t,
                        bool dormant)
 {
@@ -242,7 +270,7 @@ nft_table_builtin_add(struct nft_handle *h, struct builtin_table *_t,
        return ret;
 }
 
-static struct nft_chain *
+struct nft_chain *
 nft_chain_builtin_alloc(struct builtin_table *table,
                        struct builtin_chain *chain, int policy)
 {
@@ -262,7 +290,7 @@ nft_chain_builtin_alloc(struct builtin_table *table,
        return c;
 }
 
-static void
+void
 nft_chain_builtin_add(struct nft_handle *h, struct builtin_table *table,
                      struct builtin_chain *chain, int policy)
 {
@@ -288,8 +316,8 @@ nft_chain_builtin_add(struct nft_handle *h, struct builtin_table *table,
 }
 
 /* find if built-in table already exists */
-static struct builtin_table
-*nft_table_builtin_find(struct nft_handle *h, const char *table)
+struct builtin_table *
+nft_table_builtin_find(struct nft_handle *h, const char *table)
 {
        int i;
        bool found = false;
@@ -309,7 +337,7 @@ static struct builtin_table
 }
 
 /* find if built-in chain already exists */
-static struct builtin_chain *
+struct builtin_chain *
 nft_chain_builtin_find(struct builtin_table *t, const char *chain)
 {
        int i;
@@ -346,7 +374,7 @@ __nft_chain_builtin_init(struct nft_handle *h,
        }
 }
 
-static int
+int
 nft_chain_builtin_init(struct nft_handle *h, const char *table,
                       const char *chain, int policy)
 {
@@ -597,7 +625,7 @@ static int __add_target(struct nft_rule_expr *e, struct xt_entry_target *t)
        return 0;
 }
 
-static int add_target(struct nft_rule *r, struct xt_entry_target *t)
+int add_target(struct nft_rule *r, struct xt_entry_target *t)
 {
        struct nft_rule_expr *expr;
        int ret;
@@ -612,7 +640,7 @@ static int add_target(struct nft_rule *r, struct xt_entry_target *t)
        return ret;
 }
 
-static int add_jumpto(struct nft_rule *r, const char *name, int verdict)
+int add_jumpto(struct nft_rule *r, const char *name, int verdict)
 {
        struct nft_rule_expr *expr;
 
@@ -628,7 +656,7 @@ static int add_jumpto(struct nft_rule *r, const char *name, int verdict)
        return 0;
 }
 
-static int add_verdict(struct nft_rule *r, int verdict)
+int add_verdict(struct nft_rule *r, int verdict)
 {
        struct nft_rule_expr *expr;
 
@@ -654,7 +682,7 @@ static void nft_rule_print_debug(struct nft_rule *r, struct nlmsghdr *nlh)
 #endif
 }
 
-static int add_counters(struct nft_rule *r, uint64_t packets, uint64_t bytes)
+int add_counters(struct nft_rule *r, uint64_t packets, uint64_t bytes)
 {
        struct nft_rule_expr *expr;
 
@@ -1533,12 +1561,12 @@ __nft_rule_del(struct nft_handle *h, struct nft_rule *r)
                perror("mnl_talk:nft_rule_del");
 }
 
-static struct nft_rule_list *nft_rule_list_create(struct nft_handle *h)
+struct nft_rule_list *nft_rule_list_create(struct nft_handle *h)
 {
        return nft_rule_list_get(h);
 }
 
-static void nft_rule_list_destroy(struct nft_rule_list *list)
+void nft_rule_list_destroy(struct nft_rule_list *list)
 {
        nft_rule_list_free(list);
 }
@@ -2443,3 +2471,246 @@ err:
        return ret == 0 ? 1 : 0;
 }
 
+/*
+ * XXX These are almost copy and paste of the original functions, but adapted
+ * to ARP. These functions should go away with some refactoring of the
+ * existing infrastructure.
+ */
+static struct nft_rule *
+nft_arp_rule_new(struct nft_handle *h, const char *chain, const char *table,
+            struct arpt_entry *fw)
+{
+       struct xt_entry_target *t;
+       char *targname;
+       struct nft_rule *r;
+       int ret = 0;
+
+       t = nft_arp_get_target(fw);
+       targname = t->u.user.name;
+
+       r = nft_rule_alloc();
+       if (r == NULL)
+               return NULL;
+
+       nft_rule_attr_set_u32(r, NFT_RULE_ATTR_FAMILY, h->family);
+       nft_rule_attr_set(r, NFT_RULE_ATTR_TABLE, (char *)table);
+       nft_rule_attr_set(r, NFT_RULE_ATTR_CHAIN, (char *)chain);
+
+       h->ops->add(r, fw);
+
+       /* Counters need to me added before the target, otherwise they are
+        * increased for each rule because of the way nf_tables works.
+        */
+       if (add_counters(r, fw->counters.pcnt, fw->counters.bcnt) < 0)
+               goto err;
+
+       /* Standard target? */
+       if (strcmp(targname, XTC_LABEL_ACCEPT) == 0)
+               ret = add_verdict(r, NF_ACCEPT);
+       else if (strcmp(targname, XTC_LABEL_DROP) == 0)
+               ret = add_verdict(r, NF_DROP);
+       else if (strcmp(targname, XTC_LABEL_RETURN) == 0)
+               ret = add_verdict(r, NFT_RETURN);
+       else if (xtables_find_target(targname, XTF_TRY_LOAD) != NULL)
+               ret = add_target(r, t);
+       else
+               ret = add_jumpto(r, targname, NFT_JUMP);
+
+       if (ret < 0)
+               goto err;
+
+       return r;
+err:
+       nft_rule_free(r);
+       return NULL;
+
+}
+
+static void
+nft_arp_rule_print_debug(struct nft_rule *r, struct nlmsghdr *nlh) {
+#ifdef NLDEBUG
+       char tmp[1024];
+
+       nft_rule_snprintf(tmp, sizeof(tmp), r, 0, 0);
+       printf("DEBUG: rule: %s", tmp);
+       mnl_nlmsg_fprintf(stdout, nlh, nlh->nlmsg_len, sizeof(struct nfgenmsg));
+#endif
+}
+
+static int
+nft_arp_rule_add(struct nft_handle *h, const char *chain,
+                const char *table, struct arpt_entry *fw,
+                uint64_t handle, bool verbose)
+{
+       char buf[MNL_SOCKET_BUFFER_SIZE];
+       struct nlmsghdr *nlh;
+       struct nft_rule *r;
+       int ret = 1;
+
+       r = nft_arp_rule_new(h, chain, table, fw);
+       if (r == NULL) {
+               ret = 0;
+               goto err;
+       }
+       if (handle > 0)
+                       nft_rule_attr_set_u64(r, NFT_RULE_ATTR_POSITION, handle);
+
+       if (h->commit) {
+               nft_rule_attr_set_u32(r, NFT_RULE_ATTR_FLAGS,
+                                     NFT_RULE_F_COMMIT);
+       }
+
+       nlh = nft_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, h->family,
+                                      NLM_F_ACK|NLM_F_CREATE, h->seq);
+       nft_rule_nlmsg_build_payload(nlh, r);
+       nft_arp_rule_print_debug(r, nlh);
+       nft_rule_free(r);
+
+       ret = mnl_talk(h, nlh, NULL, NULL);
+       if (ret < 0)
+               perror("mnl_talk:nft_arp_rule_add");
+
+err:
+       /* the core expects 1 for success and 0 for error */
+       return ret == 0 ? 1 : 0;
+}
+
+int nft_arp_rule_append(struct nft_handle *h, const char *chain,
+                       const char *table, struct arpt_entry *fw, bool verbose)
+{
+       char buf[MNL_SOCKET_BUFFER_SIZE];
+       struct nlmsghdr *nlh;
+       struct nft_rule *r;
+       uint16_t flags = NLM_F_ACK|NLM_F_CREATE;
+       int ret = 1;
+
+       /* If built-in chains don't exist for this table, create them */
+       if (nft_xtables_config_load(h, XTABLES_CONFIG_DEFAULT, 0) < 0)
+               nft_chain_builtin_init(h, table, chain, NF_ACCEPT);
+
+       nft_fn = nft_arp_rule_append;
+
+       r = nft_arp_rule_new(h, chain, table, fw);
+       if (r == NULL) {
+               ret = 0;
+               goto err;
+       }
+
+       /*if (handle > 0) {
+               nft_rule_attr_set(r, NFT_RULE_ATTR_HANDLE, &handle);
+               flags |= NLM_F_REPLACE;
+       } else
+               flags |= NLM_F_APPEND;*/
+
+       flags |= NLM_F_APPEND;
+
+       if (h->commit) {
+               nft_rule_attr_set_u32(r, NFT_RULE_ATTR_FLAGS,
+                                     NFT_RULE_F_COMMIT);
+       }
+
+       nlh = nft_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, h->family,
+                                      flags, h->seq);
+       nft_rule_nlmsg_build_payload(nlh, r);
+       nft_arp_rule_print_debug(r, nlh);
+       nft_rule_free(r);
+
+       ret = mnl_talk(h, nlh, NULL, NULL);
+       if (ret < 0)
+               perror("mnl_talk:nft_arp_rule_append");
+
+err:
+       /* the core expects 1 for success and 0 for error */
+       return ret == 0 ? 1 : 0;
+}
+
+static struct nft_rule *
+nft_arp_rule_find(struct nft_rule_list *list, const char *chain,
+                 const char *table, struct arpt_entry *fw, int rulenum)
+{
+       struct nft_rule *r;
+       struct nft_rule_list_iter *iter;
+       int rule_ctr = 0;
+       bool found = false;
+
+       iter = nft_rule_list_iter_create(list);
+       if (iter == NULL)
+               return 0;
+
+       r = nft_rule_list_iter_next(iter);
+       while (r != NULL) {
+               const char *rule_table =
+                       nft_rule_attr_get_str(r, NFT_RULE_ATTR_TABLE);
+               const char *rule_chain =
+                       nft_rule_attr_get_str(r, NFT_RULE_ATTR_CHAIN);
+               const struct nft_family_ops *ops = nft_family_ops_lookup(
+                               nft_rule_attr_get_u8(r, NFT_RULE_ATTR_FAMILY));
+               struct arpt_entry this = {};
+
+               if (strcmp(table, rule_table) != 0 ||
+                   strcmp(chain, rule_chain) != 0) {
+                       DEBUGP("different chain / table\n");
+                       goto next;
+               }
+
+               if (rulenum >= 0) {
+                       /* Delete by rule number case */
+                       if (rule_ctr != rulenum)
+                               goto next;
+                       found = true;
+                       break;
+               } else {
+                       /* Delete by matching rule case */
+                       nft_rule_to_arpt_entry(r, &this);
+
+                       DEBUGP("comparing with... ");
+
+                       found = true;
+                       break;
+               }
+next:
+               rule_ctr++;
+               r = nft_rule_list_iter_next(iter);
+       }
+
+       nft_rule_list_iter_destroy(iter);
+
+       return found ? r : NULL;
+}
+
+int nft_arp_rule_insert(struct nft_handle *h, const char *chain,
+                       const char *table, struct arpt_entry *fw,
+                       int rulenum, bool verbose)
+{
+       struct nft_rule_list *list;
+       struct nft_rule *r;
+       uint64_t handle = 0;
+
+       /* If built-in chains don't exist for this table, create them */
+       if (nft_xtables_config_load(h, XTABLES_CONFIG_DEFAULT, 0) < 0)
+               nft_chain_builtin_init(h, table, chain, NF_ACCEPT);
+
+       nft_fn = nft_arp_rule_insert;
+
+       if (rulenum > 0) {
+               list = nft_rule_list_create(h);
+               if (list == NULL)
+                       goto err;
+
+               r = nft_arp_rule_find(list, chain, table, fw, rulenum);
+               if (r == NULL) {
+                       errno = ENOENT;
+                       goto err;
+               }
+
+               handle = nft_rule_attr_get_u64(r, NFT_RULE_ATTR_HANDLE);
+               DEBUGP("adding after rule handle %"PRIu64"\n", handle);
+
+               nft_rule_list_destroy(list);
+       }
+
+       return nft_arp_rule_add(h, chain, table, fw, handle, verbose);
+err:
+       nft_rule_list_destroy(list);
+       return 0;
+}
index fe1b9c81e2743445dbad584ebc759dc5dd759e42..25275cee1531fd3cc596c42b74084ad743b84b1d 100644 (file)
@@ -34,7 +34,11 @@ struct nft_handle {
 };
 
 extern struct builtin_table xtables_ipv4[TABLES_MAX];
+extern struct builtin_table xtables_arp[TABLES_MAX];
 
+int mnl_talk(struct nft_handle *h, struct nlmsghdr *nlh,
+            int (*cb)(const struct nlmsghdr *nlh, void *data),
+            void *data);
 int nft_init(struct nft_handle *h, struct builtin_table *t);
 void nft_fini(struct nft_handle *h);
 
@@ -44,6 +48,8 @@ void nft_fini(struct nft_handle *h);
 struct nft_table;
 struct nft_chain_list;
 
+int nft_table_builtin_add(struct nft_handle *h, struct builtin_table *_t, bool dormant);
+struct builtin_table *nft_table_builtin_find(struct nft_handle *h, const char *table);
 int nft_table_add(struct nft_handle *h, const struct nft_table *t);
 int nft_for_each_table(struct nft_handle *h, int (*func)(struct nft_handle *h, const char *tablename, bool counters), bool counters);
 bool nft_table_find(struct nft_handle *h, const char *tablename);
@@ -56,6 +62,10 @@ int nft_table_purge_chains(struct nft_handle *h, const char *table, struct nft_c
  */
 struct nft_chain;
 
+struct nft_chain *nft_chain_builtin_alloc(struct builtin_table *table, struct builtin_chain *chain, int policy);
+void nft_chain_builtin_add(struct nft_handle *h, struct builtin_table *table, struct builtin_chain *chain, int policy);
+struct builtin_chain *nft_chain_builtin_find(struct builtin_table *t, const char *chain);
+int nft_chain_builtin_init(struct nft_handle *h, const char *table, const char *chain, int policy);
 int nft_chain_add(struct nft_handle *h, const struct nft_chain *c);
 int nft_chain_set(struct nft_handle *h, const char *table, const char *chain, const char *policy, const struct xt_counters *counters);
 struct nft_chain_list *nft_chain_dump(struct nft_handle *h);
@@ -82,6 +92,16 @@ int nft_rule_list_save(struct nft_handle *h, const char *chain, const char *tabl
 int nft_rule_save(struct nft_handle *h, const char *table, bool counters);
 int nft_rule_flush(struct nft_handle *h, const char *chain, const char *table);
 int nft_rule_zero_counters(struct nft_handle *h, const char *chain, const char *table, int rulenum);
+struct nft_rule_list *nft_rule_list_create(struct nft_handle *h);
+void nft_rule_list_destroy(struct nft_rule_list *list);
+
+/*
+ * Operations used in userspace tools
+ */
+int add_counters(struct nft_rule *r, uint64_t packets, uint64_t bytes);
+int add_verdict(struct nft_rule *r, int verdict);
+int add_target(struct nft_rule *r, struct xt_entry_target *t);
+int add_jumpto(struct nft_rule *r, const char *name, int verdict);
 
 enum nft_rule_print {
        NFT_RULE_APPEND,
@@ -110,6 +130,8 @@ const char *nft_strerror(int err);
 
 /* For xtables.c */
 int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table);
+/* For xtables-arptables.c */
+int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table);
 
 /*
  * Parse config for tables and chain helper functions
@@ -127,4 +149,17 @@ enum {
 
 int nft_xtables_config_load(struct nft_handle *h, const char *filename, uint32_t flags);
 
+/*
+ * ARP
+ */
+
+struct arpt_entry;
+
+int nft_arp_rule_append(struct nft_handle *h, const char *chain,
+                       const char *table, struct arpt_entry *fw,
+                       bool verbose);
+int nft_arp_rule_insert(struct nft_handle *h, const char *chain,
+                       const char *table, struct arpt_entry *fw,
+                       int rulenum, bool verbose);
+
 #endif
diff --git a/iptables/xtables-arp-standalone.c b/iptables/xtables-arp-standalone.c
new file mode 100644 (file)
index 0000000..186c9a1
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+ * Author: Paul.Russell@rustcorp.com.au and mneuling@radlogic.com.au
+ *
+ * Based on the ipchains code by Paul Russell and Michael Neuling
+ *
+ * (C) 2000-2002 by the netfilter coreteam <coreteam@netfilter.org>:
+ *                 Paul 'Rusty' Russell <rusty@rustcorp.com.au>
+ *                 Marc Boucher <marc+nf@mbsi.ca>
+ *                 James Morris <jmorris@intercode.com.au>
+ *                 Harald Welte <laforge@gnumonks.org>
+ *                 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
+ *     arptables -- IP firewall administration for kernels with
+ *     firewall table (aimed for the 2.3 kernels)
+ *
+ *     See the accompanying manual page arptables(8) for information
+ *     about proper usage of this program.
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <xtables.h>
+#include "nft.h"
+#include <linux/netfilter_arp/arp_tables.h>
+
+#include "xtables-multi.h"
+
+extern struct xtables_globals xtables_globals;
+extern const char *program_version, *program_name;
+
+static const struct xtables_afinfo afinfo_arp = {
+        .kmod          = "arp_tables",
+        .proc_exists   = "/proc/net/arp_tables_names",
+        .libprefix     = "libarp_",
+        .family        = NFPROTO_ARP,
+        .ipproto       = IPPROTO_IP,
+        .so_rev_match  = -1,
+        .so_rev_target = -1,
+};
+
+int xtables_arp_main(int argc, char *argv[])
+{
+       int ret;
+       char *table = "filter";
+       struct nft_handle h = {
+               .family = NFPROTO_ARP,
+       };
+
+       xtables_globals.program_name = "xtables-arp";
+       /* This code below could be replaced by xtables_init_all, which
+        * doesn't support NFPROTO_ARP yet.
+        */
+       xtables_init();
+       afinfo = &afinfo_arp;
+       ret = xtables_set_params(&xtables_globals);
+       if (ret < 0) {
+               fprintf(stderr, "%s/%s Failed to initialize xtables\n",
+                               xtables_globals.program_name,
+                               xtables_globals.program_version);
+               exit(1);
+       }
+
+#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
+       init_extensions();
+#endif
+
+       ret = do_commandarp(&h, argc, argv, &table);
+
+       exit(!ret);
+}
diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c
new file mode 100644 (file)
index 0000000..68687c0
--- /dev/null
@@ -0,0 +1,1457 @@
+/* Code to take an arptables-style command line and do it. */
+
+/*
+ * arptables:
+ * Author: Bart De Schuymer <bdschuym@pandora.be>, but
+ * almost all code is from the iptables userspace program, which has main
+ * authors: Paul.Russell@rustcorp.com.au and mneuling@radlogic.com.au
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+  Currently, only support for specifying hardware addresses for Ethernet
+  is available.
+  This tool is not luser-proof: you can specify an Ethernet source address
+  and set hardware length to something different than 6, f.e.
+*/
+
+#include <getopt.h>
+#include <string.h>
+#include <netdb.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <dlfcn.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/wait.h>
+#include <net/if.h>
+#include <netinet/ether.h>
+#include <xtables.h>
+
+#include "xshared.h"
+
+#include "nft.h"
+#include <linux/netfilter_arp/arp_tables.h>
+
+typedef char arpt_chainlabel[32];
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+/* XXX: command defined by nft-shared.h do not overlap with these two */
+#undef CMD_CHECK
+#undef CMD_RENAME_CHAIN
+
+#define CMD_NONE               0x0000U
+#define CMD_INSERT             0x0001U
+#define CMD_DELETE             0x0002U
+#define CMD_DELETE_NUM         0x0004U
+#define CMD_REPLACE            0x0008U
+#define CMD_APPEND             0x0010U
+#define CMD_LIST               0x0020U
+#define CMD_FLUSH              0x0040U
+#define CMD_ZERO               0x0080U
+#define CMD_NEW_CHAIN          0x0100U
+#define CMD_DELETE_CHAIN       0x0200U
+#define CMD_SET_POLICY         0x0400U
+#define CMD_CHECK              0x0800U
+#define CMD_RENAME_CHAIN       0x1000U
+#define NUMBER_OF_CMD  13
+static const char cmdflags[] = { 'I', 'D', 'D', 'R', 'A', 'L', 'F', 'Z',
+                                'N', 'X', 'P', 'E' };
+
+#define OPTION_OFFSET 256
+
+#define OPT_NONE       0x00000U
+#define OPT_NUMERIC    0x00001U
+#define OPT_S_IP       0x00002U
+#define OPT_D_IP       0x00004U
+#define OPT_S_MAC      0x00008U
+#define OPT_D_MAC      0x00010U
+#define OPT_H_LENGTH   0x00020U
+#define OPT_P_LENGTH   0x00040U
+#define OPT_OPCODE     0x00080U
+#define OPT_H_TYPE     0x00100U
+#define OPT_P_TYPE     0x00200U
+#define OPT_JUMP       0x00400U
+#define OPT_VERBOSE    0x00800U
+#define OPT_VIANAMEIN  0x01000U
+#define OPT_VIANAMEOUT 0x02000U
+#define OPT_LINENUMBERS 0x04000U
+#define OPT_COUNTERS   0x08000U
+#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'};
+
+static struct option original_opts[] = {
+       { "append", 1, 0, 'A' },
+       { "delete", 1, 0,  'D' },
+       { "insert", 1, 0,  'I' },
+       { "replace", 1, 0,  'R' },
+       { "list", 2, 0,  'L' },
+       { "flush", 2, 0,  'F' },
+       { "zero", 2, 0,  'Z' },
+       { "new-chain", 1, 0,  'N' },
+       { "delete-chain", 2, 0,  'X' },
+       { "rename-chain", 1, 0,  'E' },
+       { "policy", 1, 0,  'P' },
+       { "source-ip", 1, 0, 's' },
+       { "destination-ip", 1, 0,  'd' },
+       { "src-ip", 1, 0,  's' },
+       { "dst-ip", 1, 0,  'd' },
+       { "source-mac", 1, 0, 2},
+       { "destination-mac", 1, 0, 3},
+       { "src-mac", 1, 0, 2},
+       { "dst-mac", 1, 0, 3},
+       { "h-length", 1, 0,  'l' },
+       { "p-length", 1, 0,  8 },
+       { "opcode", 1, 0,  4 },
+       { "h-type", 1, 0,  5 },
+       { "proto-type", 1, 0,  6 },
+       { "in-interface", 1, 0, 'i' },
+       { "jump", 1, 0, 'j' },
+       { "table", 1, 0, 't' },
+       { "match", 1, 0, 'm' },
+       { "numeric", 0, 0, 'n' },
+       { "out-interface", 1, 0, 'o' },
+       { "verbose", 0, 0, 'v' },
+       { "exact", 0, 0, 'x' },
+       { "version", 0, 0, 'V' },
+       { "help", 2, 0, 'h' },
+       { "line-numbers", 0, 0, '0' },
+       { "modprobe", 1, 0, 'M' },
+       { 0 }
+};
+
+int RUNTIME_NF_ARP_NUMHOOKS = 3;
+
+static struct option *opts = original_opts;
+static unsigned int global_option_offset = 0;
+
+extern void xtables_exit_error(enum xtables_exittype status, const char *msg, ...);
+extern struct xtables_globals xtables_globals;
+
+/* Table of legal combinations of commands and options.  If any of the
+ * given commands make an option legal, that option is legal (applies to
+ * CMD_LIST and CMD_ZERO only).
+ * Key:
+ *  +  compulsory
+ *  x  illegal
+ *     optional
+ */
+
+static char commands_v_options[NUMBER_OF_CMD][NUMBER_OF_OPT] =
+/* Well, it's better than "Re: Linux vs FreeBSD" */
+{
+       /*     -n  -s  -d  -p  -j  -v  -x  -i  -o  -f  --line */
+/*INSERT*/    {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*DELETE*/    {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*DELETE_NUM*/{' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*REPLACE*/   {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*APPEND*/    {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*LIST*/      {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*FLUSH*/     {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*ZERO*/      {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*NEW_CHAIN*/ {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*DEL_CHAIN*/ {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*SET_POLICY*/{' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*CHECK*/     {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '},
+/*RENAME*/    {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '}
+};
+
+static int inverse_for_options[NUMBER_OF_OPT] =
+{
+/* -n */ 0,
+/* -s */ ARPT_INV_SRCIP,
+/* -d */ ARPT_INV_TGTIP,
+/* 2 */ ARPT_INV_SRCDEVADDR,
+/* 3 */ ARPT_INV_TGTDEVADDR,
+/* -l */ ARPT_INV_ARPHLN,
+/* 8 */ 0,
+/* 4 */ ARPT_INV_ARPOP,
+/* 5 */ ARPT_INV_ARPHRD,
+/* 6 */ ARPT_INV_ARPPRO,
+/* -j */ 0,
+/* -v */ 0,
+/* -i */ ARPT_INV_VIA_IN,
+/* -o */ ARPT_INV_VIA_OUT,
+/*--line*/ 0,
+/* -c */ 0,
+};
+
+const char *program_version = XTABLES_VERSION;
+const char *program_name = "xtables-arp";
+
+/* A few hardcoded protocols for 'all' and in case the user has no
+   /etc/protocols */
+struct pprot {
+       char *name;
+       u_int8_t num;
+};
+
+/* 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 */
+/***********************************************/
+
+unsigned char mac_type_unicast[ETH_ALEN] =   {0,0,0,0,0,0};
+unsigned char msk_type_unicast[ETH_ALEN] =   {1,0,0,0,0,0};
+unsigned char mac_type_multicast[ETH_ALEN] = {1,0,0,0,0,0};
+unsigned char msk_type_multicast[ETH_ALEN] = {1,0,0,0,0,0};
+unsigned char mac_type_broadcast[ETH_ALEN] = {255,255,255,255,255,255};
+unsigned char msk_type_broadcast[ETH_ALEN] = {255,255,255,255,255,255};
+
+/*
+ * put the mac address into 6 (ETH_ALEN) bytes
+ */
+static int getmac_and_mask(char *from, char *to, char *mask)
+{
+       char *p;
+       int i;
+       struct ether_addr *addr;
+
+       if (strcasecmp(from, "Unicast") == 0) {
+               memcpy(to, mac_type_unicast, ETH_ALEN);
+               memcpy(mask, msk_type_unicast, ETH_ALEN);
+               return 0;
+       }
+       if (strcasecmp(from, "Multicast") == 0) {
+               memcpy(to, mac_type_multicast, ETH_ALEN);
+               memcpy(mask, msk_type_multicast, ETH_ALEN);
+               return 0;
+       }
+       if (strcasecmp(from, "Broadcast") == 0) {
+               memcpy(to, mac_type_broadcast, ETH_ALEN);
+               memcpy(mask, msk_type_broadcast, ETH_ALEN);
+               return 0;
+       }
+       if ( (p = strrchr(from, '/')) != NULL) {
+               *p = '\0';
+               if (!(addr = ether_aton(p + 1)))
+                       return -1;
+               memcpy(mask, addr, ETH_ALEN);
+       } else
+               memset(mask, 0xff, ETH_ALEN);
+       if (!(addr = ether_aton(from)))
+               return -1;
+       memcpy(to, addr, ETH_ALEN);
+       for (i = 0; i < ETH_ALEN; i++)
+               to[i] &= mask[i];
+       return 0;
+}
+
+static int getlength_and_mask(char *from, uint8_t *to, uint8_t *mask)
+{
+       char *p, *buffer;
+       int i;
+
+       if ( (p = strrchr(from, '/')) != NULL) {
+               *p = '\0';
+               i = strtol(p+1, &buffer, 10);
+               if (*buffer != '\0' || i < 0 || i > 255)
+                       return -1;
+               *mask = (uint8_t)i;
+       } else
+               *mask = 255;
+       i = strtol(from, &buffer, 10);
+       if (*buffer != '\0' || i < 0 || i > 255)
+               return -1;
+       *to = (uint8_t)i;
+       return 0;
+}
+
+static int get16_and_mask(char *from, uint16_t *to, uint16_t *mask, int base)
+{
+       char *p, *buffer;
+       int i;
+
+       if ( (p = strrchr(from, '/')) != NULL) {
+               *p = '\0';
+               i = strtol(p+1, &buffer, base);
+               if (*buffer != '\0' || i < 0 || i > 65535)
+                       return -1;
+               *mask = htons((uint16_t)i);
+       } else
+               *mask = 65535;
+       i = strtol(from, &buffer, base);
+       if (*buffer != '\0' || i < 0 || i > 65535)
+               return -1;
+       *to = htons((uint16_t)i);
+       return 0;
+}
+
+static int
+string_to_number(const char *s, unsigned int min, unsigned int max,
+                unsigned int *ret)
+{
+       long number;
+       char *end;
+
+       /* Handle hex, octal, etc. */
+       errno = 0;
+       number = strtol(s, &end, 0);
+       if (*end == '\0' && end != s) {
+               /* we parsed a number, let's see if we want this */
+               if (errno != ERANGE && min <= number && number <= max) {
+                       *ret = number;
+                       return 0;
+               }
+       }
+       return -1;
+}
+
+/*********************************************/
+/* ARPTABLES SPECIFIC NEW FUNCTIONS END HERE */
+/*********************************************/
+
+static struct in_addr *
+dotted_to_addr(const char *dotted)
+{
+       static struct in_addr addr;
+       unsigned char *addrp;
+       char *p, *q;
+       unsigned int onebyte;
+       int i;
+       char buf[20];
+
+       /* copy dotted string, because we need to modify it */
+       strncpy(buf, dotted, sizeof(buf) - 1);
+       addrp = (unsigned char *) &(addr.s_addr);
+
+       p = buf;
+       for (i = 0; i < 3; i++) {
+               if ((q = strchr(p, '.')) == NULL)
+                       return (struct in_addr *) NULL;
+
+               *q = '\0';
+               if (string_to_number(p, 0, 255, &onebyte) == -1)
+                       return (struct in_addr *) NULL;
+
+               addrp[i] = (unsigned char) onebyte;
+               p = q + 1;
+       }
+
+       /* we've checked 3 bytes, now we check the last one */
+       if (string_to_number(p, 0, 255, &onebyte) == -1)
+               return (struct in_addr *) NULL;
+
+       addrp[3] = (unsigned char) onebyte;
+
+       return &addr;
+}
+
+static struct in_addr *
+network_to_addr(const char *name)
+{
+       struct netent *net;
+       static struct in_addr addr;
+
+       if ((net = getnetbyname(name)) != NULL) {
+               if (net->n_addrtype != AF_INET)
+                       return (struct in_addr *) NULL;
+               addr.s_addr = htonl((unsigned long) net->n_net);
+               return &addr;
+       }
+
+       return (struct in_addr *) NULL;
+}
+
+static void
+inaddrcpy(struct in_addr *dst, struct in_addr *src)
+{
+       /* memcpy(dst, src, sizeof(struct in_addr)); */
+       dst->s_addr = src->s_addr;
+}
+
+static void
+exit_tryhelp(int status)
+{
+       fprintf(stderr, "Try `%s -h' or '%s --help' for more information.\n",
+                       program_name, program_name );
+       exit(status);
+}
+
+static void
+exit_printhelp(void)
+{
+       struct xtables_target *t = NULL;
+       int i;
+
+       printf("%s v%s\n\n"
+"Usage: %s -[AD] chain rule-specification [options]\n"
+"       %s -[RI] chain rulenum rule-specification [options]\n"
+"       %s -D chain rulenum [options]\n"
+"       %s -[LFZ] [chain] [options]\n"
+"       %s -[NX] chain\n"
+"       %s -E old-chain-name new-chain-name\n"
+"       %s -P chain target [options]\n"
+"       %s -h (print this help information)\n\n",
+              program_name, program_version, program_name, program_name,
+              program_name, program_name, program_name, program_name,
+              program_name, program_name);
+
+       printf(
+"Commands:\n"
+"Either long or short options are allowed.\n"
+"  --append  -A chain          Append to chain\n"
+"  --delete  -D chain          Delete matching rule from chain\n"
+"  --delete  -D chain rulenum\n"
+"                              Delete rule rulenum (1 = first) from chain\n"
+"  --insert  -I chain [rulenum]\n"
+"                              Insert in chain as rulenum (default 1=first)\n"
+"  --replace -R chain rulenum\n"
+"                              Replace rule rulenum (1 = first) in chain\n"
+"  --list    -L [chain]                List the rules in a chain or all chains\n"
+"  --flush   -F [chain]                Delete all rules in  chain or all chains\n"
+"  --zero    -Z [chain]                Zero counters in chain or all chains\n"
+"  --new     -N chain          Create a new user-defined chain\n"
+"  --delete-chain\n"
+"            -X [chain]                Delete a user-defined chain\n"
+"  --policy  -P chain target\n"
+"                              Change policy on chain to target\n"
+"  --rename-chain\n"
+"            -E old-chain new-chain\n"
+"                              Change chain name, (moving any references)\n"
+
+"Options:\n"
+"  --source-ip -s [!] address[/mask]\n"
+"                              source specification\n"
+"  --destination-ip -d [!] address[/mask]\n"
+"                              destination specification\n"
+"  --source-mac [!] address[/mask]\n"
+"  --destination-mac [!] address[/mask]\n"
+"  --h-length   -l   length[/mask] hardware length (nr of bytes)\n"
+"  --opcode code[/mask] operation code (2 bytes)\n"
+"  --h-type   type[/mask]  hardware type (2 bytes, hexadecimal)\n"
+"  --proto-type   type[/mask]  protocol type (2 bytes)\n"
+"  --in-interface -i [!] input name[+]\n"
+"                              network interface name ([+] for wildcard)\n"
+"  --out-interface -o [!] output name[+]\n"
+"                              network interface name ([+] for wildcard)\n"
+"  --jump      -j target\n"
+"                              target for rule (may load target extension)\n"
+"  --match     -m match\n"
+"                              extended match (may load extension)\n"
+"  --numeric   -n              numeric output of addresses and ports\n"
+"  --table     -t table        table to manipulate (default: `filter')\n"
+"  --verbose   -v              verbose mode\n"
+"  --line-numbers              print line numbers when listing\n"
+"  --exact     -x              expand numbers (display exact values)\n"
+"  --modprobe=<command>                try to insert modules using this command\n"
+"  --set-counters PKTS BYTES   set the counter during insert/append\n"
+"[!] --version -V              print package version.\n");
+       printf(" opcode strings: \n");
+        for (i = 0; i < NUMOPCODES; i++)
+                printf(" %d = %s\n", i + 1, opcodes[i]);
+        printf(
+" hardware type string: 1 = Ethernet\n"
+" protocol type string: 0x800 = IPv4\n");
+
+       /* Print out any special helps. A user might like to be able
+               to add a --help to the commandline, and see expected
+               results. So we call help for all matches & targets */
+       for (t = xtables_targets; t; t = t->next) {
+               if (strcmp(t->name, "CLASSIFY") && strcmp(t->name, "mangle"))
+                       continue;
+               printf("\n");
+               t->help();
+       }
+       exit(0);
+}
+
+static void
+generic_opt_check(int command, int options)
+{
+       int i, j, legal = 0;
+
+       /* Check that commands are valid with options.  Complicated by the
+        * fact that if an option is legal with *any* command given, it is
+        * legal overall (ie. -z and -l).
+        */
+       for (i = 0; i < NUMBER_OF_OPT; i++) {
+               legal = 0; /* -1 => illegal, 1 => legal, 0 => undecided. */
+
+               for (j = 0; j < NUMBER_OF_CMD; j++) {
+                       if (!(command & (1<<j)))
+                               continue;
+
+                       if (!(options & (1<<i))) {
+                               if (commands_v_options[j][i] == '+')
+                                       xtables_error(PARAMETER_PROBLEM,
+                                                     "You need to supply the `-%c' "
+                                                     "option for this command\n",
+                                                     optflags[i]);
+                       } else {
+                               if (commands_v_options[j][i] != 'x')
+                                       legal = 1;
+                               else if (legal == 0)
+                                       legal = -1;
+                       }
+               }
+               if (legal == -1)
+                       xtables_error(PARAMETER_PROBLEM,
+                                     "Illegal option `-%c' with this command\n",
+                                     optflags[i]);
+       }
+}
+
+static char
+opt2char(int option)
+{
+       const char *ptr;
+       for (ptr = optflags; option > 1; option >>= 1, ptr++);
+
+       return *ptr;
+}
+
+static char
+cmd2char(int option)
+{
+       const char *ptr;
+       for (ptr = cmdflags; option > 1; option >>= 1, ptr++);
+
+       return *ptr;
+}
+
+static void
+add_command(unsigned int *cmd, const int newcmd, const unsigned int othercmds, int invert)
+{
+       if (invert)
+               xtables_error(PARAMETER_PROBLEM, "unexpected ! flag");
+       if (*cmd & (~othercmds))
+               xtables_error(PARAMETER_PROBLEM, "Can't use -%c with -%c\n",
+                             cmd2char(newcmd), cmd2char(*cmd & (~othercmds)));
+       *cmd |= newcmd;
+}
+
+static int
+check_inverse(const char option[], int *invert, int *optind, int argc)
+{
+       if (option && strcmp(option, "!") == 0) {
+               if (*invert)
+                       xtables_error(PARAMETER_PROBLEM,
+                                     "Multiple `!' flags not allowed");
+               *invert = TRUE;
+               if (optind) {
+                       *optind = *optind+1;
+                       if (argc && *optind > argc)
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "no argument following `!'");
+               }
+
+               return TRUE;
+       }
+       return FALSE;
+}
+
+static struct in_addr *
+host_to_addr(const char *name, unsigned int *naddr)
+{
+       struct hostent *host;
+       struct in_addr *addr;
+       unsigned int i;
+
+       *naddr = 0;
+       if ((host = gethostbyname(name)) != NULL) {
+               if (host->h_addrtype != AF_INET ||
+                   host->h_length != sizeof(struct in_addr))
+                       return (struct in_addr *) NULL;
+
+               while (host->h_addr_list[*naddr] != (char *) NULL)
+                       (*naddr)++;
+               addr = xtables_calloc(*naddr, sizeof(struct in_addr));
+               for (i = 0; i < *naddr; i++)
+                       inaddrcpy(&(addr[i]),
+                                 (struct in_addr *) host->h_addr_list[i]);
+               return addr;
+       }
+
+       return (struct in_addr *) NULL;
+}
+
+/*
+ *     All functions starting with "parse" should succeed, otherwise
+ *     the program fails.
+ *     Most routines return pointers to static data that may change
+ *     between calls to the same or other routines with a few exceptions:
+ *     "host_to_addr", "parse_hostnetwork", and "parse_hostnetworkmask"
+ *     return global static data.
+*/
+
+static struct in_addr *
+parse_hostnetwork(const char *name, unsigned int *naddrs)
+{
+       struct in_addr *addrp, *addrptmp;
+
+       if ((addrptmp = dotted_to_addr(name)) != NULL ||
+           (addrptmp = network_to_addr(name)) != NULL) {
+               addrp = xtables_malloc(sizeof(struct in_addr));
+               inaddrcpy(addrp, addrptmp);
+               *naddrs = 1;
+               return addrp;
+       }
+       if ((addrp = host_to_addr(name, naddrs)) != NULL)
+               return addrp;
+
+       xtables_error(PARAMETER_PROBLEM, "host/network `%s' not found", name);
+}
+
+static struct in_addr *
+parse_mask(char *mask)
+{
+       static struct in_addr maskaddr;
+       struct in_addr *addrp;
+       unsigned int bits;
+
+       if (mask == NULL) {
+               /* no mask at all defaults to 32 bits */
+               maskaddr.s_addr = 0xFFFFFFFF;
+               return &maskaddr;
+       }
+       if ((addrp = dotted_to_addr(mask)) != NULL)
+               /* dotted_to_addr already returns a network byte order addr */
+               return addrp;
+       if (string_to_number(mask, 0, 32, &bits) == -1)
+               xtables_error(PARAMETER_PROBLEM,
+                             "invalid mask `%s' specified", mask);
+       if (bits != 0) {
+               maskaddr.s_addr = htonl(0xFFFFFFFF << (32 - bits));
+               return &maskaddr;
+       }
+
+       maskaddr.s_addr = 0L;
+       return &maskaddr;
+}
+
+static void
+parse_hostnetworkmask(const char *name, struct in_addr **addrpp,
+                     struct in_addr *maskp, unsigned int *naddrs)
+{
+       struct in_addr *addrp;
+       char buf[256];
+       char *p;
+       int i, j, k, n;
+
+       strncpy(buf, name, sizeof(buf) - 1);
+       if ((p = strrchr(buf, '/')) != NULL) {
+               *p = '\0';
+               addrp = parse_mask(p + 1);
+       } else
+               addrp = parse_mask(NULL);
+       inaddrcpy(maskp, addrp);
+
+       /* if a null mask is given, the name is ignored, like in "any/0" */
+       if (maskp->s_addr == 0L)
+               strcpy(buf, "0.0.0.0");
+
+       addrp = *addrpp = parse_hostnetwork(buf, naddrs);
+       n = *naddrs;
+       for (i = 0, j = 0; i < n; i++) {
+               addrp[j++].s_addr &= maskp->s_addr;
+               for (k = 0; k < j - 1; k++) {
+                       if (addrp[k].s_addr == addrp[j - 1].s_addr) {
+                               (*naddrs)--;
+                               j--;
+                               break;
+                       }
+               }
+       }
+}
+
+static void
+parse_interface(const char *arg, char *vianame, unsigned char *mask)
+{
+       int vialen = strlen(arg);
+       unsigned int i;
+
+       memset(mask, 0, IFNAMSIZ);
+       memset(vianame, 0, IFNAMSIZ);
+
+       if (vialen + 1 > IFNAMSIZ)
+               xtables_error(PARAMETER_PROBLEM,
+                             "interface name `%s' must be shorter than IFNAMSIZ"
+                             " (%i)", arg, IFNAMSIZ-1);
+
+       strcpy(vianame, arg);
+       if (vialen == 0)
+               memset(mask, 0, IFNAMSIZ);
+       else if (vianame[vialen - 1] == '+') {
+               memset(mask, 0xFF, vialen - 1);
+               memset(mask + vialen - 1, 0, IFNAMSIZ - vialen + 1);
+               /* Don't remove `+' here! -HW */
+       } else {
+               /* Include nul-terminator in match */
+               memset(mask, 0xFF, vialen + 1);
+               memset(mask + vialen + 1, 0, IFNAMSIZ - vialen - 1);
+               for (i = 0; vianame[i]; i++) {
+                       if (!isalnum(vianame[i])
+                           && vianame[i] != '_'
+                           && vianame[i] != '.') {
+                               printf("Warning: wierd character in interface"
+                                      " `%s' (No aliases, :, ! or *).\n",
+                                      vianame);
+                               break;
+                       }
+               }
+       }
+}
+
+/* Can't be zero. */
+static int
+parse_rulenumber(const char *rule)
+{
+       unsigned int rulenum;
+
+       if (string_to_number(rule, 1, INT_MAX, &rulenum) == -1)
+               xtables_error(PARAMETER_PROBLEM,
+                             "Invalid rule number `%s'", rule);
+
+       return rulenum;
+}
+
+static const char *
+parse_target(const char *targetname)
+{
+       const char *ptr;
+
+       if (strlen(targetname) < 1)
+               xtables_error(PARAMETER_PROBLEM,
+                             "Invalid target name (too short)");
+
+       if (strlen(targetname)+1 > sizeof(arpt_chainlabel))
+               xtables_error(PARAMETER_PROBLEM,
+                             "Invalid target name `%s' (%zu chars max)",
+                             targetname, sizeof(arpt_chainlabel)-1);
+
+       for (ptr = targetname; *ptr; ptr++)
+               if (isspace(*ptr))
+                       xtables_error(PARAMETER_PROBLEM,
+                                     "Invalid target name `%s'", targetname);
+       return targetname;
+}
+
+static void
+set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
+          int invert)
+{
+       if (*options & option)
+               xtables_error(PARAMETER_PROBLEM, "multiple -%c flags not allowed",
+                             opt2char(option));
+       *options |= option;
+
+       if (invert) {
+               unsigned int i;
+               for (i = 0; 1 << i != option; i++);
+
+               if (!inverse_for_options[i])
+                       xtables_error(PARAMETER_PROBLEM,
+                                     "cannot have ! before -%c",
+                                     opt2char(option));
+               *invflg |= inverse_for_options[i];
+       }
+}
+
+static int
+list_entries(struct nft_handle *h, const char *chain, const char *table,
+            int rulenum, int verbose, int numeric, int expanded,
+            int linenumbers)
+{
+       unsigned int format;
+
+       format = FMT_OPTIONS;
+       if (!verbose)
+               format |= FMT_NOCOUNTS;
+       else
+               format |= FMT_VIA;
+
+       if (numeric)
+               format |= FMT_NUMERIC;
+
+       if (!expanded)
+               format |= FMT_KILOMEGAGIGA;
+
+       if (linenumbers)
+               format |= FMT_LINENUMBERS;
+
+       return nft_rule_list(h, chain, table, rulenum, format);
+}
+
+static struct arpt_entry *
+generate_entry(const struct arpt_entry *fw,
+              struct arpt_entry_target *target)
+{
+       struct arpt_entry_target **t;
+       struct arpt_entry *e;
+       unsigned int size;
+
+
+       size = sizeof(struct arpt_entry);
+
+       e = xtables_malloc(size + target->u.target_size);
+       *e = *fw;
+       e->target_offset = size;
+       e->next_offset = size + target->u.target_size;
+
+       t = (void *) e + e->target_offset;
+       *t = target;
+
+       return e;
+}
+
+static struct xtables_target *command_jump(struct arpt_entry *fw,
+                                          const char *jumpto)
+{
+       struct xtables_target *target;
+       size_t size;
+
+       /* XTF_TRY_LOAD (may be chain name) */
+       target = xtables_find_target(jumpto, XTF_TRY_LOAD);
+
+       if (!target)
+               return NULL;
+
+       size = XT_ALIGN(sizeof(struct xt_entry_target))
+               + target->size;
+
+       target->t = xtables_calloc(1, size);
+       target->t->u.target_size = size;
+       strcpy(target->t->u.user.name, jumpto);
+       target->t->u.user.revision = target->revision;
+
+       xs_init_target(target);
+
+       if (target->x6_options != NULL)
+               opts = xtables_options_xfrm(xtables_globals.orig_opts,
+                                           opts, target->x6_options,
+                                           &target->option_offset);
+       else
+               opts = xtables_merge_options(xtables_globals.orig_opts,
+                                            opts, target->extra_opts,
+                                            &target->option_offset);
+
+       return target;
+}
+
+static int
+append_entry(struct nft_handle *h,
+            const char *chain,
+            const char *table,
+            struct arpt_entry *fw,
+            int rulenum,
+            unsigned int nsaddrs,
+            const struct in_addr saddrs[],
+            unsigned int ndaddrs,
+            const struct in_addr daddrs[],
+            bool verbose, bool append)
+{
+       unsigned int i, j;
+       int ret = 1;
+
+       for (i = 0; i < nsaddrs; i++) {
+               fw->arp.src.s_addr = saddrs[i].s_addr;
+               for (j = 0; j < ndaddrs; j++) {
+                       fw->arp.tgt.s_addr = daddrs[j].s_addr;
+                       if (append) {
+                               ret = nft_arp_rule_append(h, chain, table,
+                                                         fw, verbose);
+                       } else {
+                               ret = nft_arp_rule_insert(h, chain, table,
+                                                         fw, rulenum,
+                                                         verbose);
+                       }
+               }
+       }
+
+       return ret;
+}
+
+int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table)
+{
+       struct arpt_entry fw, *e = NULL;
+       int invert = 0;
+       unsigned int nsaddrs = 0, ndaddrs = 0;
+       struct in_addr *saddrs = NULL, *daddrs = NULL;
+
+       int c, verbose = 0;
+       const char *chain = NULL;
+       const char *shostnetworkmask = NULL, *dhostnetworkmask = NULL;
+       const char *policy = NULL, *newname = NULL;
+       unsigned int rulenum = 0, options = 0, command = 0;
+       const char *pcnt = NULL, *bcnt = NULL;
+       int ret = 1;
+       struct xtables_target *target = NULL;
+       struct xtables_target *t;
+
+       const char *jumpto = "";
+
+       memset(&fw, 0, sizeof(fw));
+       opts = original_opts;
+       global_option_offset = 0;
+
+       xtables_globals.orig_opts = original_opts;
+
+       /* re-set optind to 0 in case do_command gets called
+        * a second time */
+       optind = 0;
+
+       for (t = xtables_targets; t; t = t->next) {
+               t->tflags = 0;
+               t->used = 0;
+       }
+
+       /* Suppress error messages: we may add new options if we
+           demand-load a protocol. */
+       opterr = 0;
+
+       while ((c = getopt_long(argc, argv,
+          "-A:D:R:I:L::M:F::Z::N:X::E:P:Vh::o:p:s:d:j:l:i:vnt:m:c:",
+                                          opts, NULL)) != -1) {
+               switch (c) {
+                       /*
+                        * Command selection
+                        */
+               case 'A':
+                       add_command(&command, CMD_APPEND, CMD_NONE,
+                                   invert);
+                       chain = optarg;
+                       break;
+
+               case 'D':
+                       add_command(&command, CMD_DELETE, CMD_NONE,
+                                   invert);
+                       chain = optarg;
+                       if (optind < argc && argv[optind][0] != '-'
+                           && argv[optind][0] != '!') {
+                               rulenum = parse_rulenumber(argv[optind++]);
+                               command = CMD_DELETE_NUM;
+                       }
+                       break;
+
+               case 'R':
+                       add_command(&command, CMD_REPLACE, CMD_NONE,
+                                   invert);
+                       chain = optarg;
+                       if (optind < argc && argv[optind][0] != '-'
+                           && argv[optind][0] != '!')
+                               rulenum = parse_rulenumber(argv[optind++]);
+                       else
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "-%c requires a rule number",
+                                             cmd2char(CMD_REPLACE));
+                       break;
+
+               case 'I':
+                       add_command(&command, CMD_INSERT, CMD_NONE,
+                                   invert);
+                       chain = optarg;
+                       if (optind < argc && argv[optind][0] != '-'
+                           && argv[optind][0] != '!')
+                               rulenum = parse_rulenumber(argv[optind++]);
+                       else rulenum = 1;
+                       break;
+
+               case 'L':
+                       add_command(&command, CMD_LIST, CMD_ZERO,
+                                   invert);
+                       if (optarg) chain = optarg;
+                       else if (optind < argc && argv[optind][0] != '-'
+                                && argv[optind][0] != '!')
+                               chain = argv[optind++];
+                       break;
+
+               case 'F':
+                       add_command(&command, CMD_FLUSH, CMD_NONE,
+                                   invert);
+                       if (optarg) chain = optarg;
+                       else if (optind < argc && argv[optind][0] != '-'
+                                && argv[optind][0] != '!')
+                               chain = argv[optind++];
+                       break;
+
+               case 'Z':
+                       add_command(&command, CMD_ZERO, CMD_LIST,
+                                   invert);
+                       if (optarg) chain = optarg;
+                       else if (optind < argc && argv[optind][0] != '-'
+                               && argv[optind][0] != '!')
+                               chain = argv[optind++];
+                       break;
+
+               case 'N':
+                       if (optarg && *optarg == '-')
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "chain name not allowed to start "
+                                             "with `-'\n");
+                       if (xtables_find_target(optarg, XTF_TRY_LOAD))
+                               xtables_error(PARAMETER_PROBLEM,
+                                               "chain name may not clash "
+                                               "with target name\n");
+                       add_command(&command, CMD_NEW_CHAIN, CMD_NONE,
+                                   invert);
+                       chain = optarg;
+                       break;
+
+               case 'X':
+                       add_command(&command, CMD_DELETE_CHAIN, CMD_NONE,
+                                   invert);
+                       if (optarg) chain = optarg;
+                       else if (optind < argc && argv[optind][0] != '-'
+                                && argv[optind][0] != '!')
+                               chain = argv[optind++];
+                       break;
+
+               case 'E':
+                       add_command(&command, CMD_RENAME_CHAIN, CMD_NONE,
+                                   invert);
+                       chain = optarg;
+                       if (optind < argc && argv[optind][0] != '-'
+                           && argv[optind][0] != '!')
+                               newname = argv[optind++];
+                       else
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "-%c requires old-chain-name and "
+                                             "new-chain-name",
+                                             cmd2char(CMD_RENAME_CHAIN));
+                       break;
+
+               case 'P':
+                       add_command(&command, CMD_SET_POLICY, CMD_NONE,
+                                   invert);
+                       chain = optarg;
+                       if (optind < argc && argv[optind][0] != '-'
+                           && argv[optind][0] != '!')
+                               policy = argv[optind++];
+                       else
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "-%c requires a chain and a policy",
+                                             cmd2char(CMD_SET_POLICY));
+                       break;
+
+               case 'h':
+                       if (!optarg)
+                               optarg = argv[optind];
+
+                       exit_printhelp();
+                       break;
+               case 's':
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_S_IP, &fw.arp.invflags,
+                                  invert);
+                       shostnetworkmask = argv[optind-1];
+                       break;
+
+               case 'd':
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_D_IP, &fw.arp.invflags,
+                                  invert);
+                       dhostnetworkmask = argv[optind-1];
+                       break;
+
+               case 2:/* src-mac */
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_S_MAC, &fw.arp.invflags,
+                                  invert);
+                       if (getmac_and_mask(argv[optind - 1],
+                           fw.arp.src_devaddr.addr, fw.arp.src_devaddr.mask))
+                               xtables_error(PARAMETER_PROBLEM, "Problem with specified "
+                                               "source mac");
+                       break;
+
+               case 3:/* dst-mac */
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_D_MAC, &fw.arp.invflags,
+                                  invert);
+
+                       if (getmac_and_mask(argv[optind - 1],
+                           fw.arp.tgt_devaddr.addr, fw.arp.tgt_devaddr.mask))
+                               xtables_error(PARAMETER_PROBLEM, "Problem with specified "
+                                               "destination mac");
+                       break;
+
+               case 'l':/* hardware length */
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_H_LENGTH, &fw.arp.invflags,
+                                  invert);
+                       getlength_and_mask(argv[optind - 1], &fw.arp.arhln,
+                                          &fw.arp.arhln_mask);
+                       break;
+
+               case 8:/* protocol length */
+                       xtables_error(PARAMETER_PROBLEM, "not supported");
+/*
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_P_LENGTH, &fw.arp.invflags,
+                                  invert);
+
+                       getlength_and_mask(argv[optind - 1], &fw.arp.arpln,
+                                          &fw.arp.arpln_mask);
+                       break;
+*/
+
+               case 4:/* opcode */
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_OPCODE, &fw.arp.invflags,
+                                  invert);
+                       if (get16_and_mask(argv[optind - 1], &fw.arp.arpop, &fw.arp.arpop_mask, 10)) {
+                               int i;
+
+                               for (i = 0; i < NUMOPCODES; i++)
+                                       if (!strcasecmp(opcodes[i], optarg))
+                                               break;
+                               if (i == NUMOPCODES)
+                                       xtables_error(PARAMETER_PROBLEM, "Problem with specified opcode");
+                               fw.arp.arpop = htons(i+1);
+                       }
+                       break;
+
+               case 5:/* h-type */
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_H_TYPE, &fw.arp.invflags,
+                                  invert);
+                       if (get16_and_mask(argv[optind - 1], &fw.arp.arhrd, &fw.arp.arhrd_mask, 16)) {
+                               if (strcasecmp(argv[optind-1], "Ethernet"))
+                                       xtables_error(PARAMETER_PROBLEM, "Problem with specified hardware type");
+                               fw.arp.arhrd = htons(1);
+                       }
+                       break;
+
+               case 6:/* proto-type */
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_P_TYPE, &fw.arp.invflags,
+                                  invert);
+                       if (get16_and_mask(argv[optind - 1], &fw.arp.arpro, &fw.arp.arpro_mask, 0)) {
+                               if (strcasecmp(argv[optind-1], "ipv4"))
+                                       xtables_error(PARAMETER_PROBLEM, "Problem with specified protocol type");
+                               fw.arp.arpro = htons(0x800);
+                       }
+                       break;
+
+               case 'j':
+                       set_option(&options, OPT_JUMP, &fw.arp.invflags,
+                                  invert);
+                       jumpto = parse_target(optarg);
+                       target = command_jump(&fw, jumpto);
+                       break;
+
+               case 'i':
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_VIANAMEIN, &fw.arp.invflags,
+                                  invert);
+                       parse_interface(argv[optind-1],
+                                       fw.arp.iniface,
+                                       fw.arp.iniface_mask);
+/*                     fw.nfcache |= NFC_IP_IF_IN; */
+                       break;
+
+               case 'o':
+                       check_inverse(optarg, &invert, &optind, argc);
+                       set_option(&options, OPT_VIANAMEOUT, &fw.arp.invflags,
+                                  invert);
+                       parse_interface(argv[optind-1],
+                                       fw.arp.outiface,
+                                       fw.arp.outiface_mask);
+                       /* fw.nfcache |= NFC_IP_IF_OUT; */
+                       break;
+
+               case 'v':
+                       if (!verbose)
+                               set_option(&options, OPT_VERBOSE,
+                                          &fw.arp.invflags, invert);
+                       verbose++;
+                       break;
+
+               case 'm': /*{
+                       size_t size;
+
+                       if (invert)
+                               exit_error(PARAMETER_PROBLEM,
+                                          "unexpected ! flag before --match");
+
+                       m = find_match(optarg, LOAD_MUST_SUCCEED);
+                       size = ARPT_ALIGN(sizeof(struct arpt_entry_match))
+                                        + m->size;
+                       m->m = fw_calloc(1, size);
+                       m->m->u.match_size = size;
+                       strcpy(m->m->u.user.name, m->name);
+                       m->init(m->m, &fw.nfcache);
+                       opts = merge_options(opts, m->extra_opts, &m->option_offset);
+               }*/
+               break;
+
+               case 'n':
+                       set_option(&options, OPT_NUMERIC, &fw.arp.invflags,
+                                  invert);
+                       break;
+
+               case 't':
+                       if (invert)
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "unexpected ! flag before --table");
+                       *table = argv[optind-1];
+                       break;
+
+               case 'V':
+                       if (invert)
+                               printf("Not %s ;-)\n", program_version);
+                       else
+                               printf("%s v%s\n",
+                                      program_name, program_version);
+                       exit(0);
+
+               case '0':
+                       set_option(&options, OPT_LINENUMBERS, &fw.arp.invflags,
+                                  invert);
+                       break;
+
+               case 'M':
+                       //modprobe = optarg;
+                       break;
+
+               case 'c':
+
+                       set_option(&options, OPT_COUNTERS, &fw.arp.invflags,
+                                  invert);
+                       pcnt = optarg;
+                       if (optind < argc && argv[optind][0] != '-'
+                           && argv[optind][0] != '!')
+                               bcnt = argv[optind++];
+                       else
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "-%c requires packet and byte counter",
+                                             opt2char(OPT_COUNTERS));
+
+                       if (sscanf(pcnt, "%llu", &fw.counters.pcnt) != 1)
+                       xtables_error(PARAMETER_PROBLEM,
+                               "-%c packet counter not numeric",
+                               opt2char(OPT_COUNTERS));
+
+                       if (sscanf(bcnt, "%llu", &fw.counters.bcnt) != 1)
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "-%c byte counter not numeric",
+                                             opt2char(OPT_COUNTERS));
+
+                       break;
+
+
+               case 1: /* non option */
+                       if (optarg[0] == '!' && optarg[1] == '\0') {
+                               if (invert)
+                                       xtables_error(PARAMETER_PROBLEM,
+                                                     "multiple consecutive ! not"
+                                                     " allowed");
+                               invert = TRUE;
+                               optarg[0] = '\0';
+                               continue;
+                       }
+                       printf("Bad argument `%s'\n", optarg);
+                       exit_tryhelp(2);
+
+               default:
+                       break;
+               }
+               invert = FALSE;
+       }
+
+       if (target)
+               xtables_option_tfcall(target);
+
+       /* Fix me: must put inverse options checking here --MN */
+
+       if (optind < argc)
+               xtables_error(PARAMETER_PROBLEM,
+                             "unknown arguments found on commandline");
+       if (!command)
+               xtables_error(PARAMETER_PROBLEM, "no command specified");
+       if (invert)
+               xtables_error(PARAMETER_PROBLEM,
+                             "nothing appropriate following !");
+
+       if (command & (CMD_REPLACE | CMD_INSERT | CMD_DELETE | CMD_APPEND)) {
+               if (!(options & OPT_D_IP))
+                       dhostnetworkmask = "0.0.0.0/0";
+               if (!(options & OPT_S_IP))
+                       shostnetworkmask = "0.0.0.0/0";
+       }
+
+       if (shostnetworkmask)
+               parse_hostnetworkmask(shostnetworkmask, &saddrs,
+                                     &(fw.arp.smsk), &nsaddrs);
+
+       if (dhostnetworkmask)
+               parse_hostnetworkmask(dhostnetworkmask, &daddrs,
+                                     &(fw.arp.tmsk), &ndaddrs);
+
+       if ((nsaddrs > 1 || ndaddrs > 1) &&
+           (fw.arp.invflags & (ARPT_INV_SRCIP | ARPT_INV_TGTIP)))
+               xtables_error(PARAMETER_PROBLEM, "! not allowed with multiple"
+                               " source or destination IP addresses");
+
+       if (command == CMD_REPLACE && (nsaddrs != 1 || ndaddrs != 1))
+               xtables_error(PARAMETER_PROBLEM, "Replacement rule does not "
+                                                "specify a unique address");
+
+       generic_opt_check(command, options);
+
+       if (chain && strlen(chain) > ARPT_FUNCTION_MAXNAMELEN)
+               xtables_error(PARAMETER_PROBLEM,
+                               "chain name `%s' too long (must be under %i chars)",
+                               chain, ARPT_FUNCTION_MAXNAMELEN);
+
+       if (nft_init(h, xtables_arp) < 0)
+               xtables_error(OTHER_PROBLEM,
+                             "Could not initialize nftables layer.");
+
+       h->ops = nft_family_ops_lookup(h->family);
+       if (h->ops == NULL)
+               xtables_error(PARAMETER_PROBLEM, "Unknown family");
+
+       if (command == CMD_APPEND
+           || command == CMD_DELETE
+           || command == CMD_INSERT
+           || command == CMD_REPLACE) {
+               if (strcmp(chain, "PREROUTING") == 0
+                   || strcmp(chain, "INPUT") == 0) {
+                       /* -o not valid with incoming packets. */
+                       if (options & OPT_VIANAMEOUT)
+                               xtables_error(PARAMETER_PROBLEM,
+                                             "Can't use -%c with %s\n",
+                                             opt2char(OPT_VIANAMEOUT),
+                                             chain);
+               }
+
+               if (strcmp(chain, "POSTROUTING") == 0
+                   || strcmp(chain, "OUTPUT") == 0) {
+                       /* -i not valid with outgoing packets */
+                       if (options & OPT_VIANAMEIN)
+                               xtables_error(PARAMETER_PROBLEM,
+                                               "Can't use -%c with %s\n",
+                                               opt2char(OPT_VIANAMEIN),
+                                               chain);
+               }
+
+               if (!target && strlen(jumpto) != 0) {
+                       size_t size;
+
+                       target = xtables_find_target(XT_STANDARD_TARGET,
+                                                    XTF_LOAD_MUST_SUCCEED);
+                       size = sizeof(struct arpt_entry_target) + target->size;
+                       target->t = xtables_calloc(1, size);
+                       target->t->u.target_size = size;
+                       strcpy(target->t->u.user.name, jumpto);
+               }
+
+               if (!target) {
+                       xtables_error(PARAMETER_PROBLEM,
+                                     "No target provided or"
+                                     " initalization failed");
+               }
+
+               e = generate_entry(&fw, target->t);
+       }
+
+       switch (command) {
+       case CMD_APPEND:
+               ret = append_entry(h, chain, *table, e, 0,
+                                  nsaddrs, saddrs, ndaddrs, daddrs,
+                                  options&OPT_VERBOSE, true);
+               break;
+       case CMD_DELETE:
+               /*ret = delete_entry(chain, e,
+                                       nsaddrs, saddrs, ndaddrs, daddrs,
+                                       options&OPT_VERBOSE,
+                                       handle);*/
+               break;
+       case CMD_DELETE_NUM:
+               /*ret = arptc_delete_num_entry(chain, rulenum - 1, handle);*/
+               break;
+       case CMD_REPLACE:
+               /*ret = replace_entry(chain, e, rulenum - 1,
+                                       saddrs, daddrs, options&OPT_VERBOSE,
+                                       handle);*/
+               break;
+       case CMD_INSERT:
+               ret = append_entry(h, chain, *table, e, rulenum,
+                                  nsaddrs, saddrs, ndaddrs, daddrs,
+                                  options&OPT_VERBOSE, false);
+               break;
+       case CMD_LIST:
+               ret = list_entries(h, chain, *table,
+                                  rulenum,
+                                  options&OPT_VERBOSE,
+                                  options&OPT_NUMERIC,
+                                  /*options&OPT_EXPANDED*/0,
+                                  options&OPT_LINENUMBERS);
+               break;
+       case CMD_FLUSH:
+               ret = nft_rule_flush(h, chain, *table);
+               break;
+       case CMD_ZERO:
+               ret = nft_chain_zero_counters(h, chain, *table);
+               break;
+       case CMD_LIST|CMD_ZERO:
+               ret = list_entries(h, chain, *table, rulenum,
+                                  options&OPT_VERBOSE,
+                                  options&OPT_NUMERIC,
+                                  /*options&OPT_EXPANDED*/0,
+                                  options&OPT_LINENUMBERS);
+               /*if (ret)
+                       ret = zero_entries(chain,
+                                               options&OPT_VERBOSE, handle);*/
+               break;
+       case CMD_NEW_CHAIN:
+               ret = nft_chain_user_add(h, chain, *table);
+               break;
+       case CMD_DELETE_CHAIN:
+               ret = nft_chain_user_del(h, chain, *table);
+               break;
+       case CMD_RENAME_CHAIN:
+               ret = nft_chain_user_rename(h, chain, *table, newname);
+               break;
+       case CMD_SET_POLICY:
+               ret = nft_chain_set(h, *table, chain, policy, NULL);
+               if (ret < 0)
+                       xtables_error(PARAMETER_PROBLEM, "Wrong policy `%s'\n",
+                                     policy);
+               break;
+       default:
+               /* We should never reach this... */
+               exit_tryhelp(2);
+       }
+
+/*     if (verbose > 1)
+               dump_entries(*handle);*/
+
+       return ret;
+}
index 5732ba386d1e4583ea49973c4b2c4ba126440133..5f487355bc145b1a3701bb449b4c8ea242ff14e4 100644 (file)
@@ -42,6 +42,7 @@ static const struct subcommand multi_subcommands[] = {
        {"xtables-restore",     xtables_restore_main},
        {"xtables-config",      xtables_config_main},
        {"xtables-events",      xtables_events_main},
+       {"xtables-arp",         xtables_arp_main},
 #endif
        {NULL},
 };
index c609ea5b35cd0d6e62f1b28218cd30b4fd38258b..759e24f0867240cc5b340dbf9ab4e01b1871ddb4 100644 (file)
@@ -7,5 +7,6 @@ extern int xtables_save_main(int, char **);
 extern int xtables_restore_main(int, char **);
 extern int xtables_config_main(int, char **);
 extern int xtables_events_main(int, char **);
+extern int xtables_arp_main(int, char **);
 
 #endif /* _XTABLES_MULTI_H */