diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr/hash.c | 12 | ||||
| -rw-r--r-- | src/expr/numgen.c | 15 |
2 files changed, 18 insertions, 9 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; } diff --git a/src/expr/numgen.c b/src/expr/numgen.c index f5ca3fd..e4e055e 100644 --- a/src/expr/numgen.c +++ b/src/expr/numgen.c @@ -180,17 +180,22 @@ nftnl_expr_ng_snprintf_default(char *buf, size_t size, switch (ng->type) { case NFT_NG_INCREMENTAL: - ret = snprintf(buf, len, "reg %u = %u + inc mod %u ", ng->dreg, - ng->offset, ng->modulus); + ret = snprintf(buf, len, "reg %u = inc mod %u ", + ng->dreg, ng->modulus); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); break; case NFT_NG_RANDOM: - ret = snprintf(buf, len, "reg %u = %u + random mod %u ", - ng->dreg, ng->offset, ng->modulus); + ret = snprintf(buf, len, "reg %u = random mod %u ", + ng->dreg, ng->modulus); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); break; default: - break; + return 0; + } + + if (ng->offset) { + ret = snprintf(buf, len, "offset %u ", ng->offset); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } return offset; |