Merge branch 'opts' of git://dev.medozas.de/iptables

1 files changed, 9 insertions, 1 deletions

diff --git a/include/xtables.h.in b/include/xtables.h.in
index 3bdf7248..b4915c41 100644
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -48,10 +48,15 @@ struct in_addr;
 /**
  * %XTTYPE_NONE:	option takes no argument
  * %XTTYPE_UINT*:	standard integer
+ * %XTTYPE_UINT*RC:	colon-separated range of standard integers
+ * %XTTYPE_STRING:	arbitrary string
  */
 enum xt_option_type {
 	XTTYPE_NONE,
+	XTTYPE_UINT8,
 	XTTYPE_UINT32,
+	XTTYPE_UINT32RC,
+	XTTYPE_STRING,
 };
 
 /**
@@ -95,6 +100,7 @@ struct xt_option_entry {
  * @data:	per-extension data block
  * @xflags:	options of the extension that have been used
  * @invert:	whether option was used with !
+ * @nvals:	number of results in uXX_multi
  * @val:	parsed result
  */
 struct xt_option_call {
@@ -103,8 +109,10 @@ struct xt_option_call {
 	void *data;
 	unsigned int xflags;
 	bool invert;
+	uint8_t nvals;
 	union {
-		uint32_t u32;
+		uint8_t u8;
+		uint32_t u32, u32_range[2];
 	} val;
 };