diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-09-23 10:16:53 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-09-23 10:16:53 +0200 |
commit | ea53daf1291b05ea5cfdda85ae811ec6c086ceff (patch) | |
tree | 688a65f73b986a51d36db997b5d9784ce30e7604 /src/expr/hash.c | |
parent | 0758d102627744847d0bd2e4744d27695edb9a14 (diff) |
src: display offset only if present in hash and numgen expressions
So nft payload python tests don't break.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/hash.c')
-rw-r--r-- | src/expr/hash.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/expr/hash.c b/src/expr/hash.c index 08f09f5..c235502 100644 --- a/src/expr/hash.c +++ b/src/expr/hash.c @@ -214,12 +214,16 @@ nftnl_expr_hash_snprintf_default(char *buf, size_t size, struct nftnl_expr_hash *hash = nftnl_expr_data(e); int len = size, offset = 0, ret; - ret = snprintf(buf, len, - "reg %u = %u + jhash(reg %u, %u, 0x%x) %% mod %u ", - hash->offset, hash->dreg, hash->sreg, hash->len, - hash->seed, hash->modulus); + ret = snprintf(buf, len, "reg %u = jhash(reg %u, %u, 0x%x) %% mod %u ", + hash->dreg, hash->sreg, hash->len, hash->seed, + hash->modulus); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (hash->offset) { + ret = snprintf(buf, len, "offset %u ", hash->offset); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + return offset; } |