cleanup base includes and add <nftdefault.h> header
cover cleanup base includes and add <nftdefault.h> header
- cleanup _GNU_SOURCE/_XOPEN_SOURCE handling
- ensure <config.h> is included as first (via <nftdefault.h> header)
- add <nftdefault.h> to provide a base header that is included everywhere.
Thomas Haller (6):
meta: define _GNU_SOURCE to get strptime() from <time.h>
src: add <nftdefault.h> header and include it as first
include: don't define _GNU_SOURCE in public header
configure: use AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE
include: include <std{bool,int}.h> via nftdefault.h
configure: drop AM_PROG_CC_C_O autoconf check
configure.ac | 4 +++- include/Makefile.am | 3 ++- include/cli.h | 1 - include/datatype.h | 1 - include/dccpopt.h | 1 - include/expression.h | 1 - include/gmputil.h | 2 -- include/nftables.h | 1 - include/nftables/libnftables.h | 1 - include/nftdefault.h | 10 ++++++++++ include/rule.h | 1 - include/utils.h | 3 --- src/cache.c | 2 ++ src/cli.c | 3 ++- src/cmd.c | 2 ++ src/ct.c | 2 ++ src/datatype.c | 2 ++ src/dccpopt.c | 3 ++- src/erec.c | 4 ++-- src/evaluate.c | 3 ++- src/expression.c | 3 ++- src/exthdr.c | 3 ++- src/fib.c | 2 ++ src/gmputil.c | 2 ++ src/hash.c | 2 ++ src/iface.c | 2 ++ src/intervals.c | 2 ++ src/ipopt.c | 3 ++- src/json.c | 3 ++- src/libnftables.c | 3 +++ src/main.c | 2 ++ src/mergesort.c | 3 ++- src/meta.c | 8 +++----- src/mini-gmp.c | 2 ++ src/misspell.c | 2 ++ src/mnl.c | 2 ++ src/monitor.c | 2 ++ src/netlink.c | 2 ++ src/netlink_delinearize.c | 3 ++- src/netlink_linearize.c | 2 ++ src/nfnl_osf.c | 2 ++ src/nftutils.c | 3 +-- src/nftutils.h | 1 - src/numgen.c | 2 ++ src/optimize.c | 3 ++- src/osf.c | 2 ++ src/owner.c | 2 ++ src/parser_json.c | 4 ++-- src/payload.c | 3 ++- src/print.c | 2 ++ src/proto.c | 3 ++- src/rt.c | 3 ++- src/rule.c | 3 ++- src/scanner.l | 2 ++ src/sctp_chunk.c | 2 ++ src/segtree.c | 2 ++ src/socket.c | 2 ++ src/statement.c | 3 ++- src/tcpopt.c | 3 ++- src/utils.c | 2 ++ src/xfrm.c | 2 ++ src/xt.c | 2 ++ 62 files changed, 114 insertions(+), 42 deletions(-) create mode 100644 include/nftdefault.h
Signature · 1 line
2.41.0
PATCH 1/6 meta: define _GNU_SOURCE to get strptime() from <time.h>
To use strptime(), the documentation indicates
#define _XOPEN_SOURCE #include <time.h>
However, previously this was done wrongly.
For example, when building with musl we got a warning:
CC meta.lo
meta.c:40: warning: "_XOPEN_SOURCE" redefined
40 | #define _XOPEN_SOURCE
|
In file included from /usr/include/errno.h:8,
from meta.c:13:
/usr/include/features.h:16: note: this is the location of the previous definition
16 | #define _XOPEN_SOURCE 700
|
Defining "__USE_XOPEN" is wrong. This is a glibc internal define not for the user.
Note that if we just set _XOPEN_SOURCE (or _XOPEN_SOURCE=700), we won't get other things like "struct tm.tm_gmtoff".
Instead, we already define _GNU_SOURCE at other places. Do that here too, it will give us strptime() and all is good.
Also, those directives should be defined as first thing (or via "-D" command line). See [1].
This is also important, because to use "time_t" in a header, we would need to include <time.h>. That only works, if we get the feature test macros right. That is, define th _?_SOURCE macro as first thing.
[1] https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
--- src/meta.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
src/meta.c +3 -4
@@ -10,6 +10,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#define _GNU_SOURCE +#include <errno.h> #include <limits.h> #include <stddef.h>
@@ -25,6 +27,7 @@#include <linux/netfilter.h> #include <linux/pkt_sched.h> #include <linux/if_packet.h> +#include <time.h> #include <nftables.h> #include <expression.h>
@@ -37,10 +40,6 @@#include <iface.h> #include <json.h> -#define _XOPEN_SOURCE -#define __USE_XOPEN -#include <time.h> -static void tchandle_type_print (const struct expr *expr,struct output_ctx *octx) {
Signature · 1 line
2.41.0
PATCH 2/6 src: add <nftdefault.h> header and include it as first
In reply to Thomas Haller<config.h> is generated by the configure script. As it contains our feature detection, it want to use it everywhere.
Likewise, in some of our sources, we define _GNU_SOURCE. Such defines should also be defined before anything else. And there is no reason for not defining it for all our sources. It would be good to use autoconf's AC_USE_SYSTEM_EXTENSIONS, in which case we would also need to ensure that <config.h> is always included as first.
Instead of going through all source files and include <config.h> as first, add a new header "include/nftdefault.h", which is supposed to be included in all our source (and as first).
This will also allow us to prepare some common base, like include <stdbool.h> everywhere.
The aim that internal headers are self-contained, so that they can be included in any order. Which, by the way, already didn't work because some headers define _GNU_SOURCE, which would only work if the header gets included as first. There is however an exception to the rule:
everything we compile shall rely on having <nftdefault.h> header included as first. This applies to source files (which include it as first) and to internal header files (which are always included after).
Note that <config.h> has no include guards, which is at least ugly to include multiple times. It doesn't cause problems in practice, because it only contains defines and the compiler doesn't warn about redefining a macro with the same value. Still, <nftdefault.h> ensures to include <config.h> exactly once.
--- include/Makefile.am | 3 ++- include/cli.h | 1 - include/gmputil.h | 2 -- include/nftdefault.h | 9 +++++++++ include/utils.h | 1 - src/cache.c | 2 ++ src/cli.c | 3 ++- src/cmd.c | 2 ++ src/ct.c | 2 ++ src/datatype.c | 2 ++ src/dccpopt.c | 2 ++ src/erec.c | 4 ++-- src/evaluate.c | 2 ++ src/expression.c | 2 ++ src/exthdr.c | 2 ++ src/fib.c | 2 ++ src/gmputil.c | 2 ++ src/hash.c | 2 ++ src/iface.c | 2 ++ src/intervals.c | 2 ++ src/ipopt.c | 2 ++ src/json.c | 3 ++- src/libnftables.c | 3 +++ src/main.c | 2 ++ src/mergesort.c | 2 ++ src/meta.c | 2 +- src/mini-gmp.c | 2 ++ src/misspell.c | 2 ++ src/mnl.c | 2 ++ src/monitor.c | 2 ++ src/netlink.c | 2 ++ src/netlink_delinearize.c | 2 ++ src/netlink_linearize.c | 2 ++ src/nfnl_osf.c | 2 ++ src/nftutils.c | 2 +- src/numgen.c | 2 ++ src/optimize.c | 3 ++- src/osf.c | 2 ++ src/owner.c | 2 ++ src/parser_json.c | 3 ++- src/payload.c | 2 ++ src/print.c | 2 ++ src/proto.c | 2 ++ src/rt.c | 2 ++ src/rule.c | 2 ++ src/scanner.l | 2 ++ src/sctp_chunk.c | 2 ++ src/segtree.c | 2 ++ src/socket.c | 2 ++ src/statement.c | 2 ++ src/tcpopt.c | 2 ++ src/utils.c | 2 ++ src/xfrm.c | 2 ++ src/xt.c | 2 ++ 54 files changed, 108 insertions(+), 13 deletions(-) create mode 100644 include/nftdefault.h
include/Makefile.am +2 -1
@@ -1,11 +1,12 @@ SUBDIRS = linux \ nftables -noinst_HEADERS = cli.h \ +noinst_HEADERS = cli.h \ cache.h \ cmd.h \ datatype.h \ dccpopt.h \ + nftdefault.h \ expression.h \ fib.h \ hash.h \
include/cli.h +0 -1
@@ -2,7 +2,6 @@#define _NFT_CLI_H_#include <nftables/libnftables.h> -#include <config.h> #if defined(HAVE_LIBREADLINE ) || defined(HAVE_LIBEDIT ) || defined(HAVE_LIBLINENOISE )extern int cli_init (struct nft_ctx *nft);
include/gmputil.h +0 -2
@@ -1,8 +1,6 @@#ifndef NFTABLES_GMPUTIL_H #define NFTABLES_GMPUTIL_H -#include <config.h> -#ifdef HAVE_LIBGMP #include <gmp.h> #else
include/nftdefault.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef NFTABLES_NFTDEFAULT_H +#define NFTABLES_NFTDEFAULT_H + +#define _GNU_SOURCE + +#include <config.h> + +#endif /* NFTABLES_NFTDEFAULT_H */
include/utils.h +0 -1
@@ -11,7 +11,6 @@#include <list.h> #include <gmputil.h> -#include "config.h" #ifdef HAVE_VISIBILITY_HIDDEN # define __visible __attribute__((visibility("default")))# define EXPORT_SYMBOL (x) typeof(x) (x) __visible;
src/cache.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <expression.h> #include <statement.h> #include <rule.h>
src/cli.c +2 -1
@@ -12,7 +12,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ -#include <config.h> +#include <nftdefault.h> +#include <stdlib.h> #include <stdio.h> #include <stdarg.h>
src/cmd.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <erec.h> #include <mnl.h> #include <cmd.h>
src/ct.c +2 -0
@@ -10,6 +10,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/datatype.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stdlib.h> #include <string.h> #include <inttypes.h>
src/dccpopt.c +2 -0
@@ -1,3 +1,5 @@ +#include <nftdefault.h> +#include <stddef.h> #include <stdint.h>
src/erec.c +2 -2
@@ -8,8 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ -#define _GNU_SOURCE -#include <config.h> +#include <nftdefault.h> +#include <stdio.h> #include <string.h> #include <stdarg.h>
src/evaluate.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/expression.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/exthdr.c +2 -0
@@ -10,6 +10,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/fib.c +2 -0
@@ -8,6 +8,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <nftables.h> #include <erec.h> #include <expression.h>
src/gmputil.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdarg.h>
src/hash.c +2 -0
@@ -8,6 +8,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <nftables.h> #include <expression.h> #include <datatype.h>
src/iface.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <stdio.h> #include <stdlib.h> #include <net/if.h>
src/intervals.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <nftables.h> #include <expression.h> #include <intervals.h>
src/ipopt.c +2 -0
@@ -1,3 +1,5 @@ +#include <nftdefault.h> +#include <stdint.h> #include <netinet/in.h>
src/json.c +2 -1
@@ -6,7 +6,8 @@* later) as published by the Free Software Foundation. */ -#define _GNU_SOURCE +#include <nftdefault.h> +#include <stdio.h> #include <string.h>
src/libnftables.c +3 -0
@@ -5,6 +5,9 @@* it under the terms of the GNU General Public License version 2 (or any * later) as published by the Free Software Foundation. */ + +#include <nftdefault.h> +#include <nftables/libnftables.h> #include <erec.h> #include <mnl.h>
src/main.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stdlib.h> #include <stddef.h> #include <unistd.h>
src/mergesort.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <stdint.h> #include <expression.h> #include <gmputil.h>
src/meta.c +1 -1
@@ -10,7 +10,7 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ -#define _GNU_SOURCE +#include <nftdefault.h> #include <errno.h> #include <limits.h>
src/mini-gmp.c +2 -0
@@ -41,6 +41,8 @@ see https://www.gnu.org/licenses/. */mpn/generic/sbpi1_div_qr.c, mpn/generic/sub_n.c, mpn/generic/submul_1.c. */ +#include <nftdefault.h> +#include <assert.h> #include <ctype.h> #include <limits.h>
src/misspell.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <stdlib.h> #include <string.h> #include <limits.h>
src/mnl.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <libmnl/libmnl.h> #include <libnftnl/common.h> #include <libnftnl/ruleset.h>
src/monitor.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <string.h> #include <fcntl.h> #include <errno.h>
src/netlink.c +2 -0
@@ -9,6 +9,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <string.h> #include <errno.h> #include <libmnl/libmnl.h>
src/netlink_delinearize.c +2 -0
@@ -9,6 +9,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stdlib.h> #include <stdbool.h> #include <string.h>
src/netlink_linearize.c +2 -0
@@ -9,6 +9,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <linux/netfilter/nf_tables.h> #include <linux/netfilter/nf_log.h>
src/nfnl_osf.c +2 -0
@@ -19,6 +19,8 @@* Based on iptables/utils/nfnl_osf.c. */ +#include <nftdefault.h> +#include <sys/time.h> #include <ctype.h>
src/nftutils.c +1 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <config.h> +#include <nftdefault.h> #include "nftutils.h"
src/numgen.c +2 -0
@@ -8,6 +8,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <nftables.h> #include <expression.h> #include <datatype.h>
src/optimize.c +2 -1
@@ -11,7 +11,8 @@* programme. */ -#define _GNU_SOURCE +#include <nftdefault.h> +#include <string.h> #include <errno.h> #include <inttypes.h>
src/osf.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <nftables.h> #include <expression.h> #include <utils.h>
src/owner.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <stdio.h> #include <unistd.h> #include <stdlib.h>
src/parser_json.c +2 -1
@@ -6,7 +6,8 @@* later) as published by the Free Software Foundation. */ -#define _GNU_SOURCE +#include <nftdefault.h> +#include <errno.h> #include <stdint.h> /* needed by gmputil.h */ #include <string.h>
src/payload.c +2 -0
@@ -10,6 +10,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/print.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <stdarg.h> #include <nftables.h> #include <utils.h>
src/proto.c +2 -0
@@ -9,6 +9,8 @@* */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdint.h>
src/rt.c +2 -0
@@ -8,6 +8,8 @@* published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <errno.h> #include <stddef.h> #include <stdlib.h>
src/rule.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/scanner.l +2 -0
@@ -10,6 +10,8 @@ %{ +#include <nftdefault.h> + #include <limits.h> #include <glob.h> #include <netinet/in.h>
src/sctp_chunk.c +2 -0
@@ -6,6 +6,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <exthdr.h> #include <sctp_chunk.h>
src/segtree.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stdlib.h> #include <string.h> #include <inttypes.h>
src/socket.c +2 -0
@@ -8,6 +8,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <nftables.h> #include <expression.h> #include <socket.h>
src/statement.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/tcpopt.c +2 -0
@@ -1,3 +1,5 @@ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h>
src/utils.c +2 -0
@@ -8,6 +8,8 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <nftdefault.h> +#include <stddef.h> #include <stdlib.h> #include <stdarg.h>
src/xfrm.c +2 -0
@@ -8,6 +8,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <nftables.h> #include <erec.h> #include <expression.h>
src/xt.c +2 -0
@@ -7,6 +7,8 @@* later) as published by the Free Software Foundation. */ +#include <nftdefault.h> +#include <stdlib.h> #include <time.h> #include <string.h>
Signature · 1 line
2.41.0
PATCH 3/6 include: don't define _GNU_SOURCE in public header
In reply to Thomas Haller_GNU_SOURCE is supposed to be defined as first thing, before including any libc headers. Defining it in the public header of nftables is wrong, because it would only (somewhat) work if the user includes the nftables header as first thing too. But that is not what users commonly would do, in particular with autotools projects, where users would include <config.h> first.
It's also unnecessary. Nothing in "nftables/libnftables.h" itself requires _GNU_SOURCE. Drop it.
--- include/nftables/libnftables.h | 1 - 1 file changed, 1 deletion(-)
include/nftables/libnftables.h +0 -1
@@ -9,7 +9,6 @@#ifndef LIB_NFTABLES_H #define LIB_NFTABLES_H -#define _GNU_SOURCE#include <stdint.h> #include <stdio.h> #include <stdbool.h>
Signature · 1 line
2.41.0
PATCH 4/6 configure: use AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE
In reply to Thomas HallerLet "configure" detect which features are available. Also, nftables is a Linux project, so portability beyond gcc/clang and glibc/musl is less relevant. And even if it were, then feature detection by "configure" would still be preferable.
Use AC_USE_SYSTEM_EXTENSIONS ([1]).
Apparently available since autoconf 2.60, from 2006 ([2]).
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Posix-Variants.html#index-AC_005fUSE_005fSYSTEM_005fEXTENSIONS-1046
[2] https://lists.gnu.org/archive/html/autoconf/2006-06/msg00111.html
--- configure.ac | 3 +++ include/nftdefault.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
configure.ac +3 -0
@@ -45,6 +45,9 @@ fi AM_PROG_AR LT_INIT([disable-static]) AM_PROG_CC_C_O + +AC_USE_SYSTEM_EXTENSIONS + AC_EXEEXT CHECK_GCC_FVISIBILITY
include/nftdefault.h +0 -2
@@ -2,8 +2,6 @@#ifndef NFTABLES_NFTDEFAULT_H #define NFTABLES_NFTDEFAULT_H -#define _GNU_SOURCE -#include <config.h> #endif /* NFTABLES_NFTDEFAULT_H */
Signature · 1 line
2.41.0
Re: [PATCH nft 4/6] configure: use AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE
configure.ac fi · line 49
Quoted 11 lines · Thomas Haller
configure.ac +0
-0@@ -45,6 +45,9 @@ fiAM_PROG_AR
LT_INIT([disable-static])
AM_PROG_CC_C_Oconfigure.ac +2
-0+ +AC_USE_SYSTEM_EXTENSIONS
AC_USE_SYSTEM_EXTENTIONS needs to move up, right after AC_PROG_CC. I will fix that in v2.
Thomas
PATCH 5/6 include: include <std{bool,int}.h> via nftdefault.h
In reply to Thomas HallerThere is a minimum base that all our sources will end up needing. That is what <nftdefault.h> provides.
Add <stdbool.h> and <stdint.h> there. It's unlikely that we want to implement anything, without having "bool" and "uint32_t" types available.
Yes, this means the internal headers are not self-contained, with respect to what "nftdefault.h" provides. This is the exception to the rule, where headers on having "nftdefault.h" included for them.
--- include/datatype.h | 1 - include/dccpopt.h | 1 - include/expression.h | 1 - include/nftables.h | 1 - include/nftdefault.h | 3 +++ include/rule.h | 1 - include/utils.h | 2 -- src/dccpopt.c | 1 - src/evaluate.c | 1 - src/expression.c | 1 - src/exthdr.c | 1 - src/ipopt.c | 1 - src/mergesort.c | 1 - src/meta.c | 1 - src/netlink_delinearize.c | 1 - src/nftutils.c | 1 - src/nftutils.h | 1 - src/parser_json.c | 1 - src/payload.c | 1 - src/proto.c | 1 - src/rt.c | 1 - src/rule.c | 1 - src/statement.c | 1 - src/tcpopt.c | 1 - 24 files changed, 3 insertions(+), 24 deletions(-)
include/datatype.h +0 -1
@@ -1,7 +1,6 @@#ifndef NFTABLES_DATATYPE_H #define NFTABLES_DATATYPE_H -#include <stdbool.h> #include <json.h> /**
include/dccpopt.h +0 -1
@@ -2,7 +2,6 @@#define NFTABLES_DCCPOPT_H #include <nftables.h> -#include <stdint.h> #define DCCPOPT_TYPE_MIN 0#define DCCPOPT_TYPE_MAX UINT8_MAX
include/expression.h +0 -1
@@ -1,7 +1,6 @@#ifndef NFTABLES_EXPRESSION_H #define NFTABLES_EXPRESSION_H -#include <stdbool.h> #include <gmputil.h> #include <linux/netfilter/nf_tables.h>
include/nftables.h +0 -1
@@ -1,7 +1,6 @@#ifndef NFTABLES_NFTABLES_H #define NFTABLES_NFTABLES_H -#include <stdbool.h> #include <stdarg.h> #include <limits.h> #include <utils.h>
include/nftdefault.h +3 -0
@@ -4,4 +4,7 @@#include <config.h> +#include <stdbool.h> +#include <stdint.h> +#endif /* NFTABLES_NFTDEFAULT_H */
include/rule.h +0 -1
@@ -1,7 +1,6 @@#ifndef NFTABLES_RULE_H #define NFTABLES_RULE_H -#include <stdint.h> #include <nftables.h> #include <list.h> #include <netinet/in.h>
include/utils.h +0 -2
@@ -2,8 +2,6 @@#define NFTABLES_UTILS_H #include <asm/byteorder.h> -#include <stdint.h> -#include <stdbool.h> #include <stdarg.h> #include <stdio.h> #include <unistd.h>
src/dccpopt.c +0 -1
@@ -1,7 +1,6 @@#include <nftdefault.h> #include <stddef.h> -#include <stdint.h> #include <datatype.h> #include <dccpopt.h>
src/evaluate.c +0 -1
@@ -13,7 +13,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <arpa/inet.h> #include <linux/netfilter.h>
src/expression.c +0 -1
@@ -13,7 +13,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <limits.h>
src/exthdr.c +0 -1
@@ -15,7 +15,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <netinet/in.h> #include <netinet/ip6.h>
src/ipopt.c +0 -1
@@ -1,6 +1,5 @@#include <nftdefault.h> -#include <stdint.h> #include <netinet/in.h> #include <netinet/ip.h>
src/mergesort.c +0 -1
@@ -8,7 +8,6 @@#include <nftdefault.h> -#include <stdint.h> #include <expression.h> #include <gmputil.h> #include <list.h>
src/meta.c +0 -1
@@ -17,7 +17,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <net/if.h> #include <net/if_arp.h>
src/netlink_delinearize.c +0 -1
@@ -12,7 +12,6 @@#include <nftdefault.h> #include <stdlib.h> -#include <stdbool.h> #include <string.h> #include <limits.h> #include <linux/netfilter/nf_tables.h>
src/nftutils.c +0 -1
@@ -6,7 +6,6 @@#include <netdb.h> #include <string.h> -#include <stdint.h> /* Buffer size used for getprotobynumber_r() and similar. The manual comments * that a buffer of 1024 should be sufficient "for most applications"(??), so
src/nftutils.h +0 -1
@@ -2,7 +2,6 @@#ifndef NFTUTILS_H #define NFTUTILS_H -#include <stdbool.h> #include <stddef.h> /* The maximum buffer size for (struct protoent).p_name. It is excessively large,
src/parser_json.c +0 -1
@@ -9,7 +9,6 @@#include <nftdefault.h> #include <errno.h> -#include <stdint.h> /* needed by gmputil.h */ #include <string.h> #include <syslog.h>
src/payload.c +0 -1
@@ -15,7 +15,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <net/if_arp.h> #include <arpa/inet.h>
src/proto.c +0 -1
@@ -13,7 +13,6 @@#include <stddef.h> #include <stdlib.h> -#include <stdint.h> #include <string.h> #include <net/if_arp.h> #include <arpa/inet.h>
src/rt.c +0 -1
@@ -14,7 +14,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <arpa/inet.h> #include <linux/netfilter.h>
src/rule.c +0 -1
@@ -13,7 +13,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <inttypes.h> #include <errno.h>
src/statement.c +0 -1
@@ -13,7 +13,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <inttypes.h> #include <string.h> #include <syslog.h>
src/tcpopt.c +0 -1
@@ -3,7 +3,6 @@#include <stddef.h> #include <stdlib.h> #include <stdio.h> -#include <stdint.h> #include <string.h> #include <netinet/in.h> #include <netinet/ip6.h>
Signature · 1 line
2.41.0
PATCH 6/6 configure: drop AM_PROG_CC_C_O autoconf check
In reply to Thomas HallerThis macro is obsolete since automake 1.14 (2013). It might have been unnecessary even before, in practice only gcc/clang are supported compilers.
[1] https://www.gnu.org/software/automake/manual/html_node/Public-Macros.html#index-AM_005fPROG_005fCC_005fC_005fO
[2] https://lists.gnu.org/archive/html/info-gnu/2013-06/msg00009.html
--- configure.ac | 1 - 1 file changed, 1 deletion(-)
configure.ac +0 -1
@@ -44,7 +44,6 @@ fi AM_PROG_AR LT_INIT([disable-static]) -AM_PROG_CC_C_O AC_USE_SYSTEM_EXTENSIONS
Signature · 1 line
2.41.0
Pablo Neira Ayuso
maintainerQuoted 4 lines · Thomas Haller
- cleanup _GNU_SOURCE/_XOPEN_SOURCE handling
- ensure <config.h> is included as first (via <nftdefault.h> header)
- add <nftdefault.h> to provide a base header that is included everywhere.
Could you use include/nft.h instead?
Quoted 76 lines
Thomas Haller (6):
meta: define_GNU_SOURCEto getstrptime()from <time.h>
src: add <nftdefault.h> header and include it as first
include: don't define_GNU_SOURCEin public header
configure: useAC_USE_SYSTEM_EXTENSIONSto get_GNU_SOURCE
include: include <std{bool,int}.h> vianftdefault.h
configure: dropAM_PROG_CC_C_Oautoconf checkconfigure.ac | 4 +++- include/Makefile.am | 3 ++- include/cli.h | 1 - include/datatype.h | 1 - include/dccpopt.h | 1 - include/expression.h | 1 - include/gmputil.h | 2 -- include/nftables.h | 1 - include/nftables/libnftables.h | 1 - include/nftdefault.h | 10 ++++++++++ include/rule.h | 1 - include/utils.h | 3 --- src/cache.c | 2 ++ src/cli.c | 3 ++- src/cmd.c | 2 ++ src/ct.c | 2 ++ src/datatype.c | 2 ++ src/dccpopt.c | 3 ++- src/erec.c | 4 ++-- src/evaluate.c | 3 ++- src/expression.c | 3 ++- src/exthdr.c | 3 ++- src/fib.c | 2 ++ src/gmputil.c | 2 ++ src/hash.c | 2 ++ src/iface.c | 2 ++ src/intervals.c | 2 ++ src/ipopt.c | 3 ++- src/json.c | 3 ++- src/libnftables.c | 3 +++ src/main.c | 2 ++ src/mergesort.c | 3 ++- src/meta.c | 8 +++----- src/mini-gmp.c | 2 ++ src/misspell.c | 2 ++ src/mnl.c | 2 ++ src/monitor.c | 2 ++ src/netlink.c | 2 ++ src/netlink_delinearize.c | 3 ++- src/netlink_linearize.c | 2 ++ src/nfnl_osf.c | 2 ++ src/nftutils.c | 3 +-- src/nftutils.h | 1 - src/numgen.c | 2 ++ src/optimize.c | 3 ++- src/osf.c | 2 ++ src/owner.c | 2 ++ src/parser_json.c | 4 ++-- src/payload.c | 3 ++- src/print.c | 2 ++ src/proto.c | 3 ++- src/rt.c | 3 ++- src/rule.c | 3 ++- src/scanner.l | 2 ++ src/sctp_chunk.c | 2 ++ src/segtree.c | 2 ++ src/socket.c | 2 ++ src/statement.c | 3 ++- src/tcpopt.c | 3 ++- src/utils.c | 2 ++ src/xfrm.c | 2 ++ src/xt.c | 2 ++ 62 files changed, 114 insertions(+), 42 deletions(-) create mode 100644 include/nftdefault.hSignature · 1 line
2.41.0
Quoted 8 lines · Pablo Neira Ayuso
Quoted 5 lines · Thomas Haller
- cleanup _GNU_SOURCE/_XOPEN_SOURCE handling
- ensure <config.h> is included as first (via <nftdefault.h> header)
- add <nftdefault.h> to provide a base header that is included everywhere.Could you use
include/nft.hinstead?
ACK. I will rename for v2.
Thomas