| Message ID | 20171017112218.14539-1-phil@nwl.cc |
|---|---|
| State | Changes Requested |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [libnftnl,v2] expr: Introduce nftnl_expr_fprintf() | expand |
On Tue, Oct 17, 2017 at 01:22:18PM +0200, Phil Sutter wrote: > Implement expression printing into a FILE pointer analogous to > nftnl_rule_fprintf(). > > Signed-off-by: Phil Sutter <phil@nwl.cc> > --- > Changes since v1: > - Update src/libnftnl.map Thanks Phil. I think we need to collapse this change to your patch. diff --git a/src/libnftnl.map b/src/libnftnl.map index a01a6599a975..74f33c438a16 100644 --- a/src/libnftnl.map +++ b/src/libnftnl.map @@ -103,7 +103,6 @@ global: nftnl_expr_get_u64; nftnl_expr_get_str; nftnl_expr_snprintf; - nftnl_expr_fprintf; nftnl_expr_free; nftnl_rule_list_alloc; @@ -308,3 +307,7 @@ global: local: *; }; + +LIBNFTNL_6 { + nftnl_expr_fprintf; +} LIBMNL_5;
On Tue, Oct 17, 2017 at 01:31:50PM +0200, Pablo Neira Ayuso wrote: > On Tue, Oct 17, 2017 at 01:22:18PM +0200, Phil Sutter wrote: > > Implement expression printing into a FILE pointer analogous to > > nftnl_rule_fprintf(). > > > > Signed-off-by: Phil Sutter <phil@nwl.cc> > > --- > > Changes since v1: > > - Update src/libnftnl.map > > Thanks Phil. > > I think we need to collapse this change to your patch. Ah, so that is because LIBNFTNL_5 is already released in 1.0.8, right? Do I have to adjust the respective nftables patch for backwards compatibility? If so, in which way? Thanks, Phil PS: V3 follows in a few seconds. -- 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
Hi, Actually, I don't quite get the suggested change: On Tue, Oct 17, 2017 at 01:31:50PM +0200, Pablo Neira Ayuso wrote: > @@ -308,3 +307,7 @@ global: > > local: *; > }; > + > +LIBNFTNL_6 { > + nftnl_expr_fprintf; > +} LIBMNL_5; Why LIBMNL_5? Shouldn't this be LIBNFTNL_5? Cheers, Phil -- 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 Tue, Oct 17, 2017 at 02:02:22PM +0200, Phil Sutter wrote: > Hi, > > Actually, I don't quite get the suggested change: > > On Tue, Oct 17, 2017 at 01:31:50PM +0200, Pablo Neira Ayuso wrote: > > @@ -308,3 +307,7 @@ global: > > > > local: *; > > }; > > + > > +LIBNFTNL_6 { > > + nftnl_expr_fprintf; > > +} LIBMNL_5; > > Why LIBMNL_5? Shouldn't this be LIBNFTNL_5? Oh right :-) Neurons rollerskating here, sorry. -- 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/expr.h b/include/libnftnl/expr.h index 76f28fee7b5f7..f37f50963d6c3 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -39,6 +39,7 @@ const char *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type); bool nftnl_expr_cmp(const struct nftnl_expr *e1, const struct nftnl_expr *e2); int nftnl_expr_snprintf(char *buf, size_t buflen, const struct nftnl_expr *expr, uint32_t type, uint32_t flags); +int nftnl_expr_fprintf(FILE *fp, const struct nftnl_expr *expr, uint32_t type, uint32_t flags); enum { NFTNL_EXPR_PAYLOAD_DREG = NFTNL_EXPR_BASE, diff --git a/src/expr.c b/src/expr.c index c5fcf06492ae2..1eae70787209d 100644 --- a/src/expr.c +++ b/src/expr.c @@ -293,3 +293,17 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, return offset; } EXPORT_SYMBOL(nftnl_expr_snprintf); + +static int nftnl_expr_do_snprintf(char *buf, size_t size, const void *e, + uint32_t cmd, uint32_t type, uint32_t flags) +{ + return nftnl_expr_snprintf(buf, size, e, type, flags); +} + +int nftnl_expr_fprintf(FILE *fp, const struct nftnl_expr *expr, uint32_t type, + uint32_t flags) +{ + return nftnl_fprintf(fp, expr, NFTNL_CMD_UNSPEC, type, flags, + nftnl_expr_do_snprintf); +} +EXPORT_SYMBOL(nftnl_expr_fprintf); diff --git a/src/libnftnl.map b/src/libnftnl.map index 1892c983eb504..a01a6599a9750 100644 --- a/src/libnftnl.map +++ b/src/libnftnl.map @@ -103,6 +103,7 @@ global: nftnl_expr_get_u64; nftnl_expr_get_str; nftnl_expr_snprintf; + nftnl_expr_fprintf; nftnl_expr_free; nftnl_rule_list_alloc;
Implement expression printing into a FILE pointer analogous to nftnl_rule_fprintf(). Signed-off-by: Phil Sutter <phil@nwl.cc> --- Changes since v1: - Update src/libnftnl.map --- include/libnftnl/expr.h | 1 + src/expr.c | 14 ++++++++++++++ src/libnftnl.map | 1 + 3 files changed, 16 insertions(+)