Userspace revision handling is reworked

In order to make it simpler and more straightforward to express
the revisions of the set type, all keywords and their parsing
are separated from the individual set types.

All backward compatibility arguments are recognized and ignored
arguments are supported.

Recognized but ignored arguments will be removed in a later release.

1 files changed, 494 insertions, 730 deletions

diff --git a/lib/ipset_hash_netport.c b/lib/ipset_hash_netport.c
index b996541..e6d9aa9 100644
--- a/lib/ipset_hash_netport.c
+++ b/lib/ipset_hash_netport.c
@@ -10,59 +10,7 @@
 #include <libipset/ui.h>			/* ipset_port_usage */
 #include <libipset/types.h>			/* prototypes */
 
-/* Parse commandline arguments */
-static const struct ipset_arg hash_netport_create_args1[] = {
-	{ .name = { "family", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,		.print = ipset_print_family,
-	},
-	/* Alias: family inet */
-	{ .name = { "-4", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	/* Alias: family inet6 */
-	{ .name = { "-6", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	{ .name = { "hashsize", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_HASHSIZE,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "maxelem", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_MAXELEM,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ },
-};
-
-static const struct ipset_arg hash_netport_add_args1[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ },
-};
-
-static const char hash_netport_usage1[] =
-"create SETNAME hash:net,port\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE]\n"
-"add    SETNAME IP[/CIDR],PROTO:PORT [timeout VALUE]\n"
-"del    SETNAME IP[/CIDR],PROTO:PORT\n"
-"test   SETNAME IP[/CIDR],PROTO:PORT\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
-"      port range is supported both for IPv4 and IPv6.\n";
-
+/* SCTP and UDPLITE support */
 static struct ipset_type ipset_hash_netport1 = {
 	.name = "hash:net,port",
 	.alias = { "netporthash", NULL },
@@ -81,63 +29,75 @@ static struct ipset_type ipset_hash_netport1 = {
 			.opt = IPSET_OPT_PORT
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = hash_netport_create_args1,
-		[IPSET_ADD] = hash_netport_add_args1,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_CIDR),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_CIDR),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_CIDR),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_FAMILY,
+				/* Aliases */
+				IPSET_ARG_INET,
+				IPSET_ARG_INET6,
+				IPSET_ARG_HASHSIZE,
+				IPSET_ARG_MAXELEM,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NONE,
+			},
+			.need = 0,
+			.full = 0,
+			.help = "",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
 	},
-
-	.usage = hash_netport_usage1,
+	.usage = "where depending on the INET family\n"
+		 "      IP is a valid IPv4 or IPv6 address (or hostname),\n"
+		 "      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
+		 "      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
+		 "      port range is supported both for IPv4 and IPv6.",
 	.usagefn = ipset_port_usage,
 	.description = "SCTP and UDPLITE support",
 };
 
-static const char hash_netport_usage2[] =
-"create SETNAME hash:net,port\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE]\n"
-"add    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT [timeout VALUE]\n"
-"del    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT\n"
-"test   SETNAME IP[/CIDR],PROTO:PORT\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with IPv4 is supported.\n"
-"      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
-"      port range is supported both for IPv4 and IPv6.\n";
-
+/* Add/del range support */
 static struct ipset_type ipset_hash_netport2 = {
 	.name = "hash:net,port",
 	.alias = { "netporthash", NULL },
@@ -156,77 +116,77 @@ static struct ipset_type ipset_hash_netport2 = {
 			.opt = IPSET_OPT_PORT
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = hash_netport_create_args1,
-		[IPSET_ADD] = hash_netport_add_args1,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_FAMILY,
+				/* Aliases */
+				IPSET_ARG_INET,
+				IPSET_ARG_INET6,
+				IPSET_ARG_HASHSIZE,
+				IPSET_ARG_MAXELEM,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NONE,
+			},
+			.need = 0,
+			.full = 0,
+			.help = "",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
 	},
-
-	.usage = hash_netport_usage2,
+	.usage = "where depending on the INET family\n"
+		 "      IP is a valid IPv4 or IPv6 address (or hostname),\n"
+		 "      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
+		 "      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
+		 "      port range is supported both for IPv4 and IPv6.",
 	.usagefn = ipset_port_usage,
 	.description = "Add/del range support",
 };
 
