]>
git.ipfire.org Git - thirdparty/iptables.git/log
Jan Engelhardt [Thu, 4 Oct 2007 16:25:58 +0000 (16:25 +0000)]
Constify data structures
Constify more data structures. Make functions static.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Thu, 4 Oct 2007 16:25:23 +0000 (16:25 +0000)]
Delete empty ->print() and ->save() functions
Deletes empty ->print() and ->save() functions.
ip[6]tables prints the trivial thing automatically.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Thu, 4 Oct 2007 16:24:50 +0000 (16:24 +0000)]
Delete empty ->final_check() functions
Deletes empty ->final_check() functions, and makes ip[6]tables
checks for NULL on these.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Thu, 4 Oct 2007 16:24:00 +0000 (16:24 +0000)]
Delete empty ->init() functions
Deletes empty ->init() functions. ip[6]tables already
checks for .init being NULL or not.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Thu, 4 Oct 2007 16:23:20 +0000 (16:23 +0000)]
Remove stray NULLs
Mixing member accessors (non-named vs named) is not good.
Remove stray NULL.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
László Attila Tóth [Thu, 4 Oct 2007 05:01:35 +0000 (05:01 +0000)]
Addrtype match: renaming functions
The function names in libipt_addrtype.c makes debugging hard, also I renamed them
prefixed by 'addrtype_'.
Laszlo attila toth <panther@balabit.hu>
Hann-Huei Chiou [Fri, 28 Sep 2007 15:27:43 +0000 (15:27 +0000)]
Couldn't load/find match `u32'
iptables (up to 0927 snapshot) keeps complaining of "Couldn't
load (or find, if NO_SHARED_LIBS=1) match `u32'. After comparing
with other libxt_*.c, I found that there's no member ".family"
in the "u32_reg" structure, while ".family = AF_INET6" exists
in "u32_reg6"
Hann-Huei Chiou <koala@ascenvision.com>
Jan Engelhardt [Sun, 23 Sep 2007 15:17:42 +0000 (15:17 +0000)]
Add the libxt_time iptables match
This is libipt_time from POM-ng enhanced by the following:
* day-of-month support (for example "match on the 15th of each month")
* inversion support for --weekdays and --monthdays
* match against UTC or local timezone
* a manpage
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Jan Engelhardt [Wed, 19 Sep 2007 12:59:33 +0000 (12:59 +0000)]
Fix u32 warnings
warning: format '%ld' expects type 'long int', but argument 3 has type 'int'.
With %u alone, you would get "but arg-start is long" warnings on x64.
With %lu, you would get "but arg-start is int" on x86.
Fix it up by explicitly deciding for one (%u and cast to unsigned int)
and using that.
Jan Engelhardt <jengelh@computergmbh.de>
Jan Engelhardt [Mon, 10 Sep 2007 11:50:46 +0000 (11:50 +0000)]
Adds u32 to iptables.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Patrick McHardy [Sat, 8 Sep 2007 16:52:25 +0000 (16:52 +0000)]
Fix unused function warning
Patrick McHardy [Sat, 8 Sep 2007 16:00:01 +0000 (16:00 +0000)]
Fix more sparse warnings: non-C99 array declaration, incorrect function prototypes
Patrick McHardy [Sat, 8 Sep 2007 15:59:04 +0000 (15:59 +0000)]
Fix sparse warnings: non-ANSI function declarations, 0 used as pointer
László Attila Tóth [Thu, 6 Sep 2007 11:11:36 +0000 (11:11 +0000)]
Makefile for man pages of xtables extensions (Laszlo Attila Toth <panther@balabit.hu>)
* no extra target/match by default :)
* man page of fix modules (PF_EXT_SLIB etc.) plus optional
(...SLIB_OPTS) modules generated, but not all.
* because of the previous one I had to rename PF_EXT_SE_SLIB to
PF_EXT_SELINUX_SLIB etc. as a non-optional variable, original
PF_EXT_SE_SLIB gets the value of PF_EXT_SELINUX_SLIB if DO_SELINUX is
set to 1.
Patrick McHardy [Thu, 6 Sep 2007 11:06:11 +0000 (11:06 +0000)]
Remove unsupported connrate extension
László Attila Tóth [Wed, 5 Sep 2007 15:00:11 +0000 (15:00 +0000)]
Build manpages for xtables extensions (Laszlo Attila Toth <panther@balabit.hu>)
Patrick McHardy [Wed, 5 Sep 2007 14:19:23 +0000 (14:19 +0000)]
Fix aligned_u64 type on 64 bit: its an unsigned long, not an unsigned long long.
Fixes compiler warning in quota match.
Patrick McHardy [Wed, 5 Sep 2007 14:10:53 +0000 (14:10 +0000)]
Fix strict aliasing warnings
Patrick McHardy [Wed, 5 Sep 2007 14:02:28 +0000 (14:02 +0000)]
Build IPv6 hbh/dst matches unconditionally
Patrick McHardy [Wed, 5 Sep 2007 14:00:15 +0000 (14:00 +0000)]
Build IPv6 rt match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:58:58 +0000 (13:58 +0000)]
Build ipv6header match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:57:28 +0000 (13:57 +0000)]
Build IPv6 mh match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:56:30 +0000 (13:56 +0000)]
Resync header files and build IPv6 frag match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:55:27 +0000 (13:55 +0000)]
Resync header file and build IPv6 ah match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:53:55 +0000 (13:53 +0000)]
Build IPv6 REJECT target unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:52:15 +0000 (13:52 +0000)]
Resync header file and build CLUSTERIP target unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:50:33 +0000 (13:50 +0000)]
Build recent match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:48:50 +0000 (13:48 +0000)]
Build dccp match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:47:58 +0000 (13:47 +0000)]
Build string match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:47:05 +0000 (13:47 +0000)]
Build statistic match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:46:02 +0000 (13:46 +0000)]
Build connbytes match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:44:51 +0000 (13:44 +0000)]
Build quota match unconditionally
Patrick McHardy [Wed, 5 Sep 2007 13:42:58 +0000 (13:42 +0000)]
Build NFLOG target unconditionally
Peter Riley [Sun, 2 Sep 2007 13:09:07 +0000 (13:09 +0000)]
Remove last vestiges of NFC (Peter Riley <Peter.Riley@hotpop.com>)
zhangxiliang [Wed, 29 Aug 2007 20:05:57 +0000 (20:05 +0000)]
Fix dscp match manpage (zhangxiliang <zhangxiliang@cn.fujitsu.com>)
The description for the value in option "-m dscp -dscp" should be
modified to 0~63.
The option can match 6 bit DSCP field within the TOS field in the IP
header. So the range for the option should be 0~(26-1) that is 0~63.
Patrick McHardy [Thu, 23 Aug 2007 16:39:36 +0000 (16:39 +0000)]
Resync ip6t_REJECT.h with kernel - seems the entire time we had an imcompatible
header :(
Noticed by Peter Riley <Peter.Riley@hotpop.com>
Dan Nicholson [Mon, 6 Aug 2007 10:01:45 +0000 (10:01 +0000)]
In <xsl:param name="$node"/>, "$node" is not a valid QName.
See http://www.w3.org/TR/xslt#variables
Dan Nicholson <dbn.lists@gmail.com>
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:28:23 +0000 (08:28 +0000)]
Add IPv6 support to statistic match
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:26:59 +0000 (08:26 +0000)]
Add IPv6 support to helper match
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:25:43 +0000 (08:25 +0000)]
Add IPv6 support to connbytes match
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:24:29 +0000 (08:24 +0000)]
Add IPv6 support to DSCP target
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:23:13 +0000 (08:23 +0000)]
Add IPv6 support to CLASSIFY target
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:22:03 +0000 (08:22 +0000)]
Unifies libip[6]t_TRACE into libxt_TRACE
Yasuyuki KOZAKAIYasuyuki KOZAKAI [Sat, 4 Aug 2007 08:21:16 +0000 (08:21 +0000)]
Unifies libip[6]t_NFLOG into libxt_NFLOG
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:19:38 +0000 (08:19 +0000)]
Revert commit 6990.
That log is not correct and .NF_LOG-testx has incorrect mode.
Yasuyuki KOZAKAIYasuyuki KOZAKAI [Sat, 4 Aug 2007 08:21:16 +0000 (08:21 +0000)]
Unifies libip[6]t_state into libxt_state
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:09:51 +0000 (08:09 +0000)]
Unifies libip[6]t_state into libxt_state
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:09:04 +0000 (08:09 +0000)]
Unifies libip[6]t_connmark into libxt_connmark
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:08:20 +0000 (08:08 +0000)]
Unifies libip[6]t_hashlimit into libxt_hashlimit
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:06:55 +0000 (08:06 +0000)]
Unifies libip[6]t_MARK into libxt_MARK
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:05:46 +0000 (08:05 +0000)]
Unifies libip[6]t_CONNSECMARK into libxt_CONNSECMARK
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 08:04:43 +0000 (08:04 +0000)]
Add IPv6 support to CONNMARK match
Yasuyuki KOZAKAI [Sat, 4 Aug 2007 05:22:17 +0000 (05:22 +0000)]
Tries to load libxt_*.so at first.
If failed, it tries libip[6]t_*.so.
Jan Engelhardt [Wed, 1 Aug 2007 15:19:15 +0000 (15:19 +0000)]
Make @msg argument a const char *, just like printf().
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Tue, 31 Jul 2007 16:47:38 +0000 (16:47 +0000)]
Moves libip{,6}t_connlimit to libxt.
Also fixes an option parsing bug (connlimit_parse() may receive
a 'c' that is not from the connlimit options table).
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Mon, 30 Jul 2007 14:46:51 +0000 (14:46 +0000)]
Make the option structures const.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Mon, 30 Jul 2007 14:32:26 +0000 (14:32 +0000)]
Makes it possible to omit extra_opts of matches/targets if unnecessary.
(Jan Engelhardt <jengelh@gmx.de>)
A nice side effect is that merge_option() doesn't copy options in that case.
Jan Engelhardt [Mon, 30 Jul 2007 13:56:15 +0000 (13:56 +0000)]
The option struct needs to be terminated, otherwise ip{,6}tables
will access illegal memory in merge_options().
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Mon, 30 Jul 2007 13:38:44 +0000 (13:38 +0000)]
Remove the .next=NULL field. This is automatically initialized to zero.
I've kept .print=NULL and .save=NULL so it stands out
(since iptables will do the print/save then).
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Jan Engelhardt [Mon, 30 Jul 2007 13:20:43 +0000 (13:20 +0000)]
Make xtables_target->extra_opts const (xtables_match->extra_opts already is)
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 08:24:37 +0000 (08:24 +0000)]
Changes permissions of test scripts of dccp, string, and quota match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:29:36 +0000 (07:29 +0000)]
Unifies libip[6]t_NFQUEUE.c into libxt_NFQUEUE.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:27:02 +0000 (07:27 +0000)]
Unifies libip[6]t_SECMARK.c into libxt_SECMARK.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:22:24 +0000 (07:22 +0000)]
Unifies libip[6]t_TCPMSS.c into libxt_TCPMSS.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:21:17 +0000 (07:21 +0000)]
Add IPv6 support to comment match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:19:41 +0000 (07:19 +0000)]
Add IPv6 support to dccp match.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:17:23 +0000 (07:17 +0000)]
Add IPv6 support to dscp match.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:16:20 +0000 (07:16 +0000)]
Unifies libip[6]t_esp.c into libxt_esp.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:15:03 +0000 (07:15 +0000)]
Unifies libip[6]t_length.c into libxt_length.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:11:26 +0000 (07:11 +0000)]
Unifies libip[6]t_limit.c into libxt_limit.c.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:09:51 +0000 (07:09 +0000)]
Unifies libip[6]t_mac.c into libxt_mac.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:06:57 +0000 (07:06 +0000)]
Unifies libip[6]t_physdev.c into libxt_physdev.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:05:45 +0000 (07:05 +0000)]
Add IPv6 support to pkttype match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:03:59 +0000 (07:03 +0000)]
Add IPv6 support to quota match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:02:26 +0000 (07:02 +0000)]
Unifies libip[6]t_sctp.c into libxt_sctp.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 07:00:40 +0000 (07:00 +0000)]
Unifies libip[6]t_standard.c into libxt_standard.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:59:00 +0000 (06:59 +0000)]
Unifies libip[6]t_tcp.c into libxt_tcp.c.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:57:56 +0000 (06:57 +0000)]
Add IPv6 support to tcpmss match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:56:21 +0000 (06:56 +0000)]
Unifies libip[6]t_udp.c into libxt_udp.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:55:05 +0000 (06:55 +0000)]
Unifies libip[6]_mark.c into libxt_mark.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:53:14 +0000 (06:53 +0000)]
Use unified API in libipt_mark.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:52:16 +0000 (06:52 +0000)]
Add IPv6 support to string match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:51:30 +0000 (06:51 +0000)]
Moves libipt_string.c to libxt_string.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:50:03 +0000 (06:50 +0000)]
Use unified API in string match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:49:15 +0000 (06:49 +0000)]
Unifies libip[6]t_multiport.c into libipxt_multiport.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:47:36 +0000 (06:47 +0000)]
Moves libipt_multiport.c to libxt_multiport.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:46:08 +0000 (06:46 +0000)]
Splits ipt_multport into family dependent parts and others
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:45:03 +0000 (06:45 +0000)]
Use unified API in multiport match
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:43:55 +0000 (06:43 +0000)]
Add IPv6 support to NOTRACK
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:42:15 +0000 (06:42 +0000)]
Renames libipt_NOTRACK.c to libxt_NOTRACK.c
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:41:01 +0000 (06:41 +0000)]
Use unified API in NOTRACK target.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:39:40 +0000 (06:39 +0000)]
Moves all declarations in iptables_common.h to xtables.h.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:09:15 +0000 (06:09 +0000)]
Installs libxt_*.so to DEST_IPT_LIBIDR and link libip[6]t_*.so to it.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:08:05 +0000 (06:08 +0000)]
Introduces DEST_IPT_LIBDIR to simplify $(DESTDIR)$(LIBDIR)/iptables
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:06:59 +0000 (06:06 +0000)]
Fixes warning on compilation, part 2
This changes the type of arguments as follows in multiport, DNAT, SNAT,
MASQUERADE, and REDIRECT
- ip[6]t_ip[6] * -> void *
- ip[6]t_entry * -> void *
and adds lines to cast these pointer with intended type.
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:03:45 +0000 (06:03 +0000)]
Fixes warning on compilation of ip6tables matches/targets
This changes the type of arguments as follows
- ip6t_ip6 * -> void *
- ip6t_entry * -> void *
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 06:02:05 +0000 (06:02 +0000)]
Fixes warning on compilation of iptables matches/targets
This changes the type of arguments as follows
- ipt_ip * -> void *
- ipt_entry * -> void *
This patch doesn't change multiport, DNAT, SNAT, MASQUERADE, REDIRECT
because these need more changes (casting void * variable with intended type)
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 05:58:56 +0000 (05:58 +0000)]
Replaces ip6t_entry_* with xt_entry_* in matches/targets
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 05:57:28 +0000 (05:57 +0000)]
Replaces ipt_entry_* with xt_entry_* in matches/targets
Yasuyuki KOZAKAI [Tue, 24 Jul 2007 05:55:12 +0000 (05:55 +0000)]
Moves IPPROTO_* and IP[6]T_LIB_DIR definitions to xtables.h