luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 15:33:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix g_socket_get_available() with TCP on Windows

Browse Source 
Windows needs a special inefficient hack to implement
g_socket_get_available() correctly for UDP sockets, but that hack
isn't needed for TCP, and in fact, might give the wrong answer in that
case. Fix it to only use the hack with UDP.

Also, fix that case to handle non-blocking sockets as well.

And add a test case for g_socket_get_available() with TCP.

https://bugzilla.gnome.org/show_bug.cgi?id=723422
This commit is contained in:
Dan Winship
2014-02-01 14:21:10 +01:00
parent d690b3dcd0
commit 074df39681
2 changed files with 100 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gio/gsocket.c
View File

@@ -2478,8 +2478,10 @@ g_socket_get_available_bytes (GSocket *socket)
#ifdef G_OS_WIN32
const gint bufsize = 64 * 1024;
static guchar *buf = NULL;
#endif
u_long avail;
#else
gint avail;
#endif
g_return_val_if_fail (G_IS_SOCKET (socket), -1);
@@ -2490,10 +2492,20 @@ g_socket_get_available_bytes (GSocket *socket)
if (ioctl (socket->priv->fd, FIONREAD, &avail) < 0)
avail = -1;
#else
if (G_UNLIKELY (g_once_init_enter (&buf)))
g_once_init_leave (&buf, g_malloc (bufsize));
if (socket->priv->type == G_SOCKET_TYPE_DATAGRAM)
{
if (G_UNLIKELY (g_once_init_enter (&buf)))
g_once_init_leave (&buf, g_malloc (bufsize));
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)
avail = 0;
}
else
{
if (ioctlsocket (socket->priv->fd, FIONREAD, &avail) < 0)
avail = -1;
}
#endif
return avail;