summaryrefslogtreecommitdiff
path: root/cleopatre/devkit/plcd
diff options
context:
space:
mode:
authorlefranc2010-06-22 16:47:32 +0000
committerlefranc2010-06-22 16:47:32 +0000
commitb8d986f3e9bc91679ea387e2fc8667fca98d2fa1 (patch)
tree86ed944184ef7cd28759cbfe29de4c4ec398f6b6 /cleopatre/devkit/plcd
parent85011ff1152556d72614d4b349f4ae7f182ef5bc (diff)
cleo/{devkit,appli}: use NLMSG_LENGTH for netlink, closes #1692
- NLMSG_LENGTH replaces NLMSG_SPACE which is aligning data to 4 bytes git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7252 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/devkit/plcd')
-rw-r--r--cleopatre/devkit/plcd/src/event.c6
-rw-r--r--cleopatre/devkit/plcd/src/hpav.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/cleopatre/devkit/plcd/src/event.c b/cleopatre/devkit/plcd/src/event.c
index 4c9d741cc3..430aa59c75 100644
--- a/cleopatre/devkit/plcd/src/event.c
+++ b/cleopatre/devkit/plcd/src/event.c
@@ -301,11 +301,11 @@ int event_process (plcd_ctx_t *ctx)
if (FD_ISSET (ctx->plc_sock, &readfds))
{
/* create message from PLC driver netlink */
- nlh=(struct nlmsghdr *)malloc(NLMSG_SPACE(ETH_DATA_LEN));
- memset(nlh, 0, NLMSG_SPACE(ETH_DATA_LEN));
+ nlh=(struct nlmsghdr *)malloc(NLMSG_LENGTH(ETH_DATA_LEN));
+ memset(nlh, 0, NLMSG_LENGTH(ETH_DATA_LEN));
memset(&kernel_addr, 0, sizeof(kernel_addr));
iov.iov_base = (void *)nlh;
- iov.iov_len = NLMSG_SPACE(ETH_DATA_LEN);
+ iov.iov_len = NLMSG_LENGTH(ETH_DATA_LEN);
msg.msg_name = (void *)&kernel_addr;
msg.msg_namelen = sizeof(kernel_addr);
msg.msg_iov = &iov;
diff --git a/cleopatre/devkit/plcd/src/hpav.c b/cleopatre/devkit/plcd/src/hpav.c
index db3867af65..1ba6ff226c 100644
--- a/cleopatre/devkit/plcd/src/hpav.c
+++ b/cleopatre/devkit/plcd/src/hpav.c
@@ -113,11 +113,11 @@ int hpav_send_mme (const plcd_ctx_t *plcd_ctx, mme_ctx_t *request_ctx, mme_ctx_t
kernel_addr.nl_groups = 0; /* unicast */
/* create the message */
- nlh=(struct nlmsghdr *)malloc(NLMSG_SPACE(ETH_FRAME_LEN));
- memset(nlh, 0, NLMSG_SPACE(ETH_FRAME_LEN));
+ nlh=(struct nlmsghdr *)malloc(NLMSG_LENGTH(ETH_FRAME_LEN));
+ memset(nlh, 0, NLMSG_LENGTH(ETH_FRAME_LEN));
/* fill the netlink message header */
- nlh->nlmsg_len = NLMSG_SPACE(ETH_FRAME_LEN);
+ nlh->nlmsg_len = NLMSG_LENGTH(ETH_FRAME_LEN);
nlh->nlmsg_pid = getpid(); /* self pid */
nlh->nlmsg_flags = 0;
@@ -139,7 +139,7 @@ int hpav_send_mme (const plcd_ctx_t *plcd_ctx, mme_ctx_t *request_ctx, mme_ctx_t
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
iov.iov_base = (void *)nlh;
- iov.iov_len = NLMSG_SPACE(msg_payload_len);
+ iov.iov_len = NLMSG_LENGTH(msg_payload_len);
if(0 > sendmsg (plcd_ctx->plc_sock, &msg, 0))
{
@@ -149,8 +149,8 @@ int hpav_send_mme (const plcd_ctx_t *plcd_ctx, mme_ctx_t *request_ctx, mme_ctx_t
}
/* prepare the recv message */
- memset(nlh, 0, NLMSG_SPACE(ETH_FRAME_LEN));
- iov.iov_len = NLMSG_SPACE(ETH_FRAME_LEN);
+ memset(nlh, 0, NLMSG_LENGTH(ETH_FRAME_LEN));
+ iov.iov_len = NLMSG_LENGTH(ETH_FRAME_LEN);
/* wait for confirm message */
timeout.tv_sec = MME_TOUT;