[iptables] Merge branch 'master' of git://dev.medozas.de/iptables
Patrick McHardy
netfilter-cvslog-bounces at lists.netfilter.org
Mon Feb 9 19:00:29 CET 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=300e2909ba4714abc6093cba0ed860708282bd3e
commit 300e2909ba4714abc6093cba0ed860708282bd3e
Merge: 9cfc59f... 1eb619f...
Author: Patrick McHardy <kaber at trash.net>
AuthorDate: Mon Feb 9 18:58:45 2009 +0100
Commit: Patrick McHardy <kaber at trash.net>
CommitDate: Mon Feb 9 18:58:45 2009 +0100
Merge branch 'master' of git://dev.medozas.de/iptables
commit 1eb619f3a0508d62847c311e69a09f4a8534c4df
Merge: 77f48c2... 2120921...
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Sun Feb 8 18:19:43 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Sun Feb 8 18:20:32 2009 +0100
Merge branch 'origin/master'
(throw away remote three commits as they had been redone
in this local branch)
commit 77f48c2f1ef21fa43aa68c25a1457db319ca2526
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Sat Feb 7 19:59:53 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Sat Feb 7 20:04:09 2009 +0100
libxtables: move afinfo around
libxtables should not rely on the program executable providing the
magic constants for using [gs]etsockopt.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 1de7edffc9085c0f41c261dca995e28ae4126c29
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Fri Jan 30 05:38:11 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 05:38:34 2009 +0100
libxtables: prefix/order - move parse_protocol to xtables.c
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 0f16c725aadaac7e670d632ecbaea3661ff00827
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Fri Jan 30 04:55:38 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 05:38:33 2009 +0100
libxtables: prefix/order - move check_inverse to xtables.c
This also adds a warning that intrapositional negation support
is deprecated.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a0baae85f8159f03d52535934aa9b3a375e0f1f3
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Fri Jan 30 04:32:50 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 05:38:30 2009 +0100
libxtables: prefix - parse and escaped output func
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit aae6be9edc99e58164a3592c510fe5488141c698
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Fri Jan 30 04:24:47 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 05:38:29 2009 +0100
libxtables: prefix - misc functions
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 1e01b0b82f70b0b11dcfbced485dbe7aeac4fb8c
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Fri Jan 30 04:20:32 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 05:38:25 2009 +0100
libxtables: prefix/order - ascii to ipaddr/ipmask input
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit e44ea7faa17c10c68f14f5338a7cc6e3291a0ce7
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Fri Jan 30 03:55:09 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 03:55:09 2009 +0100
libxtables: prefix/order - ipaddr/ipmask to ascii output
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a41545ca7cde43e0ba53260ba74bd9bf74025a68
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 21:27:19 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 03:27:53 2009 +0100
libxtables: prefix/order - param_act
Changes:
exittype -> xtables_exittype
P_* -> XTF_* flags
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit dacafa55379fd98212031d8c559096c91d7ce93b
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 20:56:23 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Fri Jan 30 03:27:42 2009 +0100
libxtables: prefix/order - program_name
Split XTABLES_VERSION into xtables and iptables, and encode the
xtables soversion into the extensions instead. This makes it possible
to upgrade iptables without having to recompile 3rd-party extensions
(if the libxtables version matches, of course).
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 5f2922cfc0bbfbeb878f5c12e9fb3eb602ae5507
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 18:43:01 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:30 2009 +0100
libxtables: prefix/order - strtoui
This commit also throws out the redundant string_to_number_*.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 39bf9c8214d3073a496a8a1eff91046a8d6fbbdf
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 15:59:06 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:30 2009 +0100
libxtables: prefix/order - libdir
Consolidate the libdir variable initialization code into xtables.c.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 2338efd8f799d8373dc196c797bda9690283b698
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 15:23:01 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:29 2009 +0100
libxtables: prefix/order - match/target loading
This change affects:
find_{match,target} -> xtables_find_{match,target}
enum xt_tryload -> enum xtables_tryload
loose flags like DONT_LOAD -> XTF_DONT_LOAD
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit c021c3ce7b1583eb5dd71b10ac3d8ab3cd36beaa
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 15:10:05 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:29 2009 +0100
libxtables: prefix/order - modprobe and xtables.ko loading
This change affects:
load_xtables_ko -> xtables_load_ko
modprobe_program -> xtables_modprobe_program
Now uses bool for the "quiet" flag.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 630ef48037f3602333addfdb53789c9c6a4bb4c8
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 14:58:41 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:29 2009 +0100
libxtables: prefix/order - fw_xalloc
It is good practice to prefix names in a library some way so that
it does not clash with external programs' variable names right
on the first try.
This change: rename fw_[cm]alloc to xtables_[cm]alloc and
move the definition from internal.h to xtables.h to avoid
potential compiler warnings.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit e917bca09924435f3fca23c01042543b1826c81e
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 18:14:21 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:29 2009 +0100
extensions: use UINT_MAX constants over open-coded numbers (2/2)
Use the handy constants for ranges.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a80975497968e69b23f56bf15d346c65bec381f2
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 17:39:01 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:29 2009 +0100
extensions: use UINT_MAX constants over open-coded bits (1/2)
~0 depends on the sizeof(int), so it is better to use UINT32_MAX.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 7a63ca74dbcd323217cab7296e68a19b8c9ea6c4
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 17:34:58 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:28 2009 +0100
libxt_owner: use correct UID/GID boundaries
-1 is a reserved number (chown uses it to denote "do not change"),
so the maximum libxt_owner should permit is up to UINT32_MAX-1.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 213e185afbb298e6708881e4c2adffdc47a8b6da
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 17:24:34 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 23:14:26 2009 +0100
src: remove redundant casts
All of them are implicitly convertable without any wanted side effects.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 825c317eedc12e1c8c93e22a96bc423d27b3c1f4
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Jan 27 17:16:26 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Jan 27 17:16:29 2009 +0100
src: remove redundant returns at end of void-returning functions
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
via 300e2909ba4714abc6093cba0ed860708282bd3e (commit)
via 1eb619f3a0508d62847c311e69a09f4a8534c4df (commit)
via 77f48c2f1ef21fa43aa68c25a1457db319ca2526 (commit)
via 1de7edffc9085c0f41c261dca995e28ae4126c29 (commit)
via 0f16c725aadaac7e670d632ecbaea3661ff00827 (commit)
via a0baae85f8159f03d52535934aa9b3a375e0f1f3 (commit)
via aae6be9edc99e58164a3592c510fe5488141c698 (commit)
via 1e01b0b82f70b0b11dcfbced485dbe7aeac4fb8c (commit)
via e44ea7faa17c10c68f14f5338a7cc6e3291a0ce7 (commit)
via a41545ca7cde43e0ba53260ba74bd9bf74025a68 (commit)
via dacafa55379fd98212031d8c559096c91d7ce93b (commit)
via 5f2922cfc0bbfbeb878f5c12e9fb3eb602ae5507 (commit)
via 39bf9c8214d3073a496a8a1eff91046a8d6fbbdf (commit)
via 2338efd8f799d8373dc196c797bda9690283b698 (commit)
via c021c3ce7b1583eb5dd71b10ac3d8ab3cd36beaa (commit)
via 630ef48037f3602333addfdb53789c9c6a4bb4c8 (commit)
via e917bca09924435f3fca23c01042543b1826c81e (commit)
via a80975497968e69b23f56bf15d346c65bec381f2 (commit)
via 7a63ca74dbcd323217cab7296e68a19b8c9ea6c4 (commit)
via 213e185afbb298e6708881e4c2adffdc47a8b6da (commit)
via 825c317eedc12e1c8c93e22a96bc423d27b3c1f4 (commit)
from 9cfc59f71f83ee97c4513fd340acf1e45073562b (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 300e2909ba4714abc6093cba0ed860708282bd3e
Merge: 9cfc59f71f83ee97c4513fd340acf1e45073562b 1eb619f3a0508d62847c311e69a09f4a8534c4df
Author: Patrick McHardy <kaber at trash.net>
Date: Mon Feb 9 18:58:45 2009 +0100
Merge branch 'master' of git://dev.medozas.de/iptables
commit 1eb619f3a0508d62847c311e69a09f4a8534c4df
Merge: 77f48c2f1ef21fa43aa68c25a1457db319ca2526 212092173b63be8532d95241bbd86db96e110220
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sun Feb 8 18:19:43 2009 +0100
Merge branch 'origin/master'
(throw away remote three commits as they had been redone
in this local branch)
commit 77f48c2f1ef21fa43aa68c25a1457db319ca2526
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sat Feb 7 19:59:53 2009 +0100
libxtables: move afinfo around
libxtables should not rely on the program executable providing the
magic constants for using [gs]etsockopt.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 1de7edffc9085c0f41c261dca995e28ae4126c29
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri Jan 30 05:38:11 2009 +0100
libxtables: prefix/order - move parse_protocol to xtables.c
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 0f16c725aadaac7e670d632ecbaea3661ff00827
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri Jan 30 04:55:38 2009 +0100
libxtables: prefix/order - move check_inverse to xtables.c
This also adds a warning that intrapositional negation support
is deprecated.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a0baae85f8159f03d52535934aa9b3a375e0f1f3
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri Jan 30 04:32:50 2009 +0100
libxtables: prefix - parse and escaped output func
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit aae6be9edc99e58164a3592c510fe5488141c698
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri Jan 30 04:24:47 2009 +0100
libxtables: prefix - misc functions
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 1e01b0b82f70b0b11dcfbced485dbe7aeac4fb8c
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri Jan 30 04:20:32 2009 +0100
libxtables: prefix/order - ascii to ipaddr/ipmask input
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit e44ea7faa17c10c68f14f5338a7cc6e3291a0ce7
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri Jan 30 03:55:09 2009 +0100
libxtables: prefix/order - ipaddr/ipmask to ascii output
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a41545ca7cde43e0ba53260ba74bd9bf74025a68
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 21:27:19 2009 +0100
libxtables: prefix/order - param_act
Changes:
exittype -> xtables_exittype
P_* -> XTF_* flags
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit dacafa55379fd98212031d8c559096c91d7ce93b
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 20:56:23 2009 +0100
libxtables: prefix/order - program_name
Split XTABLES_VERSION into xtables and iptables, and encode the
xtables soversion into the extensions instead. This makes it possible
to upgrade iptables without having to recompile 3rd-party extensions
(if the libxtables version matches, of course).
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 5f2922cfc0bbfbeb878f5c12e9fb3eb602ae5507
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 18:43:01 2009 +0100
libxtables: prefix/order - strtoui
This commit also throws out the redundant string_to_number_*.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 39bf9c8214d3073a496a8a1eff91046a8d6fbbdf
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 15:59:06 2009 +0100
libxtables: prefix/order - libdir
Consolidate the libdir variable initialization code into xtables.c.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 2338efd8f799d8373dc196c797bda9690283b698
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 15:23:01 2009 +0100
libxtables: prefix/order - match/target loading
This change affects:
find_{match,target} -> xtables_find_{match,target}
enum xt_tryload -> enum xtables_tryload
loose flags like DONT_LOAD -> XTF_DONT_LOAD
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit c021c3ce7b1583eb5dd71b10ac3d8ab3cd36beaa
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 15:10:05 2009 +0100
libxtables: prefix/order - modprobe and xtables.ko loading
This change affects:
load_xtables_ko -> xtables_load_ko
modprobe_program -> xtables_modprobe_program
Now uses bool for the "quiet" flag.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 630ef48037f3602333addfdb53789c9c6a4bb4c8
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 14:58:41 2009 +0100
libxtables: prefix/order - fw_xalloc
It is good practice to prefix names in a library some way so that
it does not clash with external programs' variable names right
on the first try.
This change: rename fw_[cm]alloc to xtables_[cm]alloc and
move the definition from internal.h to xtables.h to avoid
potential compiler warnings.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit e917bca09924435f3fca23c01042543b1826c81e
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 18:14:21 2009 +0100
extensions: use UINT_MAX constants over open-coded numbers (2/2)
Use the handy constants for ranges.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit a80975497968e69b23f56bf15d346c65bec381f2
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 17:39:01 2009 +0100
extensions: use UINT_MAX constants over open-coded bits (1/2)
~0 depends on the sizeof(int), so it is better to use UINT32_MAX.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 7a63ca74dbcd323217cab7296e68a19b8c9ea6c4
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 17:34:58 2009 +0100
libxt_owner: use correct UID/GID boundaries
-1 is a reserved number (chown uses it to denote "do not change"),
so the maximum libxt_owner should permit is up to UINT32_MAX-1.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 213e185afbb298e6708881e4c2adffdc47a8b6da
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 17:24:34 2009 +0100
src: remove redundant casts
All of them are implicitly convertable without any wanted side effects.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 825c317eedc12e1c8c93e22a96bc423d27b3c1f4
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Jan 27 17:16:26 2009 +0100
src: remove redundant returns at end of void-returning functions
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
-----------------------------------------------------------------------
.gitignore | 1 +
Makefile.am | 2 +-
configure.ac | 26 +--
extensions/libip6t_HL.c | 4 +-
extensions/libip6t_LOG.c | 8 +-
extensions/libip6t_REJECT.c | 2 +-
extensions/libip6t_ah.c | 6 +-
extensions/libip6t_dst.c | 11 +-
extensions/libip6t_frag.c | 6 +-
extensions/libip6t_hbh.c | 11 +-
extensions/libip6t_hl.c | 2 +-
extensions/libip6t_icmp6.c | 6 +-
extensions/libip6t_ipv6header.c | 8 +-
extensions/libip6t_mh.c | 4 +-
extensions/libip6t_policy.c | 8 +-
extensions/libip6t_rt.c | 10 +-
extensions/libipt_CLUSTERIP.c | 10 +-
extensions/libipt_DNAT.c | 10 +-
extensions/libipt_ECN.c | 6 +-
extensions/libipt_LOG.c | 10 +-
extensions/libipt_MASQUERADE.c | 2 +-
extensions/libipt_NETMAP.c | 12 +-
extensions/libipt_REDIRECT.c | 4 +-
extensions/libipt_REJECT.c | 2 +-
extensions/libipt_SAME.c | 14 +-
extensions/libipt_SET.c | 2 +-
extensions/libipt_SNAT.c | 10 +-
extensions/libipt_TTL.c | 4 +-
extensions/libipt_ULOG.c | 6 +-
extensions/libipt_addrtype.c | 8 +-
extensions/libipt_ah.c | 4 +-
extensions/libipt_ecn.c | 8 +-
extensions/libipt_icmp.c | 6 +-
extensions/libipt_policy.c | 16 +-
extensions/libipt_realm.c | 4 +-
extensions/libipt_set.c | 2 +-
extensions/libipt_ttl.c | 8 +-
extensions/libxt_CONNMARK.c | 56 +++---
extensions/libxt_DSCP.c | 7 +-
extensions/libxt_MARK.c | 50 +++---
extensions/libxt_NFLOG.c | 6 +-
extensions/libxt_NFQUEUE.c | 3 +-
extensions/libxt_TCPMSS.c | 3 +-
extensions/libxt_TCPOPTSTRIP.c | 3 +-
extensions/libxt_TOS.c | 36 ++--
extensions/libxt_TPROXY.c | 36 ++--
extensions/libxt_comment.c | 2 +-
extensions/libxt_connbytes.c | 2 +-
extensions/libxt_connlimit.c | 2 +-
extensions/libxt_connmark.c | 16 +-
extensions/libxt_conntrack.c | 91 +++++-----
extensions/libxt_dccp.c | 18 +-
extensions/libxt_dscp.c | 11 +-
extensions/libxt_esp.c | 4 +-
extensions/libxt_hashlimit.c | 98 +++++-----
extensions/libxt_helper.c | 4 +-
extensions/libxt_iprange.c | 80 ++++----
extensions/libxt_length.c | 6 +-
extensions/libxt_limit.c | 6 +-
extensions/libxt_mac.c | 2 +-
extensions/libxt_mark.c | 16 +-
extensions/libxt_multiport.c | 18 +-
extensions/libxt_owner.c | 73 ++++----
extensions/libxt_physdev.c | 14 +-
extensions/libxt_pkttype.c | 2 +-
extensions/libxt_quota.c | 4 +-
extensions/libxt_rateest.c | 27 ++--
extensions/libxt_recent.c | 8 +-
extensions/libxt_sctp.c | 12 +-
extensions/libxt_state.c | 2 +-
extensions/libxt_statistic.c | 9 +-
extensions/libxt_string.c | 6 +-
extensions/libxt_tcp.c | 18 +-
extensions/libxt_tcpmss.c | 6 +-
extensions/libxt_time.c | 1 -
extensions/libxt_tos.c | 8 +-
extensions/libxt_u32.c | 2 -
extensions/libxt_udp.c | 10 +-
extensions/tos_values.c | 8 +-
include/xtables.h.in | 115 +++++++------
include/xtables/internal.h | 36 ----
include/xtables/internal.h.in | 17 ++
ip6tables-restore.c | 17 +--
ip6tables-save.c | 17 +--
ip6tables-standalone.c | 15 +-
ip6tables.c | 149 +++------------
iptables-restore.c | 17 +--
iptables-save.c | 17 +--
iptables-standalone.c | 15 +-
iptables-xml.c | 8 +-
iptables.c | 140 +++-----------
xtables.c | 387 +++++++++++++++++++++++++++------------
92 files changed, 963 insertions(+), 1036 deletions(-)
delete mode 100644 include/xtables/internal.h
create mode 100644 include/xtables/internal.h.in
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 3006124..1fc9b7e 100644
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -262,8 +262,6 @@ static void ipv6header_print(const void *ip,
if (info->modeflag)
printf("soft ");
-
- return;
}
static void ipv6header_save(const void *ip, const struct xt_entry_match *match)
@@ -276,8 +274,6 @@ static void ipv6header_save(const void *ip, const struct xt_entry_match *match)
printf(" ");
if (info->modeflag)
printf("--soft ");
-
- return;
}
static struct xtables_match ipv6header_mt6_reg = {
diff --git a/extensions/libxt_DSCP.c b/extensions/libxt_DSCP.c
index 6625db1..c9b0327 100644
--- a/extensions/libxt_DSCP.c
+++ b/extensions/libxt_DSCP.c
@@ -57,7 +57,6 @@ parse_dscp(const char *s, struct xt_DSCP_info *dinfo)
"DSCP `%d` out of range\n", dscp);
dinfo->dscp = (u_int8_t )dscp;
- return;
}
diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index 7daed18..5880785 100644
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -38,7 +38,6 @@ parse_num(const char *s, struct xt_NFQ_info *tinfo)
"Invalid queue number `%s'\n", s);
tinfo->queuenum = num & 0xffff;
- return;
}
static int
diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c
index eefb186..bb794f5 100644
--- a/extensions/libxt_dscp.c
+++ b/extensions/libxt_dscp.c
@@ -57,7 +57,6 @@ parse_dscp(const char *s, struct xt_dscp_info *dinfo)
"DSCP `%d` out of range\n", dscp);
dinfo->dscp = (u_int8_t )dscp;
- return;
}
diff --git a/extensions/libxt_u32.c b/extensions/libxt_u32.c
index 256d15f..f0bb61a 100644
--- a/extensions/libxt_u32.c
+++ b/extensions/libxt_u32.c
@@ -254,7 +254,6 @@ static void u32_print(const void *ip, const struct xt_entry_match *match,
if (data->invert)
printf("! ");
u32_dump(data);
- return;
}
static void u32_save(const void *ip, const struct xt_entry_match *match)
@@ -264,7 +263,6 @@ static void u32_save(const void *ip, const struct xt_entry_match *match)
printf("! ");
printf("--u32 ");
u32_dump(data);
- return;
}
static struct xtables_match u32_match = {
diff --git a/iptables-xml.c b/iptables-xml.c
index 8aee5c2..6481b8e 100644
--- a/iptables-xml.c
+++ b/iptables-xml.c
@@ -531,8 +531,6 @@ do_rule_part(char *leveltag1, char *leveltag2, int part, int argc,
if (level1)
printf("%s", leveli1);
CLOSE_LEVEL(1);
-
- return;
}
static int
More information about the netfilter-cvslog
mailing list