Starting on TcpClient, some formatting fixes

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

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index 1be3ad9..605f92b 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -54,6 +54,7 @@ enum
   PROP_FD,
   PROP_BLOCKING,
   PROP_BACKLOG,
+  PROP_REUSE_ADDRESS,
   PROP_LOCAL_ADDRESS,
   PROP_REMOTE_ADDRESS
 };
@@ -63,12 +64,16 @@ struct _GSocketPrivate
   gint fd;
   gboolean blocking;
   gint backlog;
+  gboolean reuse_address;
   GSocketAddress *local_address;
   GSocketAddress *remote_address;
 };
 
 static void
-g_socket_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+g_socket_get_property (GObject    *object,
+                       guint       prop_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
 {
   GSocket *socket = G_SOCKET (object);
 
@@ -86,6 +91,10 @@ g_socket_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
         g_value_set_int (value, socket->priv->backlog);
         break;
 
+      case PROP_REUSE_ADDRESS:
+        g_value_set_boolean (value, socket->priv->reuse_address);
+        break;
+
       case PROP_LOCAL_ADDRESS:
         g_value_set_object (value, socket->priv->local_address);
         break;
@@ -100,7 +109,10 @@ g_socket_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
 }
 
 static void
-g_socket_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+g_socket_set_property (GObject      *object,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
 {
   GSocket *socket = G_SOCKET (object);
 
@@ -118,6 +130,10 @@ g_socket_set_property (GObject *object, guint prop_id, const GValue *value, GPar
         socket->priv->backlog = g_value_get_int (value);
         break;
 
+      case PROP_REUSE_ADDRESS:
+        g_socket_set_reuse_address (socket, g_value_get_boolean (value));
+        break;
+
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -126,7 +142,13 @@ g_socket_set_property (GObject *object, guint prop_id, const GValue *value, GPar
 static void
 g_socket_finalize (GObject *object)
 {
-  GSocket *socket G_GNUC_UNUSED = G_SOCKET (object);
+  GSocket *socket = G_SOCKET (object);
+
+  if (socket->priv->local_address)
+    g_object_unref (socket->priv->local_address);
+
+  if (socket->priv->remote_address)
+    g_object_unref (socket->priv->remote_address);
 
   if (G_OBJECT_CLASS (g_socket_parent_class)->finalize)
     (*G_OBJECT_CLASS (g_socket_parent_class)->finalize) (object);
@@ -135,7 +157,9 @@ g_socket_finalize (GObject *object)
 static void
 g_socket_dispose (GObject *object)
 {
-  GSocket *socket G_GNUC_UNUSED = G_SOCKET (object);;
+  GSocket *socket = G_SOCKET (object);
+
+  g_socket_close (socket);
 
   if (G_OBJECT_CLASS (g_socket_parent_class)->dispose)
     (*G_OBJECT_CLASS (g_socket_parent_class)->dispose) (object);
@@ -180,6 +204,13 @@ g_socket_class_init (GSocketClass *klass)
                                                      10,
                                                      G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
 
+  g_object_class_install_property (gobject_class, PROP_REUSE_ADDRESS,
+                                   g_param_spec_boolean ("reuse-address",
+                                                         "reuse address",
+                                                         "allow reuse of local addresses when binding",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+
   g_object_class_install_property (gobject_class, PROP_LOCAL_ADDRESS,
                                    g_param_spec_object ("local-address",
                                                         "local address",
@@ -319,6 +350,28 @@ g_socket_get_blocking (GSocket *socket)
   return socket->priv->blocking;
 }
 
+void
+g_socket_set_reuse_address (GSocket  *socket,
+                            gboolean  reuse)
+{
+  gint value = (gint) reuse;
+
+  g_return_if_fail (G_IS_SOCKET (socket));
+
+  if (setsockopt (socket->priv->fd, SOL_SOCKET, SO_REUSEADDR, (gpointer) &value, sizeof (value)) < 0)
+    g_warning ("error setting reuse address: %s", g_strerror (errno));
+
+  socket->priv->reuse_address = reuse;
+}
+
+gboolean
+g_socket_get_reuse_address (GSocket *socket)
+{
+  g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
+
+  return socket->priv->reuse_address;
+}
+
 GSocketAddress *
 g_socket_get_local_address (GSocket  *socket,
                             GError  **error)
@@ -361,12 +414,19 @@ g_socket_get_remote_address (GSocket  *socket,
   return (socket->priv->remote_address = g_object_ref_sink (g_socket_address_from_native (buffer, len)));
 }
 
-void
-g_socket_listen (GSocket *socket)
+gboolean
+g_socket_listen (GSocket  *socket,
+                 GError  **error)
 {
-  g_return_if_fail (G_IS_SOCKET (socket));
+  g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
 
-  listen (socket->priv->fd, socket->priv->backlog);
+  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));
+      return FALSE;
+    }
+
+  return TRUE;
 }
 
 gboolean