From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Jan Engelhardt <jengelh@medozas.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH 4/9] libiptc: combine common types
Date: Mon, 12 Sep 2011 11:36:03 +0200 [thread overview]
Message-ID: <20110912093603.GD2194@1984> (raw)
In-Reply-To: <1315755359-7012-5-git-send-email-jengelh@medozas.de>
On Sun, Sep 11, 2011 at 05:35:53PM +0200, Jan Engelhardt wrote:
> Make an xt_chainlabel type out of ipt_chainlabel and ip6t_chainlabel,
> and add backward-API #defines. The ABI naturally does not change
> either, so no soversion bump.
>
> Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
> ---
> include/Makefile.am | 2 +-
> include/libiptc/libip6tc.h | 3 ++-
> include/libiptc/libiptc.h | 3 ++-
> include/libiptc/xtcshared.h | 6 ++++++
> 4 files changed, 11 insertions(+), 3 deletions(-)
> create mode 100644 include/libiptc/xtcshared.h
>
> diff --git a/include/Makefile.am b/include/Makefile.am
> index 0a1abea..6f7da59 100644
> --- a/include/Makefile.am
> +++ b/include/Makefile.am
> @@ -9,4 +9,4 @@ endif
>
> nobase_include_HEADERS += \
> libiptc/ipt_kernel_headers.h libiptc/libiptc.h \
> - libiptc/libip6tc.h libiptc/libxtc.h
> + libiptc/libip6tc.h libiptc/libxtc.h libiptc/xtcshared.h
> diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
> index 4f2d1f8..55e0bfc 100644
> --- a/include/libiptc/libip6tc.h
> +++ b/include/libiptc/libip6tc.h
> @@ -10,10 +10,11 @@
> # include <limits.h> /* INT_MAX in ip6_tables.h */
> #endif
> #include <linux/netfilter_ipv6/ip6_tables.h>
> +#include <libiptc/xtcshared.h>
>
> struct ip6tc_handle;
>
> -typedef char ip6t_chainlabel[32];
> +#define ip6t_chainlabel xt_chainlabel
>
> #define IP6TC_LABEL_ACCEPT "ACCEPT"
> #define IP6TC_LABEL_DROP "DROP"
> diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h
> index 3497d6a..ccbf6bf 100644
> --- a/include/libiptc/libiptc.h
> +++ b/include/libiptc/libiptc.h
> @@ -10,6 +10,7 @@
> # include <limits.h> /* INT_MAX in ip_tables.h */
> #endif
> #include <linux/netfilter_ipv4/ip_tables.h>
> +#include <libiptc/xtcshared.h>
>
> #ifdef __cplusplus
> extern "C" {
> @@ -17,7 +18,7 @@ extern "C" {
>
> struct iptc_handle;
>
> -typedef char ipt_chainlabel[32];
> +#define ipt_chainlabel xt_chainlabel
>
> #define IPTC_LABEL_ACCEPT "ACCEPT"
> #define IPTC_LABEL_DROP "DROP"
> diff --git a/include/libiptc/xtcshared.h b/include/libiptc/xtcshared.h
> new file mode 100644
> index 0000000..aaf87a4
> --- /dev/null
> +++ b/include/libiptc/xtcshared.h
> @@ -0,0 +1,6 @@
> +#ifndef _LIBXTC_SHARED_H
> +#define _LIBXTC_SHARED_H 1
> +
> +typedef char xt_chainlabel[32];
> +
> +#endif /* _LIBXTC_SHARED_H */
I think this definition naturally belong to libxtc.h.
next prev parent reply other threads:[~2011-09-12 9:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-11 15:35 iptables: libiptc, cleanups Jan Engelhardt
2011-09-11 15:35 ` [PATCH 1/9] libiptc: resolve compile failure Jan Engelhardt
2011-09-11 15:35 ` [PATCH 2/9] iptables-save: remove binary dumping dead code Jan Engelhardt
2011-09-12 9:32 ` Pablo Neira Ayuso
2011-09-12 10:48 ` Jan Engelhardt
2011-09-12 18:52 ` Pablo Neira Ayuso
2011-09-11 15:35 ` [PATCH 3/9] libiptc: remove unused HOOK_DROPPING thing Jan Engelhardt
2011-09-11 15:35 ` [PATCH 4/9] libiptc: combine common types Jan Engelhardt
2011-09-12 9:36 ` Pablo Neira Ayuso [this message]
2011-09-12 10:43 ` Jan Engelhardt
2011-09-12 18:38 ` Pablo Neira Ayuso
2011-09-11 15:35 ` [PATCH 5/9] libiptc: replace ipt_chainlabel by xt_chainlabel Jan Engelhardt
2011-09-11 15:35 ` [PATCH 6/9] libiptc: combine common types: _handle Jan Engelhardt
2011-09-11 15:35 ` [PATCH 7/9] src: resolve old macro names that are indirections Jan Engelhardt
2011-09-11 15:35 ` [PATCH 8/9] libiptc: use a family-invariant xtc_ops struct for code reduction Jan Engelhardt
2011-09-11 15:35 ` [PATCH 9/9] ip6tables-restore: make code look alike with iptables-restore Jan Engelhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110912093603.GD2194@1984 \
--to=pablo@netfilter.org \
--cc=jengelh@medozas.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).