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

gsocket: add G_IO_ERROR_CONNECTION_CLOSED

Browse Source 
Add G_IO_ERROR_CONNECTION_CLOSED as an alias for
G_IO_ERROR_BROKEN_PIPE, and also return it on ECONNRESET.

It doesn't really make sense to try to distinguish EPIPE and
ECONNRESET at the GLib level, since the exact choice of which error
gets returned in what conditions depends on the OS. Given that, we
ought to map the two errors to the same value, and since we're already
mapping EPIPE to G_IO_ERROR_BROKEN_PIPE, we need to map ECONNRESET to
that too. But the existing name doesn't really make sense for sockets,
so we add a new name.

https://bugzilla.gnome.org/show_bug.cgi?id=728928
This commit is contained in:
Dan Winship
2011-08-19 10:23:12 -04:00
parent 64f9bf96fd
commit 967fedc0ae
3 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gio/tests/socket.c
View File

@@ -317,9 +317,23 @@ test_ip_async (GSocketFamily family)
g_thread_join (data->thread);
len = g_socket_receive (client, buf, sizeof (buf), NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (len, ==, 0);
if (family == G_SOCKET_FAMILY_IPV4)
{
/* Test that reading on a remote-closed socket gets back 0 bytes. */
len = g_socket_receive_with_blocking (client, buf, sizeof (buf),
TRUE, NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (len, ==, 0);
}
else
{
/* Test that writing to a remote-closed socket gets back CONNECTION_CLOSED. */
len = g_socket_send_with_blocking (client, testbuf, strlen (testbuf) + 1,
TRUE, NULL, &error);
g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED);
g_assert_cmpint (len, ==, -1);
g_clear_error (&error);
}
g_socket_close (client, &error);
g_assert_no_error (error);
@@ -406,9 +420,21 @@ test_ip_sync (GSocketFamily family)
g_thread_join (data->thread);
len = g_socket_receive (client, buf, sizeof (buf), NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (len, ==, 0);
if (family == G_SOCKET_FAMILY_IPV4)
{
/* Test that reading on a remote-closed socket gets back 0 bytes. */
len = g_socket_receive (client, buf, sizeof (buf), NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (len, ==, 0);
}
else
{
/* Test that writing to a remote-closed socket gets back CONNECTION_CLOSED. */
len = g_socket_send (client, testbuf, strlen (testbuf) + 1, NULL, &error);
g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED);
g_assert_cmpint (len, ==, -1);
g_clear_error (&error);
}
g_socket_close (client, &error);
g_assert_no_error (error);