Commit 246f1ab2 authored by Dennis Hamester's avatar Dennis Hamester Committed by Jean-Baptiste Kempf

compat: Add custom implementation of recvmsg/sendmsg on NaCl

On Pepper 49, recvmsg and sendmsg are implemented as stubs, which always
return ENOTSUP. Proper implementations for these functions will become
available in later Pepper versions, which should make these compat
functions obsolete.
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3e2accc8
/*****************************************************************************
* recvmsg.c: POSIX recvmsg() replacement
*****************************************************************************
* Copyright © 2017 VLC authors and VideoLAN
* Copyright © 2016 Rémi Denis-Courmont
*
* Authors: Rémi Denis-Courmont
* Dennis Hamester <dhamester@jusst.de>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
......@@ -78,4 +82,82 @@ ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
}
return -1;
}
#elif __native_client__
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/uio.h>
ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
{
if (msg->msg_controllen != 0)
{
errno = ENOSYS;
return -1;
}
if ((msg->msg_iovlen <= 0) || (msg->msg_iovlen > IOV_MAX))
{
errno = EMSGSIZE;
return -1;
}
size_t full_size = 0;
for (int i = 0; i < msg->msg_iovlen; ++i)
full_size += msg->msg_iov[i].iov_len;
if (full_size > SSIZE_MAX) {
errno = EINVAL;
return -1;
}
/**
* We always allocate here, because whether recv/recvfrom allow NULL message
* or not is unspecified.
*/
char *data = malloc(full_size ? full_size : 1);
if (!data) {
errno = ENOMEM;
return -1;
}
ssize_t res;
if (msg->msg_name)
res = recvfrom(fd, data, full_size, flags, msg->msg_name, &msg->msg_namelen);
else
res = recv(fd, data, full_size, flags);
if (res > 0) {
size_t left;
if ((size_t)res <= full_size) {
left = res;
msg->msg_flags = 0;
}
else {
left = full_size;
msg->msg_flags = MSG_TRUNC;
}
const char *src = data;
for (int i = 0; (i < msg->msg_iovlen) && (left > 0); ++i)
{
size_t to_copy = msg->msg_iov[i].iov_len;
if (to_copy > left)
to_copy = left;
memcpy(msg->msg_iov[i].iov_base, src, to_copy);
src += to_copy;
left -= to_copy;
}
}
free(data);
return res;
}
#else
#error recvmsg not implemented on your platform!
#endif
/*****************************************************************************
* sendmsg.c: POSIX sendmsg() replacement
*****************************************************************************
* Copyright © 2017 VLC authors and VideoLAN
* Copyright © 2016 Rémi Denis-Courmont
*
* Authors: Rémi Denis-Courmont
* Dennis Hamester <dhamester@jusst.de>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
......@@ -68,4 +72,64 @@ ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
}
return -1;
}
#elif __native_client__
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/uio.h>
ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
{
if (msg->msg_controllen != 0)
{
errno = ENOSYS;
return -1;
}
if ((msg->msg_iovlen <= 0) || (msg->msg_iovlen > IOV_MAX))
{
errno = EMSGSIZE;
return -1;
}
size_t full_size = 0;
for (int i = 0; i < msg->msg_iovlen; ++i)
full_size += msg->msg_iov[i].iov_len;
if (full_size > SSIZE_MAX) {
errno = EINVAL;
return -1;
}
/**
* We always allocate here, because whether send/sento allow NULL message or
* not is unspecified.
*/
char *data = malloc(full_size ? full_size : 1);
if (!data) {
errno = ENOMEM;
return -1;
}
size_t tmp = 0;
for (int i = 0; i < msg->msg_iovlen; ++i) {
memcpy(data + tmp, msg->msg_iov[i].iov_base, msg->msg_iov[i].iov_len);
tmp += msg->msg_iov[i].iov_len;
}
ssize_t res;
if (msg->msg_name)
res = sendto(fd, data, full_size, flags, msg->msg_name, msg->msg_namelen);
else
res = send(fd, data, full_size, flags);
free(data);
return res;
}
#else
#error sendmsg not implemented on your platform!
#endif
......@@ -301,6 +301,8 @@ case "${host_os}" in
SYS=nacl
AC_DEFINE([_XOPEN_SOURCE], [700], [POSIX and XPG 7th edition])
AC_LIBOBJ([sigwait])
AC_LIBOBJ([recvmsg])
AC_LIBOBJ([sendmsg])
;;
*)
SYS="${host_os}"
......
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