Fixed building issues after merge

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

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index d92a1d0..5005cc2 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #include <glib.h>
 #include <gio/gio.h>
-#include <gnio/gnio.h>
 #include "gasynchelper.h"
 #include "gnioenumtypes.h"
 
@@ -79,7 +78,6 @@ struct _GSocketPrivate
 };
 
 static void
-<<<<<<< HEAD:gnio/gsocket.c
 g_socket_constructed (GObject *object)
 {
   GSocket *sock = G_SOCKET (object);
@@ -421,6 +419,8 @@ g_socket_set_blocking (GSocket  *socket,
     g_warning ("Error setting socket status flags: %s", g_strerror (errno));
 
   socket->priv->blocking = blocking;
+
+  g_object_notify (G_OBJECT (socket), "blocking");
 }
 
 gboolean
@@ -443,6 +443,8 @@ g_socket_set_reuse_address (GSocket  *socket,
     g_warning ("error setting reuse address: %s", g_strerror (errno));
 
   socket->priv->reuse_address = reuse;
+
+  g_object_notify (G_OBJECT (socket), "reuse-address");
 }
 
 gboolean
@@ -453,12 +455,36 @@ g_socket_get_reuse_address (GSocket *socket)
   return socket->priv->reuse_address;
 }
 
+gboolean
+g_socket_has_socket_error (GSocket  *socket,
+                           GError  **error)
+{
+  gint sockerr;
+  guint32 sockerr_size = sizeof (sockerr);
+
+  g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
+
+  if (getsockopt (socket->priv->fd, SOL_SOCKET, SO_ERROR, (gpointer) &sockerr, &sockerr_size) < 0)
+    {
+      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "could not get socket error: %s", g_strerror (errno));
+      return TRUE;
+    }
+
+  if (sockerr != 0)
+    {
+      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (sockerr), "error connecting: %s", g_strerror (sockerr));
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 GSocketAddress *
 g_socket_get_local_address (GSocket  *socket,
                             GError  **error)
 {
   gchar buffer[256];
-  gsize len = 256;
+  guint32 len = 256;
 
   g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
 
@@ -479,7 +505,7 @@ g_socket_get_remote_address (GSocket  *socket,
                              GError  **error)
 {
   gchar buffer[256];
-  gsize len = 256;
+  guint32 len = 256;
 
   g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
 
@@ -624,7 +650,7 @@ g_socket_receive (GSocket       *socket,
 
 gssize
 g_socket_send (GSocket       *socket,
-               gchar         *buffer,
+               const gchar   *buffer,
                gsize          size,
                GError       **error)
 {
@@ -660,5 +686,5 @@ g_socket_create_source (GSocket      *socket,
 {
   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);
+  return _g_fd_source_new (socket->priv->fd, condition, cancellable);
 }