nftables to ipset translation infrastructure
Subsystems (2)
Pablo Neira Ayuso
maintainerv4 cover nftables to ipset translation infrastructure
Hi Jozsef,
This v4 of the patchset to add the ipset to nftables translation utility. Example invocation of this new tool is the following:
# ipset-translate restore < file.ipset
This v4 round includes:
- regression tests: there is at least one test for each ipset type.
- many bugfixes that have been spotted by the regression test infrastructure.
- Disentanglement of the ipset_xlate() logic for ADT commands.
to run regression tests:
# cd tests/xlate # ./runtest.sh [OK] tests are fine!
The xlate.t file contains the ipset set definitions, then the xlate.t.nft file contains the expected output in nftables syntax. In case that there is a mismatch, the diff with the expected output is provided.
Please, apply, thanks!
Pablo Neira Ayuso (4):
lib: split parser from command execution
lib: Detach restore routine from parser add ipset to nftables translation infrastructure
tests: add tests ipset to nftables
configure.ac | 1 + include/libipset/Makefile.am | 3 +- include/libipset/xlate.h | 6 + lib/ipset.c | 588 ++++++++++++++++++++++++++++++++++- src/Makefile.am | 8 +- src/ipset-translate.8 | 91 ++++++ src/ipset.c | 8 +- tests/xlate/runtest.sh | 29 ++ tests/xlate/xlate.t | 55 ++++ tests/xlate/xlate.t.nft | 56 ++++ 10 files changed, 827 insertions(+), 18 deletions(-) create mode 100644 include/libipset/xlate.h create mode 100644 src/ipset-translate.8 create mode 100755 tests/xlate/runtest.sh create mode 100644 tests/xlate/xlate.t create mode 100644 tests/xlate/xlate.t.nft
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v4 1/4 lib: split parser from command execution
ipset_parse_argv() parses, builds and send the netlink messages to the kernel. This patch extracts the parser and wrap it around the new ipset_parser() function.
This patch comes is preparation for the ipset to nftables translation infrastructure.
---
v4: no changes.
lib/ipset.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-)
lib/ipset.c +30 -14
@@ -923,20 +923,8 @@ static const char *cmd_prefix[] = { [IPSET_TEST] = "test SETNAME", }; -/* Workhorses */ - -/** -* ipset_parse_argv - parse and argv array and execute the command -* @ipset: ipset structure -* @argc: length of the array -* @argv: array of strings -* -* Parse an array of strings and execute the ipset command. -* -* Returns 0 on success or a negative error code. -*/ -int -ipset_parse_argv (struct ipset *ipset,int oargc,char *oargv[]) +static int +ipset_parser (struct ipset *ipset,int oargc,char *oargv[]) {int ret =0 ;enum ipset_cmd cmd =IPSET_CMD_NONE ;
@@ -1280,6 +1268,34 @@ ipset_parse_argv(struct ipset *ipset, int oargc, char *oargv[])if (argc >1 )return ipset->custom_error (ipset, p,IPSET_PARAMETER_PROBLEM ,"Unknown argument %s" , argv[1 ]); + +return cmd; +} + +/* Workhorses */ + +/** +* ipset_parse_argv - parse and argv array and execute the command +* @ipset: ipset structure +* @argc: length of the array +* @argv: array of strings +* +* Parse an array of strings and execute the ipset command. +* +* Returns 0 on success or a negative error code. +*/ +int +ipset_parse_argv (struct ipset *ipset,int oargc,char *oargv[]) +{ +struct ipset_session *session = ipset->session; +void *p =ipset_session_printf_private (session); +enum ipset_cmd cmd; +int ret; + + cmd =ipset_parser (ipset, oargc, oargv); +if (cmd <0 ) +return cmd; + ret =ipset_cmd (session, cmd, ipset->restore_line);D ("ret %d" , ret);/* In the case of warning, the return code is success */
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v4 2/4 lib: Detach restore routine from parser
In reply to Pablo Neira AyusoDo not call restore() from ipset_parser(). Instead, ipset_parser() returns the IPSET_CMD_RESTORE command and the caller invokes restore().
This patch comes in preparation for the ipset to nftables translation infrastructure.
---
v4: no changes.
lib/ipset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
lib/ipset.c +4 -1
@@ -1231,7 +1231,7 @@ ipset_parser(struct ipset *ipset, int oargc, char *oargv[])return ipset->custom_error (ipset, p,IPSET_PARAMETER_PROBLEM ,"Unknown argument %s" , argv[1 ]); -return restore (ipset); +return IPSET_CMD_RESTORE ;case IPSET_CMD_ADD :case IPSET_CMD_DEL :case IPSET_CMD_TEST :
@@ -1296,6 +1296,9 @@ ipset_parse_argv(struct ipset *ipset, int oargc, char *oargv[])if (cmd <0 )return cmd; +if (cmd ==IPSET_CMD_RESTORE ) +return restore (ipset); + ret =ipset_cmd (session, cmd, ipset->restore_line);D ("ret %d" , ret);/* In the case of warning, the return code is success */
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v4 3/4 add ipset to nftables translation infrastructure
In reply to Pablo Neira AyusoThis patch provides the ipset-translate utility which allows you to translate your existing ipset file to nftables.
The ipset-translate utility is actually a symlink to ipset, which checks for 'argv[0] == ipset-translate' to exercise the translation path.
You can translate your ipset file through:
ipset-translate restore < sets.ipt
This patch reuses the existing parser and API to represent the sets and the elements.
There is a new ipset_xlate_set dummy object that allows to store a created set to fetch the type without interactions with the kernel.
---
v4: many bugfixes that resulted from running the new xlate test infra.
configure.ac | 1 + include/libipset/Makefile.am | 3 +- include/libipset/xlate.h | 6 + lib/ipset.c | 541 ++++++++++++++++++++++++++++++++++- src/Makefile.am | 8 +- src/ipset-translate.8 | 91 ++++++ src/ipset.c | 8 +- 7 files changed, 654 insertions(+), 4 deletions(-) create mode 100644 include/libipset/xlate.h create mode 100644 src/ipset-translate.8
configure.ac +1 -0
@@ -7,6 +7,7 @@ AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_PROG_LN_S AC_ENABLE_STATIC LT_INIT([dlopen]) LT_CONFIG_LTDL_DIR([libltdl])
include/libipset/Makefile.am +2 -1
@@ -17,6 +17,7 @@ pkginclude_HEADERS = \ transport.h \ types.h \ ipset.h \ - utils.h + utils.h \ + xlate.h EXTRA_DIST = debug.h icmp.h icmpv6.h
include/libipset/xlate.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef LIBIPSET_XLATE_H +#define LIBIPSET_XLATE_H + +int ipset_xlate_argv (struct ipset *ipset,int argc,char *argv[]); + +#endif
lib/ipset.c +540 -1
589 lines not on this page · raw message
src/Makefile.am +7 -1
@@ -12,10 +12,16 @@ AM_LDFLAGS = -static endif endif -dist_man_MANS = ipset.8 +dist_man_MANS = ipset.8 ipset-translate.8 sparse-check: $(ipset_SOURCES:.c=.d) %.d: %.c $(IPSET_AM_V_CHECK)\ $(SPARSE) -I.. $(SPARSE_FLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS) $< || : + +install-exec-hook: + ${LN_S} -f "${sbindir}/ipset" "${DESTDIR}${sbindir}/ipset-translate"; + +uninstall-hook: + rm -f ${DESTDIR}${sbindir}/ipset-translate
src/ipset-translate.8 new file +91 -0
91 lines not on this page · raw message
src/ipset.c +7 -1
@@ -9,9 +9,11 @@#include <assert.h> /* assert */ #include <stdio.h> /* fprintf */ #include <stdlib.h> /* exit */ +#include <string.h> /* strcmp */ #include <config.h> #include <libipset/ipset.h> /* ipset library */ +#include <libipset/xlate.h> /* translate to nftables */ int main (int argc,char *argv[])
@@ -29,7 +31,11 @@ main(int argc, char *argv[])exit (1 ); } - ret =ipset_parse_argv (ipset, argc, argv); +if (!strcmp (argv[0 ],"ipset-translate" )) { + ret =ipset_xlate_argv (ipset, argc, argv); + }else { + ret =ipset_parse_argv (ipset, argc, argv); + }ipset_fini (ipset);
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v4 4/4 tests: add tests ipset to nftables
In reply to Pablo Neira AyusoThis test checks that the translation from ipset to nftables is correct.
term$ cd tests/xlate
term$ ./runtest.sh
in case that the translation is not correct, it shows the diff with expected translation output.
---
v4: new patch in this series :-)
tests/xlate/runtest.sh | 29 +++++++++++++++++++++ tests/xlate/xlate.t | 55 ++++++++++++++++++++++++++++++++++++++++ tests/xlate/xlate.t.nft | 56 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100755 tests/xlate/runtest.sh create mode 100644 tests/xlate/xlate.t create mode 100644 tests/xlate/xlate.t.nft
tests/xlate/runtest.sh new file +29 -0
@@ -0,0 +1,29 @@ +#!/bin/bash + +DIFF=$(which diff) +if [ ! -x "$DIFF" ] ; then + echo "ERROR: missing diff" + exit 1 +fi + +IPSET_XLATE=$(which ipset-translate) +if [ ! -x "$IPSET_XLATE" ] ; then + echo "ERROR: ipset-translate is not installed yet" + exit 1 +fi + +TMP=$(mktemp) +ipset-translate restore < xlate.t &> $TMP +if [ $? -ne 0 ] +then + cat $TMP + echo -e "[\033[0;31mERROR\033[0m] failed to run ipset-translate" + exit 1 +fi +${DIFF} -u xlate.t.nft $TMP +if [ $? -eq 0 ] +then + echo -e "[\033[0;32mOK\033[0m] tests are fine!" +else + echo -e "[\033[0;31mERROR\033[0m] unexpected ipset to nftables translation" +fi
tests/xlate/xlate.t new file +55 -0
55 lines not on this page · raw message
tests/xlate/xlate.t.nft new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.20.1
Hi Pablo,
Quoted 18 lines · Pablo Neira Ayuso
This v4 of the patchset to add the ipset to nftables translation utility. Example invocation of this new tool is the following:
# ipset-translate restore < file.ipsetThis v4 round includes:
- regression tests: there is at least one test for each ipset type.
- many bugfixes that have been spotted by the regression test infrastructure.
- Disentanglement of theipset_xlate()logic for ADT commands.to run regression tests:
# cd tests/xlate # ./runtest.sh [OK] tests are fine!
Quoted 6 lines
The xlate.t file contains the ipset set definitions, then the xlate.t.nft file contains the expected output in nftables syntax. In case that there is a mismatch, the diff with the expected output is provided.
Please, apply, thanks!
The patches are applied to the ipset git tree. Thanks indeed!
Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : https://wigner.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary