From 8ce5d4ca70884654988eb86734cb3022e0b71995 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 3 Apr 2010 08:29:16 +0200 Subject: add validation infrastructure and rework attribute parsing This patch includes the new validation infrastructure which is decoupled from the attribute parsing. It is composed of: - mnl_attr_type_invalid: that allows to check if the attribute type is valid (ie. the type is not higher than WXYZ_MAX). - mnl_attr_validate: that allows to validate that there's enough room for the attribute data. The patch includes the rework of the attribute parsers. Now, you don't have to use an array of pointer to store the result of the parsing, you can use whatever data structure instead. The prototype as it follows: typedef int (*mnl_attr_cb_t)(const struct nlattr *attr, void *data); extern int mnl_attr_parse(const struct nlmsghdr *nlh, int offset, mnl_attr_cb_t cb, void *data) There are three versions of rtnl-link-dump.c that show how attribute parsing can be done now. Probably that many examples are not good idea, I may remove some of them from the tree in the future. This patch also merges mnl_attr_parse_at_offset into mnl_attr_parse. This patch modifies MNL_ALIGN so that we can use it in static arrays (the use of mnl_align() is not allowed in compilation time to initialize an array field). I have added the mnl_attr_for_each() macro and I have changed mnl_attr_for_each_nested() to declare the length variable internally. Signed-off-by: Pablo Neira Ayuso --- examples/Makefile.am | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'examples/Makefile.am') diff --git a/examples/Makefile.am b/examples/Makefile.am index 92c5342..1874971 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,12 +1,23 @@ include $(top_srcdir)/Make_global.am -check_PROGRAMS = rtnl-link-dump rtnl-link-event rtnl-link-set \ - rtnl-route-dump genl-family-get +check_PROGRAMS = rtnl-link-dump rtnl-link-dump2 rtnl-link-dump3 \ + rtnl-link-event \ + rtnl-link-set \ + rtnl-route-dump \ + genl-family-get rtnl_link_dump_SOURCES = rtnl-link-dump.c rtnl_link_dump_LDADD = ../src/libmnl.la rtnl_link_dump_LDFLAGS = -dynamic -ldl +rtnl_link_dump2_SOURCES = rtnl-link-dump2.c +rtnl_link_dump2_LDADD = ../src/libmnl.la +rtnl_link_dump2_LDFLAGS = -dynamic -ldl + +rtnl_link_dump3_SOURCES = rtnl-link-dump3.c +rtnl_link_dump3_LDADD = ../src/libmnl.la +rtnl_link_dump3_LDFLAGS = -dynamic -ldl + rtnl_link_event_SOURCES = rtnl-link-event.c rtnl_link_event_LDADD = ../src/libmnl.la rtnl_link_event_LDFLAGS = -dynamic -ldl -- cgit v1.2.3