pull in gasynchelper (won't need this once gnio is merged into gio)

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

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index fe93ca8..9a61e11 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #include <glib.h>
 #include <gio/gio.h>
+#include <gio/gasynchelper.h>
 
 #include <string.h>
 #ifndef G_OS_WIN32
@@ -142,7 +143,7 @@ g_socket_class_init (GSocketClass *klass)
                                    g_param_spec_boolean ("blocking",
                                                          "blocking",
                                                          "whether or not this socket is blocking",
-                                                         FALSE,
+                                                         TRUE,
                                                          G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
 }
 
@@ -197,6 +198,16 @@ g_socket_set_blocking (GSocket  *socket,
 
   if (fcntl (socket->priv->fd, F_SETFL, arg) < 0)
     g_warning ("Error setting socket status flags: %s", g_strerror (errno));
+
+  socket->priv->blocking = blocking;
+}
+
+gboolean
+g_socket_get_blocking (GSocket *socket)
+{
+  g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
+
+  return socket->priv->blocking;
 }
 
 GSocketAddress *
@@ -206,6 +217,8 @@ g_socket_get_peer_address (GSocket  *socket,
   gchar buffer[128];
   gsize len;
 
+  g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
+
   if (getpeername (socket->priv->fd, (struct sockaddr *) buffer, &len) < 0)
     {
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "could not get peer address");
@@ -274,13 +287,72 @@ g_socket_accept (GSocket       *socket,
   return g_socket_new_from_fd (ret);
 }
 
+typedef struct {
+  GAsyncReadyCallback callback;
+  GCancellable *cancellable;
+  gpointer user_data;
+  GSocket *socket;
+} AcceptData;
+
+static gboolean
+accept_callback (AcceptData *data,
+                 GIOCondition condition,
+                 gint fd)
+{
+  if (condition & G_IO_IN)
+    {
+      g_print ("WE COULD ACCEPT HERE\n");
+    }
+
+  return FALSE;
+}
+
 void
 g_socket_accept_async (GSocket             *socket,
                        GCancellable        *cancellable,
-                       GAsyncReadyCallback *callback,
+                       GAsyncReadyCallback  callback,
                        gpointer             user_data)
 {
-  
+  GSource *source;
+  GSimpleAsyncResult *result;
+  AcceptData *data;
+  gint ret;
+
+  g_return_if_fail (G_IS_SOCKET (socket));
+
+  if (g_socket_get_blocking (socket))
+    g_socket_set_blocking (socket, FALSE);
+
+  if ((ret = accept (socket->priv->fd, NULL, 0)) < 0)
+    {
+      if (errno == EAGAIN)
+        {
+          source = _g_fd_source_new (socket->priv->fd, G_IO_IN | G_IO_HUP | G_IO_ERR, cancellable);
+
+          data = g_new (AcceptData, 1);
+
+          data->socket = socket;
+          data->callback = callback;
+          data->cancellable = cancellable;
+          data->user_data = user_data;
+
+          g_source_set_callback (source, (GSourceFunc) accept_callback, data, g_free);
+
+          g_source_attach (source, NULL);
+        }
+      else
+        {
+          g_simple_async_report_error_in_idle (G_OBJECT (socket), callback, user_data, G_IO_ERROR, g_io_error_from_errno (errno), "error accepting connection");
+        }
+    }
+  else
+    {
+      result = g_simple_async_result_new (G_OBJECT (socket), callback, user_data, g_socket_accept_async);
+
+      g_simple_async_result_complete_in_idle (result);
+
+      g_object_unref (result);
+    }
 }
 
 GSocket *