]>
git.ipfire.org Git - thirdparty/iptables.git/log
Martin Josefsson [Mon, 3 Jan 2005 07:48:06 +0000 (07:48 +0000)]
Remove leftover debug printf
Martin Josefsson [Mon, 3 Jan 2005 07:46:07 +0000 (07:46 +0000)]
Replace memchr with strlen and fix up one of the statements.
Rusty Russell [Mon, 3 Jan 2005 03:48:40 +0000 (03:48 +0000)]
Extension revision number support (if kernel supports the getsockopts).
Enhance MARK match with second revision.
Committed in anticipation of the kernel patch being applied.
Nicolas Bouliane [Sun, 2 Jan 2005 23:34:48 +0000 (23:34 +0000)]
Prevent user from using --helper multiple times (Nicolas Bouliane <nib@cookinglinux.org>)
John Lange [Sun, 2 Jan 2005 23:33:12 +0000 (23:33 +0000)]
Add --log-uid option (John Lange <john.lange@open-it.ca>)
Rusty Russell [Wed, 29 Dec 2004 11:14:52 +0000 (11:14 +0000)]
Stupid typo that meant we didn't compare target data when doing delete-by-matching-rule (found by nfsim test).
Rusty Russell [Wed, 29 Dec 2004 11:13:12 +0000 (11:13 +0000)]
Fix compile error introduced by C99 conversion.
Pablo Neira [Tue, 28 Dec 2004 13:11:59 +0000 (13:11 +0000)]
Pablo Neira: extensions conversion to C99 structure initialization
(I removed the revision stuff for the moment, but this needs to go in before the code moves too much --RR)
Martin Josefsson [Mon, 27 Dec 2004 19:49:28 +0000 (19:49 +0000)]
Fix setting lib_dir in ip*tables-{save,restore}
Rusty Russell [Wed, 22 Dec 2004 04:26:53 +0000 (04:26 +0000)]
Use string_to_number. Don't check for no optarg: we set has_arg to 1 in option array, so getopt does that for us.
Rusty Russell [Wed, 22 Dec 2004 00:37:10 +0000 (00:37 +0000)]
Don't need ipt_entry_target()/ip6t_entry_target() now kernel uses static inline instead of extern inline (otherwise it doesn't compile without -O).
Don't re-initialize libiptc/libip6t unless modprobe attempt actually succeeds. This makes nfsim run about 20 times faster, as it doesn't have to explore failures in the first iptc_init().
Rusty Russell [Mon, 20 Dec 2004 05:29:52 +0000 (05:29 +0000)]
Implement IPTABLES_LIB_DIR and IP6TABLES_LIB_DIR environment variables, and set them in testsuite if we're running iptables within tree.
Nicolas Bouliane [Mon, 20 Dec 2004 05:11:59 +0000 (05:11 +0000)]
Nicolas Bouliane: I was writing an nfsim .sim for the match tos, when I realized that when we enter --tos twice the second overwrite the first.
Martin Josefsson [Sat, 18 Dec 2004 17:18:49 +0000 (17:18 +0000)]
Implement some optimization for finding rules to replace in TC_REPLACE_ENTRY.
Stolen from TC_DELETE_NUM_ENTRY.
Rusty Russell [Thu, 16 Dec 2004 14:22:23 +0000 (14:22 +0000)]
Make "is_same" test basics and entries only: targets are generic.
Make target testing aware of different kinds of rules.
Change reverse logic: target_different now target_same.
Set type to MODULE in iptcc_map_target.
Add testcase for this.
Rusty Russell [Thu, 16 Dec 2004 13:21:44 +0000 (13:21 +0000)]
Remove GET_TARGET() define: this was for compiling iptables for debugging (ie. without -O) on old kernels where ipt_get_target() was defined "extern inline". These days it's "static inline", and only developers build without -O anyway.
Fix up DUMP_ENTRIES a little, but remove calls: it only dumps the table as loaded, not the changed (cached) table, which is misleading.
Fix TC_DELETE_ENTRY: we need to use iptcc_map_target() before comparing, otherwise "-j DROP" (as an example) doesn't work.
Patrick Schaaf [Tue, 14 Dec 2004 02:58:31 +0000 (02:58 +0000)]
ROUTE --tee target extension (Patrick Schaaf)
Joszef Kadlecsik [Wed, 1 Dec 2004 09:11:33 +0000 (09:11 +0000)]
ipset 2 related updates (JK)
Harald Welte [Thu, 18 Nov 2004 22:59:36 +0000 (22:59 +0000)]
fix some compiler warnings and errors
Harald Welte [Thu, 18 Nov 2004 22:50:01 +0000 (22:50 +0000)]
sync with latest patch-o-matic-ng update (support direction and mode parameters)
Martin Josefsson [Sun, 24 Oct 2004 22:27:31 +0000 (22:27 +0000)]
Search backwards when inserting/deleting in/from the top half of the rules in a chain.
before:
insert 50k rules without any previous rules
real 0m1.314s
user 0m1.184s
sys 0m0.123s
insert 50k with one already existing rule
real 2m38.052s
user 2m37.296s
sys 0m0.353s
insert 50k rules in the middle of 20k already existing rules
real 2m43.831s
user 2m43.005s
sys 0m0.414s
delete rule #70000 10k times with 100k rules
real 1m37.990s
user 1m37.247s
sys 0m0.500s
after:
insert 50k without any previous rules
real 0m1.315s
user 0m1.184s
sys 0m0.125s
insert 50k with one already existing rule
real 0m1.313s
user 0m1.189s
sys 0m0.119s
insert 50k rules in the middle of 20k already existing rules
real 0m8.550s
user 0m8.327s
sys 0m0.197s
delete rule #70000 10k times with 100k rules
real 0m35.566s
user 0m35.062s
sys 0m0.416s
Harald Welte [Fri, 22 Oct 2004 08:14:07 +0000 (08:14 +0000)]
Fix module-autoloading in certain cases (Fixse Debian Bug 219686)
Harald Welte [Wed, 20 Oct 2004 22:02:47 +0000 (22:02 +0000)]
minor syntax fixes
Harald Welte [Wed, 20 Oct 2004 14:49:56 +0000 (14:49 +0000)]
- add hashlimit to makefile
- fix typo in libipt_hashlimit
Harald Welte [Wed, 20 Oct 2004 14:49:13 +0000 (14:49 +0000)]
move ipt_hashlimit to it's correct location
Harald Welte [Wed, 20 Oct 2004 14:06:58 +0000 (14:06 +0000)]
add hashlimit kernel header file
Harald Welte [Wed, 20 Oct 2004 13:28:17 +0000 (13:28 +0000)]
hashlimit port of userspace plugin
Harald Welte [Wed, 6 Oct 2004 12:32:54 +0000 (12:32 +0000)]
add paragraph about raw table
Patrick McHardy [Sun, 3 Oct 2004 20:36:54 +0000 (20:36 +0000)]
Mention owner brokenness in manpage
Phil Oester [Fri, 1 Oct 2004 21:32:39 +0000 (21:32 +0000)]
note owner match brokenness in helptext, closes bugzilla #244 (Phil Oester)
Phil Oester [Sun, 26 Sep 2004 07:44:48 +0000 (07:44 +0000)]
Add comment about time not adhering DST (Phil Oester) (Closes: #75)
Martin Josefsson [Thu, 23 Sep 2004 19:25:06 +0000 (19:25 +0000)]
Replace O(n) with O(1) when TC_INSERT_ENTRY() inserts an entry at the end.
Do the same with TC_DELETE_NUM_ENTRY() when deleting the last rule.
My rule management script does both of these things in certain situations.
Created a file with 50.000 rules which my script converted into
iptables-restore format but inserting each rule with an index instead of
appending like the iptables-save output does. That took a while without this
optimization. Same thing when deleting the 45.000 last rules in that chain,
the script outputs deletes by number starting from the bottom.
Inserting or deleting (by number) in the middle of the chain is still O(n)
where n is the rulenumber where the insert/delete is taking place.
Martin Josefsson [Thu, 23 Sep 2004 18:24:29 +0000 (18:24 +0000)]
Spelling error.
Martin Josefsson [Thu, 23 Sep 2004 18:23:20 +0000 (18:23 +0000)]
Fix returnvalue of TC_BUILTIN()
All jumps to nonexisting chains were believed to be jumps to builtin chains,
that's bad as it made it impossible to add rules with external targets.
Martin Josefsson [Wed, 22 Sep 2004 22:04:07 +0000 (22:04 +0000)]
Make sure to zero all the memory we allocate for the new table.
Makes flushing of chains containing more than a few entries work without
potentially oopsing the kernel.
Martin Josefsson [Wed, 22 Sep 2004 21:37:41 +0000 (21:37 +0000)]
Make TC_DELETE_ENTRY() and TC_DELETE_NUM_ENTRY() actually do something practical
Martin Josefsson [Wed, 22 Sep 2004 21:31:09 +0000 (21:31 +0000)]
Fix two more rulenumber off by 1 errors
Martin Josefsson [Wed, 22 Sep 2004 21:04:07 +0000 (21:04 +0000)]
Insertion of rules with -I was broken.
It checked if a rule existed on the position we were inserting to.
Thus inserting into an empty chain didn't work.
And it didn't care about the fact that the first rule in the chain has index 1
the rulenumer we get starts at 0...
Martin Josefsson [Wed, 22 Sep 2004 21:00:19 +0000 (21:00 +0000)]
Fix rule counting
Martin Josefsson [Wed, 22 Sep 2004 19:39:40 +0000 (19:39 +0000)]
Fix listing of module targets.
Type was only set for standard targets.
Harald: please review.
Simon Lodal [Wed, 22 Sep 2004 01:57:41 +0000 (01:57 +0000)]
realm: fix inversion (Simon Lodal)
Phil Oester [Tue, 21 Sep 2004 10:49:13 +0000 (10:49 +0000)]
Fix half-working ipv6 limit invert check (Phil Oester)
Phil Oester [Tue, 21 Sep 2004 10:46:40 +0000 (10:46 +0000)]
Fix half-working dstlimit invert check (Phil Oester)
Phil Oester [Tue, 21 Sep 2004 10:43:45 +0000 (10:43 +0000)]
limit match does not support invert, warn about it. Closes bugzilla #95 (Phil Oester)
Brad Fisher [Mon, 20 Sep 2004 08:52:19 +0000 (08:52 +0000)]
Add comment match extension (Brad Fisher)
Harald Welte [Sun, 19 Sep 2004 21:00:12 +0000 (21:00 +0000)]
fix segfault from memory allocation: handle->entries is actualy struct ipt_get_entries plus the size
Phil Oester [Sat, 18 Sep 2004 17:45:41 +0000 (17:45 +0000)]
fix psd option parsing (Phil Oester)
Patrick McHardy [Sat, 18 Sep 2004 17:43:36 +0000 (17:43 +0000)]
Print error when '!' is used with multiport. Based on patch by Phil Oester.
Bart De Schuymer [Sun, 12 Sep 2004 22:37:31 +0000 (22:37 +0000)]
port physdev to ip6tables (Bart De Schuymer)
Phil Oester [Thu, 9 Sep 2004 09:57:11 +0000 (09:57 +0000)]
Fix typo. (Phil Oester) Closes #239
Piotr Gasidło [Thu, 2 Sep 2004 20:54:43 +0000 (20:54 +0000)]
Fix number parsing (Piotr Gasidlo)
Harald Welte [Mon, 30 Aug 2004 20:28:53 +0000 (20:28 +0000)]
add delete by matching-rule to libiptc2 (still untested)
Harald Welte [Mon, 30 Aug 2004 16:00:32 +0000 (16:00 +0000)]
slightly different semantics of iptc_builtin
Harald Welte [Mon, 30 Aug 2004 16:00:09 +0000 (16:00 +0000)]
fix slightly changed semantics of iptc_is_builtin
Harald Welte [Sun, 29 Aug 2004 23:32:14 +0000 (23:32 +0000)]
complete libiptc rewrite. Time to load 10k rules goes down from 2.20 minutes to 1.255 seconds (!). Might still contain bugs, use with caution.
Youza Youzovic [Tue, 24 Aug 2004 18:59:05 +0000 (18:59 +0000)]
add missing spaces in 'save' printout (youza@post.cz) (Closes: #235)
Phil Oester [Mon, 23 Aug 2004 20:45:17 +0000 (20:45 +0000)]
Cleanup ttl-match option parsing, fixes bugzilla #183 (Phil Oester)
Phil Oester [Mon, 23 Aug 2004 18:41:44 +0000 (18:41 +0000)]
Fix conntrack-match typo, fixes bugzilla #194 (Phil Oester)
Patrick McHardy [Tue, 3 Aug 2004 22:38:39 +0000 (22:38 +0000)]
Allocate enough memory for addr-list in host_to_addr()
Maciej Soltysiak [Wed, 28 Jul 2004 14:08:22 +0000 (14:08 +0000)]
Limit ttl-value to 0-255 (Maciej Soltysiak <solt@dns.toxicfilms.tv>)
Nicolas Bouliane [Tue, 27 Jul 2004 21:46:21 +0000 (21:46 +0000)]
Check that TTL is between 0 and 255 (Nicolas Bouliane)
Piotr Gasidło [Fri, 23 Jul 2004 00:01:03 +0000 (00:01 +0000)]
update to ipt_account 0.1.16 (Piotr Gasid?o)
Harald Welte [Fri, 16 Jul 2004 13:51:42 +0000 (13:51 +0000)]
In C, we declare variables at the top of function (Olivier Clerget)
Nicolas Bouliane [Mon, 12 Jul 2004 07:16:54 +0000 (07:16 +0000)]
Giving --dst-range twice to iprange did not ring the bell
Bug reported and fixed by Nicolas Bouliane
Harald Welte [Sun, 11 Jul 2004 20:17:53 +0000 (20:17 +0000)]
fix syntax of help message
keso [Sun, 4 Jul 2004 15:20:53 +0000 (15:20 +0000)]
fix dual-free bug with multiple-A dns records (keso@klister.net)
Patrick McHardy [Mon, 28 Jun 2004 12:38:03 +0000 (12:38 +0000)]
Add addrtype match to list of unconditionally built extensions
Patrick McHardy [Mon, 28 Jun 2004 12:33:40 +0000 (12:33 +0000)]
Add ipt_addrtype.h
Joszef Kadlecsik [Mon, 28 Jun 2004 08:09:19 +0000 (08:09 +0000)]
make DO_MULTI=1 documented in INSTALL file
Joszef Kadlecsik [Sun, 27 Jun 2004 01:12:07 +0000 (01:12 +0000)]
Missing file from multi patch added
Bastiaan Bakker [Fri, 25 Jun 2004 11:18:57 +0000 (11:18 +0000)]
Bastiaan Bakker's patch to combine iptables, iptables-save and iptables-restore
for size reduction applied
Harald Welte [Mon, 21 Jun 2004 21:44:08 +0000 (21:44 +0000)]
add missing include
Harald Welte [Thu, 17 Jun 2004 12:21:11 +0000 (12:21 +0000)]
pom-ng only deals with numerical versions
Joszef Kadlecsik [Thu, 17 Jun 2004 09:02:35 +0000 (09:02 +0000)]
Semicolon were missing in the added assigment lines
Joszef Kadlecsik [Thu, 17 Jun 2004 08:48:30 +0000 (08:48 +0000)]
Fix for empty extra match/target man page list processing
Harald Welte [Mon, 14 Jun 2004 22:07:06 +0000 (22:07 +0000)]
fix 'make distrib'
Martin Josefsson [Wed, 26 May 2004 21:56:26 +0000 (21:56 +0000)]
With a 64bit kernel only the high 32bits of nfmark was used regardless of
32/64bit userspace. This makes it quite hard to interoperate with 'tc'.
Sync ipv6 versions with ipv4 versions.
Tested on x86 and sparc64 with both 32bit and 64bit userspace.
Martin Josefsson [Wed, 26 May 2004 16:04:48 +0000 (16:04 +0000)]
Get rid of some warnings when compiling 64bit.
Martin Josefsson [Wed, 26 May 2004 15:58:07 +0000 (15:58 +0000)]
Fix 64bit kernel / 32bit userspace issue.
Sync header with kernel.
Martin Josefsson [Wed, 26 May 2004 15:54:49 +0000 (15:54 +0000)]
Add versions of string_to_number() for use in 32bit userspace with 64bit kernel.
Martin Josefsson [Wed, 26 May 2004 15:50:57 +0000 (15:50 +0000)]
Fix 64bit kernel / 32bit userspace issue.
Martin Josefsson [Wed, 26 May 2004 15:46:27 +0000 (15:46 +0000)]
Better(?) detection for 64bit kernel / 32bit userspace.
Add some ld-flags for sparc64.
Martin Josefsson [Wed, 26 May 2004 15:43:33 +0000 (15:43 +0000)]
What is this doing here? Go away.
Martin Josefsson [Wed, 26 May 2004 15:41:54 +0000 (15:41 +0000)]
When compiled static, don't show help-messages for all matches and targets,
only show help for specified ones.
Martin Josefsson [Tue, 18 May 2004 18:09:43 +0000 (18:09 +0000)]
Get rid of some memoryleaks.
Will make ip(6)tables-restore sessions use less memory.
Harald Welte [Sun, 16 May 2004 09:05:07 +0000 (09:05 +0000)]
cosmetic fix (space between include directive and filename)
Stephane Ouellette [Fri, 14 May 2004 08:21:06 +0000 (08:21 +0000)]
Compiler warnings due to missing include files (Stephane Ouellette)
Martin Josefsson [Sat, 8 May 2004 14:02:36 +0000 (14:02 +0000)]
don't use signed things...
Joszef Kadlecsik [Wed, 5 May 2004 10:10:33 +0000 (10:10 +0000)]
Fabrice's time match update + Tom Eastep's conntrack mach fix applied (JK)
Nuuti Kotivuori [Sun, 18 Apr 2004 17:33:26 +0000 (17:33 +0000)]
Add connrate match userspace part (Nuuti Kotivuori)
Harald Welte [Thu, 15 Apr 2004 10:10:19 +0000 (10:10 +0000)]
include netdb.h if we use getprotobynumber
Harald Welte [Thu, 15 Apr 2004 09:33:07 +0000 (09:33 +0000)]
iptables-1.2.10 coming up
Harald Welte [Thu, 15 Apr 2004 09:28:00 +0000 (09:28 +0000)]
fix typo
Martin Josefsson [Wed, 7 Apr 2004 13:00:43 +0000 (13:00 +0000)]
Fix missing 6 (Bjorn Mattsson)
Ozgur AKAN [Wed, 7 Apr 2004 09:36:29 +0000 (09:36 +0000)]
fix case where somebody uses '-i +' as interface name (Ozgur AKAN)
Pedro Lamarão [Wed, 7 Apr 2004 09:33:17 +0000 (09:33 +0000)]
use /etc/protocols when printing protocol names (Pedro Lamarão)
Piotr Gasidło [Wed, 17 Mar 2004 14:40:03 +0000 (14:40 +0000)]
add userspace support for 'ipt_account' match (Piotr Gasid'o)
Matthew Strait [Wed, 17 Mar 2004 14:26:08 +0000 (14:26 +0000)]
better wording for '-i' (Matthew Strait)
Harald Welte [Thu, 4 Mar 2004 07:45:30 +0000 (07:45 +0000)]
add definition for IPPROTO_SCTP for systems with old header files
Maciej Soltysiak [Thu, 4 Mar 2004 00:14:03 +0000 (00:14 +0000)]
Fix missing newline in libipt_DSCP help-text (Maciej Soltysiak)