-static const struct ipset_arg hash_netport_add_args3[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "nomatch", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_NOMATCH,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ },
-};
-
-static const char hash_netport_usage3[] =
-"create SETNAME hash:net,port\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE]\n"
-"add    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT [timeout VALUE] [nomatch]\n"
-"del    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT\n"
-"test   SETNAME IP[/CIDR],PROTO:PORT\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with IPv4 is supported.\n"
-"      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
-"      port range is supported both for IPv4 and IPv6.\n";
-
+/* nomatch flag support */
 static struct ipset_type ipset_hash_netport3 = {
 	.name = "hash:net,port",
 	.alias = { "netporthash", NULL },
@@ -245,130 +205,79 @@ static struct ipset_type ipset_hash_netport3 = {
 			.opt = IPSET_OPT_PORT
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = hash_netport_create_args1,
-		[IPSET_ADD] = hash_netport_add_args3,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_FAMILY,
+				/* Aliases */
+				IPSET_ARG_INET,
+				IPSET_ARG_INET6,
+				IPSET_ARG_HASHSIZE,
+				IPSET_ARG_MAXELEM,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NONE,
+			},
+			.need = 0,
+			.full = 0,
+			.help = "",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
 	},
-
-	.usage = hash_netport_usage3,
+	.usage = "where depending on the INET family\n"
+		 "      IP is a valid IPv4 or IPv6 address (or hostname),\n"
+		 "      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
+		 "      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
+		 "      port range is supported both for IPv4 and IPv6.",
 	.usagefn = ipset_port_usage,
 	.description = "nomatch flag support",
 };
 
