From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [libnftables PATCH 2/2] set: XML parse Date: Thu, 25 Jul 2013 22:49:09 +0200 Message-ID: <20130725204909.GB3407@localhost> References: <20130725202033.21531.41100.stgit@nfdev.cica.es> <20130725202038.21531.87739.stgit@nfdev.cica.es> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: netfilter-devel@vger.kernel.org To: Arturo Borrero Gonzalez Return-path: Received: from mail.us.es ([193.147.175.20]:42495 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751479Ab3GYUtX (ORCPT ); Thu, 25 Jul 2013 16:49:23 -0400 Content-Disposition: inline In-Reply-To: <20130725202038.21531.87739.stgit@nfdev.cica.es> Sender: netfilter-devel-owner@vger.kernel.org List-ID: On Thu, Jul 25, 2013 at 10:20:39PM +0200, Arturo Borrero Gonzalez wrote= : > Sets are now parsed, following this previous snprintf pattern: >=20 > > uint32_t > uint32_t > size_t > uint32_t > size_t > > uint32_t > > > > > > > > > [...] > > > > >=20 >=20 > Signed-off-by: Arturo Borrero Gonz=E1lez > --- > include/libnftables/set.h | 9 ++ > src/libnftables.map | 2 + > src/mxml.c | 2 - > src/set.c | 174 +++++++++++++++++++++++++++++++++++= ++++++++++ > src/set_elem.c | 85 +++++++++++++++++++++- > tests/nft-parsing-test.c | 10 +++ > tests/xmlfiles/36-set.xml | 51 +++++++++++++ > 7 files changed, 328 insertions(+), 5 deletions(-) > create mode 100644 tests/xmlfiles/36-set.xml >=20 > diff --git a/include/libnftables/set.h b/include/libnftables/set.h > index 6023d50..4fc3a8d 100644 > --- a/include/libnftables/set.h > +++ b/include/libnftables/set.h > @@ -52,6 +52,14 @@ struct nft_set *nft_set_list_iter_cur(struct nft_s= et_list_iter *iter); > struct nft_set *nft_set_list_iter_next(struct nft_set_list_iter *ite= r); > void nft_set_list_iter_destroy(struct nft_set_list_iter *iter); > =20 > +enum nft_set_parse_type { > + NFT_SET_PARSE_NONE =3D 0, > + NFT_SET_PARSE_XML, > + NFT_SET_PARSE_MAX, > +}; > + > +int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, c= har *data); > + > /* > * Set elements > */ > @@ -94,6 +102,7 @@ void nft_set_elem_nlmsg_build_payload(struct nlmsg= hdr *nlh, struct nft_set_elem > =20 > int nft_set_elem_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_= set_elem *s); > =20 > +int nft_set_elem_parse(struct nft_set_elem *e, enum nft_set_parse_ty= pe type, char *data); > int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_ele= m *s, uint32_t type, uint32_t flags); > =20 > int nft_set_elem_foreach(struct nft_set *s, int (*cb)(struct nft_set= _elem *e, void *data), void *data); > diff --git a/src/libnftables.map b/src/libnftables.map > index f2084d9..614c705 100644 > --- a/src/libnftables.map > +++ b/src/libnftables.map > @@ -120,6 +120,7 @@ global: > nft_set_nlmsg_build_hdr; > nft_set_nlmsg_build_payload; > nft_set_nlmsg_parse; > + nft_set_parse; > nft_set_snprintf; > =20 > nft_set_list_alloc; > @@ -149,6 +150,7 @@ global: > nft_set_elem_nlmsg_build_hdr; > nft_set_elem_nlmsg_build_payload; > nft_set_elem_nlmsg_parse; > + nft_set_elem_parse; > nft_set_elem_snprintf; > =20 > nft_set_elems_nlmsg_build_payload; > diff --git a/src/mxml.c b/src/mxml.c > index f812bf6..3d6ada4 100644 > --- a/src/mxml.c > +++ b/src/mxml.c > @@ -111,7 +111,7 @@ int nft_mxml_data_reg_parse(mxml_node_t *tree, co= nst char *node_name, > } > =20 > node =3D mxmlFindElement(node, node, "data_reg", NULL, NULL, > - MXML_DESCEND); > + MXML_DESCEND_FIRST); > if (node =3D=3D NULL || node->child =3D=3D NULL) { > errno =3D EINVAL; > goto err; > diff --git a/src/set.c b/src/set.c > index ef15527..5e1f8ed 100644 > --- a/src/set.c > +++ b/src/set.c > @@ -16,6 +16,8 @@ > #include > #include > #include > +#include > +#include > =20 > #include > #include > @@ -301,6 +303,178 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *= nlh, struct nft_set *s) > } > EXPORT_SYMBOL(nft_set_nlmsg_parse); > =20 > +static int nft_set_xml_parse(struct nft_set *s, char *xml) > +{ > +#ifdef XML_PARSING > + mxml_node_t *tree =3D NULL; no need to init this variable. > + mxml_node_t *node =3D NULL; > + mxml_node_t *save =3D NULL; > + char *set_elem_str =3D NULL; > + struct nft_set_elem *elem; > + int version; > + int family; > + > + tree =3D mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); > + if (tree =3D=3D NULL) { > + errno =3D EINVAL; > + return -1; > + } > + > + if (strcmp(tree->value.opaque, "set") !=3D 0) > + goto einval; > + > + if (mxmlElementGetAttr(tree, "version") =3D=3D NULL) > + goto einval; > + > + if (nft_strtoi(mxmlElementGetAttr(tree, "version"), 10, &version, > + NFT_TYPE_U64) !=3D 0) > + goto err; > + > + if (version !=3D NFT_SET_XML_VERSION) > + goto einval; > + > + if (mxmlElementGetAttr(tree, "name") =3D=3D NULL) > + goto einval; > + > + if (s->name) > + free(s->name); > + > + s->name =3D strdup(mxmlElementGetAttr(tree, "name")); > + s->flags |=3D (1 << NFT_SET_ATTR_NAME); > + > + if (mxmlElementGetAttr(tree, "table") =3D=3D NULL) > + goto einval; > + > + if (s->table) > + free(s->table); > + > + s->table =3D strdup(mxmlElementGetAttr(tree, "table")); > + s->flags |=3D (1 << NFT_SET_ATTR_TABLE); > + > + node =3D mxmlFindElement(tree, tree, "family", NULL, NULL, > + MXML_DESCEND_FIRST); > + if (node =3D=3D NULL) > + goto einval; > + > + if (node->child =3D=3D NULL) > + goto einval; > + > + family =3D nft_str2family(node->child->value.opaque); > + > + if (family < 0) > + goto eafnosupport; > + > + s->family =3D family; > + > + s->flags |=3D (1 << NFT_SET_ATTR_FAMILY); > + > + if (nft_mxml_num_parse(tree, "set_flags", MXML_DESCEND_FIRST, > + BASE_DEC, &s->set_flags, NFT_TYPE_U32) !=3D 0) > + goto einval; nft_mxml_num_parse already sets errno. > + > + s->flags |=3D (1 << NFT_SET_ATTR_FLAGS); > + > + > + if (nft_mxml_num_parse(tree, "key_type", MXML_DESCEND_FIRST, > + BASE_DEC, &s->key_type, NFT_TYPE_U32) !=3D 0) > + goto einval; > + > + s->flags |=3D (1 << NFT_SET_ATTR_KEY_TYPE); > + > + if (nft_mxml_num_parse(tree, "key_len", MXML_DESCEND_FIRST, > + BASE_DEC, &s->key_type, NFT_TYPE_U32) !=3D 0) > + goto einval; > + > + s->flags |=3D (1 << NFT_SET_ATTR_KEY_LEN); > + > + if (nft_mxml_num_parse(tree, "data_type", MXML_DESCEND_FIRST, > + BASE_DEC, &s->data_type, NFT_TYPE_U32) !=3D 0) > + goto einval; > + > + s->flags |=3D (1 << NFT_SET_ATTR_DATA_TYPE); > + > + if (nft_mxml_num_parse(tree, "data_len", MXML_DESCEND_FIRST, > + BASE_DEC, &s->data_len, NFT_TYPE_U32) !=3D 0) > + goto einval; > + > + s->flags |=3D (1 << NFT_SET_ATTR_DATA_LEN); > + > + /* Iterate over each */ > + for (node =3D mxmlFindElement(tree, tree, "set_elem", NULL, > + NULL, MXML_DESCEND); > + node !=3D NULL; > + node =3D mxmlFindElement(node, tree, "set_elem", NULL, > + NULL, MXML_DESCEND)) { > + > + elem =3D nft_set_elem_alloc(); > + if (elem =3D=3D NULL) > + goto enomem; already sets ENOMEM, no need for this. > + > + /* This is a hack for mxml to print just the current node */ > + save =3D node->next; > + node->next =3D NULL; > + > + set_elem_str =3D mxmlSaveAllocString(node, MXML_NO_CALLBACK); > + if (set_elem_str =3D=3D NULL) { > + free(elem); > + goto enomem; > + } > + > + if (nft_set_elem_parse(elem, NFT_SET_PARSE_XML, > + set_elem_str) !=3D 0) { > + printf("nft_set_elem_parse err: %s\n", set_elem_str); > + free(set_elem_str); > + free(elem); > + goto err; > + } > + > + node->next =3D save; > + free(set_elem_str); > + > + list_add_tail(&elem->head, &s->element_list); > + } Please, move element parsing to another function. Making functions smaller help maintainability. > + > + mxmlDelete(tree); > + return 0; > +einval: rename this to err:, now it's the only possible error in this function. > + errno =3D EINVAL; > + mxmlDelete(tree); > + return -1; > +eafnosupport: > + errno =3D EAFNOSUPPORT; > + mxmlDelete(tree); > + return -1; no need for this, not nft_family2str sets it. > +enomem: > + errno =3D ENOMEM; > + mxmlDelete(tree); > + return -1; remove this. > +err: > + mxmlDelete(tree); > + return -1; > +#else > + errno =3D EOPNOTSUPP; > + return -1; > +#endif > +} > + > +int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, c= har *data) > +{ > + int ret; > + > + switch (type) { > + case NFT_SET_PARSE_XML: > + ret =3D nft_set_xml_parse(s, data); > + break; > + default: > + ret =3D -1; > + errno =3D EOPNOTSUPP; > + break; > + } > + > + return ret; > +} > +EXPORT_SYMBOL(nft_set_parse); > + > static int nft_set_snprintf_json(char *buf, size_t size, struct nft_= set *s, > uint32_t type, uint32_t flags) > { > diff --git a/src/set_elem.c b/src/set_elem.c > index 4adba91..724c312 100644 > --- a/src/set_elem.c > +++ b/src/set_elem.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > =20 > #include > #include > @@ -374,8 +375,83 @@ int nft_set_elems_nlmsg_parse(const struct nlmsg= hdr *nlh, struct nft_set *s) > } > EXPORT_SYMBOL(nft_set_elems_nlmsg_parse); > =20 > +static int nft_set_elem_xml_parse(struct nft_set_elem *e, char *xml) > +{ > +#ifdef XML_PARSING > + mxml_node_t *tree =3D NULL; > + int set_elem_data; > + > + tree =3D mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); > + if (tree =3D=3D NULL) { > + errno =3D EINVAL; > + return -1; > + } > + > + if (strcmp(tree->value.opaque, "set_elem") !=3D 0) > + goto einval; > + > + if (nft_mxml_num_parse(tree, "set_elem_flags", MXML_DESCEND_FIRST, > + BASE_DEC, &e->set_elem_flags, > + NFT_TYPE_U32) !=3D 0) > + goto einval; no need to einval here, num_parse already sets. > + > + e->flags |=3D (1 << NFT_SET_ELEM_ATTR_FLAGS); > + > + if (nft_mxml_data_reg_parse(tree, "set_elem_key", > + &e->key) !=3D DATA_VALUE) > + goto einval; > + > + e->flags |=3D (1 << NFT_SET_ELEM_ATTR_KEY); > + > + set_elem_data =3D nft_mxml_data_reg_parse(tree, "set_elem_data", > + &e->data); > + switch (set_elem_data) { > + case DATA_VALUE: > + e->flags |=3D (1 << NFT_SET_ELEM_ATTR_DATA); > + break; > + case DATA_VERDICT: > + e->flags |=3D (1 << NFT_SET_ELEM_ATTR_VERDICT); > + break; > + case DATA_CHAIN: > + e->flags |=3D (1 << NFT_SET_ELEM_ATTR_CHAIN); > + break; > + default: > + goto einval; > + } > + > + mxmlDelete(tree); > + return 0; > + > +einval: > + errno =3D EINVAL; > + mxmlDelete(tree); > + return -1; > +#else > + errno =3D EOPNOTSUPP; > + return -1; > +#endif > +} > + > +int nft_set_elem_parse(struct nft_set_elem *e, > + enum nft_set_parse_type type, char *data) { > + int ret; > + > + switch (type) { > + case NFT_SET_PARSE_XML: > + ret =3D nft_set_elem_xml_parse(e, data); > + break; > + default: > + errno =3D EOPNOTSUPP; > + ret =3D -1; > + break; > + } > + > + return ret; > +} > +EXPORT_SYMBOL(nft_set_elem_parse); > + > static int nft_set_elem_snprintf_json(char *buf, size_t size, > - struct nft_set_elem *e, uint32_t flags) > + struct nft_set_elem *e, uint32_t flags) > { > int ret, len =3D size, offset =3D 0, type =3D -1; > =20 > @@ -414,8 +490,9 @@ static int nft_set_elem_snprintf_json(char *buf, = size_t size, > return offset; > } > =20 > -static int nft_set_elem_snprintf_default(char *buf, size_t size, > - struct nft_set_elem *e) > +static > +int nft_set_elem_snprintf_default(char *buf, size_t size, > + struct nft_set_elem *e, uint32_t flags) > { > int ret, len =3D size, offset =3D 0, i; > =20 > @@ -505,7 +582,7 @@ int nft_set_elem_snprintf(char *buf, size_t size,= struct nft_set_elem *e, > { > switch(type) { > case NFT_SET_O_DEFAULT: > - return nft_set_elem_snprintf_default(buf, size, e); > + return nft_set_elem_snprintf_default(buf, size, e, flags); > case NFT_SET_O_XML: > return nft_set_elem_snprintf_xml(buf, size, e, flags); > case NFT_SET_O_JSON: > diff --git a/tests/nft-parsing-test.c b/tests/nft-parsing-test.c > index 4fe60c3..c75d97b 100644 > --- a/tests/nft-parsing-test.c > +++ b/tests/nft-parsing-test.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > =20 > #ifdef XML_PARSING > #include > @@ -21,6 +22,7 @@ static int test_xml(const char *filename) > struct nft_table *t =3D NULL; > struct nft_chain *c =3D NULL; > struct nft_rule *r =3D NULL; > + struct nft_set *s =3D NULL; > FILE *fp; > mxml_node_t *tree =3D NULL;; > char *xml =3D NULL; > @@ -61,6 +63,14 @@ static int test_xml(const char *filename) > =20 > nft_rule_free(r); > } > + } else if (strcmp(tree->value.opaque, "set") =3D=3D 0) { > + s =3D nft_set_alloc(); > + if (s !=3D NULL) { > + if (nft_set_parse(s, NFT_SET_PARSE_XML, xml) =3D=3D 0) > + ret =3D 0; > + > + nft_set_free(s); > + } > } > =20 > return ret; > diff --git a/tests/xmlfiles/36-set.xml b/tests/xmlfiles/36-set.xml > new file mode 100644 > index 0000000..71ca189 > --- /dev/null > +++ b/tests/xmlfiles/36-set.xml > @@ -0,0 +1,51 @@ > + > + ip > + 6 > + 0 > + 12 > + 0 > + 12 > + > + 1 > + > + > + 4 > + 0xffaabbdd > + > + > + > + > + accept > + > + > + > + > + 1 > + > + > + 4 > + 0xffaabb11 > + > + > + > + > + test > + > + > + > + > + 1 > + > + > + 4 > + 0xffaabb11 > + > + > + > + > + 4 > + 0xcafecafe > + > + > + > + >=20 > -- > To unsubscribe from this list: send the line "unsubscribe netfilter-d= evel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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