Pablo Neira Ayuso wrote:
Patrick McHardy wrote:
This one is really hard to review because of the mixed renames
and code movals. Please split this into two patches.
OK, I'm splitting them now.
Thanks.
+static inline const struct nf_conntrack_tuple *
+nf_ct_tuple(const struct nf_conn *ct, enum ip_conntrack_dir dir)
+{
+ return &ct->tuplehash[dir].tuple;
+}
This is a useful helper for other situations as well, so I think
it shouldn't be const.
I get:
net/netfilter/nf_conntrack_netlink.c:370: warning: passing argument 1 of
'nf_ct_tuple' discards qualifiers from pointer target type
net/netfilter/nf_conntrack_netlink.c:377: warning: passing argument 1 of
'nf_ct_tuple' discards qualifiers from pointer target type
So I have to remove the 'const' from the last parameter of
ctnetlink_fill_info().
Or do some ugly casting in the nf_ct_tuple() calls to avoid the warning,
in that case I would prefer to leave that macro there.
Please, let me know what you prefer.
The best way is probably to keep using a macro since there's
no other way to handle this properly. But I'm all in favour
of renaming that macro and making it globally available as
you did.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html