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, 213 insertions, 362 deletions

diff --git a/lib/ipset_bitmap_ipmac.c b/lib/ipset_bitmap_ipmac.c
index d193246..e26cc69 100644
--- a/lib/ipset_bitmap_ipmac.c
+++ b/lib/ipset_bitmap_ipmac.c
@@ -9,50 +9,7 @@
 #include <libipset/print.h>			/* printing functions */
 #include <libipset/types.h>			/* prototypes */
 
-/* Parse commandline arguments */
-static const struct ipset_arg bitmap_ipmac_create_args0[] = {
-	{ .name = { "range", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_netrange,	.print = ipset_print_ip,
-	},
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	/* Backward compatibility */
-	{ .name = { "from", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "to", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP_TO,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "network", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_net,
-	},
-	{ },
-};
-
-static const struct ipset_arg bitmap_ipmac_add_args0[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ },
-};
-
-static const char bitmap_ipmac_usage0[] =
-"create SETNAME bitmap:ip,mac range IP/CIDR|FROM-TO\n"
-"               [matchunset] [timeout VALUE]\n"
-"add    SETNAME IP[,MAC] [timeout VALUE]\n"
-"del    SETNAME IP[,MAC]\n"
-"test   SETNAME IP[,MAC]\n\n"
-"where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
-"      CIDR is a valid IPv4 CIDR prefix,\n"
-"      MAC is a valid MAC address.\n";
-
+/* Initial release */
 static struct ipset_type ipset_bitmap_ipmac0 = {
 	.name = "bitmap:ip,mac",
 	.alias = { "macipmap", NULL },
@@ -72,91 +29,59 @@ static struct ipset_type ipset_bitmap_ipmac0 = {
 			.opt = IPSET_OPT_ETHER
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = bitmap_ipmac_create_args0,
-		[IPSET_ADD] = bitmap_ipmac_add_args0,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_IPRANGE,
+				IPSET_ARG_TIMEOUT,
+				/* Backward compatibility */
+				IPSET_ARG_FROM_IP,
+				IPSET_ARG_TO_IP,
+				IPSET_ARG_NETWORK,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "range IP/CIDR|FROM-TO",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
 	},
-
-	.usage = bitmap_ipmac_usage0,
+	.usage = "where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
+		 "      CIDR is a valid IPv4 CIDR prefix.\n"
+		 "      MAC is a valid MAC address.",
 	.description = "Initial revision",
 };
 
-/* Parse commandline arguments */
-static const struct ipset_arg bitmap_ipmac_create_args1[] = {
-	{ .name = { "range", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_netrange,	.print = ipset_print_ip,
-	},
-	{ .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,
-	},
-	/* Backward compatibility */
-	{ .name = { "from", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "to", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP_TO,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "network", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_net,
-	},
-	{ },
-};
-
-static const struct ipset_arg bitmap_ipmac_add_args1[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .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 char bitmap_ipmac_usage1[] =
-"create SETNAME bitmap:ip,mac range IP/CIDR|FROM-TO\n"
-"               [matchunset] [timeout VALUE] [counters]\n"
-"add    SETNAME IP[,MAC] [timeout VALUE]\n"
-"               [packets VALUE] [bytes VALUE]\n"
-"del    SETNAME IP[,MAC]\n"
-"test   SETNAME IP[,MAC]\n\n"
-"where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
-"      CIDR is a valid IPv4 CIDR prefix,\n"
-"      MAC is a valid MAC address.\n";
-
+/* Counters support */
 static struct ipset_type ipset_bitmap_ipmac1 = {
 	.name = "bitmap:ip,mac",
 	.alias = { "macipmap", NULL },
@@ -176,102 +101,62 @@ static struct ipset_type ipset_bitmap_ipmac1 = {
 			.opt = IPSET_OPT_ETHER
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = bitmap_ipmac_create_args1,
-		[IPSET_ADD] = bitmap_ipmac_add_args1,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_COUNTERS),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_PACKETS)
-			| IPSET_FLAG(IPSET_OPT_BYTES),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_IPRANGE,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_COUNTERS,
+				/* Backward compatibility */
+				IPSET_ARG_FROM_IP,
+				IPSET_ARG_TO_IP,
+				IPSET_ARG_NETWORK,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "range IP/CIDR|FROM-TO",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_PACKETS,
+				IPSET_ARG_BYTES,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
 	},
-
-	.usage = bitmap_ipmac_usage1,
+	.usage = "where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
+		 "      CIDR is a valid IPv4 CIDR prefix.\n"
+		 "      MAC is a valid MAC address.",
 	.description = "counters support",
 };
 
-/* Parse commandline arguments */
-static const struct ipset_arg bitmap_ipmac_create_args2[] = {
-	{ .name = { "range", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_netrange,	.print = ipset_print_ip,
-	},
-	{ .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,
-	},
-	/* Backward compatibility */
-	{ .name = { "from", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "to", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP_TO,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "network", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_net,
-	},
-	{ },
-};
-
-static const struct ipset_arg bitmap_ipmac_add_args2[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .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 char bitmap_ipmac_usage2[] =
-"create SETNAME bitmap:ip,mac range IP/CIDR|FROM-TO\n"
-"               [matchunset] [timeout VALUE] [counters] [comment]\n"
-"add    SETNAME IP[,MAC] [timeout VALUE]\n"
-"               [packets VALUE] [bytes VALUE] [comment \"string\"]\n"
-"del    SETNAME IP[,MAC]\n"
-"test   SETNAME IP[,MAC]\n\n"
-"where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
-"      CIDR is a valid IPv4 CIDR prefix,\n"
-"      MAC is a valid MAC address.\n";
-
+/* Comment support */
 static struct ipset_type ipset_bitmap_ipmac2 = {
 	.name = "bitmap:ip,mac",
 	.alias = { "macipmap", NULL },
@@ -291,122 +176,64 @@ static struct ipset_type ipset_bitmap_ipmac2 = {
 			.opt = IPSET_OPT_ETHER
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = bitmap_ipmac_create_args2,
-		[IPSET_ADD] = bitmap_ipmac_add_args2,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| 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_ETHER)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| 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_ETHER),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_IPRANGE,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_COUNTERS,
+				IPSET_ARG_COMMENT,
+				/* Backward compatibility */
+				IPSET_ARG_FROM_IP,
+				IPSET_ARG_TO_IP,
+				IPSET_ARG_NETWORK,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "range IP/CIDR|FROM-TO",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_PACKETS,
+				IPSET_ARG_BYTES,
+				IPSET_ARG_ADT_COMMENT,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
 	},
-
-	.usage = bitmap_ipmac_usage2,
+	.usage = "where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
+		 "      CIDR is a valid IPv4 CIDR prefix.\n"
+		 "      MAC is a valid MAC address.",
 	.description = "comment support",
 };
 
-/* Parse commandline arguments */
-static const struct ipset_arg bitmap_ipmac_create_args3[] = {
-	{ .name = { "range", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_netrange,	.print = ipset_print_ip,
-	},
-	{ .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 = { "skbinfo", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_SKBINFO,
-	  .parse = ipset_parse_flag,		.print = ipset_print_flag,
-	},
-	/* Backward compatibility */
-	{ .name = { "from", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "to", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP_TO,
-	  .parse = ipset_parse_single_ip,
-	},
-	{ .name = { "network", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_IP,
-	  .parse = ipset_parse_net,
-	},
-	{ },
-};
-
-static const struct ipset_arg bitmap_ipmac_add_args3[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_timeout,		.print = ipset_print_number,
-	},
-	{ .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 bitmap_ipmac_usage3[] =
-"create SETNAME bitmap:ip,mac range IP/CIDR|FROM-TO\n"
-"               [matchunset] [timeout VALUE] [counters] [comment]\n"
-"		[skbinfo]\n"
-"add    SETNAME IP[,MAC] [timeout VALUE]\n"
-"               [packets VALUE] [bytes VALUE] [comment \"string\"]\n"
-"		[skbmark VALUE] [skbprio VALUE] [skbqueue VALUE]\n"
-"del    SETNAME IP[,MAC]\n"
-"test   SETNAME IP[,MAC]\n\n"
-"where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
-"      CIDR is a valid IPv4 CIDR prefix,\n"
-"      MAC is a valid MAC address.\n";
-
+/* skbinfo support */
 static struct ipset_type ipset_bitmap_ipmac3 = {
 	.name = "bitmap:ip,mac",
 	.alias = { "macipmap", NULL },
@@ -426,40 +253,64 @@ static struct ipset_type ipset_bitmap_ipmac3 = {
 			.opt = IPSET_OPT_ETHER
 		},
 	},
-	.args = {
-		[IPSET_CREATE] = bitmap_ipmac_create_args3,
-		[IPSET_ADD] = bitmap_ipmac_add_args3,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| IPSET_FLAG(IPSET_OPT_COUNTERS)
-			| IPSET_FLAG(IPSET_OPT_CREATE_COMMENT)
-			| IPSET_FLAG(IPSET_OPT_SKBINFO),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT)
-			| 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_ETHER),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_ETHER),
+	.cmd = {
+		[IPSET_CREATE] = {
+			.args = {
+				IPSET_ARG_IPRANGE,
+				IPSET_ARG_TIMEOUT,
+				IPSET_ARG_COUNTERS,
+				IPSET_ARG_COMMENT,
+				IPSET_ARG_SKBINFO,
+				/* Backward compatibility */
+				IPSET_ARG_FROM_IP,
+				IPSET_ARG_TO_IP,
+				IPSET_ARG_NETWORK,
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_IP_TO),
+			.help = "range IP/CIDR|FROM-TO",
+		},
+		[IPSET_ADD] = {
+			.args = {
+				IPSET_ARG_TIMEOUT,
+				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),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_DEL] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
+		[IPSET_TEST] = {
+			.args = {
+				IPSET_ARG_NONE,
+			},
+			.need = IPSET_FLAG(IPSET_OPT_IP),
+			.full = IPSET_FLAG(IPSET_OPT_IP)
+				| IPSET_FLAG(IPSET_OPT_ETHER),
+			.help = "IP[,MAC]",
+		},
 	},
-
-	.usage = bitmap_ipmac_usage3,
+	.usage = "where IP, FROM and TO are IPv4 addresses (or hostnames),\n"
+		 "      CIDR is a valid IPv4 CIDR prefix.\n"
+		 "      MAC is a valid MAC address.",
 	.description = "skbinfo support",
 };