[nft PATCH] datatype: fix name of icmp* code

[nft PATCH] datatype: fix name of icmp* code

[Eric Leblond]

The name of datatypes can be used in set definition so they should
follow the same logic (and maybe not contain space to avoid problem
with parsing).

This patch adds an underscore to the name of the icmp* code
datatype.

Signed-off-by: Eric Leblond <eric@regit.org>
---
 src/datatype.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/datatype.c b/src/datatype.c
index 5f976aa..1948bfa 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -717,7 +717,7 @@ static struct error_record *icmp_code_type_parse(const struct expr *sym,
 
 const struct datatype icmp_code_type = {
 	.type		= TYPE_ICMP_CODE,
-	.name		= "icmp code",
+	.name		= "icmp_code",
 	.desc		= "icmp code",
 	.size		= BITS_PER_BYTE,
 	.byteorder	= BYTEORDER_BIG_ENDIAN,
@@ -749,7 +749,7 @@ static struct error_record *icmpv6_code_type_parse(const struct expr *sym,
 
 const struct datatype icmpv6_code_type = {
 	.type		= TYPE_ICMPV6_CODE,
-	.name		= "icmpv6 code",
+	.name		= "icmpv6_code",
 	.desc		= "icmpv6 code",
 	.size		= BITS_PER_BYTE,
 	.byteorder	= BYTEORDER_BIG_ENDIAN,
@@ -781,7 +781,7 @@ static struct error_record *icmpx_code_type_parse(const struct expr *sym,
 
 const struct datatype icmpx_code_type = {
 	.type		= TYPE_ICMPX_CODE,
-	.name		= "icmpx code",
+	.name		= "icmpx_code",
 	.desc		= "icmpx code",
 	.size		= BITS_PER_BYTE,
 	.byteorder	= BYTEORDER_BIG_ENDIAN,
-- 
2.1.3

Re: [nft PATCH] datatype: fix name of icmp* code

[Álvaro Neira Ayuso]

Hi Eric

El 03/12/14 a las 00:02, Eric Leblond escribió:
> The name of datatypes can be used in set definition so they should
> follow the same logic (and maybe not contain space to avoid problem
> with parsing).
>
> This patch adds an underscore to the name of the icmp* code
> datatype.
>
> Signed-off-by: Eric Leblond <eric@regit.org>

Looks good to me. Thanks, I have used a uncorrect name format :)

> ---
>   src/datatype.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/datatype.c b/src/datatype.c
> index 5f976aa..1948bfa 100644
> --- a/src/datatype.c
> +++ b/src/datatype.c
> @@ -717,7 +717,7 @@ static struct error_record *icmp_code_type_parse(const struct expr *sym,
>
>   const struct datatype icmp_code_type = {
>   	.type		= TYPE_ICMP_CODE,
> -	.name		= "icmp code",
> +	.name		= "icmp_code",
>   	.desc		= "icmp code",
>   	.size		= BITS_PER_BYTE,
>   	.byteorder	= BYTEORDER_BIG_ENDIAN,
> @@ -749,7 +749,7 @@ static struct error_record *icmpv6_code_type_parse(const struct expr *sym,
>
>   const struct datatype icmpv6_code_type = {
>   	.type		= TYPE_ICMPV6_CODE,
> -	.name		= "icmpv6 code",
> +	.name		= "icmpv6_code",
>   	.desc		= "icmpv6 code",
>   	.size		= BITS_PER_BYTE,
>   	.byteorder	= BYTEORDER_BIG_ENDIAN,
> @@ -781,7 +781,7 @@ static struct error_record *icmpx_code_type_parse(const struct expr *sym,
>
>   const struct datatype icmpx_code_type = {
>   	.type		= TYPE_ICMPX_CODE,
> -	.name		= "icmpx code",
> +	.name		= "icmpx_code",
>   	.desc		= "icmpx code",
>   	.size		= BITS_PER_BYTE,
>   	.byteorder	= BYTEORDER_BIG_ENDIAN,
>

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [nft PATCH] datatype: fix name of icmp* code

[Pablo Neira Ayuso]

On Wed, Dec 03, 2014 at 12:25:15PM +0100, Álvaro Neira Ayuso wrote:
> Hi Eric
> 
> El 03/12/14 a las 00:02, Eric Leblond escribió:
> >The name of datatypes can be used in set definition so they should
> >follow the same logic (and maybe not contain space to avoid problem
> >with parsing).
> >
> >This patch adds an underscore to the name of the icmp* code
> >datatype.
> >
> >Signed-off-by: Eric Leblond <eric@regit.org>
> 
> Looks good to me. Thanks, I have used a uncorrect name format :)

Applied, thanks for reviewing.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html