Merge commit 'scormi3/master'

[cascardo/gnio.git] / gnio / gtcpclient.c

diff --git a/gnio/gtcpclient.c b/gnio/gtcpclient.c
index c732a59..8978897 100644 (file)
--- a/gnio/gtcpclient.c
+++ b/gnio/gtcpclient.c
@@ -36,15 +36,19 @@ enum
   PROP_0,
   PROP_ADDRESS,
   PROP_HOSTNAME,
-  PROP_PORT
+  PROP_PORT,
+  PROP_INPUT_STREAM,
+  PROP_OUTPUT_STREAM
 };
 
 struct _GTcpClientPrivate
 {
-  GInetSocketAddress *address;
-  gchar              *hostname;
-  gushort             port;
-  GSocket            *socket;
+  GInetSocketAddress   *address;
+  gchar                *hostname;
+  gushort               port;
+  GSocket              *socket;
+  GNetworkInputStream  *input;
+  GNetworkOutputStream *output;
 };
 
 static void
@@ -83,6 +87,14 @@ g_tcp_client_get_property (GObject    *object,
         g_value_set_uint (value, client->priv->port);
         break;
 
+      case PROP_INPUT_STREAM:
+        g_value_set_object (value, g_tcp_client_get_input_stream (client));
+        break;
+
+      case PROP_OUTPUT_STREAM:
+        g_value_set_object (value, g_tcp_client_get_output_stream (client));
+        break;
+
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -175,6 +187,20 @@ g_tcp_client_class_init (GTcpClientClass *klass)
                                                       G_MAXUSHORT,
                                                       0,
                                                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+
+  g_object_class_install_property (gobject_class, PROP_INPUT_STREAM,
+                                   g_param_spec_object ("input-stream",
+                                                        "input stream",
+                                                        "the GNetworkInputStream for reading from this socket",
+                                                        G_TYPE_NETWORK_INPUT_STREAM,
+                                                        G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+
+  g_object_class_install_property (gobject_class, PROP_OUTPUT_STREAM,
+                                   g_param_spec_object ("output-stream",
+                                                        "output stream",
+                                                        "the GNetworkOutputStream for writing to this socket",
+                                                        G_TYPE_NETWORK_OUTPUT_STREAM,
+                                                        G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
 }
 
 static void
@@ -186,6 +212,8 @@ g_tcp_client_init (GTcpClient *client)
   client->priv->hostname = NULL;
   client->priv->port = 0;
   client->priv->socket = NULL;
+  client->priv->input = NULL;
+  client->priv->output = NULL;
 }
 
 GTcpClient *
@@ -207,7 +235,12 @@ g_tcp_client_get_input_stream (GTcpClient *client)
   if (!client->priv->socket)
     return NULL;
 
-  return _g_network_input_stream_new (client->priv->socket);
+  if (client->priv->input)
+    return client->priv->input;
+
+  // TODO: should we set g_object_notify here, or just create both these streams earlier?
+
+  return (client->priv->input = _g_network_input_stream_new (client->priv->socket));
 }
 
 GNetworkOutputStream *
@@ -216,7 +249,12 @@ g_tcp_client_get_output_stream (GTcpClient *client)
   if (!client->priv->socket)
     return NULL;
 
-  return _g_network_output_stream_new (client->priv->socket);
+  if (client->priv->output)
+    return client->priv->output;
+
+  // TODO: should we set g_object_notify here, or just create both these streams earlier?
+
+  return (client->priv->output = _g_network_output_stream_new (client->priv->socket));
 }
 
 gboolean
@@ -250,16 +288,16 @@ g_tcp_client_connect (GTcpClient    *client,
     }
 
   if (G_IS_INET4_ADDRESS (address))
-    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL, error);
+    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL);
   else if (G_IS_INET6_ADDRESS (address))
-    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET6, G_SOCKET_TYPE_STREAM, NULL, error);
+    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET6, G_SOCKET_TYPE_STREAM, NULL);
   else
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported address domain");
       return FALSE;
     }
 
-  if (!client->priv->socket)
+  if (g_socket_has_error (client->priv->socket, error))
     return FALSE;
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
@@ -293,7 +331,7 @@ connect_callback (ConnectData *data,
     {
       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");
@@ -308,6 +346,41 @@ connect_callback (ConnectData *data,
   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,
@@ -325,7 +398,17 @@ g_tcp_client_connect_async (GTcpClient          *client,
   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;
     }
 
@@ -354,7 +437,7 @@ g_tcp_client_connect_async (GTcpClient          *client,
       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);