Message ID | 20160808124235.11135-1-carlosfg@riseup.net |
---|---|
State | Changes Requested |
Delegated to: | Pablo Neira |
Headers | show |
On Mon, Aug 08, 2016 at 02:42:31PM +0200, Carlos Falgueras García wrote: > Signed-off-by: Carlos Falgueras García <carlosfg@riseup.net> > --- > include/libnftnl/rule.h | 2 +- > src/rule.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h > index 2776a77..09af96c 100644 > --- a/include/libnftnl/rule.h > +++ b/include/libnftnl/rule.h > @@ -70,7 +70,7 @@ int nftnl_expr_foreach(struct nftnl_rule *r, > > struct nftnl_expr_iter; > > -struct nftnl_expr_iter *nftnl_expr_iter_create(struct nftnl_rule *r); > +struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r); Good point, other iterators need this too. Some please send a patch constifying them all these nftnl_*_iter functions. Once this patch is applied, then you send a v3 of this patches. Try to deliver updates that have dependencies in smaller batches. Thanks Carlos. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 10, 2016 at 11:48:55AM +0200, Carlos Falgueras García wrote: > This patch implements the function 'bool nftnl_rule_cmp(const struct > nftnl_rule *r, const struct nftnl_rule *r2)' for rule comparison. > > Expressions within rules need to be compared, so also has been created the > function 'nftnl_expr_cmp' which calls new field within > 'nfntl_expr_<expression>': a function pointer to a comparator. The > expressions that can be compared with memcmp have this new field set to > NULL, otherwise they have implemented a comparator. Could you send me a follow up patch to extend what we have under tests/ so it covers these new nftnl_.*_cmp() functions? I would like to have this tested before applying this. Thanks! -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/libnftnl/rule.h b/include/libnftnl/rule.h index 2776a77..09af96c 100644 --- a/include/libnftnl/rule.h +++ b/include/libnftnl/rule.h @@ -70,7 +70,7 @@ int nftnl_expr_foreach(struct nftnl_rule *r, struct nftnl_expr_iter; -struct nftnl_expr_iter *nftnl_expr_iter_create(struct nftnl_rule *r); +struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r); struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter); void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter); diff --git a/src/rule.c b/src/rule.c index a0edca7..30b8b5e 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1026,11 +1026,11 @@ int nftnl_expr_foreach(struct nftnl_rule *r, EXPORT_SYMBOL_ALIAS(nftnl_expr_foreach, nft_rule_expr_foreach); struct nftnl_expr_iter { - struct nftnl_rule *r; + const struct nftnl_rule *r; struct nftnl_expr *cur; }; -struct nftnl_expr_iter *nftnl_expr_iter_create(struct nftnl_rule *r) +struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r) { struct nftnl_expr_iter *iter;
Signed-off-by: Carlos Falgueras García <carlosfg@riseup.net> --- include/libnftnl/rule.h | 2 +- src/rule.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)