iptables branch, master, updated. v1.4.10-230-g8075493
Patrick McHardy
netfilter-cvslog-bounces at lists.netfilter.org
Wed May 11 13:44:45 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "iptables".
The branch, master has been updated
via 8075493a00e06857147263574333df4073ea671b (commit)
via 77b6230adfe51836ad5b31b41638b43e9b0062e2 (commit)
via 73425492d4c57d34a616d948666ac75ecc612eed (commit)
via 58e9118dc61c9ff656c0140c429f0fa892c36ac5 (commit)
via 7c816547270050ccc29fb07c9e62c230e015c8e3 (commit)
via 372203af4c70fb20bc7ff3a49788b9bbf57d2eb1 (commit)
via 170cf49a630fd0d237818b537c01794dde00b07a (commit)
via 0f77e2e40a498688f3d8f8a65bf74ce13db893b2 (commit)
via ef7d2e845f72fd3a01c9d89e73c90de5dcca73a7 (commit)
via 87a34d7aef2cba833f4f36536575dee304bbece5 (commit)
via 94cd683a969e024ec870df258fafd790b8a1abf1 (commit)
via 21d243c3152f0798683aacbf95acfc8c1378924e (commit)
via d441ad6a68c5d65344449962f4648d297d453b6c (commit)
via 66266abd17adc9631f3769ef0b82968c0bac6f38 (commit)
via fe02f76e013941a7f65f57f297d3177bcfeb0623 (commit)
via fa9b759bacc0ad6a093892ef508811e7feb981b0 (commit)
via 269cbfd30aac18c1fd251be83430dabc60abee0c (commit)
via d7282413763b0ba85d512c1cd49174b762ff449c (commit)
via 51a746e6b1d66ca546fd2f8a1f7809868174e637 (commit)
via 27adf1ec123b949f1c7b48fbdef67d1d4ed18901 (commit)
via e8b42fee7eaa1ba6df203fe0bc4496cae226cbd2 (commit)
from c29f7ef7cb5a31620060ef721d3c65b343eb537a (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 8075493a00e06857147263574333df4073ea671b
Merge: 77b6230adfe51836ad5b31b41638b43e9b0062e2 73425492d4c57d34a616d948666ac75ecc612eed
Author: Patrick McHardy <kaber at trash.net>
Date: Wed May 11 13:43:44 2011 +0200
Merge branch 'opts' of git://dev.medozas.de/iptables
commit 77b6230adfe51836ad5b31b41638b43e9b0062e2
Merge: c29f7ef7cb5a31620060ef721d3c65b343eb537a 58e9118dc61c9ff656c0140c429f0fa892c36ac5
Author: Patrick McHardy <kaber at trash.net>
Date: Wed May 11 13:43:04 2011 +0200
Merge branch 'master' of git://dev.medozas.de/iptables
commit 73425492d4c57d34a616d948666ac75ecc612eed
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sun May 8 12:15:49 2011 +0200
libxt_conntrack: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 58e9118dc61c9ff656c0140c429f0fa892c36ac5
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon May 9 16:34:46 2011 +0200
doc: S/DNAT allows to omit IP addresses
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 7c816547270050ccc29fb07c9e62c230e015c8e3
Author: Changli Gao <xiaosuo at gmail.com>
Date: Mon Mar 14 14:23:31 2011 +0800
iptables: fix the dead loop when meeting unknown options
Signed-off-by: Changli Gao <xiaosuo at gmail.com>
commit 372203af4c70fb20bc7ff3a49788b9bbf57d2eb1
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sat May 7 13:03:06 2011 +0200
libxt_ipvs: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 170cf49a630fd0d237818b537c01794dde00b07a
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sat May 7 12:56:39 2011 +0200
libxtables: XTTYPE_PROTOCOL support
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 0f77e2e40a498688f3d8f8a65bf74ce13db893b2
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sat May 7 03:26:08 2011 +0200
libxt_limit: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit ef7d2e845f72fd3a01c9d89e73c90de5dcca73a7
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sun May 8 21:12:46 2011 +0200
libipt_NETMAP: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 87a34d7aef2cba833f4f36536575dee304bbece5
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sat May 7 00:15:49 2011 +0200
libxt_multiport: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 94cd683a969e024ec870df258fafd790b8a1abf1
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri May 6 22:59:07 2011 +0200
libxt_osf: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 21d243c3152f0798683aacbf95acfc8c1378924e
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri May 6 22:49:43 2011 +0200
libxt_owner: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit d441ad6a68c5d65344449962f4648d297d453b6c
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Fri May 6 17:45:12 2011 +0200
libxt_policy: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 66266abd17adc9631f3769ef0b82968c0bac6f38
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu May 5 14:19:25 2011 +0200
libxtables: XTTYPE_HOSTMASK support
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit fe02f76e013941a7f65f57f297d3177bcfeb0623
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Wed May 4 23:18:57 2011 +0200
libxt_hashlimit: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit fa9b759bacc0ad6a093892ef508811e7feb981b0
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Wed May 4 17:25:54 2011 +0200
libxtables: XTTYPE_PLEN support
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 269cbfd30aac18c1fd251be83430dabc60abee0c
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Thu May 5 12:53:14 2011 +0200
libxtables: flag invalid uses of XTOPT_PUT
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit d7282413763b0ba85d512c1cd49174b762ff449c
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Wed May 4 16:41:13 2011 +0200
libxtables: do not overlay addr and mask parts, and cleanup
XTTYPE_HOSTMASK will require that what has now become haddr,
hmask/hlen are not overlays of another. Thus relax the structure and
always set all members of the {haddr, hmask, hlen} triplet now for all
types that touch any of the members.
Add some more comments and clean out ONEHOST.
commit 51a746e6b1d66ca546fd2f8a1f7809868174e637
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Wed May 4 12:30:15 2011 +0200
libxt_recent: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 27adf1ec123b949f1c7b48fbdef67d1d4ed18901
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Sun May 1 21:52:25 2011 +0200
libxt_connlimit: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit e8b42fee7eaa1ba6df203fe0bc4496cae226cbd2
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon May 2 02:13:16 2011 +0200
libxtables: support for XTTYPE_PLENMASK
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
-----------------------------------------------------------------------
Summary of changes:
extensions/libipt_DNAT.c | 2 +-
extensions/libipt_DNAT.man | 2 +-
extensions/libipt_NETMAP.c | 106 +------
extensions/libipt_SNAT.c | 2 +-
extensions/libipt_SNAT.man | 2 +-
extensions/libxt_TEE.c | 2 +-
extensions/libxt_TPROXY.c | 6 +-
extensions/libxt_connlimit.c | 176 ++++-------
extensions/libxt_conntrack.c | 670 ++++++++++++++----------------------------
extensions/libxt_hashlimit.c | 419 ++++++++------------------
extensions/libxt_ipvs.c | 208 ++++---------
extensions/libxt_limit.c | 53 ++--
extensions/libxt_multiport.c | 178 +++++-------
extensions/libxt_osf.c | 97 ++-----
extensions/libxt_owner.c | 288 ++++++++-----------
extensions/libxt_policy.c | 269 +++++------------
extensions/libxt_recent.c | 186 +++++-------
include/xtables.h.in | 28 ++-
xshared.c | 2 +-
xtoptions.c | 147 +++++++++-
20 files changed, 1055 insertions(+), 1788 deletions(-)
hooks/post-receive
--
iptables
More information about the netfilter-cvslog
mailing list