diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-05-09 11:26:32 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-05-09 11:26:32 +0200 |
| commit | edc2b1adf32d2b11e126174f525293b3bca6e7bc (patch) | |
| tree | 6d386bcbd9717b9d78005899b462690463bd4ecf /include | |
| parent | 26ed9ea93564bb5ffdb5238eaa202cd9bcf6d6d1 (diff) | |
| parent | 753bbed383cde1c18e05b5b726b6c28afbde3a3c (diff) | |
Merge branch 'opts' of git://dev.medozas.de/iptables
Diffstat (limited to 'include')
| -rw-r--r-- | include/xtables.h.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/xtables.h.in b/include/xtables.h.in index 1d91d4df..5563ecb9 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -50,11 +50,14 @@ struct in_addr; * %XTTYPE_UINT*: standard integer * %XTTYPE_UINT*RC: colon-separated range of standard integers * %XTTYPE_STRING: arbitrary string + * %XTTYPE_TOSMASK: 8-bit TOS value with optional mask * %XTTYPE_MARKMASK32: 32-bit mark with optional mask * %XTTYPE_SYSLOGLEVEL: syslog level by name or number * %XTTYPE_ONEHOST: one host or address (union nf_inet_addr) * %XTTYPE_PORT: 16-bit port name or number * %XTTYPE_PORT_NE: 16-bit port name or number, stored as network-endian + * %XTTYPE_PORTRC: colon-separated port range (names acceptable) + * %XTTYPE_PORTRC_NE: same as %XTTYPE_PORTRC, stored in network-endian */ enum xt_option_type { XTTYPE_NONE, @@ -67,11 +70,14 @@ enum xt_option_type { XTTYPE_UINT32RC, XTTYPE_UINT64RC, XTTYPE_STRING, + XTTYPE_TOSMASK, XTTYPE_MARKMASK32, XTTYPE_SYSLOGLEVEL, XTTYPE_ONEHOST, XTTYPE_PORT, XTTYPE_PORT_NE, + XTTYPE_PORTRC, + XTTYPE_PORTRC_NE, }; /** @@ -127,11 +133,14 @@ struct xt_option_call { uint8_t nvals; union { uint8_t u8, u8_range[2], syslog_level; - uint16_t u16, u16_range[2], port; + uint16_t u16, u16_range[2], port, port_range[2]; uint32_t u32, u32_range[2]; uint64_t u64, u64_range[2]; union nf_inet_addr inetaddr; struct { + uint8_t tos_value, tos_mask; + }; + struct { uint32_t mark, mask; }; } val; |