Skip to content

P
PPSi
Commit 1ec040d7 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Aurelio Colosimo
Browse files
Options

posix-socket: a little simpler recvmsg

parent 7a5377a9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 14 deletions
arch-gnu-linux/posix-socket.c
View file @ 1ec040d7
...@@ -26,11 +26,10 @@ int posix_recv_msg(int fd, void *pkt, int len, TimeInternal *t) ...@@ -26,11 +26,10 @@ int posix_recv_msg(int fd, void *pkt, int len, TimeInternal *t)
ssize_t ret; ssize_t ret;
struct msghdr msg; struct msghdr msg;
struct iovec vec[1]; struct iovec vec[1];
struct sockaddr_in from_addr;
union { union {
struct cmsghdr cm; struct cmsghdr cm;
char control[CMSG_SPACE(sizeof(struct timeval))]; char control[512];
} cmsg_un; } cmsg_un;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
...@@ -40,17 +39,13 @@ int posix_recv_msg(int fd, void *pkt, int len, TimeInternal *t) ...@@ -40,17 +39,13 @@ int posix_recv_msg(int fd, void *pkt, int len, TimeInternal *t)
vec[0].iov_len = PP_PACKET_SIZE; vec[0].iov_len = PP_PACKET_SIZE;
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
memset(&from_addr, 0, sizeof(from_addr));
memset(pkt, 0, PP_PACKET_SIZE);
memset(&cmsg_un, 0, sizeof(cmsg_un)); memset(&cmsg_un, 0, sizeof(cmsg_un));
msg.msg_name = (caddr_t)&from_addr; /* msg_name, msg_namelen == 0: not used */
msg.msg_namelen = sizeof(from_addr);
msg.msg_iov = vec; msg.msg_iov = vec;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
msg.msg_control = cmsg_un.control; msg.msg_control = cmsg_un.control;
msg.msg_controllen = sizeof(cmsg_un.control); msg.msg_controllen = sizeof(cmsg_un.control);
msg.msg_flags = 0;
ret = recvmsg(fd, &msg, MSG_DONTWAIT); ret = recvmsg(fd, &msg, MSG_DONTWAIT);
if (ret <= 0) { if (ret <= 0) {
...@@ -68,14 +63,8 @@ int posix_recv_msg(int fd, void *pkt, int len, TimeInternal *t) ...@@ -68,14 +63,8 @@ int posix_recv_msg(int fd, void *pkt, int len, TimeInternal *t)
PP_PRINTF("Error: received truncated ancillary data\n"); PP_PRINTF("Error: received truncated ancillary data\n");
return 0; return 0;
} }
if (msg.msg_controllen < sizeof(cmsg_un.control)) {
PP_PRINTF("Error: received short ancillary data (%ld/%ld)\n",
(long)msg.msg_controllen, (long)sizeof(cmsg_un.control));
return 0; tv = NULL;
}
tv = 0;
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
cmsg = CMSG_NXTHDR(&msg, cmsg)) { cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level == SOL_SOCKET && if (cmsg->cmsg_level == SOL_SOCKET &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment