autotools are dumb, so I'm also adding gnioenumtypes.{c,h}

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

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index 69a1b5c..0ca9091 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -24,7 +24,9 @@
 #include <config.h>
 #include <glib.h>
 #include <gio/gio.h>
-#include <gio/gasynchelper.h>
+#include <gnio/gnio.h>
+#include "gasynchelper.h"
+#include "gnioenumtypes.h"
 
 #include <string.h>
 #ifndef G_OS_WIN32
@@ -51,6 +53,9 @@ G_DEFINE_TYPE (GSocket, g_socket, G_TYPE_OBJECT);
 enum
 {
   PROP_0,
+  PROP_DOMAIN,
+  PROP_TYPE,
+  PROP_PROTOCOL,
   PROP_FD,
   PROP_BLOCKING,
   PROP_BACKLOG,
@@ -61,14 +66,24 @@ enum
 
 struct _GSocketPrivate
 {
+  GSocketDomain domain;
+  GSocketType type;
+  gchar *protocol;
   gint fd;
   gboolean blocking;
   gint backlog;
   gboolean reuse_address;
+  GError *error;
   GSocketAddress *local_address;
   GSocketAddress *remote_address;
 };
 
+static void
+g_socket_constructed (GObject *object)
+{
+
+}
+
 static void
 g_socket_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
@@ -76,6 +91,18 @@ g_socket_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
 
   switch (prop_id)
     {
+      case PROP_DOMAIN:
+        g_value_set_int (value, socket->priv->domain);
+        break;
+
+      case PROP_TYPE:
+        g_value_set_int (value, socket->priv->type);
+        break;
+
+      case PROP_PROTOCOL:
+        g_value_set_string (value, socket->priv->protocol);
+        break;
+
       case PROP_FD:
         g_value_set_int (value, socket->priv->fd);
         break;
@@ -170,9 +197,37 @@ g_socket_class_init (GSocketClass *klass)
 
   gobject_class->finalize = g_socket_finalize;
   gobject_class->dispose = g_socket_dispose;
+  gobject_class->constructed = g_socket_constructed;
   gobject_class->set_property = g_socket_set_property;
   gobject_class->get_property = g_socket_get_property;
 
+  g_object_class_install_property (gobject_class, PROP_DOMAIN,
+                                   g_param_spec_int ("domain",
+                                                     "file descriptor",
+                                                     "the socket's file descriptor",
+                                                     G_MININT,
+                                                     G_MAXINT,
+                                                     -1,
+                                                     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_TYPE,
+                                   g_param_spec_int ("fd",
+                                                     "file descriptor",
+                                                     "the socket's file descriptor",
+                                                     G_MININT,
+                                                     G_MAXINT,
+                                                     -1,
+                                                     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_PROTOCOL,
+                                   g_param_spec_int ("fd",
+                                                     "file descriptor",
+                                                     "the socket's file descriptor",
+                                                     G_MININT,
+                                                     G_MAXINT,
+                                                     -1,
+                                                     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_FD,
                                    g_param_spec_int ("fd",
                                                      "file descriptor",
@@ -228,13 +283,16 @@ g_socket_init (GSocket *socket)
   socket->priv->fd = -1;
   socket->priv->blocking = TRUE;
   socket->priv->backlog = 10;
+  socket->priv->reuse_address = FALSE;
+  socket->priv->error = NULL;
   socket->priv->remote_address = NULL;
   socket->priv->local_address = NULL;
 }
 
 GSocket *
-g_socket_new (GSocketDomain domain, GSocketType type, const gchar *protocol, GError **error)
+g_socket_new (GSocketDomain domain, GSocketType type, const gchar *protocol)
 {
+  GError *error = NULL;
   static GStaticMutex getprotobyname_mutex = G_STATIC_MUTEX_INIT;
   gint fd, native_domain, native_type, native_protocol;
 
@@ -253,7 +311,7 @@ g_socket_new (GSocketDomain domain, GSocketType type, const gchar *protocol, GEr
         break;
 
       default:
-        g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket domain");
+        g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket domain");
         return NULL;
     }
 
@@ -272,7 +330,7 @@ g_socket_new (GSocketDomain domain, GSocketType type, const gchar *protocol, GEr
         break;
 
       default:
-        g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket type");
+        g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket type");
         return NULL;
     }
 
@@ -285,7 +343,7 @@ g_socket_new (GSocketDomain domain, GSocketType type, const gchar *protocol, GEr
       if (!(ent = getprotobyname (protocol)))
         {
           g_static_mutex_unlock (&getprotobyname_mutex);
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket protocol");
+          g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "unsupported socket protocol");
           return NULL;
         }
       native_protocol = ent->p_proto;
@@ -296,11 +354,13 @@ g_socket_new (GSocketDomain domain, GSocketType type, const gchar *protocol, GEr
 
   if (fd < 0)
     {
-      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "unable to create socket: %s", g_strerror (errno));
+      g_set_error (&error, G_IO_ERROR, g_io_error_from_errno (errno), "unable to create socket: %s", g_strerror (errno));
       return NULL;
     }
 
-  return G_SOCKET (g_object_new (G_TYPE_SOCKET, "fd", fd, "blocking", TRUE, NULL));
+  g_print ("finishing socket_new\n");
+
+  return G_SOCKET (g_object_new (G_TYPE_SOCKET, "blocking", TRUE, "fd", fd, NULL));
 }
 
 GSocket *
@@ -408,12 +468,27 @@ g_socket_get_remote_address (GSocket  *socket,
   return (socket->priv->remote_address = g_object_ref_sink (g_socket_address_from_native (buffer, len)));
 }
 
+gboolean
+g_socket_has_error (GSocket  *socket,
+                    GError  **error)
+{
+  g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
+
+  if (!socket->priv->error)
+    return FALSE;
+
+  return TRUE;
+}
+
 gboolean
 g_socket_listen (GSocket  *socket,
                  GError  **error)
 {
   g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
 
+  if (g_socket_has_error (socket, error))
+    return FALSE;
+
   if (listen (socket->priv->fd, socket->priv->backlog) < 0)
     {
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "could not listen: %s", g_strerror (errno));
@@ -430,6 +505,9 @@ g_socket_bind (GSocket         *socket,
 {
   g_return_val_if_fail (G_IS_SOCKET (socket) && G_IS_SOCKET_ADDRESS (address), FALSE);
 
+  if (g_socket_has_error (socket, error))
+    return FALSE;
+
   {
     gchar addr[256];
 
@@ -456,6 +534,11 @@ g_socket_accept (GSocket       *socket,
 {
   gint ret;
 
+  g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
+
+  if (g_socket_has_error (socket, error))
+    return NULL;
+
   if ((ret = accept (socket->priv->fd, NULL, 0)) < 0)
     {
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error accepting connection: %s", g_strerror (errno));
@@ -474,6 +557,9 @@ g_socket_connect (GSocket         *socket,
 
   g_return_val_if_fail (G_IS_SOCKET (socket) && G_IS_SOCKET_ADDRESS (address), FALSE);
 
+  if (g_socket_has_error (socket, error))
+    return FALSE;
+
   g_socket_address_to_native (address, buffer);
 
   if (connect (socket->priv->fd, (struct sockaddr *) buffer, g_socket_address_native_size (address)) < 0)