Close socket on dispose

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

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index 4678e46..9d50665 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -126,7 +126,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 +141,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);
@@ -404,7 +412,7 @@ g_socket_accept (GSocket       *socket,
 
   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");
+      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error accepting connection: %s", g_strerror (errno));
       return NULL;
     }
 
@@ -467,7 +475,7 @@ g_socket_send (GSocket       *socket,
 
   if ((ret = send (socket->priv->fd, buffer, size, 0)) < 0)
     {
-      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error receiving data: %s", g_strerror (errno));
+      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error sending data: %s", g_strerror (errno));
       return -1;
     }
 
@@ -485,3 +493,13 @@ g_socket_close (GSocket *socket)
   close (socket->priv->fd);
 #endif
 }
+
+GSource *
+g_socket_create_source (GSocket      *socket,
+                        GIOCondition  condition,
+                        GCancellable *cancellable)
+{
+  g_return_val_if_fail (G_IS_SOCKET (socket) && (cancellable == NULL || G_IS_CANCELLABLE (cancellable)), NULL);
+
+  return _g_fd_source_new (socket->priv->fd, G_IO_IN | G_IO_HUP | G_IO_ERR, cancellable);
+}