diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2013-02-23 17:50:31 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-12-30 23:50:25 +0100 |
| commit | 077785df023ad8947d44d19769bc6d91e3917633 (patch) | |
| tree | 81edff765ee5eeb74997f2f1c4784058798776f0 /iptables/xtables.c | |
| parent | 1ff21a68502d67e056100da7e0da074467bc08ed (diff) | |
nft: Split nft core to become family independant
This makes nft core code independant from the family. Each family needs
to implement and provide a struct nft_family_ops {}.
This split will ease the future support of bridge and arp rules manipulations.
[ updated header files and rebased upon the current tree --pablo ]
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/xtables.c')
| -rw-r--r-- | iptables/xtables.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/iptables/xtables.c b/iptables/xtables.c index 328bc695..c3110558 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -40,6 +40,7 @@ #include <xtables.h> #include <fcntl.h> #include "xshared.h" +#include "nft-shared.h" #include "nft.h" #ifndef TRUE @@ -49,21 +50,6 @@ #define FALSE 0 #endif -#define FMT_NUMERIC 0x0001 -#define FMT_NOCOUNTS 0x0002 -#define FMT_KILOMEGAGIGA 0x0004 -#define FMT_OPTIONS 0x0008 -#define FMT_NOTABLE 0x0010 -#define FMT_NOTARGET 0x0020 -#define FMT_VIA 0x0040 -#define FMT_NONEWLINE 0x0080 -#define FMT_LINENUMBERS 0x0100 - -#define FMT_PRINT_RULE (FMT_NOCOUNTS | FMT_OPTIONS | FMT_VIA \ - | FMT_NUMERIC | FMT_NOTABLE) -#define FMT(tab,notab) ((format) & FMT_NOTABLE ? (notab) : (tab)) - - #define CMD_NONE 0x0000U #define CMD_INSERT 0x0001U #define CMD_DELETE 0x0002U @@ -1262,6 +1248,9 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table) } h->family = family; + h->ops = nft_family_ops_lookup(family); + if (h->ops == NULL) + xtables_error(PARAMETER_PROBLEM, "Unknown family"); if (command == CMD_REPLACE && (s.naddrs != 1 || d.naddrs != 1)) xtables_error(PARAMETER_PROBLEM, "Replacement rule does not " |