| 11ef84b856859e7d4a08625d09c8573e5f5eef63 |
|
02-Apr-2014 |
JP Abgrall <jpa@google.com> |
Merge remote-tracking branch 'upstream/stable-1.4.20' into update
Conflicts:
.gitignore
include/linux/types.h
libiptc/libiptc.c
Change-Id: I2c949ba9de090db9ae09d914f4ac5c13e5b7d4da
|
| d7aeda5ed45ac7ca959f12180690caa371b5b14b |
|
08-Jul-2013 |
Pablo Neira Ayuso <pablo@netfilter.org> |
ip{6}tables-restore: fix breakage due to new locking approach
Since (93587a0 ip[6]tables: Add locking to prevent concurrent instances),
ip{6}tables-restore does not work anymore:
iptables-restore < x
Another app is currently holding the xtables lock. Perhaps you want to use the -w option?
do_command{6}(...) is called from ip{6}tables-restore for every iptables
command contained in the rule-set file. Thus, hitting the lock error
after the second command.
Fix it by bypassing the locking in the ip{6}tables-restore path.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
/external/iptables/iptables/iptables-standalone.c
|
| e482ec0a8b1a3b88bbf13f518a5a7261966b1628 |
|
12-Nov-2012 |
JP Abgrall <jpa@google.com> |
ignore SIGPIPES
During bugreports mostly, when adb goes away it leads to apps crashing
because their output stream got closed.
Let's just ignore it.
Bug: 6447319
Change-Id: I1b293ebef737014162edebd5fd9bf254345b2ce8
/external/iptables/iptables/iptables-standalone.c
|
| 1639fe86579f86f5f6a954a9b0adde2e16ad1980 |
|
27-Aug-2011 |
Jan Engelhardt <jengelh@medozas.de> |
libiptc: combine common types: _handle
No real API/ABI change incurred, since the definition of the structs'
types is not visible anyhow.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/iptables/iptables-standalone.c
|
| f643eb37e49a212d40eb060bcdfafbc366c0d616 |
|
26-Aug-2011 |
Jan Engelhardt <jengelh@medozas.de> |
src: remove unused IPTABLES_MULTI define
This dead code has been lingering around since commit v1.4.5~7.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/iptables/iptables-standalone.c
|
| 033e25a3ad215ee3f5a07f0a3315f74c4abfaced |
|
07-Jun-2011 |
Jan Engelhardt <jengelh@medozas.de> |
src: move all iptables pieces into a separate directory
(Unclutter top-level dir)
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/iptables/iptables-standalone.c
|