TcpClient seems to be working for sync connects, but connect()

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

diff --git a/gnio/gtcpclient.c b/gnio/gtcpclient.c
index fc03627..1bb056f 100644 (file)
--- a/gnio/gtcpclient.c
+++ b/gnio/gtcpclient.c
@@ -24,13 +24,11 @@
 #include <config.h>
 #include <glib.h>
 #include <gio/gio.h>
 #include <config.h>
 #include <glib.h>
 #include <gio/gio.h>

+#include <gnio/gnio.h>

 
 #include <string.h>
 #include <errno.h>
 
 
 #include <string.h>
 #include <errno.h>
 

-#include "gtcpclient.h"
-#include "gasynchelper.h"
-

 G_DEFINE_TYPE (GTcpClient, g_tcp_client, G_TYPE_OBJECT);
 
 enum
 G_DEFINE_TYPE (GTcpClient, g_tcp_client, G_TYPE_OBJECT);
 
 enum


@@ -46,6 +44,7 @@ struct _GTcpClientPrivate
   GInetSocketAddress *address;
   gchar              *hostname;
   gushort             port;
   GInetSocketAddress *address;
   gchar              *hostname;
   gushort             port;

+  GSocket            *socket;

 };
 
 static void
 };
 
 static void


@@ -101,7 +100,9 @@ g_tcp_client_set_property (GObject      *object,
     {
       case PROP_ADDRESS:
         // sink the address' floating reference
     {
       case PROP_ADDRESS:
         // sink the address' floating reference

-        client->priv->address = G_INET_SOCKET_ADDRESS (g_object_ref_sink (g_value_get_object (value)));
+        client->priv->address = G_INET_SOCKET_ADDRESS (g_value_get_object (value));
+        if (client->priv->address)
+          g_object_ref_sink (client->priv->address);

         break;
 
       case PROP_HOSTNAME:
         break;
 
       case PROP_HOSTNAME:


@@ -164,7 +165,7 @@ g_tcp_client_class_init (GTcpClientClass *klass)
                                                         "hostname",
                                                         "the hostname of the remote address the socket will connect to",
                                                         NULL,
                                                         "hostname",
                                                         "the hostname of the remote address the socket will connect to",
                                                         NULL,

-                                                        G_PARAM_CONSTRUCT_ONLY | G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+                                                        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_PORT,
                                    g_param_spec_uint ("port",
 
   g_object_class_install_property (gobject_class, PROP_PORT,
                                    g_param_spec_uint ("port",


@@ -173,7 +174,7 @@ g_tcp_client_class_init (GTcpClientClass *klass)
                                                       0,
                                                       G_MAXUSHORT,
                                                       0,
                                                       0,
                                                       G_MAXUSHORT,
                                                       0,

-                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+                                                      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));

 }
 
 static void
 }
 
 static void


@@ -184,6 +185,7 @@ g_tcp_client_init (GTcpClient *client)
   client->priv->address = NULL;
   client->priv->hostname = NULL;
   client->priv->port = 0;
   client->priv->address = NULL;
   client->priv->hostname = NULL;
   client->priv->port = 0;

+  client->priv->socket = NULL;

 }
 
 GTcpClient *
 }
 
 GTcpClient *


@@ -204,7 +206,51 @@ g_tcp_client_connect (GTcpClient    *client,
                       GCancellable  *cancellable,
                       GError       **error)
 {
                       GCancellable  *cancellable,
                       GError       **error)
 {

-  return FALSE;
+  GInetAddress *address;
+
+  g_return_val_if_fail (G_IS_TCP_CLIENT (client), FALSE);
+
+  if (!client->priv->address)
+    {
+      // we've been constructed with just hostname+port, resolve
+      GResolver *resolver = g_resolver_new ();
+
+      address = g_resolver_resolve (resolver, client->priv->hostname, cancellable, error);
+
+      if (!address)
+        return FALSE;
+
+      client->priv->address = g_inet_socket_address_new (address, client->priv->port);
+
+      g_object_unref (resolver);
+
+      g_object_ref_sink (client->priv->address);
+    }
+  else
+    {
+     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_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported address domain");
+      return FALSE;
+    }
+
+  if (!client->priv->socket)
+    return FALSE;
+
+  if (g_cancellable_set_error_if_cancelled (cancellable, error))
+    return FALSE;
+
+  if (!g_socket_connect (client->priv->socket, G_SOCKET_ADDRESS (client->priv->address), error))
+    return FALSE;
+
+  return TRUE;

 }
 
 typedef struct {
 }
 
 typedef struct {