-/* Parse commandline arguments */
-static const struct ipset_arg hash_netport_create_args4[] = {
-	{ .name = { "family", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,		.print = ipset_print_family,
-	},
-	/* Alias: family inet */
-	{ .name = { "-4", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	/* Alias: family inet6 */
-	{ .name = { "-6", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	{ .name = { "hashsize", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_HASHSIZE,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "maxelem", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_MAXELEM,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "counters", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_COUNTERS,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ },
-};
-
-static const struct ipset_arg hash_netport_add_args4[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "nomatch", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_NOMATCH,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "packets", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_PACKETS,
-	  .parse = ipset_parse_uint64,		.print = ipset_print_number,
-	},
-	{ .name = { "bytes", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_BYTES,
-	  .parse = ipset_parse_uint64,		.print = ipset_print_number,
-	},
-	{ },
-};
-
-static const struct ipset_arg hash_netport_test_args4[] = {
-	{ .name = { "nomatch", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_NOMATCH,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ },
-};
-
-static const char hash_netport_usage4[] =
-"create SETNAME hash:net,port\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE] [counters]\n"
-"add    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT [timeout VALUE] [nomatch]\n"
-"               [packets VALUE] [bytes VALUE]\n"
-"del    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT\n"
-"test   SETNAME IP[/CIDR],PROTO:PORT\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with IPv4 is supported.\n"
-"      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
-"      port range is supported both for IPv4 and IPv6.\n";
-
+/* counters support */
 static struct ipset_type ipset_hash_netport4 = {
 	.name = "hash:net,port",
 	.alias = { "netporthash", NULL },
@@ -387,143 +296,82 @@ static struct ipset_type ipset_hash_netport4 = {
 			.opt = IPSET_OPT_PORT
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = hash_netport_create_args4,
-		[IPSET_ADD] = hash_netport_add_args4,
-		[IPSET_TEST] = hash_netport_test_args4,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_COUNTERS),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH)
-			| IPSET_FLAG(IPSET_OPT_PACKETS)
-			| IPSET_FLAG(IPSET_OPT_BYTES),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_FAMILY,
+				/* Aliases */
+				IPSET_ARG_INET,
+				IPSET_ARG_INET6,
+				IPSET_ARG_HASHSIZE,
+				IPSET_ARG_MAXELEM,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_COUNTERS,
+				IPSET_ARG_NONE,
+			},
+			.need = 0,
+			.full = 0,
+			.help = "",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_PACKETS,
+				IPSET_ARG_BYTES,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
 	},
-
-	.usage = hash_netport_usage4,
+	.usage = "where depending on the INET family\n"
+		 "      IP is a valid IPv4 or IPv6 address (or hostname),\n"
+		 "      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
+		 "      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
+		 "      port range is supported both for IPv4 and IPv6.",
 	.usagefn = ipset_port_usage,
 	.description = "counters support",
 };
 
-/* Parse commandline arguments */
-static const struct ipset_arg hash_netport_create_args5[] = {
-	{ .name = { "family", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,		.print = ipset_print_family,
-	},
-	/* Alias: family inet */
-	{ .name = { "-4", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	/* Alias: family inet6 */
-	{ .name = { "-6", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	{ .name = { "hashsize", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_HASHSIZE,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "maxelem", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_MAXELEM,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "counters", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_COUNTERS,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "comment", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_CREATE_COMMENT,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ },
-};
-
-static const struct ipset_arg hash_netport_add_args5[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "nomatch", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_NOMATCH,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "packets", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_PACKETS,
-	  .parse = ipset_parse_uint64,		.print = ipset_print_number,
-	},
-	{ .name = { "bytes", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_BYTES,
-	  .parse = ipset_parse_uint64,		.print = ipset_print_number,
-	},
-	{ .name = { "comment", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_ADT_COMMENT,
-	  .parse = ipset_parse_comment,		.print = ipset_print_comment,
-	},
-	{ },
-};
-
-static const struct ipset_arg hash_netport_test_args5[] = {
-	{ .name = { "nomatch", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_NOMATCH,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ },
-};
-
-static const char hash_netport_usage5[] =
-"create SETNAME hash:net,port\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE] [counters] [comment]\n"
-"add    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT [timeout VALUE] [nomatch]\n"
-"               [packets VALUE] [bytes VALUE] [comment \"string\"]\n"
-"del    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT\n"
-"test   SETNAME IP[/CIDR],PROTO:PORT\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with IPv4 is supported.\n"
-"      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
-"      port range is supported both for IPv4 and IPv6.\n";
-
+/* comment support */
 static struct ipset_type ipset_hash_netport5 = {
 	.name = "hash:net,port",
 	.alias = { "netporthash", NULL },
@@ -542,118 +390,84 @@ static struct ipset_type ipset_hash_netport5 = {
 			.opt = IPSET_OPT_PORT
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = hash_netport_create_args5,
-		[IPSET_ADD] = hash_netport_add_args5,
-		[IPSET_TEST] = hash_netport_test_args5,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_COUNTERS)
-			| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH)
-			| IPSET_FLAG(IPSET_OPT_PACKETS)
-			| IPSET_FLAG(IPSET_OPT_BYTES)
-			| IPSET_FLAG(IPSET_OPT_ADT_COMMENT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_FAMILY,
+				/* Aliases */
+				IPSET_ARG_INET,
+				IPSET_ARG_INET6,
+				IPSET_ARG_HASHSIZE,
+				IPSET_ARG_MAXELEM,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_COUNTERS,
+				IPSET_ARG_COMMENT,
+				IPSET_ARG_NONE,
+			},
+			.need = 0,
+			.full = 0,
+			.help = "",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_PACKETS,
+				IPSET_ARG_BYTES,
+				IPSET_ARG_ADT_COMMENT,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
 	},
-
-	.usage = hash_netport_usage5,
+	.usage = "where depending on the INET family\n"
+		 "      IP is a valid IPv4 or IPv6 address (or hostname),\n"
+		 "      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
+		 "      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
+		 "      port range is supported both for IPv4 and IPv6.",
 	.usagefn = ipset_port_usage,
 	.description = "comment support",
 };
 
-/* Parse commandline arguments */
-static const struct ipset_arg hash_netport_create_args6[] = {
-	{ .name = { "family", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,		.print = ipset_print_family,
-	},
-	/* Alias: family inet */
-	{ .name = { "-4", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	/* Alias: family inet6 */
-	{ .name = { "-6", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	{ .name = { "hashsize", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_HASHSIZE,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "maxelem", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_MAXELEM,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "counters", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_COUNTERS,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "comment", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_CREATE_COMMENT,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "forceadd", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FORCEADD,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ },
-};
-
-static const char hash_netport_usage6[] =
-"create SETNAME hash:net,port\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE] [counters] [comment]\n"
-"		[forceadd]\n"
-"add    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT [timeout VALUE] [nomatch]\n"
-"               [packets VALUE] [bytes VALUE] [comment \"string\"]\n"
-"del    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT\n"
-"test   SETNAME IP[/CIDR],PROTO:PORT\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with IPv4 is supported.\n"
-"      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
-"      port range is supported both for IPv4 and IPv6.\n";
-
+/* forceadd support */
 static struct ipset_type ipset_hash_netport6 = {
 	.name = "hash:net,port",
 	.alias = { "netporthash", NULL },
@@ -672,160 +486,85 @@ static struct ipset_type ipset_hash_netport6 = {
 			.opt = IPSET_OPT_PORT
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = hash_netport_create_args6,
-		[IPSET_ADD] = hash_netport_add_args5,
-		[IPSET_TEST] = hash_netport_test_args5,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_COUNTERS)
-			| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT)
-			| IPSET_FLAG(IPSET_OPT_FORCEADD),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH)
-			| IPSET_FLAG(IPSET_OPT_PACKETS)
-			| IPSET_FLAG(IPSET_OPT_BYTES)
-			| IPSET_FLAG(IPSET_OPT_ADT_COMMENT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_FAMILY,
+				/* Aliases */
+				IPSET_ARG_INET,
+				IPSET_ARG_INET6,
+				IPSET_ARG_HASHSIZE,
+				IPSET_ARG_MAXELEM,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_COUNTERS,
+				IPSET_ARG_COMMENT,
+				IPSET_ARG_FORCEADD,
+				IPSET_ARG_NONE,
+			},
+			.need = 0,
+			.full = 0,
+			.help = "",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_PACKETS,
+				IPSET_ARG_BYTES,
+				IPSET_ARG_ADT_COMMENT,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
 	},
-
-	.usage = hash_netport_usage6,
+	.usage = "where depending on the INET family\n"
+		 "      IP is a valid IPv4 or IPv6 address (or hostname),\n"
+		 "      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
+		 "      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
+		 "      port range is supported both for IPv4 and IPv6.",
 	.usagefn = ipset_port_usage,
 	.description = "forceadd support",
 };
 
-/* Parse commandline arguments */
-static const struct ipset_arg hash_netport_create_args7[] = {
-	{ .name = { "family", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,		.print = ipset_print_family,
-	},
-	/* Alias: family inet */
-	{ .name = { "-4", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	/* Alias: family inet6 */
-	{ .name = { "-6", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	{ .name = { "hashsize", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_HASHSIZE,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "maxelem", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_MAXELEM,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "counters", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_COUNTERS,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "comment", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_CREATE_COMMENT,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "forceadd", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FORCEADD,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "skbinfo", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_SKBINFO,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ },
-};
-
-static const struct ipset_arg hash_netport_add_args7[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .name = { "nomatch", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_NOMATCH,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	{ .name = { "packets", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_PACKETS,
-	  .parse = ipset_parse_uint64,		.print = ipset_print_number,
-	},
-	{ .name = { "bytes", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_BYTES,
-	  .parse = ipset_parse_uint64,		.print = ipset_print_number,
-	},
-	{ .name = { "comment", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_ADT_COMMENT,
-	  .parse = ipset_parse_comment,		.print = ipset_print_comment,
-	},
-	{ .name = { "skbmark", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,       .opt = IPSET_OPT_SKBMARK,
-	  .parse = ipset_parse_skbmark,         .print = ipset_print_skbmark,
-	},
-	{ .name = { "skbprio", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,       .opt = IPSET_OPT_SKBPRIO,
-	  .parse = ipset_parse_skbprio,         .print = ipset_print_skbprio,
-	},
-	{ .name = { "skbqueue", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,       .opt = IPSET_OPT_SKBQUEUE,
-	  .parse = ipset_parse_uint16,          .print = ipset_print_number,
-	},
-	{ },
-};
-
-static const char hash_netport_usage7[] =
-"create SETNAME hash:net,port\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE] [counters] [comment]\n"
-"		[forceadd] [skbinfo]\n"
-"add    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT [timeout VALUE] [nomatch]\n"
-"               [packets VALUE] [bytes VALUE] [comment \"string\"]\n"
-"		[skbmark VALUE] [skbprio VALUE] [skbqueue VALUE]\n"
-"del    SETNAME IP[/CIDR]|FROM-TO,PROTO:PORT\n"
-"test   SETNAME IP[/CIDR],PROTO:PORT\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with IPv4 is supported.\n"
-"      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
-"      port range is supported both for IPv4 and IPv6.\n";
-
+/* skbinfo support */
 static struct ipset_type ipset_hash_netport7 = {
 	.name = "hash:net,port",
 	.alias = { "netporthash", NULL },
@@ -844,59 +583,84 @@ static struct ipset_type ipset_hash_netport7 = {
 			.opt = IPSET_OPT_PORT
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = hash_netport_create_args7,
-		[IPSET_ADD] = hash_netport_add_args7,
-		[IPSET_TEST] = hash_netport_test_args5,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_PORT),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_COUNTERS)
-			| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT)
-			| IPSET_FLAG(IPSET_OPT_FORCEADD)
-			| IPSET_FLAG(IPSET_OPT_SKBINFO),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH)
-			| IPSET_FLAG(IPSET_OPT_PACKETS)
-			| IPSET_FLAG(IPSET_OPT_BYTES)
-			| IPSET_FLAG(IPSET_OPT_ADT_COMMENT)
-			| IPSET_FLAG(IPSET_OPT_SKBMARK)
-			| IPSET_FLAG(IPSET_OPT_SKBPRIO)
-			| IPSET_FLAG(IPSET_OPT_SKBQUEUE),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PORT_TO)
-			| IPSET_FLAG(IPSET_OPT_PROTO),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_PORT)
-			| IPSET_FLAG(IPSET_OPT_PROTO)
-			| IPSET_FLAG(IPSET_OPT_NOMATCH),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_FAMILY,
+				/* Aliases */
+				IPSET_ARG_INET,
+				IPSET_ARG_INET6,
+				IPSET_ARG_HASHSIZE,
+				IPSET_ARG_MAXELEM,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_COUNTERS,
+				IPSET_ARG_COMMENT,
+				IPSET_ARG_FORCEADD,
+				IPSET_ARG_SKBINFO,
+				IPSET_ARG_NONE,
+			},
+			.need = 0,
+			.full = 0,
+			.help = "",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_PACKETS,
+				IPSET_ARG_BYTES,
+				IPSET_ARG_ADT_COMMENT,
+				IPSET_ARG_SKBMARK,
+				IPSET_ARG_SKBPRIO,
+				IPSET_ARG_SKBQUEUE,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_PORT_TO)
+				| IPSET_FLAG(IPSET_OPT_CIDR)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "IP[/CIDR]|FROM-TO,[PROTO:]PORT",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NOMATCH,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_PROTO)
+				| IPSET_FLAG(IPSET_OPT_PORT)
+				| IPSET_FLAG(IPSET_OPT_CIDR),
+			.help = "IP[/CIDR],[PROTO:]PORT",
+		},
 	},
-
-	.usage = hash_netport_usage7,
+	.usage = "where depending on the INET family\n"
+		 "      IP is a valid IPv4 or IPv6 address (or hostname),\n"
+		 "      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
+		 "      Adding/deleting multiple elements with TCP/SCTP/UDP/UDPLITE\n"
+		 "      port range is supported both for IPv4 and IPv6.",
 	.usagefn = ipset_port_usage,
 	.description = "skbinfo support",
 };