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

Revert "fix cmsg for sendmsg". Fix #778. 

This reverts commit 9582dbb778.
This commit is contained in:
fengbojiang 2023-08-11 15:13:37 +08:00
parent ac031c3e5d
commit fe40712835
1 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/ff_syscall_wrapper.c
View File

@ -383,8 +383,6 @@ ip_opt_convert(int optname)
{
switch(optname) {
case LINUX_IP_TOS:
*(char*)modoptval = *(int *)optval;
*modoptlen = CMSG_LEN(sizeof(char));
return IP_TOS;
case LINUX_IP_TTL:
return IP_TTL;
@ -528,37 +526,6 @@ freebsd2linux_sockaddr(struct linux_sockaddr *linux,
bcopy(freebsd->sa_data, linux->sa_data, freebsd->sa_len - sizeof(linux->sa_family));
}
static int
linux2freebsd_cmsg(const struct msghdr *msg, struct cmsghdr **cmsg)
{
struct cmsghdr *cmsg_bsd = NULL;
cmsg_bsd = malloc(msg->msg_controllen,NULL,0);
*cmsg = cmsg_bsd;
struct linux_cmsghdr *linux_cmsg = (struct linux_cmsghdr *) msg->msg_control;
while (linux_cmsg != NULL) {
cmsg_bsd->cmsg_len = CMSG_LEN(linux_cmsg->cmsg_len - sizeof(struct linux_cmsghdr));
cmsg_bsd->cmsg_level = linux_cmsg->cmsg_level;
cmsg_bsd->cmsg_type = linux_cmsg->cmsg_type;
void *modoptval = CMSG_DATA(cmsg_bsd);
socklen_t modoptlen = cmsg_bsd->cmsg_len;
memcpy(((char *)cmsg_bsd)+sizeof(struct cmsghdr), ((char *)linux_cmsg)+sizeof(struct linux_cmsghdr), linux_cmsg->cmsg_len - sizeof(struct linux_cmsghdr));
cmsg_bsd->cmsg_type = linux2freebsd_opt(cmsg_bsd->cmsg_level, cmsg_bsd->cmsg_type, CMSG_DATA(cmsg_bsd), cmsg_bsd->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)), &modoptval, &modoptlen);
if (cmsg_bsd->cmsg_type < 0) {
free(cmsg,NULL);
return -1;
}
cmsg_bsd->cmsg_len = modoptlen;
linux_cmsg = (struct linux_cmsghdr*) CMSG_NXTHDR(msg, linux_cmsg);
cmsg_bsd = CMSG_NXTHDR(msg, cmsg_bsd);
}
return 0;
}
int
ff_socket(int domain, int type, int protocol)
{
@ -873,28 +840,15 @@ ff_sendmsg(int s, const struct msghdr *msg, int flags)
int rc;
struct sockaddr_storage freebsd_sa;
void *linux_sa = msg->msg_name;
struct cmsghdr *cmsg = NULL;
if (linux_sa != NULL) {
linux2freebsd_sockaddr(linux_sa,
sizeof(struct linux_sockaddr), (struct sockaddr *)&freebsd_sa);
__DECONST(struct msghdr *, msg)->msg_name = &freebsd_sa;
}
if (msg && msg->msg_control)
{
if(linux2freebsd_cmsg(msg, &cmsg) < 0)
{
rc = EINVAL;
goto kern_fail;
}
__DECONST(struct msghdr *, msg)->msg_control = cmsg;
}
rc = sendit(curthread, s, __DECONST(struct msghdr *, msg), flags);
if (cmsg)
free(cmsg,NULL);
__DECONST(struct msghdr *, msg)->msg_name = linux_sa;
if (rc)