summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SET target revision 2 addedJozsef Kadlecsik2011-04-174-60/+227
| | | | | | | | | The new revision of the SET target supports the following new operations - specifying the timeout value of the entry to be added - flag to instruct the kernel that if the entry already exists then reset the timeout value to the specified one (or to the default from the set definition)
* Merge branch 'opts' of git://dev.medozas.de/iptablesPatrick McHardy2011-04-1334-1783/+955
|\
| * libxt_u32: use guided option parserJan Engelhardt2011-04-061-22/+17
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_time: use guided option parserJan Engelhardt2011-04-061-101/+52
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_state: use guided option parserJan Engelhardt2011-04-061-34/+16
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_pkttype: use guided option parserJan Engelhardt2011-04-061-37/+15
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_physdev: use guided option parserJan Engelhardt2011-04-061-71/+42
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_helper: use guided option parserJan Engelhardt2011-04-061-38/+16
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_comment: use guided option parserJan Engelhardt2011-04-061-50/+11
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_TCPOPTSTRIP: use guided option parserJan Engelhardt2011-04-061-34/+12
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_SECMARK: use guided option parserJan Engelhardt2011-04-061-39/+15
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_LED: use guided option parserJan Engelhardt2011-04-061-51/+33
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_DSCP: use guided option parserJan Engelhardt2011-04-062-127/+54
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_CLASSIFY: use guided option parserJan Engelhardt2011-04-061-40/+15
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_AUDIT: use guided option parserJan Engelhardt2011-04-061-44/+22
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libipt_addrtype: use guided option parserJan Engelhardt2011-04-061-103/+57
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libipt_ECN: use guided option parserJan Engelhardt2011-04-062-109/+68
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip6t_ipv6header: use guided option parserJan Engelhardt2011-04-061-61/+27
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip[6]t_icmp: use guided option parserJan Engelhardt2011-04-062-65/+35
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip6t_hbh: use guided option parserJan Engelhardt2011-04-061-39/+22
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip6t_dst: use guided option parserJan Engelhardt2011-04-061-41/+20
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip[6]t_REJECT: use guided option parserJan Engelhardt2011-04-062-58/+48
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxtables: XTTYPE_STRING supportJan Engelhardt2011-04-062-0/+27
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_esp: use guided option parserJan Engelhardt2011-04-061-79/+16
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip6t_frag: use guided option parserJan Engelhardt2011-04-061-109/+36
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip[6]t_ah: use guided option parserJan Engelhardt2011-04-062-158/+43
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxtables: XTTYPE_UINT32RC supportJan Engelhardt2011-04-062-2/+59
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip[6]t_hl: use guided option parserJan Engelhardt2011-04-062-133/+82
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libip[6]t_HL: use guided option parserJan Engelhardt2011-04-062-137/+84
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxtables: XTTYPE_UINT8 supportJan Engelhardt2011-04-062-1/+11
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* | Merge branch 'opts' of git://dev.medozas.de/iptablesPatrick McHardy2011-04-1213-333/+695
|\|
| * libxt_cluster: use guided option parserJan Engelhardt2011-04-061-139/+48
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxtables: min-max option supportJan Engelhardt2011-04-062-0/+8
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_cpu: use guided option parserJan Engelhardt2011-04-061-49/+16
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxtables: XTTYPE_UINT32 supportJan Engelhardt2011-04-062-3/+27
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_CONNSECMARK: use guided option parserJan Engelhardt2011-04-061-36/+23
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxtables: provide better final_checkJan Engelhardt2011-04-064-28/+63
| | | | | | | | | | | | | | | | This passes the per-extension data block to the new x6_fcheck function pointer, which can then do last alterations without using hacks like global variables (think libxt_statistic). Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_socket: use guided option parserJan Engelhardt2011-04-061-14/+15
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxt_CHECKSUM: use guided option parserJan Engelhardt2011-04-061-32/+14
| | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * libxtables: guided option parserJan Engelhardt2011-04-067-54/+501
| | | | | | | | | | | | | | | | | | | | | | This patchset seeks to drastically reduce the code in the individual extensions by centralizing their argument parsing (breakdown of strings), validation, and in part, assignment. As a secondary goal, this reduces the number of static storage duration variables in flight. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| * extensions: add missing checks for specific flags (2)Jan Engelhardt2011-04-061-1/+3
| | | | | | | | | | | | | | Addendum to v1.4.10-75-g4e5d4bf. It does not make sense to use ipv6header's --soft without specifying any options. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* | Merge branch 'master' of vishnu.netfilter.org:/data/git/iptablesPatrick McHardy2011-04-121-4/+3
|\ \
| * | Fix set match/target direction parserJozsef Kadlecsik2011-04-091-4/+3
| | | | | | | | | | | | | | | The direction parser did not catch when more src/dst direction parameters were supplied than allowed.
* | | doc: avoid duplicate entries in manpageJan Engelhardt2011-04-061-2/+2
|/ / | | | | | | | | | | | | | | | | Commit v1.4.9-35-gd4105ad changed from [A-Z] and [a-z] to use [[:alnum:]], which unfortunately drew matches into the target section, and targets into the match section. [[:upper:]] and [[:lower:]] should have been used instead, of course. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
* | convert ip6?tables-multi to actually use their own header filesMaciej Zenczykowski2011-04-052-9/+2
| | | | | | | | | | Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
* | move 'int line' definition from ip6?tables.c into xtables.cMaciej Zenczykowski2011-04-053-12/+6
| | | | | | | | | | Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
* | v6: rename do_command() to do_command6()Maciej Zenczykowski2011-04-041-2/+2
| | | | | | | | | | | | | | | | (actually only applies to two comments, since the function has long been called do_command6) Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
* | v4: rename do_command() to do_command4()Maciej Zenczykowski2011-04-045-8/+8
| | | | | | | | | | Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
* | v6: rename print_rule() to print_rule6()Maciej Zenczykowski2011-04-043-4/+4
| | | | | | | | | | Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
* | v4: rename print_rule() to print_rule4()Maciej Zenczykowski2011-04-043-4/+4
| | | | | | | | | | Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Patrick McHardy <kaber@trash.net>