From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [PATCH 3/3 v2] nftables: rule: Change the field "rule->comment" for an nftnl_attrbuf. Date: Wed, 2 Mar 2016 19:37:44 +0100 Message-ID: <20160302183744.GB1351@salvia> References: <1456763140-15121-1-git-send-email-carlosfg@riseup.net> <1456763140-15121-3-git-send-email-carlosfg@riseup.net> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: netfilter-devel@vger.kernel.org, kaber@trash.net To: Carlos Falgueras =?iso-8859-1?Q?Garc=EDa?= Return-path: Received: from mail.us.es ([193.147.175.20]:38182 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531AbcCBSht (ORCPT ); Wed, 2 Mar 2016 13:37:49 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id F10FD7403 for ; Wed, 2 Mar 2016 19:37:47 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id DF3AB11A6AE for ; Wed, 2 Mar 2016 19:37:47 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id BA6D991FF for ; Wed, 2 Mar 2016 19:37:45 +0100 (CET) Content-Disposition: inline In-Reply-To: <1456763140-15121-3-git-send-email-carlosfg@riseup.net> Sender: netfilter-devel-owner@vger.kernel.org List-ID: On Mon, Feb 29, 2016 at 05:25:40PM +0100, Carlos Falgueras Garc=EDa wro= te: > Now it is possible to store multiple variable length user data into r= ule. > Modify the parser in order to fill the nftnl_attrbuf with the comment= , and > the print function for extract these commentary and print it to user. >=20 > Signed-off-by: Carlos Falgueras Garc=EDa > --- > include/rule.h | 11 +++++++++-- > src/netlink_delinearize.c | 7 +++++-- > src/netlink_linearize.c | 6 ++++-- > src/parser_bison.y | 17 ++++++++++++++++- > src/rule.c | 40 +++++++++++++++++++++++++++++++++++++= --- > 5 files changed, 71 insertions(+), 10 deletions(-) >=20 > diff --git a/include/rule.h b/include/rule.h > index c848f0f..e079aa1 100644 > --- a/include/rule.h > +++ b/include/rule.h > @@ -4,6 +4,7 @@ > #include > #include > #include > +#include > =20 > /** > * struct handle - handle for tables, chains, rules and sets > @@ -155,7 +156,7 @@ extern void chain_print_plain(const struct chain = *chain); > * @location: location the rule was defined at > * @stmt: list of statements > * @num_stmts: number of statements in stmts list > - * @comment: comment > + * @udata: user data > */ > struct rule { > struct list_head list; > @@ -163,7 +164,7 @@ struct rule { > struct location location; > struct list_head stmts; > unsigned int num_stmts; > - const char *comment; > + struct nftnl_attrbuf *udata; > }; > =20 > extern struct rule *rule_alloc(const struct location *loc, > @@ -396,4 +397,10 @@ extern int do_command(struct netlink_ctx *ctx, s= truct cmd *cmd); > extern int cache_update(enum cmd_ops cmd, struct list_head *msgs); > extern void cache_release(void); > =20 > +enum udata_type { > + UDATA_TYPE_COMMENT, > + __UDATA_TYPE_MAX, > +}; > +#define UDATA_TYPE_MAX (__UDATA_TYPE_MAX - 1) > + > #endif /* NFTABLES_RULE_H */ > diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c > index ae6abb0..c7448d3 100644 > --- a/src/netlink_delinearize.c > +++ b/src/netlink_delinearize.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > =20 > struct netlink_parse_ctx { > struct list_head *msgs; > @@ -1738,8 +1739,10 @@ struct rule *netlink_delinearize_rule(struct n= etlink_ctx *ctx, > uint32_t len; > =20 > data =3D nftnl_rule_get_data(nlr, NFTNL_RULE_USERDATA, &len); > - pctx->rule->comment =3D xmalloc(len); > - memcpy((char *)pctx->rule->comment, data, len); > + pctx->rule->udata =3D nftnl_attrbuf_alloc(len); > + if (!pctx->rule->udata) > + memory_allocation_error(); > + nftnl_attrbuf_copy_data(pctx->rule->udata, data, len); > } > =20 > nftnl_expr_foreach((struct nftnl_rule *)nlr, netlink_parse_expr, pc= tx); > diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c > index 86b49c6..7b33f33 100644 > --- a/src/netlink_linearize.c > +++ b/src/netlink_linearize.c > @@ -21,6 +21,7 @@ > #include > =20 > #include > +#include > =20 > =20 > struct netlink_linearize_ctx { > @@ -1108,9 +1109,10 @@ void netlink_linearize_rule(struct netlink_ctx= *ctx, struct nftnl_rule *nlr, > list_for_each_entry(stmt, &rule->stmts, list) > netlink_gen_stmt(&lctx, stmt); > =20 > - if (rule->comment) > + if (rule->udata) > nftnl_rule_set_data(nlr, NFTNL_RULE_USERDATA, > - rule->comment, strlen(rule->comment) + 1); > + nftnl_attrbuf_get_data(rule->udata), > + nftnl_attrbuf_get_len(rule->udata)); > =20 > netlink_dump_rule(nlr); > } > diff --git a/src/parser_bison.y b/src/parser_bison.y > index 05ade0f..019e9a2 100644 > --- a/src/parser_bison.y > +++ b/src/parser_bison.y > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > =20 > #include > #include > @@ -1304,7 +1305,21 @@ rule : stmt_list comment_spec > struct stmt *i; > =20 > $$ =3D rule_alloc(&@$, NULL); > - $$->comment =3D $2; > + > + if ($2) { > + if (!($$->udata =3D nftnl_attrbuf_alloc(NFT_USERDATA_MAXLEN))) > + memory_allocation_error(); > + > + if (!(nftnl_attr_put_check($$->udata, > + UDATA_TYPE_COMMENT, > + strlen($2) + 1, $2)) > + ) { if (!(nftnl_attr_put_check($$->udata, UDAT= A_TYPE_COMMENT, strlen($2) + 1, $2)) ) { Please, check coding style. You can add a helper function, eg. if (!(nftnl_udata_put_strz($$->udata, UDAT= A_TYPE_COMMENT, $2) { > + erec_queue(error(&@2, "Comment too long: \"%s\"", $2), > + state->msgs); > + YYERROR; > + } > + } > + > list_for_each_entry(i, $1, list) > $$->num_stmts++; > list_splice_tail($1, &$$->stmts); > diff --git a/src/rule.c b/src/rule.c > index 18ff592..499fa7b 100644 > --- a/src/rule.c > +++ b/src/rule.c > @@ -23,6 +23,7 @@ > =20 > #include > #include > +#include > #include > #include > #include > @@ -366,6 +367,7 @@ struct rule *rule_alloc(const struct location *lo= c, const struct handle *h) > rule->location =3D *loc; > init_list_head(&rule->list); > init_list_head(&rule->stmts); > + rule->udata =3D NULL; > if (h !=3D NULL) > rule->handle =3D *h; > return rule; > @@ -375,21 +377,53 @@ void rule_free(struct rule *rule) > { > stmt_list_free(&rule->stmts); > handle_free(&rule->handle); > - xfree(rule->comment); > + nftnl_attrbuf_free(rule->udata); I would rename this function to: nftnl_udata_free(); So all functions that now refer to nftnl_attrbuf_* look like: nftnl_udata_*() then, to push/retrieve attributes, I would use the prefix: nftnl_udata_attr_*() > xfree(rule); > } > =20 > +static int rule_parse_userdata_cb(const struct nftnl_attr *attr, > + void *data) > +{ > + const struct nftnl_attr **tb =3D data; > + uint8_t type =3D nftnl_attr_get_type(attr); > + uint8_t len =3D nftnl_attr_get_len(attr); > + unsigned char *value =3D nftnl_attr_get_value(attr); > + > + /* Validation */ > + switch (type) { > + case UDATA_TYPE_COMMENT: > + if (value[len-1] !=3D '\0') > + return NFTNL_CB_ERROR; > + break; > + default: > + break; > + }; > + > + tb[type] =3D attr; > + return NFTNL_CB_OK; > +} > + > + > void rule_print(const struct rule *rule) > { > const struct stmt *stmt; > + const struct nftnl_attr *tb[UDATA_TYPE_MAX+1] =3D {}; const struct nftnl_attr *tb[UDATA_TYPE_MAX + 1] =3D {}; ^ ^ This space is preferred. > + const struct nftnl_attr *attr; > =20 > list_for_each_entry(stmt, &rule->stmts, list) { > stmt->ops->print(stmt); > printf(" "); > } > =20 > - if (rule->comment) > - printf("comment \"%s\" ", rule->comment); > + if (rule->udata) { > + if (nftnl_attr_parse(rule->udata, rule_parse_userdata_cb, tb) > + !=3D NFTNL_CB_ERROR > + ) { > + attr =3D tb[UDATA_TYPE_COMMENT]; You have to check here for the attribute: if (tb[UDATA_COMMENT]) { printf("comment \"%s\" ", (char *)nftnl_attr_get_value(attr)); } Otherwise this will break once we get new attributes. -- To unsubscribe from this list: send the line "unsubscribe netfilter-dev= el" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html