cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

API : fix bug of ff_sendmsg and ff_recvmsg 

freebsd and linux have a different "struct sockaddr".
In ff_recvmsg and ff_recvmsg, ```msg->msg_name```,which can refer to address, can be expected to be converted .
This commit is contained in:
chenwei 2018-02-02 15:28:58 +08:00
parent 4e5f8d85e1
commit 26fa2bc45b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ff_syscall_wrapper.c
View File

@ -334,9 +334,9 @@ linux2freebsd_sockaddr(const struct linux_sockaddr *linux,
return;
}
bzero(freebsd, sizeof(struct sockaddr));
freebsd->sa_len = addrlen;
/* #linux and #freebsd may point to the same address */
freebsd->sa_family = linux->sa_family;
freebsd->sa_len = addrlen;
bcopy(linux->sa_data, freebsd->sa_data, sizeof(linux->sa_data));
}
@ -610,6 +610,11 @@ ff_sendmsg(int s, const struct msghdr *msg, int flags)
{
int rc;
if (msg->msg_name != NULL) {
linux2freebsd_sockaddr(msg->msg_name,
sizeof(struct linux_sockaddr), msg->msg_name);
}
if ((rc = sendit(curthread, s, __DECONST(struct msghdr *, msg), flags)))
goto kern_fail;
@ -676,6 +681,8 @@ ff_recvmsg(int s, struct msghdr *msg, int flags)
}
rc = curthread->td_retval[0];
freebsd2linux_sockaddr(msg->msg_name, msg->msg_name);
return (rc);
kern_fail:
ff_os_errno(rc);