Merge remote-tracking branch 'source/master' into upstreamupstream

8 files changed, 20 insertions, 20 deletions

diff --git a/extensions/libct_proto_dccp.c b/extensions/libct_proto_dccp.c
index 586c4cc..f6258ad 100644
--- a/extensions/libct_proto_dccp.c
+++ b/extensions/libct_proto_dccp.c
@@ -78,7 +78,7 @@ static char dccp_commands_v_options[NUMBER_OF_CMD][DCCP_OPT_MAX] =
 /*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,1,1,1,1,0,1,1,1},
+/*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},
@@ -118,7 +118,7 @@ static int parse_options(char c,
 			 unsigned int *flags)
 {
 	int i;
-	u_int16_t port;
+	uint16_t port;
 
 	switch(c) {
 	case 1:
diff --git a/extensions/libct_proto_gre.c b/extensions/libct_proto_gre.c
index 0274a37..2dc63d1 100644
--- a/extensions/libct_proto_gre.c
+++ b/extensions/libct_proto_gre.c
@@ -91,7 +91,7 @@ static int parse_options(char c,
 			 unsigned int *flags)
 {
 	switch(c) {
-	u_int16_t port;
+	uint16_t port;
 	case '1':
 		port = htons(strtoul(optarg, NULL, 0));
 		nfct_set_attr_u16(ct, ATTR_ORIG_PORT_SRC, port);
diff --git a/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c
index 3a346ed..2ce1c65 100644
--- a/extensions/libct_proto_icmp.c
+++ b/extensions/libct_proto_icmp.c
@@ -43,8 +43,8 @@ static char icmp_commands_v_options[NUMBER_OF_CMD][ICMP_NUMBER_OF_OPT] =
 		/* 1 2 3 */
 /*CT_LIST*/	  {2,2,2},
 /*CT_CREATE*/	  {1,1,2},
-/*CT_UPDATE*/	  {1,1,2},
-/*CT_DELETE*/	  {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},
@@ -72,8 +72,8 @@ static int parse(char c,
 		 unsigned int *flags)
 {
 	switch(c) {
-		u_int8_t tmp;
-		u_int16_t id;
+		uint8_t tmp;
+		uint16_t id;
 		case '1':
 			tmp = atoi(optarg);
 			nfct_set_attr_u8(ct, ATTR_ICMP_TYPE, tmp);
diff --git a/extensions/libct_proto_icmpv6.c b/extensions/libct_proto_icmpv6.c
index 070eb7f..18dd3e5 100644
--- a/extensions/libct_proto_icmpv6.c
+++ b/extensions/libct_proto_icmpv6.c
@@ -46,8 +46,8 @@ static char icmpv6_commands_v_options[NUMBER_OF_CMD][ICMPV6_NUMBER_OF_OPT] =
 		/* 1 2 3 */
 /*CT_LIST*/	  {2,2,2},
 /*CT_CREATE*/	  {1,1,2},
-/*CT_UPDATE*/	  {1,1,2},
-/*CT_DELETE*/	  {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},
@@ -75,8 +75,8 @@ static int parse(char c,
 		 unsigned int *flags)
 {
 	switch(c) {
-		u_int8_t tmp;
-		u_int16_t id;
+		uint8_t tmp;
+		uint16_t id;
 		case '1':
 			tmp = atoi(optarg);
 			nfct_set_attr_u8(ct, ATTR_ICMP_TYPE, tmp);
diff --git a/extensions/libct_proto_sctp.c b/extensions/libct_proto_sctp.c
index f4c94df..04828bf 100644
--- a/extensions/libct_proto_sctp.c
+++ b/extensions/libct_proto_sctp.c
@@ -81,7 +81,7 @@ static char sctp_commands_v_options[NUMBER_OF_CMD][SCTP_OPT_MAX] =
 /*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,1,1,1,1,0,1,1,1,1},
+/*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},
@@ -120,8 +120,8 @@ parse_options(char c, struct nf_conntrack *ct,
 	      unsigned int *flags)
 {
 	int i;
-	u_int16_t port;
-	u_int32_t vtag;
+	uint16_t port;
+	uint32_t vtag;
 
 	switch(c) {
 	case 1:
diff --git a/extensions/libct_proto_tcp.c b/extensions/libct_proto_tcp.c
index 0b43bf5..8a37a55 100644
--- a/extensions/libct_proto_tcp.c
+++ b/extensions/libct_proto_tcp.c
@@ -65,7 +65,7 @@ static char tcp_commands_v_options[NUMBER_OF_CMD][TCP_NUMBER_OF_OPT] =
 /*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,1,1,1,1,0,1,1},
+/*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},
@@ -106,7 +106,7 @@ static int parse_options(char c,
 			 unsigned int *flags)
 {
 	int i;
-	u_int16_t port;
+	uint16_t port;
 
 	switch(c) {
 	case '1':
diff --git a/extensions/libct_proto_udp.c b/extensions/libct_proto_udp.c
index d7c4da1..e30637c 100644
--- a/extensions/libct_proto_udp.c
+++ b/extensions/libct_proto_udp.c
@@ -73,7 +73,7 @@ static char udp_commands_v_options[NUMBER_OF_CMD][UDP_NUMBER_OF_OPT] =
 /*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_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},
@@ -87,7 +87,7 @@ static int parse_options(char c,
 			 unsigned int *flags)
 {
 	switch(c) {
-		u_int16_t port;
+		uint16_t port;
 		case '1':
 			port = htons(atoi(optarg));
 			nfct_set_attr_u16(ct, ATTR_ORIG_PORT_SRC, port);
diff --git a/extensions/libct_proto_udplite.c b/extensions/libct_proto_udplite.c
index bffd5fe..f46cef0 100644
--- a/extensions/libct_proto_udplite.c
+++ b/extensions/libct_proto_udplite.c
@@ -81,7 +81,7 @@ static char udplite_commands_v_options[NUMBER_OF_CMD][UDP_OPT_MAX] =
 /*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_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},
@@ -95,7 +95,7 @@ static int parse_options(char c,
 			 unsigned int *flags)
 {
 	switch(c) {
-	u_int16_t port;
+	uint16_t port;
 	case '1':
 		port = htons(atoi(optarg));
 		nfct_set_attr_u16(ct, ATTR_ORIG_PORT_SRC, port);