github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-30 19:40:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

FDs transferred over listen socket + other fixes

Browse source
This commit is contained in:
Joseph Henry 2015-12-12 01:28:59 -08:00
parent 761bb4fdd0
commit 99afc74021
3 changed files with 64 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

8
netcon/common.inc.c
View file

@ -171,17 +171,17 @@ ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd)
size = recvmsg (sock, &msg, 0);
if (size < 0) {
perror ("recvmsg");
exit(1);
return -1;
}
cmsg = CMSG_FIRSTHDR(&msg);
if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(int))) {
if (cmsg->cmsg_level != SOL_SOCKET) {
fprintf (stderr, "invalid cmsg_level %d\n",cmsg->cmsg_level);
exit(1);
return -1;
}
if (cmsg->cmsg_type != SCM_RIGHTS) {
fprintf (stderr, "invalid cmsg_type %d\n",cmsg->cmsg_type);
exit(1);
return -1;
}
*fd = *((int *) CMSG_DATA(cmsg));
@ -190,7 +190,7 @@ ssize_t sock_fd_read(int sock, void *buf, ssize_t bufsize, int *fd)
size = read (sock, buf, bufsize);
if (size < 0) {
perror("read");
exit(1);
return -1;
}
}
return size;