matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use NLMSG_TAIL and add addraw_l 

(Logical change 1.128)
This commit is contained in:
6!tgraf 2005-01-18 13:58:49 +00:00
parent a10ab08b00
commit 07f9436201
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libnetlink.c
View File

@ -477,7 +477,7 @@ int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data)
fprintf(stderr,"addattr32: Error! max allowed bound %d exceeded\n",maxlen); fprintf(stderr,"addattr32: Error! max allowed bound %d exceeded\n",maxlen);
return -1; return -1;
} }
rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); rta = NLMSG_TAIL(n);
rta->rta_type = type; rta->rta_type = type;
rta->rta_len = len; rta->rta_len = len;
memcpy(RTA_DATA(rta), &data, 4); memcpy(RTA_DATA(rta), &data, 4);
@ -495,7 +495,7 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
fprintf(stderr, "addattr_l ERROR: message exceeded bound of %d\n",maxlen); fprintf(stderr, "addattr_l ERROR: message exceeded bound of %d\n",maxlen);
return -1; return -1;
} }
rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); rta = NLMSG_TAIL(n);
rta->rta_type = type; rta->rta_type = type;
rta->rta_len = len; rta->rta_len = len;
memcpy(RTA_DATA(rta), data, alen); memcpy(RTA_DATA(rta), data, alen);
@ -503,6 +503,19 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
return 0; return 0;
} }
int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
{
if (NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) {
fprintf(stderr, "addraw_l ERROR: message exceeded bound of %d\n",maxlen);
return -1;
}
memcpy(NLMSG_TAIL(n), data, len);
memset((void *) NLMSG_TAIL(n) + len, 0, NLMSG_ALIGN(len) - len);
n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len);
return 0;
}
int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data) int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data)
{ {
int len = RTA_LENGTH(4); int len = RTA_LENGTH(4);