emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make nl.c:nl_rtattr_parse() use the standard NLMSG_* and RTA_* macros.

Browse Source 
It's easier to verify correct behavior this way.
This commit is contained in:
Nicholas J. Kain 2014-03-17 20:02:22 -04:00
parent 268e88dc24
commit 8416d5a633
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ndhc/nl.c
View File

@ -81,13 +81,10 @@ void nl_attr_parse(const struct nlmsghdr *nlh, size_t offset,
void nl_rtattr_parse(const struct nlmsghdr *nlh, size_t offset, void nl_rtattr_parse(const struct nlmsghdr *nlh, size_t offset,
nl_rtattr_parse_fn workfn, void *data) nl_rtattr_parse_fn workfn, void *data)
{ {
struct rtattr *attr; struct rtattr *attr =
for (attr = (struct rtattr *) (struct rtattr *)((char *)NLMSG_DATA(nlh) + NLMSG_ALIGN(offset));
((char *)nlh + NLMSG_HDRLEN + NLMSG_ALIGN(offset)); size_t rtlen = nlh->nlmsg_len - NLMSG_HDRLEN - NLMSG_ALIGN(offset);
rtattr_ok(attr, (char *)nlh + NLMSG_ALIGN(nlh->nlmsg_len) - for (; RTA_OK(attr, rtlen); attr = RTA_NEXT(attr, rtlen)) {
(char *)attr);
attr = (struct rtattr *)((char *)attr + NLMSG_ALIGN(attr->rta_len)))
{
if (workfn(attr, attr->rta_type, data) < 0) if (workfn(attr, attr->rta_type, data) < 0)
break; break;
} }

5
ndhc/nl.h
View File

@ -44,11 +44,6 @@ static inline int nl_attr_ok(const struct nlattr *attr, size_t len)
return 1; return 1;
} }
static inline int rtattr_ok(const struct rtattr *attr, size_t len)
{
return RTA_OK(attr, len);
}
static inline size_t nlattr_get_len(const struct nlattr *attr) static inline size_t nlattr_get_len(const struct nlattr *attr)
{ {
return attr->nla_len; return attr->nla_len;