conntrack: use C99 initializer syntax for option map

The old way of the commands_v_options initialization made it more
difficult and error-prone to add a map for a new command, because one
would have to calculate a proper "index" for the initializer and fill
the gap with zeros.

As a preparation step for adding the new "-A" command support,
switch to C99 initializer syntax for commands_v_options.

Signed-off-by: Mikhail Sennikovsky <mikhail.sennikovskii@ionos.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

8 files changed, 128 insertions, 128 deletions

diff --git a/extensions/libct_proto_dccp.c b/extensions/libct_proto_dccp.c
index e9da474..6103117 100644
--- a/extensions/libct_proto_dccp.c
+++ b/extensions/libct_proto_dccp.c
@@ -67,22 +67,22 @@ static const char *dccp_optflags[DCCP_OPT_MAX] = {
 static char dccp_commands_v_options[NUMBER_OF_CMD][DCCP_OPT_MAX] =
 /* Well, it's better than "Re: Sevilla vs Betis" */
 {
-	    	/* 1 2 3 4 5 6 7 8 9 10*/
-/*CT_LIST*/   	  {2,2,2,2,0,0,2,0,0,0},
-/*CT_CREATE*/	  {3,3,3,3,0,0,1,0,0,1},
-/*CT_UPDATE*/	  {2,2,2,2,0,0,2,0,0,0},
-/*CT_DELETE*/	  {2,2,2,2,0,0,2,0,0,0},
-/*CT_GET*/	  {3,3,3,3,0,0,2,0,0,0},
-/*CT_FLUSH*/	  {0,0,0,0,0,0,0,0,0,0},
-/*CT_EVENT*/	  {2,2,2,2,0,0,2,0,0,0},
-/*CT_VERSION*/	  {0,0,0,0,0,0,0,0,0,0},
-/*CT_HELP*/	  {0,0,0,0,0,0,0,0,0,0},
-/*EXP_LIST*/	  {0,0,0,0,0,0,0,0,0,0},
-/*EXP_CREATE*/	  {1,1,0,0,1,1,0,1,1,1},
-/*EXP_DELETE*/	  {1,1,1,1,0,0,0,0,0,0},
-/*EXP_GET*/	  {1,1,1,1,0,0,0,0,0,0},
-/*EXP_FLUSH*/	  {0,0,0,0,0,0,0,0,0,0},
-/*EXP_EVENT*/	  {0,0,0,0,0,0,0,0,0,0},
+				/* 1 2 3 4 5 6 7 8 9 10 */
+	[CT_LIST_BIT]		= {2,2,2,2,0,0,2,0,0,0},
+	[CT_CREATE_BIT]		= {3,3,3,3,0,0,1,0,0,1},
+	[CT_UPDATE_BIT]		= {2,2,2,2,0,0,2,0,0,0},
+	[CT_DELETE_BIT]		= {2,2,2,2,0,0,2,0,0,0},
+	[CT_GET_BIT]		= {3,3,3,3,0,0,2,0,0,0},
+	[CT_FLUSH_BIT]		= {0,0,0,0,0,0,0,0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2,2,0,0,2,0,0,0},
+	[CT_VERSION_BIT]	= {0,0,0,0,0,0,0,0,0,0},
+	[CT_HELP_BIT]		= {0,0,0,0,0,0,0,0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0,0,0,0,0,0,0,0},
+	[EXP_CREATE_BIT]	= {1,1,0,0,1,1,0,1,1,1},
+	[EXP_DELETE_BIT]	= {1,1,1,1,0,0,0,0,0,0},
+	[EXP_GET_BIT]		= {1,1,1,1,0,0,0,0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0,0,0,0,0,0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0,0,0,0,0,0,0,0},
 };
 
 static const char *dccp_states[DCCP_CONNTRACK_MAX] = {
diff --git a/extensions/libct_proto_gre.c b/extensions/libct_proto_gre.c
index a36d111..c619db3 100644
--- a/extensions/libct_proto_gre.c
+++ b/extensions/libct_proto_gre.c
@@ -66,22 +66,22 @@ static void help(void)
 
 static char gre_commands_v_options[NUMBER_OF_CMD][GRE_OPT_MAX] =
 {
-		/* 1 2 3 4 5 6 7 8 */
-/*CT_LIST*/	  {2,2,2,2,0,0,0,0},
-/*CT_CREATE*/	  {3,3,3,3,0,0,0,0},
-/*CT_UPDATE*/	  {2,2,2,2,0,0,0,0},
-/*CT_DELETE*/	  {2,2,2,2,0,0,0,0},
-/*CT_GET*/	  {3,3,3,3,0,0,0,0},
-/*CT_FLUSH*/	  {0,0,0,0,0,0,0,0},
-/*CT_EVENT*/	  {2,2,2,2,0,0,0,0},
-/*CT_VERSION*/	  {0,0,0,0,0,0,0,0},
-/*CT_HELP*/	  {0,0,0,0,0,0,0,0},
-/*EXP_LIST*/	  {0,0,0,0,0,0,0,0},
-/*EXP_CREATE*/	  {1,1,1,1,1,1,1,1},
-/*EXP_DELETE*/	  {1,1,1,1,0,0,0,0},
-/*EXP_GET*/	  {1,1,1,1,0,0,0,0},
-/*EXP_FLUSH*/	  {0,0,0,0,0,0,0,0},
-/*EXP_EVENT*/	  {0,0,0,0,0,0,0,0},
+				/* 1 2 3 4 5 6 7 8 */
+	[CT_LIST_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_CREATE_BIT]		= {3,3,3,3,0,0,0,0},
+	[CT_UPDATE_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_DELETE_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_GET_BIT]		= {3,3,3,3,0,0,0,0},
+	[CT_FLUSH_BIT]		= {0,0,0,0,0,0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_VERSION_BIT]	= {0,0,0,0,0,0,0,0},
+	[CT_HELP_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_CREATE_BIT]	= {1,1,1,1,1,1,1,1},
+	[EXP_DELETE_BIT]	= {1,1,1,1,0,0,0,0},
+	[EXP_GET_BIT]		= {1,1,1,1,0,0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0,0,0,0,0,0},
 };
 
 static int parse_options(char c,
diff --git a/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c
index ec52c39..304018f 100644
--- a/extensions/libct_proto_icmp.c
+++ b/extensions/libct_proto_icmp.c
@@ -40,22 +40,22 @@ static const char *icmp_optflags[ICMP_NUMBER_OF_OPT] = {
 static char icmp_commands_v_options[NUMBER_OF_CMD][ICMP_NUMBER_OF_OPT] =
 /* Well, it's better than "Re: Maradona vs Pele" */
 {
-		/* 1 2 3 */
-/*CT_LIST*/	  {2,2,2},
-/*CT_CREATE*/	  {1,1,2},
-/*CT_UPDATE*/	  {2,2,2},
-/*CT_DELETE*/	  {2,2,2},
-/*CT_GET*/	  {1,1,2},
-/*CT_FLUSH*/	  {0,0,0},
-/*CT_EVENT*/	  {2,2,2},
-/*CT_VERSION*/	  {0,0,0},
-/*CT_HELP*/	  {0,0,0},
-/*EXP_LIST*/	  {0,0,0},
-/*EXP_CREATE*/	  {0,0,0},
-/*EXP_DELETE*/	  {0,0,0},
-/*EXP_GET*/	  {0,0,0},
-/*EXP_FLUSH*/	  {0,0,0},
-/*EXP_EVENT*/	  {0,0,0},
+				/* 1 2 3 */
+	[CT_LIST_BIT]		= {2,2,2},
+	[CT_CREATE_BIT]		= {1,1,2},
+	[CT_UPDATE_BIT]		= {2,2,2},
+	[CT_DELETE_BIT]		= {2,2,2},
+	[CT_GET_BIT]		= {1,1,2},
+	[CT_FLUSH_BIT]		= {0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2},
+	[CT_VERSION_BIT]	= {0,0,0},
+	[CT_HELP_BIT]		= {0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0},
+	[EXP_CREATE_BIT]	= {0,0,0},
+	[EXP_DELETE_BIT]	= {0,0,0},
+	[EXP_GET_BIT]		= {0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0},
 };
 
 static void help(void)
diff --git a/extensions/libct_proto_icmpv6.c b/extensions/libct_proto_icmpv6.c
index fe16a1d..114bcac 100644
--- a/extensions/libct_proto_icmpv6.c
+++ b/extensions/libct_proto_icmpv6.c
@@ -43,22 +43,22 @@ static const char *icmpv6_optflags[ICMPV6_NUMBER_OF_OPT] = {
 static char icmpv6_commands_v_options[NUMBER_OF_CMD][ICMPV6_NUMBER_OF_OPT] =
 /* Well, it's better than "Re: Maradona vs Pele" */
 {
-		/* 1 2 3 */
-/*CT_LIST*/	  {2,2,2},
-/*CT_CREATE*/	  {1,1,2},
-/*CT_UPDATE*/	  {2,2,2},
-/*CT_DELETE*/	  {2,2,2},
-/*CT_GET*/	  {1,1,2},
-/*CT_FLUSH*/	  {0,0,0},
-/*CT_EVENT*/	  {2,2,2},
-/*CT_VERSION*/	  {0,0,0},
-/*CT_HELP*/	  {0,0,0},
-/*EXP_LIST*/	  {0,0,0},
-/*EXP_CREATE*/	  {0,0,0},
-/*EXP_DELETE*/	  {0,0,0},
-/*EXP_GET*/	  {0,0,0},
-/*EXP_FLUSH*/	  {0,0,0},
-/*EXP_EVENT*/	  {0,0,0},
+				/* 1 2 3 */
+	[CT_LIST_BIT]		= {2,2,2},
+	[CT_CREATE_BIT]		= {1,1,2},
+	[CT_UPDATE_BIT]		= {2,2,2},
+	[CT_DELETE_BIT]		= {2,2,2},
+	[CT_GET_BIT]		= {1,1,2},
+	[CT_FLUSH_BIT]		= {0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2},
+	[CT_VERSION_BIT]	= {0,0,0},
+	[CT_HELP_BIT]		= {0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0},
+	[EXP_CREATE_BIT]	= {0,0,0},
+	[EXP_DELETE_BIT]	= {0,0,0},
+	[EXP_GET_BIT]		= {0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0},
 };
 
 static void help(void)
diff --git a/extensions/libct_proto_sctp.c b/extensions/libct_proto_sctp.c
index a58ccde..723a2cd 100644
--- a/extensions/libct_proto_sctp.c
+++ b/extensions/libct_proto_sctp.c
@@ -70,22 +70,22 @@ static const char *sctp_optflags[SCTP_OPT_MAX] = {
 static char sctp_commands_v_options[NUMBER_OF_CMD][SCTP_OPT_MAX] =
 /* Well, it's better than "Re: Sevilla vs Betis" */
 {
-	    	/* 1 2 3 4 5 6 7 8 9 10 11*/
-/*CT_LIST*/   	  {2,2,2,2,0,0,2,0,0,0,0},
-/*CT_CREATE*/	  {3,3,3,3,0,0,1,0,0,1,1},
-/*CT_UPDATE*/	  {2,2,2,2,0,0,2,0,0,2,2},
-/*CT_DELETE*/	  {2,2,2,2,0,0,2,0,0,0,0},
-/*CT_GET*/	  {3,3,3,3,0,0,2,0,0,2,2},
-/*CT_FLUSH*/	  {0,0,0,0,0,0,0,0,0,0,0},
-/*CT_EVENT*/	  {2,2,2,2,0,0,2,0,0,0,0},
-/*CT_VERSION*/	  {0,0,0,0,0,0,0,0,0,0,0},
-/*CT_HELP*/	  {0,0,0,0,0,0,0,0,0,0,0},
-/*EXP_LIST*/	  {0,0,0,0,0,0,0,0,0,0,0},
-/*EXP_CREATE*/	  {1,1,0,0,1,1,0,1,1,1,1},
-/*EXP_DELETE*/	  {1,1,1,1,0,0,0,0,0,0,0},
-/*EXP_GET*/	  {1,1,1,1,0,0,0,0,0,0,0},
-/*EXP_FLUSH*/	  {0,0,0,0,0,0,0,0,0,0,0},
-/*EXP_EVENT*/	  {0,0,0,0,0,0,0,0,0,0,0},
+				/* 1 2 3 4 5 6 7 8 9 10 11 */
+	[CT_LIST_BIT]		= {2,2,2,2,0,0,2,0,0,0,0},
+	[CT_CREATE_BIT]		= {3,3,3,3,0,0,1,0,0,1,1},
+	[CT_UPDATE_BIT]		= {2,2,2,2,0,0,2,0,0,2,2},
+	[CT_DELETE_BIT]		= {2,2,2,2,0,0,2,0,0,0,0},
+	[CT_GET_BIT]		= {3,3,3,3,0,0,2,0,0,2,2},
+	[CT_FLUSH_BIT]		= {0,0,0,0,0,0,0,0,0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2,2,0,0,2,0,0,0,0},
+	[CT_VERSION_BIT]	= {0,0,0,0,0,0,0,0,0,0,0},
+	[CT_HELP_BIT]		= {0,0,0,0,0,0,0,0,0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0,0,0,0,0,0,0,0,0},
+	[EXP_CREATE_BIT]	= {1,1,0,0,1,1,0,1,1,1,1},
+	[EXP_DELETE_BIT]	= {1,1,1,1,0,0,0,0,0,0,0},
+	[EXP_GET_BIT]		= {1,1,1,1,0,0,0,0,0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0,0,0,0,0,0,0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0,0,0,0,0,0,0,0,0},
 };
 
 static const char *sctp_states[SCTP_CONNTRACK_MAX] = {
diff --git a/extensions/libct_proto_tcp.c b/extensions/libct_proto_tcp.c
index 3da0dc6..7e4500c 100644
--- a/extensions/libct_proto_tcp.c
+++ b/extensions/libct_proto_tcp.c
@@ -54,22 +54,22 @@ static const char *tcp_optflags[TCP_NUMBER_OF_OPT] = {
 static char tcp_commands_v_options[NUMBER_OF_CMD][TCP_NUMBER_OF_OPT] =
 /* Well, it's better than "Re: Sevilla vs Betis" */
 {
-	    	/* 1 2 3 4 5 6 7 8 9 */
-/*CT_LIST*/   	  {2,2,2,2,0,0,2,0,0},
-/*CT_CREATE*/	  {3,3,3,3,0,0,1,0,0},
-/*CT_UPDATE*/	  {2,2,2,2,0,0,2,0,0},
-/*CT_DELETE*/	  {2,2,2,2,0,0,2,0,0},
-/*CT_GET*/	  {3,3,3,3,0,0,2,0,0},
-/*CT_FLUSH*/	  {0,0,0,0,0,0,0,0,0},
-/*CT_EVENT*/	  {2,2,2,2,0,0,2,0,0},
-/*CT_VERSION*/	  {0,0,0,0,0,0,0,0,0},
-/*CT_HELP*/	  {0,0,0,0,0,0,0,0,0},
-/*EXP_LIST*/	  {0,0,0,0,0,0,0,0,0},
-/*EXP_CREATE*/	  {1,1,0,0,1,1,0,1,1},
-/*EXP_DELETE*/	  {1,1,1,1,0,0,0,0,0},
-/*EXP_GET*/	  {1,1,1,1,0,0,0,0,0},
-/*EXP_FLUSH*/	  {0,0,0,0,0,0,0,0,0},
-/*EXP_EVENT*/	  {0,0,0,0,0,0,0,0,0},
+				/* 1 2 3 4 5 6 7 8 9 */
+	[CT_LIST_BIT]		= {2,2,2,2,0,0,2,0,0},
+	[CT_CREATE_BIT]		= {3,3,3,3,0,0,1,0,0},
+	[CT_UPDATE_BIT]		= {2,2,2,2,0,0,2,0,0},
+	[CT_DELETE_BIT]		= {2,2,2,2,0,0,2,0,0},
+	[CT_GET_BIT]		= {3,3,3,3,0,0,2,0,0},
+	[CT_FLUSH_BIT]		= {0,0,0,0,0,0,0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2,2,0,0,2,0,0},
+	[CT_VERSION_BIT]	= {0,0,0,0,0,0,0,0,0},
+	[CT_HELP_BIT]		= {0,0,0,0,0,0,0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0,0,0,0,0,0,0},
+	[EXP_CREATE_BIT]	= {1,1,0,0,1,1,0,1,1},
+	[EXP_DELETE_BIT]	= {1,1,1,1,0,0,0,0,0},
+	[EXP_GET_BIT]		= {1,1,1,1,0,0,0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0,0,0,0,0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0,0,0,0,0,0,0},
 };
 
 static const char *tcp_states[TCP_CONNTRACK_MAX] = {
diff --git a/extensions/libct_proto_udp.c b/extensions/libct_proto_udp.c
index fe43548..fce489d 100644
--- a/extensions/libct_proto_udp.c
+++ b/extensions/libct_proto_udp.c
@@ -62,22 +62,22 @@ static void help(void)
 static char udp_commands_v_options[NUMBER_OF_CMD][UDP_NUMBER_OF_OPT] =
 /* Well, it's better than "Re: Galeano vs Vargas Llosa" */
 {
-		/* 1 2 3 4 5 6 7 8 */
-/*CT_LIST*/	  {2,2,2,2,0,0,0,0},
-/*CT_CREATE*/     {3,3,3,3,0,0,0,0},
-/*CT_UPDATE*/     {2,2,2,2,0,0,0,0},
-/*CT_DELETE*/     {2,2,2,2,0,0,0,0},
-/*CT_GET*/        {3,3,3,3,0,0,0,0},
-/*CT_FLUSH*/      {0,0,0,0,0,0,0,0},
-/*CT_EVENT*/      {2,2,2,2,0,0,0,0},
-/*CT_VERSION*/    {0,0,0,0,0,0,0,0},
-/*CT_HELP*/       {0,0,0,0,0,0,0,0},
-/*EXP_LIST*/      {0,0,0,0,0,0,0,0},
-/*EXP_CREATE*/    {1,1,0,0,1,1,1,1},
-/*EXP_DELETE*/    {1,1,1,1,0,0,0,0},
-/*EXP_GET*/       {1,1,1,1,0,0,0,0},
-/*EXP_FLUSH*/     {0,0,0,0,0,0,0,0},
-/*EXP_EVENT*/     {0,0,0,0,0,0,0,0},
+				/* 1 2 3 4 5 6 7 8 */
+	[CT_LIST_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_CREATE_BIT]		= {3,3,3,3,0,0,0,0},
+	[CT_UPDATE_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_DELETE_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_GET_BIT]		= {3,3,3,3,0,0,0,0},
+	[CT_FLUSH_BIT]		= {0,0,0,0,0,0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_VERSION_BIT]	= {0,0,0,0,0,0,0,0},
+	[CT_HELP_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_CREATE_BIT]	= {1,1,0,0,1,1,1,1},
+	[EXP_DELETE_BIT]	= {1,1,1,1,0,0,0,0},
+	[EXP_GET_BIT]		= {1,1,1,1,0,0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0,0,0,0,0,0},
 };
 
 static int parse_options(char c,
diff --git a/extensions/libct_proto_udplite.c b/extensions/libct_proto_udplite.c
index 2bece38..8d42d1a 100644
--- a/extensions/libct_proto_udplite.c
+++ b/extensions/libct_proto_udplite.c
@@ -70,22 +70,22 @@ static void help(void)
 
 static char udplite_commands_v_options[NUMBER_OF_CMD][UDP_OPT_MAX] =
 {
-		/* 1 2 3 4 5 6 7 8 */
-/*CT_LIST*/	  {2,2,2,2,0,0,0,0},
-/*CT_CREATE*/	  {3,3,3,3,0,0,0,0},
-/*CT_UPDATE*/	  {2,2,2,2,0,0,0,0},
-/*CT_DELETE*/	  {2,2,2,2,0,0,0,0},
-/*CT_GET*/	  {3,3,3,3,0,0,0,0},
-/*CT_FLUSH*/	  {0,0,0,0,0,0,0,0},
-/*CT_EVENT*/	  {2,2,2,2,0,0,0,0},
-/*CT_VERSION*/	  {0,0,0,0,0,0,0,0},
-/*CT_HELP*/	  {0,0,0,0,0,0,0,0},
-/*EXP_LIST*/	  {0,0,0,0,0,0,0,0},
-/*EXP_CREATE*/	  {1,1,0,0,1,1,1,1},
-/*EXP_DELETE*/	  {1,1,1,1,0,0,0,0},
-/*EXP_GET*/	  {1,1,1,1,0,0,0,0},
-/*EXP_FLUSH*/	  {0,0,0,0,0,0,0,0},
-/*EXP_EVENT*/	  {0,0,0,0,0,0,0,0},
+				/* 1 2 3 4 5 6 7 8 */
+	[CT_LIST_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_CREATE_BIT]		= {3,3,3,3,0,0,0,0},
+	[CT_UPDATE_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_DELETE_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_GET_BIT]		= {3,3,3,3,0,0,0,0},
+	[CT_FLUSH_BIT]		= {0,0,0,0,0,0,0,0},
+	[CT_EVENT_BIT]		= {2,2,2,2,0,0,0,0},
+	[CT_VERSION_BIT]	= {0,0,0,0,0,0,0,0},
+	[CT_HELP_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_LIST_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_CREATE_BIT]	= {1,1,0,0,1,1,1,1},
+	[EXP_DELETE_BIT]	= {1,1,1,1,0,0,0,0},
+	[EXP_GET_BIT]		= {1,1,1,1,0,0,0,0},
+	[EXP_FLUSH_BIT]		= {0,0,0,0,0,0,0,0},
+	[EXP_EVENT_BIT]		= {0,0,0,0,0,0,0,0},
 };
 
 static int parse_options(char c,