luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/lantw/freebsd-socket-tests' into 'master'

Browse Source 
socket: Fix get_available_bytes on systems other than Linux and Windows

See merge request GNOME/glib!70
This commit is contained in:
Philip Withnall 2018-06-11 10:58:25 +00:00
commit 15a490755e
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gio/gsocket.c
View File

@ -2957,9 +2957,11 @@ g_socket_check_connect_result (GSocket *socket,
gssize gssize
g_socket_get_available_bytes (GSocket *socket) g_socket_get_available_bytes (GSocket *socket)
{ {
#ifdef G_OS_WIN32 #ifndef SO_NREAD
const gint bufsize = 64 * 1024; const gint bufsize = 64 * 1024;
static guchar *buf = NULL; static guchar *buf = NULL;
#endif
#ifdef G_OS_WIN32
u_long avail; u_long avail;
#else #else
gint avail; gint avail;
@ -2967,25 +2969,37 @@ g_socket_get_available_bytes (GSocket *socket)
g_return_val_if_fail (G_IS_SOCKET (socket), -1); g_return_val_if_fail (G_IS_SOCKET (socket), -1);
#if defined (SO_NREAD) #ifdef SO_NREAD
if (!g_socket_get_option (socket, SOL_SOCKET, SO_NREAD, &avail, NULL)) if (!g_socket_get_option (socket, SOL_SOCKET, SO_NREAD, &avail, NULL))
return -1; return -1;
#elif !defined (G_OS_WIN32)
if (ioctl (socket->priv->fd, FIONREAD, &avail) < 0)
avail = -1;
#else #else
if (socket->priv->type == G_SOCKET_TYPE_DATAGRAM) if (socket->priv->type == G_SOCKET_TYPE_DATAGRAM)
{ {
if (G_UNLIKELY (g_once_init_enter (&buf))) if (G_UNLIKELY (g_once_init_enter (&buf)))
g_once_init_leave (&buf, g_malloc (bufsize)); g_once_init_leave (&buf, g_malloc (bufsize));
/* On datagram sockets, FIONREAD ioctl is not reliable because many
* systems add internal header size to the reported size, making it
* unusable for this function. */
avail = recv (socket->priv->fd, buf, bufsize, MSG_PEEK); avail = recv (socket->priv->fd, buf, bufsize, MSG_PEEK);
if (avail == -1 && get_socket_errno () == WSAEWOULDBLOCK) if (avail == -1)
avail = 0; {
int errsv = get_socket_errno ();
#ifdef G_OS_WIN32
if (errsv == WSAEWOULDBLOCK)
#else
if (errsv == EWOULDBLOCK || errsv == EAGAIN)
#endif
avail = 0;
}
} }
else else
{ {
#ifdef G_OS_WIN32
if (ioctlsocket (socket->priv->fd, FIONREAD, &avail) < 0) if (ioctlsocket (socket->priv->fd, FIONREAD, &avail) < 0)
#else
if (ioctl (socket->priv->fd, FIONREAD, &avail) < 0)
#endif
avail = -1; avail = -1;
} }
#endif #endif