Commit 95ba2e83 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

compat: replace sendmsg()

parent a3f92eaf
/*****************************************************************************
* sendmsg.c: POSIX sendmsg() replacement
*****************************************************************************
* Copyright © 2016 Rémi Denis-Courmont
*
* 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef _WIN32
# include <errno.h>
# include <stdlib.h>
# include <mswsock.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 > IOV_MAX)
{
errno = EINVAL;
return -1;
}
WSABUF *buf = malloc(msg->msg_iovlen * sizeof (*buf));
if (buf == NULL)
return -1;
for (unsigned i = 0; i < msg->msg_iovlen; i++)
{
buf[i].len = msg->msg_iov[i].iov_len;
buf[i].buf = (void *)msg->msg_iov[i].iov_base;
}
DWORD sent;
int ret = WSASendTo(fd, buf, msg->msg_iovlen, &sent, flags,
msg->msg_name, msg->msg_namelen, NULL, NULL);
free(buf);
if (ret == 0)
return sent;
switch (WSAGetLastError())
{
case WSAEWOULDBLOCK:
errno = EAGAIN;
break;
}
return -1;
}
#endif
...@@ -565,7 +565,7 @@ need_libc=false ...@@ -565,7 +565,7 @@ need_libc=false
dnl Check for usual libc functions dnl Check for usual libc functions
AC_CHECK_DECLS([nanosleep],,,[#include <time.h>]) AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
AC_CHECK_FUNCS([daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale pthread_cond_timedwait_monotonic_np pthread_condattr_setclock]) AC_CHECK_FUNCS([daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale pthread_cond_timedwait_monotonic_np pthread_condattr_setclock])
AC_REPLACE_FUNCS([atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy timegm timespec_get strverscmp]) AC_REPLACE_FUNCS([atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv nrand48 poll posix_memalign rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy timegm timespec_get strverscmp])
AC_CHECK_FUNCS(fdatasync,, AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
]) ])
......
...@@ -346,6 +346,30 @@ struct if_nameindex ...@@ -346,6 +346,30 @@ struct if_nameindex
# define if_freenameindex(list) (void)0 # define if_freenameindex(list) (void)0
#endif #endif
#ifdef _WIN32
struct iovec
{
void *iov_base;
size_t iov_len;
};
#define IOV_MAX 255
struct msghdr
{
void *msg_name;
size_t msg_namelen;
struct iovec *msg_iov;
size_t msg_iovlen;
void *msg_control;
size_t msg_controllen;
int msg_flags;
};
#endif
#ifndef HAVE_SENDMSG
struct msghdr;
ssize_t sendmsg(int, const struct msghdr *, int);
#endif
/* search.h */ /* search.h */
#ifndef HAVE_SEARCH_H #ifndef HAVE_SEARCH_H
typedef struct entry { typedef struct entry {
......
...@@ -41,24 +41,6 @@ ...@@ -41,24 +41,6 @@
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
# define net_errno (WSAGetLastError()) # define net_errno (WSAGetLastError())
struct iovec
{
void *iov_base;
size_t iov_len;
};
struct msghdr
{
void *msg_name;
size_t msg_namelen;
struct iovec *msg_iov;
size_t msg_iovlen;
void *msg_control;
size_t msg_controllen;
int msg_flags;
};
# ifndef IPV6_V6ONLY # ifndef IPV6_V6ONLY
# define IPV6_V6ONLY 27 # define IPV6_V6ONLY 27
# endif # endif
......
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