Merge remote branch 'gvdb/master'

[platform/upstream/glib.git] / gio / gsocket.h

diff --git a/gio/gsocket.h b/gio/gsocket.h
index 05d5d37..d17de32 100644 (file)
--- a/gio/gsocket.h
+++ b/gio/gsocket.h
@@ -97,6 +97,9 @@ gboolean               g_socket_get_keepalive           (GSocket
 gint                   g_socket_get_listen_backlog      (GSocket                 *socket);
 void                   g_socket_set_listen_backlog      (GSocket                 *socket,
                                                         gint                     backlog);
+guint                  g_socket_get_timeout             (GSocket                 *socket);
+void                   g_socket_set_timeout             (GSocket                 *socket,
+                                                        guint                    timeout);
 gboolean               g_socket_is_connected            (GSocket                 *socket);
 gboolean               g_socket_bind                    (GSocket                 *socket,
                                                         GSocketAddress          *address,
@@ -104,6 +107,7 @@ gboolean               g_socket_bind                    (GSocket
                                                         GError                 **error);
 gboolean               g_socket_connect                 (GSocket                 *socket,
                                                         GSocketAddress          *address,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gboolean               g_socket_check_connect_result    (GSocket                 *socket,
                                                         GError                 **error);
@@ -114,26 +118,31 @@ gboolean               g_socket_condition_wait          (GSocket
                                                         GCancellable            *cancellable,
                                                         GError                 **error);
 GSocket *              g_socket_accept                  (GSocket                 *socket,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gboolean               g_socket_listen                  (GSocket                 *socket,
                                                         GError                 **error);
 gssize                 g_socket_receive                 (GSocket                 *socket,
                                                         gchar                   *buffer,
                                                         gsize                    size,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gssize                 g_socket_receive_from            (GSocket                 *socket,
                                                         GSocketAddress         **address,
                                                         gchar                   *buffer,
                                                         gsize                    size,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gssize                 g_socket_send                    (GSocket                 *socket,
                                                         const gchar             *buffer,
                                                         gsize                    size,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gssize                 g_socket_send_to                 (GSocket                 *socket,
                                                         GSocketAddress          *address,
                                                         const gchar             *buffer,
                                                         gsize                    size,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gssize                 g_socket_receive_message         (GSocket                 *socket,
                                                         GSocketAddress         **address,
@@ -142,6 +151,7 @@ gssize                 g_socket_receive_message         (GSocket
                                                         GSocketControlMessage ***messages,
                                                         gint                    *num_messages,
                                                         gint                    *flags,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gssize                 g_socket_send_message            (GSocket                 *socket,
                                                         GSocketAddress          *address,
@@ -150,6 +160,7 @@ gssize                 g_socket_send_message            (GSocket
                                                         GSocketControlMessage  **messages,
                                                         gint                     num_messages,
                                                         gint                     flags,
+                                                        GCancellable            *cancellable,
                                                         GError                 **error);
 gboolean               g_socket_close                   (GSocket                 *socket,
                                                         GError                 **error);
@@ -162,6 +173,21 @@ GSource *              g_socket_create_source           (GSocket
                                                         GIOCondition             condition,
                                                         GCancellable            *cancellable);
 gboolean               g_socket_speaks_ipv4             (GSocket                 *socket);
+GCredentials          *g_socket_get_credentials         (GSocket                 *socket,
+                                                         GError                 **error);
+
+gssize                 g_socket_receive_with_blocking   (GSocket                 *socket,
+                                                        gchar                   *buffer,
+                                                        gsize                    size,
+                                                        gboolean                 blocking,
+                                                        GCancellable            *cancellable,
+                                                        GError                 **error);
+gssize                 g_socket_send_with_blocking      (GSocket                 *socket,
+                                                        const gchar             *buffer,
+                                                        gsize                    size,
+                                                        gboolean                 blocking,
+                                                        GCancellable            *cancellable,
+                                                        GError                 **error);
 
 G_END_DECLS