{
result = g_simple_async_result_new (G_OBJECT (client), data->callback, data->user_data, g_tcp_client_connect_async);
}
- else if (condition & G_IO_ERR)
+ else
{
if (!g_socket_has_socket_error (client->priv->socket, &error))
g_warning ("got G_IO_ERR but socket does not have error");
return FALSE;
}
+static void
+resolve_callback (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ ConnectData *data = (ConnectData *) user_data;
+ GInetAddress *address;
+ GSimpleAsyncResult *error_result;
+ GError *error = NULL;
+
+ address = g_resolver_resolve_finish (G_RESOLVER (source), result, &error);
+
+ g_object_unref (G_RESOLVER (source));
+
+ if (!address)
+ {
+ error_result = g_simple_async_result_new_from_error (G_OBJECT (data->client), data->callback, data->user_data, error);
+
+ g_simple_async_result_complete (error_result);
+
+ g_object_unref (error_result);
+ }
+ else
+ {
+ data->client->priv->address = g_inet_socket_address_new (address, data->client->priv->port);
+
+ g_object_ref_sink (data->client->priv->address);
+
+ // at this point, the address has been resolved, so connect_async again
+ g_tcp_client_connect_async (data->client, data->cancellable, data->callback, data->user_data);
+ }
+
+ g_free (data);
+}
+
void
g_tcp_client_connect_async (GTcpClient *client,
GCancellable *cancellable,
if (!client->priv->address)
{
// we've been constructed with just hostname+port, resolve
- // GResolver *resolver = g_resolver_new ();
+ GResolver *resolver = g_resolver_new ();
+
+ data = g_new (ConnectData, 1);
+
+ data->client = client;
+ data->callback = callback;
+ data->cancellable = cancellable;
+ data->user_data = user_data;
+
+ g_resolver_resolve_async (resolver, client->priv->hostname, cancellable, resolve_callback, data);
+
return;
}
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PENDING))
{
// the connection is in progress
- source = g_socket_create_source (client->priv->socket, G_IO_OUT | G_IO_ERR, cancellable);
+ source = g_socket_create_source (client->priv->socket, G_IO_OUT | G_IO_ERR | G_IO_HUP, cancellable);
data = g_new (ConnectData, 1);