diff options
| author | Liping Zhang <liping.zhang@spreadtrum.com> | 2016-09-25 16:54:34 +0800 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-10-04 08:49:50 +0200 |
| commit | 1d74732a3917781510153fcf05cf654cda554b8e (patch) | |
| tree | 9a593968c52761d05d92e58ff11f206138adac15 | |
| parent | de169cac8c2ee91d23cffa69631e7587d7e6cca3 (diff) | |
expr: log: do not print prefix if it is not set
This will avoid the following ugly display output:
[ log prefix (null) ]
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/expr/log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/expr/log.c b/src/expr/log.c index e965448..a231bac 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -230,8 +230,10 @@ static int nftnl_expr_log_snprintf_default(char *buf, size_t size, struct nftnl_expr_log *log = nftnl_expr_data(e); int ret, offset = 0, len = size; - ret = snprintf(buf, len, "prefix %s ", log->prefix); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) { + ret = snprintf(buf, len, "prefix %s ", log->prefix); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } if (e->flags & (1 << NFTNL_EXPR_LOG_GROUP)) { ret = snprintf(buf + offset, len, |