diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-18 15:03:22 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-18 15:03:22 +0200 |
| commit | 57a92c7b7ed01ad8f49c680af63341409c3afb1a (patch) | |
| tree | 1c588b4357b1ca7134386aed9c4a8a1fbaffd375 /include/xtables.h.in | |
| parent | e39f367d905670e39e6f08d2b73c715a6d0b4bfb (diff) | |
| parent | 1f2474ae5276e49005c8e234dec091b007e3fce2 (diff) | |
Merge branch 'floating/opts' of git://dev.medozas.de/iptables
Diffstat (limited to 'include/xtables.h.in')
| -rw-r--r-- | include/xtables.h.in | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/include/xtables.h.in b/include/xtables.h.in index b4915c41..b0802855 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -50,13 +50,28 @@ struct in_addr; * %XTTYPE_UINT*: standard integer * %XTTYPE_UINT*RC: colon-separated range of standard integers * %XTTYPE_STRING: arbitrary string + * %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 */ enum xt_option_type { XTTYPE_NONE, XTTYPE_UINT8, + XTTYPE_UINT16, XTTYPE_UINT32, + XTTYPE_UINT64, + XTTYPE_UINT8RC, + XTTYPE_UINT16RC, XTTYPE_UINT32RC, + XTTYPE_UINT64RC, XTTYPE_STRING, + XTTYPE_MARKMASK32, + XTTYPE_SYSLOGLEVEL, + XTTYPE_ONEHOST, + XTTYPE_PORT, + XTTYPE_PORT_NE, }; /** @@ -111,9 +126,19 @@ struct xt_option_call { bool invert; uint8_t nvals; union { - uint8_t u8; + uint8_t u8, u8_range[2], syslog_level; + uint16_t u16, u16_range[2], port; uint32_t u32, u32_range[2]; + uint64_t u64, u64_range[2]; + union nf_inet_addr inetaddr; + struct { + uint32_t mark, mask; + }; } val; + union { + struct xt_entry_match **match; + struct xt_entry_target **target; + }; }; /** @@ -127,6 +152,16 @@ struct xt_fcheck_call { unsigned int xflags; }; +/** + * A "linear"/linked-list based name<->id map, for files similar to + * /etc/iproute2/. + */ +struct xtables_lmap { + char *name; + int id; + struct xtables_lmap *next; +}; + /* Include file for additions: new matches and targets. */ struct xtables_match { @@ -412,6 +447,11 @@ extern void xtables_option_mfcall(struct xtables_match *); extern void xtables_options_fcheck(const char *, unsigned int, const struct xt_option_entry *); +extern struct xtables_lmap *xtables_lmap_init(const char *); +extern void xtables_lmap_free(struct xtables_lmap *); +extern int xtables_lmap_name2id(const struct xtables_lmap *, const char *); +extern const char *xtables_lmap_id2name(const struct xtables_lmap *, int); + #ifdef XTABLES_INTERNAL /* Shipped modules rely on this... */ |