#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
enum
{
PROP_0,
+ PROP_DOMAIN,
+ PROP_TYPE,
+ PROP_PROTOCOL,
PROP_FD,
PROP_BLOCKING,
+ PROP_BACKLOG,
+ PROP_REUSE_ADDRESS,
PROP_LOCAL_ADDRESS,
PROP_REMOTE_ADDRESS
};
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)
{
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;
g_value_set_boolean (value, socket->priv->blocking);
break;
+ case PROP_BACKLOG:
+ 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;
g_socket_set_blocking (socket, g_value_get_boolean (value));
break;
+ case PROP_BACKLOG:
+ 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);
}
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);
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);
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",
TRUE,
G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
+ g_object_class_install_property (gobject_class, PROP_BACKLOG,
+ g_param_spec_int ("backlog",
+ "listen backlog",
+ "outstanding connections in the listen queue",
+ 0,
+ SOMAXCONN,
+ 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",
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;
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;
}
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;
}
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;
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, NULL));
+ g_print ("finishing socket_new\n");
+
+ return G_SOCKET (g_object_new (G_TYPE_SOCKET, "blocking", TRUE, "fd", fd, NULL));
}
GSocket *
if ((arg = fcntl (fd, F_GETFL, NULL)) < 0)
g_warning ("Error getting socket status flags: %s", g_strerror (errno));
- blocking = ((arg & O_NONBLOCK) != 0);
+ blocking = ((arg & O_NONBLOCK) == 0);
- return G_SOCKET (g_object_new (G_TYPE_SOCKET, "blocking", blocking, "fd", fd, NULL));
+ return G_SOCKET (g_object_new (G_TYPE_SOCKET, "fd", fd, "blocking", blocking, NULL));
}
void
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)
{
gchar buffer[256];
- gsize len;
+ gsize len = 256;
g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
GError **error)
{
gchar buffer[256];
- gsize len;
+ gsize len = 256;
g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
return (socket->priv->remote_address = g_object_ref_sink (g_socket_address_from_native (buffer, len)));
}
-void
-g_socket_listen (GSocket *socket,
- gint backlog)
+gboolean
+g_socket_has_error (GSocket *socket,
+ GError **error)
{
- g_return_if_fail (G_IS_SOCKET (socket));
+ g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
+
+ if (!socket->priv->error)
+ return FALSE;
- listen (socket->priv->fd, backlog);
+ 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));
+ return FALSE;
+ }
+
+ return TRUE;
}
gboolean
{
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];
{
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");
+ g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error accepting connection: %s", g_strerror (errno));
return NULL;
}
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)
return TRUE;
}
+
+gssize
+g_socket_receive (GSocket *socket,
+ gchar *buffer,
+ gsize size,
+ GError **error)
+{
+ gssize ret;
+
+ g_return_val_if_fail (G_IS_SOCKET (socket) && buffer != NULL, FALSE);
+
+ if ((ret = recv (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));
+ return -1;
+ }
+
+ return ret;
+}
+
+gssize
+g_socket_send (GSocket *socket,
+ gchar *buffer,
+ gsize size,
+ GError **error)
+{
+ gssize ret;
+
+ g_return_val_if_fail (G_IS_SOCKET (socket) && buffer != NULL, FALSE);
+
+ if ((ret = send (socket->priv->fd, buffer, size, 0)) < 0)
+ {
+ g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "error sending data: %s", g_strerror (errno));
+ return -1;
+ }
+
+ return ret;
+}
+
+void
+g_socket_close (GSocket *socket)
+{
+ g_return_if_fail (G_IS_SOCKET (socket));
+
+#ifdef G_OS_WIN32
+ closesocket (socket->priv->fd);
+#else
+ 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);
+}
projects / cascardo / gnio.git / blobdiff