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

socket-testclient: Support connecting to IPv6 addresses

Browse Source 
Each enumerated address can be of a different family type, so you have to make a socket after you have that information.

As this is just a test client we make a new socket each time for simplicity.
This commit is contained in:
Patrick Griffis
2025-07-02 09:49:37 -05:00
parent d03f495b31
commit 984d5cb199
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gio/tests/socket-testclient.c
View File

@@ -103,6 +103,17 @@ lookup_client_certificate (GTlsClientConnection *conn,
return certificate; return certificate;
} }
static GSocket *
make_socket (GSocketFamily socket_family, GSocketType socket_type, GError **error)
{
GSocket *socket = g_socket_new (socket_family, socket_type, 0, error);
if (socket && read_timeout)
g_socket_set_timeout (socket, read_timeout);
return socket;
}
static gboolean static gboolean
make_connection (const char *argument, make_connection (const char *argument,
GTlsCertificate *certificate, GTlsCertificate *certificate,
@@ -115,7 +126,6 @@ make_connection (const char *argument,
GError **error) GError **error)
{ {
GSocketType socket_type; GSocketType socket_type;
GSocketFamily socket_family;
GSocketAddressEnumerator *enumerator; GSocketAddressEnumerator *enumerator;
GSocketConnectable *connectable; GSocketConnectable *connectable;
GSocketAddress *src_address; GSocketAddress *src_address;
@@ -127,17 +137,6 @@ make_connection (const char *argument,
else else
socket_type = G_SOCKET_TYPE_STREAM; socket_type = G_SOCKET_TYPE_STREAM;
if (unix_socket)
socket_family = G_SOCKET_FAMILY_UNIX;
else
socket_family = G_SOCKET_FAMILY_IPV4;
*socket = g_socket_new (socket_family, socket_type, 0, error);
if (*socket == NULL)
return FALSE;
if (read_timeout)
g_socket_set_timeout (*socket, read_timeout);
if (unix_socket) if (unix_socket)
{ {
@@ -171,11 +170,21 @@ make_connection (const char *argument,
return FALSE; return FALSE;
} }
*socket = make_socket (unix_socket ? G_SOCKET_FAMILY_UNIX : g_socket_address_get_family (*address),
socket_type, error);
if (*socket == NULL)
{
g_object_unref (*address);
g_object_unref (enumerator);
return FALSE;
}
if (g_socket_connect (*socket, *address, cancellable, &err)) if (g_socket_connect (*socket, *address, cancellable, &err))
break; break;
g_message ("Connection to %s failed: %s, trying next", socket_address_to_string (*address), err->message); g_message ("Connection to %s failed: %s, trying next", socket_address_to_string (*address), err->message);
g_clear_error (&err); g_clear_error (&err);
g_object_unref (*socket);
g_object_unref (*address); g_object_unref (*address);
} }
g_object_unref (enumerator); g_object_unref (enumerator);