aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-4.3_r3.1' of ↵cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0stable/cm-10.2shipping/cm-11.0cm-11.0cm-10.2Steve Kondik2013-09-190-0/+0
|\ | | | | | | | | | | https://android.googlesource.com/platform/external/iptables into cm-10.2 Android 4.3 Release 3.1
| * am 42ea6673: ignore SIGPIPESJP Abgrall2012-11-270-0/+0
| |\ | | | | | | | | | | | | * commit '42ea6673b74e0ee9ad17f5462dc171fbe1491137': ignore SIGPIPES
* | | Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-240-0/+0
|\| | | | | | | | | | | Android 4.3 release 2.1
| * | Merge "ignore SIGPIPES"JP Abgrall2012-11-131-0/+3
| |\ \
| | * | ignore SIGPIPESJP Abgrall2012-11-121-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge tag 'android-4.2.2_r1' of ↵cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingcm-10.1Steve Kondik2013-02-121-0/+3
|\ \ \ | |/ / |/| / | |/ | | | | https://android.googlesource.com/platform/external/iptables into 1.1 Android 4.2.2 release 1
| * ignore SIGPIPESJP Abgrall2012-11-261-0/+3
|/ | | | | | | | | 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
* Modify iptables to talk to xt_IDLETIMER version 1.cm-10.1-M1jellybean-stablejellybeanAshish Sharma2012-04-043-1/+20
| | | | Change-Id: Ib144c5289681cdff21b21be74173164d097710e7
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
|/|
| * undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| |\
| | * reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| |/| |/|/
| * am 3b2deb17: Reconcile with honeycomb-LTE-releaseThe Android Open Source Project2011-07-300-0/+0
| |\ | |/ |/| | | | | * commit '3b2deb17f065c5664bb25e1a28489e5792eb63ff': Remove the debug tag.
* | Reconcile with honeycomb-LTE-releaseThe Android Open Source Project2011-07-300-0/+0
|\ \ | | | | | | | | | Change-Id: I33af94011c738b572ffa3716c9346f078eea843f
| * | Remove the debug tag.Ying Wang2011-07-291-6/+2
| | | | | | | | | | | | | | | | | | | | | iptables are now needed by all products. It should be added to core.mk. Change-Id: Ie1f3a83b0e0ba15482b7b76c81ada3bf8faf6096
| | * am bcc59b4a: am d184710e: Remove the debug tag.Ying Wang2011-07-291-6/+2
| | |\ | |_|/ |/| | | | | | | | * commit 'bcc59b4ad65f77df454534ff2aa5c0cee9a9a767': Remove the debug tag.
* | | am d184710e: Remove the debug tag.Ying Wang2011-07-291-6/+2
|\ \ \ | | | | | | | | | | | | | | | | * commit 'd184710e9483514e1cebdcc75576369fdd9440a6': Remove the debug tag.
| * | | Remove the debug tag.Ying Wang2011-07-291-6/+2
| |/ / | | | | | | | | | | | | | | | | | | iptables are now needed by all products. It should be added to core.mk. Change-Id: Ie1f3a83b0e0ba15482b7b76c81ada3bf8faf6096
| | * am b7ef9951: (-s ours) am e37d45ce: (-s ours) DO NOT MERGE: updating ↵JP Abgrall2011-07-270-0/+0
| | |\ | |_|/ |/| | | | | | | | | | | | | | iptables to v1.4.11++ from master * commit 'b7ef9951133f7a4eb86cd2016ed150d2b3bda684': DO NOT MERGE: updating iptables to v1.4.11++ from master
* | | am e37d45ce: (-s ours) DO NOT MERGE: updating iptables to v1.4.11++ from masterJP Abgrall2011-07-270-0/+0
|\| | | |/ |/| | | | | * commit 'e37d45ce390c2f5a7f1e64742b9100ecef0def54': DO NOT MERGE: updating iptables to v1.4.11++ from master
| * DO NOT MERGE: updating iptables to v1.4.11++ from masterJP Abgrall2011-07-26549-28888/+34230
| | | | | | | | | | | | | | It is based in master's iptables at commit 8e3c7cabff2fbb0e2b7bbf870928dc2c46ed2740 Change-Id: Ie749254e1197237b832ffb3dd376b25146e33081
* | Remove the simulator target from all makefiles.Jeff Brown2011-07-111-9/+1
| | | | | | | | | | | | Bug: 5010576 Change-Id: I7731e32d21a2bbb2710bdde1515abac9b8e58309
* | quota2: fix inversion handling for --quotaJP Abgrall2011-06-291-0/+2
| | | | | | | | | | Change-Id: I55f21aaab3c90955b4ce61687651ada60f400037 Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge remote branch 'remotes/goog/v1_4' into merge_v1_4_quota2JP Abgrall2011-06-273-0/+201
|\ \
| * | xt_quota2: fixup so that it works with iptablesJP Abgrall2011-06-241-51/+37
| | | | | | | | | | | | | | | | | | | | | It was using xtables-addons conventions: mostly incorrect arg parsing. Change-Id: I6d2ed5518d122616f252a9436b3b3dc1bd201133 Signed-off-by: JP Abgrall <jpa@google.com>
| * | Adding the original quota2 from xtables-addonsJP Abgrall2011-06-243-0/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original xt_quota in the kernel is plain broken: - counts quota at a per CPU level (was written back when ubiquitous SMP was just a dream) - provides no way to count across IPV4/IPV6. This patch is the original unaltered code from: http://sourceforge.net/projects/xtables-addons at commit e84391ce665cef046967f796dd91026851d6bbf3 Change-Id: Ia8b21394ea79ef55514748e96f769e40355a6ccf Signed-off-by: JP Abgrall <jpa@google.com>
* | | Merge remote branch 'goog/v1_4' into merge_v1.4.11_into_masterJP Abgrall2011-06-1381-1052/+1280
|\| |
| * | Post-merge fixup. Add new Android.mk, re-checkin generated filesJP Abgrall2011-06-106-369/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They have no more compilable files in the top dir. Created extra Android.mk for each subdir. Regenerated the include/iptables/internal.h and include/xtables.h with ./autogen.sh export ANDROID_ROOT=$(gettop)/prebuilt/linux-x86/toolchain/arm-linux-androideabi-4.4.x/ ./configure -host=arm-eabi CC=arm-linux-androideabi-gcc CPPFLAGS="$funky_includes" CFLAGS="-nostdlib" LDFLAGS="-Wl,-rpath-link=$ANDROID_ROOT/arm-linux-androideabi/lib -L$ANDROID_ROOT/arm-linux-androideabi/lib" Change-Id: Ia57ed699edd32ffce16e94e2f13fb93d94924a04
| * | Merge git://git.netfilter.org/iptables into v1.4.11_upstreamJP Abgrall2011-06-1075-683/+928
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using theirs, as they have taken some of my prior changes\ with some improvements. Conflicts: include/xtables.h.in iptables/xtables.c iptables/xtoptions.c Change-Id: I8e1e537fbb868eeebb448c8f1d9e33b283448aac
| * | Bump version to 1.4.11.1Patrick McHardy2011-06-081-1/+1
| | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net>
| * | doc: fix MASQUERADE section of man pageVlad Dogaru2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The section about MASQUERADE specifies that it takes a single option, but in reality it takes two: --to-ports and --random. Signed-off-by: Vlad Dogaru <ddvlad@rosedu.org> Signed-off-by: Patrick McHardy <kaber@trash.net>
| * | build: re-add missing CPPFLAGS for libiptcJan Engelhardt2011-06-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These got lost on commit v1.4.11-12-g5c8f5b6. Note: When /usr/include/libiptc/libiptc.h exists, this error is masked away :-/ (IMO, #include-with-quotes "foo.h" should not search system dirs...) Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | option: fix ignored negation before implicit extension loadingJan Engelhardt2011-06-075-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `iptables -A INPUT -p tcp ! --syn` forgot the negation, i.e. it was not present in a subsequent `iptables -S`. Commit v1.4.11~77^2~9 missed the fact that after autoloading a proto extension, cs.invert must not be touched until the next getopt call. This is now fixed by having command_default return a value to indicate whether to jump or not. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | tests: add some sample rulesets to test save-restore cycleJan Engelhardt2011-06-072-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | These rulesets use practically all options (I may have missed some) for verification that the new Guided Option Parser would take the same input as the old open-coded ones did. They might come in handy at some point. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | src: move all iptables pieces into a separate directoryJan Engelhardt2011-06-0733-81/+84
| | | | | | | | | | | | | | | | | | (Unclutter top-level dir) Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | src: move all libiptc pieces into its directoryJan Engelhardt2011-06-076-17/+18
| | | | | | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | xtables-multi: fix absence of xml translator in IPv6-only buildsMaciej Żenczykowski2011-06-075-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | Commit v1.4.11-4-gde791ff did not actually build the iptables-xml code into the xtables-multi binary. Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | doc: fix trivial typo in libipt_SNATElie De Brauwer2011-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | The word "occur" had ufortunately been removed in v1.3.8~23. References: http://bugzilla.netfilter.org/show_bug.cgi?id=707 Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | build: move remaining preprocessor flags to CPPFLAGSMike Frysinger2011-06-014-8/+8
| | | | | | | | | | | | | | | References; http://bugzilla.netfilter.org/show_bug.cgi?id=713 Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | build: move kinclude's preprocessor flags to kinclude_CPPFLAGSJan Engelhardt2011-06-013-9/+9
| | | | | | | | | | | | | | | References: http://bugzilla.netfilter.org/show_bug.cgi?id=713 Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | build: move basic preprocessor flags to regular_CPPFLAGSJan Engelhardt2011-06-015-7/+14
| | | | | | | | | | | | | | | | | | | | | This is where they belong, after all. References: http://bugzilla.netfilter.org/show_bug.cgi?id=713 Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | doc: iptables-xml should be in manpage section 1Jan Engelhardt2011-05-302-1/+1
| | | | | | | | | | | | | | | References: http://bugs.debian.org/623112 Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | doc: update GPL license textJan Engelhardt2011-05-301-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Open Build Service/rpmlint flagged the outdated address in the license text :-) iptables.x86_64: W: incorrect-fsf-address /usr/share/doc/packages/iptables/COPYING The Free Software Foundation address in this file seems to be outdated or misspelled. Ask upstream to update the address, or if this is a license file, possibly the entire file with a new copy available from the FSF. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | build: fix absence of xml translator in IPv6-only buildsJan Engelhardt2011-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | | Due to iptables-xml being listed under IPV4 only, its symlink was not created on `./configure --disable-ipv4 && make install`. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | build: fix installation of symlinksJan Engelhardt2011-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | Commit v1.4.11~20 forgot to change the symlink target names to the new executable name. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | build: remove dead code partsJan Engelhardt2011-05-303-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc-4.6 has a new warning, -Wunused-but-set-variable, which flags no-op code. CC libiptc/libip4tc.lo In file included from libiptc/libip4tc.c:118:0: libiptc/libiptc.c: In function "iptcc_chain_index_delete_chain": libiptc/libiptc.c:611:32: warning: variable "index_ptr2" set but not used libiptc/libiptc.c: In function "alloc_handle": libiptc/libiptc.c:1282:9: warning: variable "len" set but not used CC libiptc/libip6tc.lo In file included from libiptc/libip6tc.c:113:0: libiptc/libiptc.c: In function "iptcc_chain_index_delete_chain": libiptc/libiptc.c:611:32: warning: variable "index_ptr2" set but not used libiptc/libiptc.c: In function "alloc_handle": libiptc/libiptc.c:1282:9: warning: variable "len" set but not used CC xtables_multi-iptables-xml.o iptables-xml.c: In function "do_rule_part": iptables-xml.c:376:8: warning: variable "thisChain" set but not used CC xtables_multi-ip6tables.o ip6tables.c: In function "print_firewall": ip6tables.c:552:10: warning: variable "flags" set but not used Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | libxt_owner: restore inversion supportJan Engelhardt2011-05-291-2/+4
| | | | | | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * | Bump version to 1.4.11Patrick McHardy2011-05-261-1/+1
| | | | | | | | | | | | Signed-off-by: Patrick McHardy <kaber@trash.net>
| * | Merge branch 'master' of git://dev.medozas.de/iptablesPatrick McHardy2011-05-2524-292/+348
| |\ \
| | * | libxt_time: deprecate --localtz option, document kernel TZ caveatsJan Engelhardt2011-05-252-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing against the kernel time zone has significant caveats. This patch adds documentation about the issue, and makes --utc the default setting for libxt_time. Furthremore, throw a warning on using the "--localtz" option, to avoid confusion with one's shell TZ environment variable, and rename it to "--kerneltz" to be explicit about whose timezone will be used. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 19:26:01 +0000