d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on ia64.

Browse Source 
I found no way how to use CMSG_NXTHDR() macro on ia64 without alignment
warnings.

MFC after:	1 week
This commit is contained in:
pjd 2011-01-31 23:46:36 +00:00
parent f5ee3977a7
commit b1efa03054
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/hastd/proto_common.c
View File

@ -113,7 +113,7 @@ proto_common_descriptor_send(int sock, int fd)
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
// *((int *)CMSG_DATA(cmsg)) = fd;
bcopy(&fd, CMSG_DATA(cmsg), sizeof(fd));
if (sendmsg(sock, &msg, 0) == -1)
return (errno);
@ -142,14 +142,12 @@ proto_common_descriptor_recv(int sock, int *fdp)
if (recvmsg(sock, &msg, 0) == -1)
return (errno);
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_RIGHTS) {
// *fdp = *((int *)CMSG_DATA(cmsg));
return (0);
}
cmsg = CMSG_FIRSTHDR(&msg);
if (cmsg->cmsg_level != SOL_SOCKET ||
cmsg->cmsg_type == SCM_RIGHTS) {
return (EINVAL);
}
bcopy(CMSG_DATA(cmsg), fdp, sizeof(*fdp));
return (ENOENT);
return (0);
}