X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=gnio%2Fgsocket.h;h=ed2d4aa9e2d928cc796c62f6dcf42fa814709bee;hb=16c893bba43ba9f720ad26250ba8bbc8fd9ba96c;hp=678ef037a38a34d49852484fc6749b07559e303f;hpb=ce2943ed9b80f86ca8d49dea8207634785eef69c;p=cascardo%2Fgnio.git

diff --git a/gnio/gsocket.h b/gnio/gsocket.h
index 678ef03..ed2d4aa 100644
--- a/gnio/gsocket.h
+++ b/gnio/gsocket.h
@@ -27,8 +27,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include "ginetaddress.h"
-#include "gsocketaddress.h"
+#include <gnio/gsocketaddress.h>
 
 G_BEGIN_DECLS
 
@@ -55,87 +54,75 @@ struct _GSocketClass
   GObjectClass parent_class;
 };
 
-GType            g_socket_get_type         (void) G_GNUC_CONST;
+typedef enum
+{
+  G_SOCKET_DOMAIN_INET,
+  G_SOCKET_DOMAIN_INET6,
+  G_SOCKET_DOMAIN_UNIX
+} GSocketDomain;
 
-GSocket *        g_socket_new              (gint domain, gint type, gint protocol);
+typedef enum
+{
+  G_SOCKET_TYPE_STREAM,
+  G_SOCKET_TYPE_DATAGRAM,
+  G_SOCKET_TYPE_SEQPACKET
+} GSocketType;
 
-GSocket *        g_socket_new_from_fd      (gint fd);
+GType            g_socket_get_type           (void) G_GNUC_CONST;
 
-GSocketAddress * g_socket_get_peer_address (GSocket *socket, GError **error);
+GSocket *        g_socket_new                (GSocketDomain   domain,
+                                              GSocketType     type,
+                                              const gchar    *protocol,
+                                              GError        **error);
 
-void             g_socket_set_blocking     (GSocket  *socket,
-                                            gboolean  blocking);
+GSocket *        g_socket_new_from_fd        (gint fd);
 
-gboolean         g_socket_get_blocking     (GSocket  *socket);
+GSocketAddress * g_socket_get_local_address  (GSocket *socket, GError **error);
 
-gboolean         g_socket_bind             (GSocket         *socket,
-                                            GSocketAddress  *address,
-                                            GError         **error);
+GSocketAddress * g_socket_get_remote_address (GSocket *socket, GError **error);
 
-gboolean         g_socket_connect          (GSocket         *socket,
-                                            GSocketAddress  *address,
-                                            GCancellable    *cancellable,
-                                            GError         **error);
+void             g_socket_set_blocking       (GSocket  *socket,
+                                              gboolean  blocking);
 
-void             g_socket_connect_async    (GSocket             *socket,
-                                            GSocketAddress      *address,
-                                            GCancellable        *cancellable,
-                                            GAsyncReadyCallback *callback,
-                                            gpointer             user_data);
+gboolean         g_socket_get_blocking       (GSocket  *socket);
 
-gboolean         g_socket_connect_finish   (GSocket       *socket,
-                                            GAsyncResult  *result,
-                                            GError       **error);
+void             g_socket_set_reuse_address  (GSocket  *socket,
+                                              gboolean  reuse);
 
-GSocket *        g_socket_accept           (GSocket       *socket,
-                                            GCancellable  *cancellable,
-                                            GError       **error);
+gboolean         g_socket_get_reuse_address  (GSocket  *socket);
 
-void             g_socket_accept_async     (GSocket             *socket,
-                                            GCancellable        *cancellable,
-                                            GAsyncReadyCallback  callback,
-                                            gpointer             user_data);
+gboolean         g_socket_has_socket_error   (GSocket  *socket,
+                                              GError  **error);
 
-GSocket *        g_socket_accept_finish    (GSocket       *socket,
-                                            GAsyncResult  *result,
-                                            GError       **error);
+gboolean         g_socket_bind               (GSocket         *socket,
+                                              GSocketAddress  *address,
+                                              GError         **error);
 
-void             g_socket_listen           (GSocket *socket,
-                                            gint backlog);
+gboolean         g_socket_connect            (GSocket         *socket,
+                                              GSocketAddress  *address,
+                                              GError         **error);
 
-gssize           g_socket_receive          (GSocket       *socket,
-                                            gchar         *buffer,
-                                            gsize          size,
-                                            GCancellable  *cancellable,
-                                            GError       **error);
+GSocket *        g_socket_accept             (GSocket       *socket,
+                                              GError       **error);
 
-void             g_socket_receive_async    (GSocket             *socket,
-                                            gchar               *buffer,
-                                            gsize                size,
-                                            GCancellable        *cancellable,
-                                            GAsyncReadyCallback *callback,
-                                            gpointer             user_data);
+gboolean         g_socket_listen             (GSocket  *socket,
+                                              GError  **error);
 
-gssize           g_socket_receive_finish   (GSocket       *socket,
-                                            GAsyncResult  *result,
-                                            GError       **error);
+gssize           g_socket_receive            (GSocket       *socket,
+                                              gchar         *buffer,
+                                              gsize          size,
+                                              GError       **error);
 
-gssize           g_socket_send             (GSocket       *socket,
-                                            gchar         *buffer,
-                                            gsize          size,
-                                            GCancellable  *cancellable,
-                                            GError       **error);
+gssize           g_socket_send               (GSocket       *socket,
+                                              const gchar   *buffer,
+                                              gsize          size,
+                                              GError       **error);
 
-void             g_socket_send_async       (GSocket             *socket,
-                                            gchar               *buffer,
-                                            gsize                size,
-                                            GCancellable        *cancellable,
-                                            GAsyncReadyCallback *callback,
-                                            gpointer             user_data);
+void             g_socket_close              (GSocket *socket);
 
-gssize           g_socket_send_finish      (GSocket       *socket,
-                                            GAsyncResult  *result,
-                                            GError       **error);
+GSource *        g_socket_create_source      (GSocket      *socket,
+                                              GIOCondition  condition,
+                                              GCancellable *cancellable);
 
 G_END_DECLS