From: Laura Garcia Liebana Date: Fri, 24 Mar 2017 20:03:25 +0000 (+0100) Subject: src: hash: fix seed attribute not listed X-Git-Tag: v0.8~181 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ff9c79d6ae3205827e5af8b73c9195b967909c2;p=thirdparty%2Fnftables.git src: hash: fix seed attribute not listed The tests warned about a problem with the seed listing. /tests/py# ./nft-test.py ip/hash.t ip/hash.t: WARNING: line: 4: 'src/nft add rule --debug=netlink \ ip test-ip4 pre ct mark set jhash ip saddr . ip daddr mod 2 \ seed 0xdeadbeef': 'ct mark set jhash ip saddr . ip daddr mod 2 \ seed 0xdeadbeef' mismatches 'ct mark set jhash ip saddr . ip \ daddr mod 2' ip/hash.t: WARNING: line: 6: 'src/nft add rule --debug=netlink \ ip test-ip4 pre ct mark set jhash ip saddr . ip daddr mod 2 seed \ 0xdeadbeef offset 100': 'ct mark set jhash ip saddr . ip daddr \ mod 2 seed 0xdeadbeef offset 100' mismatches 'ct mark set jhash \ ip saddr . ip daddr mod 2 offset 100' ip/hash.t: 6 unit tests, 0 error, 2 warning The expression type is now treated as an unsigned int in the hash_expr_print() function. Fixes 3a86406 ("src: hash: support of symmetric hash") Signed-off-by: Laura Garcia Liebana Signed-off-by: Florian Westphal --- diff --git a/src/hash.c b/src/hash.c index a7a96122..bec1684e 100644 --- a/src/hash.c +++ b/src/hash.c @@ -28,7 +28,7 @@ static void hash_expr_print(const struct expr *expr) } printf(" mod %u", expr->hash.mod); - if (expr->hash.type & NFT_HASH_JENKINS && expr->hash.seed) + if ((expr->hash.type == NFT_HASH_JENKINS) && expr->hash.seed) printf(" seed 0x%x", expr->hash.seed); if (expr->hash.offset) printf(" offset %u", expr->hash.offset);