X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fgnio.git;a=blobdiff_plain;f=gnio%2Fgtcpclient.c;h=897889751df3caa0606ed54cd1360760a8873092;hp=60822a346b51517d0a6dfc8ca85b35da2208cc92;hb=932359e12259081300067d273febe261eee0c870;hpb=5183a9b80c8a22531948af76f4433f0a1a510cbc

diff --git a/gnio/gtcpclient.c b/gnio/gtcpclient.c
index 60822a3..8978897 100644
--- 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 *
@@ -201,6 +229,34 @@ g_tcp_client_new_from_address (GInetSocketAddress *address)
   return G_TCP_CLIENT (g_object_new (G_TYPE_TCP_CLIENT, "address", address, NULL));
 }
 
+GNetworkInputStream *
+g_tcp_client_get_input_stream (GTcpClient *client)
+{
+  if (!client->priv->socket)
+    return NULL;
+
+  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 *
+g_tcp_client_get_output_stream (GTcpClient *client)
+{
+  if (!client->priv->socket)
+    return NULL;
+
+  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
 g_tcp_client_connect (GTcpClient    *client,
                       GCancellable  *cancellable,
@@ -228,7 +284,7 @@ g_tcp_client_connect (GTcpClient    *client,
     }
   else
     {
-     address = g_inet_socket_address_get_address (client->priv->address);
+      address = g_inet_socket_address_get_address (client->priv->address);
     }
 
   if (G_IS_INET4_ADDRESS (address))
@@ -258,8 +314,6 @@ typedef struct {
   GCancellable        *cancellable;
   gpointer             user_data;
   GTcpClient          *client;
-  gchar                address_buffer[256];
-  gsize                address_length;
 } ConnectData;
 
 static gboolean
@@ -267,16 +321,149 @@ connect_callback (ConnectData *data,
                   GIOCondition condition,
                   gint fd)
 {
+  GTcpClient *client;
+  GSimpleAsyncResult *result;
+  GError *error = NULL;
+
+  client = data->client;
+
+  if (condition & G_IO_OUT)
+    {
+      result = g_simple_async_result_new (G_OBJECT (client), data->callback, data->user_data, g_tcp_client_connect_async);
+    }
+  else
+    {
+      if (!g_socket_has_socket_error (client->priv->socket, &error))
+        g_warning ("got G_IO_ERR but socket does not have error");
+
+      result = g_simple_async_result_new_from_error (G_OBJECT (client), data->callback, data->user_data, error);
+    }
+
+  g_simple_async_result_complete (result);
+
+  g_object_unref (result);
+
   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,
                             GAsyncReadyCallback  callback,
                             gpointer             user_data)
 {
+  GInetAddress *address;
+  GSimpleAsyncResult *result;
+  GSource *source;
+  ConnectData *data;
+  GError *error = NULL;
+
+  g_return_if_fail (G_IS_TCP_CLIENT (client));
+
+  if (!client->priv->address)
+    {
+      // we've been constructed with just hostname+port, resolve
+      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;
+    }
+
+  address = g_inet_socket_address_get_address (client->priv->address);
 
+  if (G_IS_INET4_ADDRESS (address))
+    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL, &error);
+  else if (G_IS_INET6_ADDRESS (address))
+    client->priv->socket = g_socket_new (G_SOCKET_DOMAIN_INET6, G_SOCKET_TYPE_STREAM, NULL, &error);
+  else
+    {
+      g_simple_async_report_error_in_idle (G_OBJECT (client), callback, user_data, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported address domain");
+      return;
+    }
+
+  if (!client->priv->socket)
+    {
+      g_simple_async_report_gerror_in_idle (G_OBJECT (client), callback, user_data, error);
+      return;
+    }
+
+  g_socket_set_blocking (client->priv->socket, FALSE);
+
+  if (!g_socket_connect (client->priv->socket, G_SOCKET_ADDRESS (client->priv->address), &error))
+    {
+      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 | G_IO_HUP, cancellable);
+
+          data = g_new (ConnectData, 1);
+
+          data->client = client;
+          data->callback = callback;
+          data->cancellable = cancellable;
+          data->user_data = user_data;
+
+          g_source_set_callback (source, (GSourceFunc) connect_callback, data, g_free);
+
+          g_source_attach (source, NULL);
+        }
+      else
+        {
+          g_simple_async_report_gerror_in_idle (G_OBJECT (client), callback, user_data, error);
+        }
+    }
+  else
+    {
+      // the connection is already completed
+      result = g_simple_async_result_new (G_OBJECT (client), callback, user_data, g_tcp_client_connect_async);
+
+      g_simple_async_result_complete_in_idle (result);
+
+      g_object_unref (result);
+    }
 }
 
 gboolean