[libnftables PATCH] log: fix qthreshold data type

[libnftables PATCH] log: fix qthreshold data type

[Arturo Borrero Gonzalez]

As stated in include/net/netfilter/nf_log.h, qthreshold is uint16_t instead of uint32_t.

This patch fixes it.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
 src/expr/log.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/expr/log.c b/src/expr/log.c
index 1ffd1d9..d8502e5 100644
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -25,7 +25,7 @@
 struct nft_expr_log {
 	uint32_t		group;
 	uint32_t		snaplen;
-	uint32_t		qthreshold;
+	uint16_t		qthreshold;
 	char			*prefix;
 };
 
@@ -49,7 +49,7 @@ nft_rule_expr_log_set(struct nft_rule_expr *e, uint16_t type,
 		log->snaplen = *((uint32_t *)data);
 		break;
 	case NFT_EXPR_LOG_QTHRESHOLD:
-		log->qthreshold = *((uint32_t *)data);
+		log->qthreshold = *((uint16_t *)data);
 		break;
 	default:
 		return -1;
@@ -197,7 +197,7 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
 		goto err;
 
 	tmp = strtoull(node->child->value.opaque, &endptr, 10);
-	if (tmp > UINT32_MAX || tmp < 0 || *endptr)
+	if (tmp > UINT16_MAX || tmp < 0 || *endptr)
 		goto err;
 
 	log->qthreshold = tmp;

Re: [libnftables PATCH] log: fix qthreshold data type

[Arturo Borrero Gonzalez]

On 25 July 2013 11:59, Arturo Borrero Gonzalez
<arturo.borrero.glez@gmail.com> wrote:
> As stated in include/net/netfilter/nf_log.h, qthreshold is uint16_t instead of uint32_t.
>
> This patch fixes it.
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
> ---
v2: still u32 in kernel.

>  src/expr/log.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
>

I forgot to note this as v2.

-- 
Arturo Borrero González
--
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