| 8a3f924e490f4a746baf713342bfd4db201106f1 |
|
22-Mar-2017 |
Lorenzo Colitti <lorenzo@google.com> |
Update to iptables 1.6.1.
This merges upstream b013e3e80e96 ("iptables 1.6.1 release")
Conflicts:
include/libiptc/ipt_kernel_headers.h
Bug: 30950746
Bug: 36108349
Test: see top of change stack.
Change-Id: Ib2b5ae0e0c330798aa375b153e3e2cba2348bb1c
|
| 92a4ff6f0448bcb0b5909982a7ad317c23c89372 |
|
07-Oct-2016 |
Liping Zhang <liping.zhang@spreadtrum.com> |
extensions: libxt_quota: add translation to nft
For example:
# iptables-translate -A OUTPUT -m quota --quota 111
nft add rule ip filter OUTPUT quota 111 bytes counter
# iptables-translate -A OUTPUT -m quota ! --quota 111
nft add rule ip filter OUTPUT quota over 111 bytes counter
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
/external/iptables/extensions/libxt_quota.c
|
| 379bd7bb9284f2692cd08accd7d2dbe2fb85b985 |
|
23-Feb-2015 |
Arturo Borrero <arturo.borrero.glez@gmail.com> |
libxt_quota: fix _save() invert syntax
Space is misplaced.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
/external/iptables/extensions/libxt_quota.c
|
| ebf81627b1a2f50fd47add49f9976ed430a19673 |
|
11-Jun-2011 |
JP Abgrall <jpa@google.com> |
Merge git://git.netfilter.org/iptables into v1.4.11_upstream
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
|
| 67db7615580f5c3490a39310f5adcb4e767ea6a8 |
|
20-May-2011 |
Jan Engelhardt <jengelh@medozas.de> |
libxt_quota: readd missing XTOPT_PUT request
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| b65b9fe5096bd49a9ec2f0f6c2f23d274cfc88ee |
|
19-May-2011 |
JP Abgrall <jpa@google.com> |
xtoptions + quota: parse and store 64bit values
The xtables_strtoul() would cram a long long into a long.
The parse_int would try to cram a UINT64 into a long.
The quota_parse would just ignore whatever value was parsed.
Change-Id: Ie1f05e98e974a255d962dd757a5592458f942f8b
/external/iptables/extensions/libxt_quota.c
|
| 1e6c1ee1bf2822d5fdf61725148700a410fb8b86 |
|
06-Mar-2011 |
Jan Engelhardt <jengelh@medozas.de> |
libxt_quota: use guided option parser
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 8a5270b14908b3173de080a958e50e21e2f046de |
|
20-Feb-2011 |
Jan Engelhardt <jengelh@medozas.de> |
libxt_quota: require --quota to be specified
It is pretty pointless to use -m quota without specifying --quota.
There would be nothing left to count down on.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 73866357e4a7a0fdc1b293bf8863fee2bd56da9e |
|
18-Dec-2010 |
Jan Engelhardt <jengelh@medozas.de> |
iptables: do not print trailing whitespaces
Due to the use of printf("foobar "), iptables emits spaces at the
end-of-line, which looks odd to some users because it causes the
terminal to wrap even if there is seemingly nothing to print.
It may also have other points of annoyance, such as mailers
interpreting a trailing space as an indicator that the paragraph
continues when format=flowed is also on.
And git highlights trailing spaces in red, so let's avoid :)
Preexisting inconsistencies in outputting spaces in the right
spot are also addressed right away.
References: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429579
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 9c60365e043a430f74115bbfaf58ce0df7585f49 |
|
18-Jan-2011 |
Jan Engelhardt <jengelh@medozas.de> |
libxt_quota: print negation when it has been selected
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| d09b6d591ca7d7d7575cb6aa20384c9830f777ab |
|
08-Jan-2011 |
Jan Engelhardt <jengelh@medozas.de> |
extensions: remove no longer necessary default: cases
Match and target parse functions now only get option characters they
have defined themselves.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 7ac405297ec38449b30e3b05fd6bf2082fd3d803 |
|
07-Jan-2011 |
Jan Engelhardt <jengelh@medozas.de> |
src: use C99/POSIX types
"u_int" was a non-standardized extension predating C99 on some platforms.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 422342e47c18e70757231f2210b13df8e1f5931c |
|
02-Aug-2010 |
Changli Gao <xiaosuo@gmail.com> |
libxt_quota: don't ignore the quota value on deletion
Don't ignore the quota value on deletion, then we can remove a special
rule everytime.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
/external/iptables/extensions/libxt_quota.c
|
| 32b8e61e4e5bd405d9ad07bf9468498dfbb19f9e |
|
23-Jul-2010 |
Jan Engelhardt <jengelh@medozas.de> |
all: consistent syntax use in struct option
Try to inhibit copypasting old stuff.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| ce06c99ee107102a7168493b55970b53380ebbb6 |
|
02-Jul-2010 |
Jan Engelhardt <jengelh@medozas.de> |
xt_quota: also document negation
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
/external/iptables/extensions/libxt_quota.c
|
| e4540fcb86c2d7f4cdf51c49872847a03a11b433 |
|
02-Jul-2010 |
Samuel Ortiz <sameo@linux.intel.com> |
extensions: libxt_quota.c: Support option negation
The xt_quota_info flags should be set properly for the --quota option negation
support.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
/external/iptables/extensions/libxt_quota.c
|
| bf97128c7262f17a02fec41cdae75b472ba77f88 |
|
03-Nov-2009 |
Jan Engelhardt <jengelh@medozas.de> |
libxtables: hand argv to xtables_check_inverse
In going to fix NF bug #611, "argv" is needed in
xtables_check_inverse to set "optarg" to the right spot in case of an
intrapositional negation.
References: http://bugzilla.netfilter.org/show_bug.cgi?id=611
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 42979363f3958b4436c6d2503753c182c58e55ea |
|
01-Jun-2009 |
Jan Engelhardt <jengelh@medozas.de> |
extensions: use NFPROTO_UNSPEC for .family field
This constant would be the designated one for the .family field; it
also, given recent changes, makes grep for NFPROTO_UNSPEC work to
finally recollect all manpages.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 69f564e3890976461de0016cd81171ff8bfa8353 |
|
26-May-2009 |
Jan Engelhardt <jengelh@medozas.de> |
extensions: add const qualifiers in print/save functions
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 1829ed482efbc8b390cc760d012b3a4450494e1a |
|
21-Feb-2009 |
Jan Engelhardt <jengelh@medozas.de> |
libxtables: prefix exit_error to xtables_error
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| 0f16c725aadaac7e670d632ecbaea3661ff00827 |
|
30-Jan-2009 |
Jan Engelhardt <jengelh@medozas.de> |
libxtables: prefix/order - move check_inverse to xtables.c
This also adds a warning that intrapositional negation support
is deprecated.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| a80975497968e69b23f56bf15d346c65bec381f2 |
|
27-Jan-2009 |
Jan Engelhardt <jengelh@medozas.de> |
extensions: use UINT_MAX constants over open-coded bits (1/2)
~0 depends on the sizeof(int), so it is better to use UINT32_MAX.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
/external/iptables/extensions/libxt_quota.c
|
| ddac6c5bc636003d664d25c08ea3fe176565096c |
|
01-Sep-2008 |
Jan Engelhardt <jengelh@medozas.de> |
src: Update comments
A number of comments are redundant, some outdated and others outright
wrong in their own way. Remove and fixup.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
/external/iptables/extensions/libxt_quota.c
|
| 0ea82bc43e9262cdbb9880ca56bb514db4c77f8e |
|
07-Jun-2008 |
Patrick McHardy <kaber@trash.net> |
sparse warning fixes: integer used as pointer
Signed-off-by: Patrick McHardy <kaber@trash.net>
/external/iptables/extensions/libxt_quota.c
|
| 8b7c64d6ba156a99008fcd810cba874c73294333 |
|
15-Apr-2008 |
Jan Engelhardt <jengelh@medozas.de> |
Remove old functions, constants
/external/iptables/extensions/libxt_quota.c
|
| 23545c2a7a31c68c1e49c7c901b632c2f1c59968 |
|
14-Feb-2008 |
Jan Engelhardt <jengelh@medozas.de> |
Implement AF_UNSPEC as a wildcard for extensions
/external/iptables/extensions/libxt_quota.c
|
| 7a236f4cc685a420c1a782a5db614a93baf37ccf |
|
03-Mar-2008 |
Jan Engelhardt <jengelh@medozas.de> |
Drop -W from CFLAGS and some tiny code cleanups
- change "unsigned" to explicit "unsigned int"
- remove some casts
/external/iptables/extensions/libxt_quota.c
|
| 9ee386a1b6d7704b259460152c959ab0e79e02aa |
|
29-Jan-2008 |
Max Kellermann <max@duempel.org> |
fix gcc warnings
Max Kellermann <max@duempel.org>
/external/iptables/extensions/libxt_quota.c
|
| 5b76f682f722bebc2f0616fca4600eee2c08dfe2 |
|
29-Jan-2008 |
Max Kellermann <max@duempel.org> |
whitespace cleanup
Max Kellermann <max@duempel.org>
/external/iptables/extensions/libxt_quota.c
|
| 181dead3f13befe02769ef479bcbb51801b7fc4e |
|
04-Oct-2007 |
Jan Engelhardt <jengelh@medozas.de> |
Unique symbols 1/6
Give symbols of libxt matches unique names (1/3).
Adds unique prefixes to all functions (most of them - especially the hook
functions) so that debugging programs can unambiguously map a symbol to an
address. Also unifies the names of the xtables_match/xtables_target structs,
(based upon libxt_connmark.c/libip6t_*.c).
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
/external/iptables/extensions/libxt_quota.c
|
| 830132ac9c0d270bf9dcfe85c2464e3fe8c73fb9 |
|
04-Oct-2007 |
Jan Engelhardt <jengelh@medozas.de> |
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>
/external/iptables/extensions/libxt_quota.c
|
| 500f483fff529dcd88ec96b9d5054be6cd6363a0 |
|
08-Sep-2007 |
Patrick McHardy <kaber@trash.net> |
Fix sparse warnings: non-ANSI function declarations, 0 used as pointer
/external/iptables/extensions/libxt_quota.c
|
| ea146a982e26c42f9954f140276f8deeb2edbe98 |
|
02-Sep-2007 |
Peter Riley <Peter.Riley@hotpop.com> |
Remove last vestiges of NFC (Peter Riley <Peter.Riley@hotpop.com>)
/external/iptables/extensions/libxt_quota.c
|
| 661f112072bc13a1625c4eb5983695e122ea97da |
|
30-Jul-2007 |
Jan Engelhardt <jengelh@medozas.de> |
Make the option structures const.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
/external/iptables/extensions/libxt_quota.c
|
| 18992db3bfdb3b695cae12b53434f560cbf8e2ae |
|
30-Jul-2007 |
Jan Engelhardt <jengelh@medozas.de> |
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>
/external/iptables/extensions/libxt_quota.c
|
| 2bcb16047e048afd1457642fa7bc2aefc8d06d9d |
|
24-Jul-2007 |
Yasuyuki KOZAKAI <yasuyuki@netfilter.org> |
Add IPv6 support to quota match
/external/iptables/extensions/libxt_quota.c
|