[iptables] manpages: do not include v4-only modules in ip6tables manpage
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Tue May 26 14:19:33 CEST 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=c304d776e9bf546829c90d0cbaeae6a3a79ef9db
commit c304d776e9bf546829c90d0cbaeae6a3a79ef9db
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue May 26 13:21:55 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue May 26 13:22:17 2009 +0200
manpages: do not include v4-only modules in ip6tables manpage
References: http://bugs.debian.org/529954
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 74670b185f8f92c499e1a67139405524da32fc66
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Wed May 13 17:40:05 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue May 26 13:14:26 2009 +0200
addrtype: fix one manpage type
References: http://bugs.debian.org/528457
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 2c69b55e55f2efc5a334b87ccdceaa9de0ecb658
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Apr 30 19:32:02 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue May 26 13:14:15 2009 +0200
iptables: replace open-coded sizeof by ARRAY_SIZE
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 69f564e3890976461de0016cd81171ff8bfa8353
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue May 26 13:14:06 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue May 26 13:14:06 2009 +0200
extensions: add const qualifiers in print/save functions
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 771871e1d9c39310cb6e2c595270d2e651309e6d
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Fri May 22 11:46:55 2009 +0200
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue May 26 13:12:05 2009 +0200
xtables: use extern "C"
This fixes linking errors for 3rd-party C++ code.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
via c304d776e9bf546829c90d0cbaeae6a3a79ef9db (commit)
via 74670b185f8f92c499e1a67139405524da32fc66 (commit)
via 2c69b55e55f2efc5a334b87ccdceaa9de0ecb658 (commit)
via 69f564e3890976461de0016cd81171ff8bfa8353 (commit)
via 771871e1d9c39310cb6e2c595270d2e651309e6d (commit)
from c65b5f2c7dcbd7ca5bd7759ab5180bd4e898e90a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c304d776e9bf546829c90d0cbaeae6a3a79ef9db
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue May 26 13:21:55 2009 +0200
manpages: do not include v4-only modules in ip6tables manpage
References: http://bugs.debian.org/529954
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 74670b185f8f92c499e1a67139405524da32fc66
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Wed May 13 17:40:05 2009 +0200
addrtype: fix one manpage type
References: http://bugs.debian.org/528457
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 2c69b55e55f2efc5a334b87ccdceaa9de0ecb658
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu Apr 30 19:32:02 2009 +0200
iptables: replace open-coded sizeof by ARRAY_SIZE
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 69f564e3890976461de0016cd81171ff8bfa8353
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue May 26 13:14:06 2009 +0200
extensions: add const qualifiers in print/save functions
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 771871e1d9c39310cb6e2c595270d2e651309e6d
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri May 22 11:46:55 2009 +0200
xtables: use extern "C"
This fixes linking errors for 3rd-party C++ code.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
-----------------------------------------------------------------------
extensions/GNUmakefile.in | 10 +++++-----
extensions/dscp_helper.c | 6 ++----
extensions/libip6t_LOG.c | 12 +++---------
extensions/libip6t_REJECT.c | 11 ++++-------
extensions/libip6t_hl.c | 2 +-
extensions/libip6t_icmp6.c | 11 ++++-------
extensions/libip6t_ipv6header.c | 16 +++++-----------
extensions/libip6t_mh.c | 7 +++----
extensions/libipt_DNAT.c | 4 ++--
extensions/libipt_LOG.c | 12 +++---------
extensions/libipt_MASQUERADE.c | 10 ++++------
extensions/libipt_NETMAP.c | 5 ++---
extensions/libipt_REDIRECT.c | 10 ++++------
extensions/libipt_REJECT.c | 9 ++++-----
extensions/libipt_SAME.c | 10 ++++------
extensions/libipt_SET.c | 6 ++----
extensions/libipt_SNAT.c | 4 ++--
extensions/libipt_addrtype.man | 2 +-
extensions/libipt_icmp.c | 11 ++++-------
extensions/libipt_realm.c | 4 ++--
extensions/libipt_set.c | 6 ++----
extensions/libxt_CONNSECMARK.c | 6 +++---
extensions/libxt_RATEEST.c | 2 +-
extensions/libxt_SECMARK.c | 6 +++---
extensions/libxt_comment.c | 4 ++--
extensions/libxt_connbytes.c | 8 ++++----
extensions/libxt_connmark.c | 4 ++--
extensions/libxt_conntrack.c | 5 +++--
extensions/libxt_dccp.c | 5 ++---
extensions/libxt_hashlimit.c | 9 +++------
extensions/libxt_helper.c | 4 ++--
extensions/libxt_limit.c | 7 +++----
extensions/libxt_mark.c | 4 ++--
extensions/libxt_physdev.c | 6 ++----
extensions/libxt_pkttype.c | 18 ++++++------------
extensions/libxt_quota.c | 4 ++--
extensions/libxt_rateest.c | 7 ++++---
extensions/libxt_sctp.c | 18 ++----------------
extensions/libxt_state.c | 4 ++--
extensions/libxt_statistic.c | 4 ++--
extensions/libxt_tcp.c | 9 +++------
extensions/libxt_time.c | 2 +-
include/xtables.h.in | 8 ++++++++
ip6tables-restore.c | 2 +-
iptables-restore.c | 2 +-
iptables-xml.c | 2 +-
46 files changed, 128 insertions(+), 190 deletions(-)
This fixes linking errors for 3rd-party C++ code.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
diff --git a/include/xtables.h.in b/include/xtables.h.in
index a399f90..4d4ca0a 100644
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -203,6 +203,10 @@ struct xtables_globals
void (*exit_err)(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3)));
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern const char *xtables_modprobe_program;
extern struct xtables_match *xtables_matches;
extern struct xtables_target *xtables_targets;
@@ -295,4 +299,8 @@ extern void _init(void);
#endif
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
#endif /* _XTABLES_H */
More information about the netfilter-cvslog
mailing list