From 952672b40823254dd6f19e28ad07d954be3077a8 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 16 Jun 2014 11:06:37 +0200 Subject: expr: queue: Use snprintf and SNPRINTF_BUFFER_SIZE in snprintf_default function Code refactoring to use snprintf and SNPRINTF_BUFFER_SIZE in snprintf_default functions. Also, It adapts to the next syntax in queue. Added in: http://git.netfilter.org/nftables/commit/?id=27619ffbe503ed4d9e59a02e81db9a7ac49d37af Here, some examples: ip test input 31 [ queue num 3-5 bypass fanout] ip test input 32 31 [ queue num 0] ip test input 33 32 [ queue num 4] ip test input 34 33 [ queue num 2-6 bypass] table ip test { chain input { type filter hook input priority 0; queue num 3-5 bypass fanout queue num 0 queue num 4 queue num 2-6 bypass } } Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/queue.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/expr/queue.c b/src/expr/queue.c index 78540b6..f366ad1 100644 --- a/src/expr/queue.c +++ b/src/expr/queue.c @@ -187,24 +187,30 @@ static int nft_rule_expr_queue_snprintf_default(char *buf, size_t len, struct nft_rule_expr *e) { struct nft_expr_queue *queue = nft_expr_data(e); - int ret; - int one = 0; - - ret = snprintf(buf, len, "num %u total %u", queue->queuenum, - queue->queues_total); - if (queue->flags) { - ret += snprintf(buf + ret, len - ret, " options "); - if (queue->flags & NFT_QUEUE_FLAG_BYPASS) { - ret += snprintf(buf + ret, len - ret, "bypass"); - one = 1; + int ret, size = len, offset = 0; + uint16_t total_queues; + + total_queues = queue->queuenum + queue->queues_total -1; + + ret = snprintf(buf + offset, len, "num %u", queue->queuenum); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + if (queue->queues_total && total_queues != queue->queuenum) { + ret = snprintf(buf + offset, len, "-%u", total_queues); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (e->flags & (1 << NFT_EXPR_QUEUE_FLAGS)) { + if (queue->flags & (NFT_QUEUE_FLAG_BYPASS)) { + ret = snprintf(buf + offset, len, " bypass"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - if (queue->flags & NFT_QUEUE_FLAG_CPU_FANOUT) { - if (one) - ret += snprintf(buf + ret, len - ret, ","); - ret += snprintf(buf + ret, len - ret, "fanout"); + if (queue->flags & (NFT_QUEUE_FLAG_CPU_FANOUT)) { + ret = snprintf(buf + offset, len, " fanout"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } } - return ret; + return offset; } static int nft_rule_expr_queue_snprintf_xml(char *buf, size_t len, @@ -213,7 +219,6 @@ static int nft_rule_expr_queue_snprintf_xml(char *buf, size_t len, int ret, size = len, offset = 0; struct nft_expr_queue *queue = nft_expr_data(e); - if (e->flags & (1 << NFT_EXPR_QUEUE_NUM)) { ret = snprintf(buf + offset, len, "%u", queue->queuenum); -- cgit v1.2.3