test \
$(NULL)
+BUILT_SOURCES =
+
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
lib_LTLIBRARIES=libgnio.la
+libgnio_la_SOURCES = \
+ ginetaddress.c \
+ ginet4address.c \
+ ginet6address.c \
+ gresolver.c \
+ gsocketaddress.c \
+ ginetsocketaddress.c \
+ gsocket.c \
+ gtcpserver.c \
+ gtcpclient.c \
+ gnetworkinputstream.c \
+ gnetworkoutputstream.c \
+ gasynchelper.c \
+ gnioenumtypes.c \
+ $(NULL)
+
gnio_headers = \
ginetaddress.h \
gsocket.h \
gtcpserver.h \
gtcpclient.h \
+ gnio.h \
+ gnioenumtypes.h \
gnetworkinputstream.h \
gnetworkoutputstream.h \
$(NULL)
-gioincludedir=$(includedir)/glib-2.0/gnio/
-gioinclude_HEADERS = \
- $(gnio_headers)
+gnioincludedir=$(includedir)/gnio/
+gnioinclude_HEADERS = \
+ $(gnio_headers) \
+ gnioenumtypes.h
+BUILT_SOURCES = \
+ gnioenumtypes.h \
+ gnioenumtypes.c \
+ $(NULL)
-libgnio_la_SOURCES = \
- ginetaddress.c \
- ginet4address.c \
- ginet6address.c \
- gresolver.c \
- gsocketaddress.c \
- ginetsocketaddress.c \
- gsocket.c \
- gtcpserver.c \
- gtcpclient.c \
- gnetworkinputstream.c \
- gnetworkoutputstream.c \
- gasynchelper.c \
- $(NULL)
+gnioenumtypes.h: $(gnio_headers) gnioenumtypes.h.template
+ ( top_builddir=`cd $(top_builddir) && pwd`; \
+ cd $(srcdir) && glib-mkenums --template gnioenumtypes.h.template $(gnio_headers) ) > \
+ gnioenumtypes.h.tmp && mv gnioenumtypes.h.tmp gnioenumtypes.h
+
+gnioenumtypes.c: $(gnio_headers) gnioenumtypes.c.template
+ ( top_builddir=`cd $(top_builddir) && pwd`; \
+ cd $(srcdir) && glib-mkenums --template gnioenumtypes.c.template $(gnio_headers) ) > \
+ gnioenumtypes.c.tmp && mv gnioenumtypes.c.tmp gnioenumtypes.c
#include <gnio/ginetaddress.h>
#include <gnio/ginet4address.h>
#include <gnio/ginet6address.h>
-#include <gnio/ginetsocketaddress.h>
#include <gnio/gsocketaddress.h>
+#include <gnio/ginetsocketaddress.h>
#include <gnio/gresolver.h>
+#include <gnio/gsocket.h>
+#include <gnio/gtcpclient.h>
+#include <gnio/gtcpserver.h>
+#include <gnio/gnioenumtypes.h>
#undef __GNIO_GNIO_H_INSIDE__
--- /dev/null
+
+/* Generated data (by glib-mkenums) */
+
+#include <gnio.h>
+
+/* enumerations from "gsocket.h" */
+GType
+g_socket_domain_get_type (void)
+{
+ static volatile gsize g_define_type_id__volatile = 0;
+
+ if (g_once_init_enter (&g_define_type_id__volatile))
+ {
+ static const GEnumValue values[] = {
+ { G_SOCKET_DOMAIN_INET, "G_SOCKET_DOMAIN_INET", "inet" },
+ { G_SOCKET_DOMAIN_INET6, "G_SOCKET_DOMAIN_INET6", "inet6" },
+ { G_SOCKET_DOMAIN_UNIX, "G_SOCKET_DOMAIN_UNIX", "unix" },
+ { 0, NULL, NULL }
+ };
+ GType g_define_type_id =
+ g_enum_register_static (g_intern_static_string ("GSocketDomain"), values);
+ g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+ }
+
+ return g_define_type_id__volatile;
+}
+
+GType
+g_socket_type_get_type (void)
+{
+ static volatile gsize g_define_type_id__volatile = 0;
+
+ if (g_once_init_enter (&g_define_type_id__volatile))
+ {
+ static const GEnumValue values[] = {
+ { G_SOCKET_TYPE_STREAM, "G_SOCKET_TYPE_STREAM", "stream" },
+ { G_SOCKET_TYPE_DATAGRAM, "G_SOCKET_TYPE_DATAGRAM", "datagram" },
+ { G_SOCKET_TYPE_SEQPACKET, "G_SOCKET_TYPE_SEQPACKET", "seqpacket" },
+ { 0, NULL, NULL }
+ };
+ GType g_define_type_id =
+ g_enum_register_static (g_intern_static_string ("GSocketType"), values);
+ g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+ }
+
+ return g_define_type_id__volatile;
+}
+
+#define __GNIO_ENUM_TYPES_C__
+
+/* Generated data ends here */
+
--- /dev/null
+/*** BEGIN file-header ***/
+#include <gnio.h>
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void)
+{
+ static volatile gsize g_define_type_id__volatile = 0;
+
+ if (g_once_init_enter (&g_define_type_id__volatile))
+ {
+ static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+ { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+ { 0, NULL, NULL }
+ };
+ GType g_define_type_id =
+ g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+ g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+ }
+
+ return g_define_type_id__volatile;
+}
+
+/*** END value-tail ***/
+
+/*** BEGIN file-tail ***/
+#define __GNIO_ENUM_TYPES_C__
+/*** END file-tail ***/
--- /dev/null
+
+/* Generated data (by glib-mkenums) */
+
+#ifndef __GNIO_ENUM_TYPES_H__
+#define __GNIO_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* enumerations from "gsocket.h" */
+GType g_socket_domain_get_type (void) G_GNUC_CONST;
+#define G_TYPE_SOCKET_DOMAIN (g_socket_domain_get_type ())
+GType g_socket_type_get_type (void) G_GNUC_CONST;
+#define G_TYPE_SOCKET_TYPE (g_socket_type_get_type ())
+G_END_DECLS
+
+#endif /* __GNIO_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+
--- /dev/null
+/*** BEGIN file-header ***/
+#ifndef __GNIO_ENUM_TYPES_H__
+#define __GNIO_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define G_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
+/*** END value-header ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* __GNIO_ENUM_TYPES_H__ */
+/*** END file-tail ***/
#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,
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;
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",
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, "blocking", TRUE, NULL));
+ g_print ("finishing socket_new\n");
+
+ return G_SOCKET (g_object_new (G_TYPE_SOCKET, "blocking", TRUE, "fd", fd, NULL));
}
GSocket *
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));
{
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: %s", g_strerror (errno));
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)
GSocket * g_socket_new (GSocketDomain domain,
GSocketType type,
- const gchar *protocol,
- GError **error);
+ const gchar *protocol);
GSocket * g_socket_new_from_fd (gint fd);
gboolean g_socket_get_reuse_address (GSocket *socket);
+gboolean g_socket_has_error (GSocket *socket,
+ GError **error);
+
gboolean g_socket_bind (GSocket *socket,
GSocketAddress *address,
GError **error);
loop = g_main_loop_new (NULL, FALSE);
- socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL, NULL);
+ socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL);
g_printf ("connecting to 127.0.0.1:31882...\n");
loop = g_main_loop_new (NULL, FALSE);
- socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL, NULL);
+ socket = g_socket_new (G_SOCKET_DOMAIN_INET, G_SOCKET_TYPE_STREAM, NULL);
g_socket_set_reuse_address (socket, TRUE);
projects / cascardo / gnio.git / commitdiff