soup-message-io: use gio streams rather than SoupSocket

[platform/upstream/libsoup.git] / libsoup / soup-socket.h

diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index afefde5..5cbf14a 100644 (file)
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -8,6 +8,8 @@
 
 #include <libsoup/soup-types.h>
 
+G_BEGIN_DECLS
+
 #define SOUP_TYPE_SOCKET            (soup_socket_get_type ())
 #define SOUP_SOCKET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SOCKET, SoupSocket))
 #define SOUP_SOCKET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SOCKET, SoupSocketClass))
@@ -15,70 +17,76 @@
 #define SOUP_IS_SOCKET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SOUP_TYPE_SOCKET))
 #define SOUP_SOCKET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_SOCKET, SoupSocketClass))
 
-typedef struct SoupSocketPrivate SoupSocketPrivate;
-
-struct SoupSocket {
+struct _SoupSocket {
        GObject parent;
 
-       SoupSocketPrivate *priv;
 };
 
 typedef struct {
        GObjectClass parent_class;
 
        /* signals */
-       void (*connect_result) (SoupSocket *, guint);
        void (*readable)       (SoupSocket *);
        void (*writable)       (SoupSocket *);
        void (*disconnected)   (SoupSocket *);
 
        void (*new_connection) (SoupSocket *, SoupSocket *);
+
+       /* Padding for future expansion */
+       void (*_libsoup_reserved1) (void);
+       void (*_libsoup_reserved2) (void);
+       void (*_libsoup_reserved3) (void);
+       void (*_libsoup_reserved4) (void);
 } SoupSocketClass;
 
-#define SOUP_SOCKET_FLAG_NONBLOCKING "non-blocking"
-#define SOUP_SOCKET_FLAG_NODELAY     "nodelay"
-#define SOUP_SOCKET_FLAG_REUSEADDR   "reuseaddr"
-#define SOUP_SOCKET_IS_SERVER        "is-server"
-#define SOUP_SOCKET_SSL_CREDENTIALS  "ssl-creds"
+#define SOUP_SOCKET_LOCAL_ADDRESS       "local-address"
+#define SOUP_SOCKET_REMOTE_ADDRESS      "remote-address"
+#define SOUP_SOCKET_FLAG_NONBLOCKING    "non-blocking"
+#define SOUP_SOCKET_IS_SERVER           "is-server"
+#define SOUP_SOCKET_SSL_CREDENTIALS     "ssl-creds"
+#define SOUP_SOCKET_SSL_STRICT          "ssl-strict"
+#define SOUP_SOCKET_SSL_FALLBACK        "ssl-fallback"
+#define SOUP_SOCKET_TRUSTED_CERTIFICATE "trusted-certificate"
+#define SOUP_SOCKET_ASYNC_CONTEXT       "async-context"
+#define SOUP_SOCKET_USE_THREAD_CONTEXT  "use-thread-context"
+#define SOUP_SOCKET_TIMEOUT             "timeout"
+#define SOUP_SOCKET_TLS_CERTIFICATE     "tls-certificate"
+#define SOUP_SOCKET_TLS_ERRORS          "tls-errors"
+
+typedef void (*SoupSocketCallback)            (SoupSocket         *sock,
+                                              guint               status,
+                                              gpointer            user_data);
 
 GType soup_socket_get_type (void);
 
 SoupSocket    *soup_socket_new                (const char         *optname1,
-                                              ...);
+                                              ...) G_GNUC_NULL_TERMINATED;
 
-guint          soup_socket_connect            (SoupSocket         *sock,
-                                              SoupAddress        *rem_addr);
-gboolean       soup_socket_listen             (SoupSocket         *sock,
-                                              SoupAddress        *local_addr);
-gboolean       soup_socket_start_ssl          (SoupSocket         *sock);
+void           soup_socket_connect_async      (SoupSocket         *sock,
+                                              GCancellable       *cancellable,
+                                              SoupSocketCallback  callback,
+                                              gpointer            user_data);
+guint          soup_socket_connect_sync       (SoupSocket         *sock,
+                                              GCancellable       *cancellable);
+int            soup_socket_get_fd             (SoupSocket         *sock);
 
-void           soup_socket_disconnect         (SoupSocket         *sock);
-gboolean       soup_socket_is_connected       (SoupSocket         *sock);
+gboolean       soup_socket_listen             (SoupSocket         *sock);
 
-typedef void (*SoupSocketCallback)            (SoupSocket         *sock,
-                                              guint               status,
-                                              gpointer            user_data);
-typedef void (*SoupSocketListenerCallback)    (SoupSocket         *listener,
-                                              SoupSocket         *sock,
-                                              gpointer            user_data);
+gboolean       soup_socket_start_ssl          (SoupSocket         *sock,
+                                              GCancellable       *cancellable);
+gboolean       soup_socket_start_proxy_ssl    (SoupSocket         *sock,
+                                              const char         *ssl_host,
+                                              GCancellable       *cancellable);
+gboolean       soup_socket_is_ssl             (SoupSocket         *sock);
 
-SoupSocket    *soup_socket_client_new_async   (const char         *hostname,
-                                              guint               port,
-                                              gpointer            ssl_creds,
-                                              SoupSocketCallback  callback,
-                                              gpointer            user_data);
-SoupSocket    *soup_socket_client_new_sync    (const char         *hostname,
-                                              guint               port,
-                                              gpointer            ssl_creds,
-                                              guint              *status);
-SoupSocket    *soup_socket_server_new         (SoupAddress        *local_addr,
-                                              gpointer            ssl_creds,
-                                              SoupSocketListenerCallback,
-                                              gpointer            user_data);
+void           soup_socket_disconnect         (SoupSocket         *sock);
+gboolean       soup_socket_is_connected       (SoupSocket         *sock);
 
 SoupAddress   *soup_socket_get_local_address  (SoupSocket         *sock);
 SoupAddress   *soup_socket_get_remote_address (SoupSocket         *sock);
 
+GInputStream  *soup_socket_get_input_stream   (SoupSocket         *sock);
+GOutputStream *soup_socket_get_output_stream  (SoupSocket         *sock);
 
 typedef enum {
        SOUP_SOCKET_OK,
@@ -89,20 +97,27 @@ typedef enum {
 
 SoupSocketIOStatus  soup_socket_read       (SoupSocket         *sock,
                                            gpointer            buffer,
-                                           guint               len,
-                                           guint              *nread);
+                                           gsize               len,
+                                           gsize              *nread,
+                                           GCancellable       *cancellable,
+                                           GError            **error);
 SoupSocketIOStatus  soup_socket_read_until (SoupSocket         *sock,
                                            gpointer            buffer,
-                                           guint               len,
+                                           gsize               len,
                                            gconstpointer       boundary,
-                                           guint               boundary_len,
-                                           guint              *nread,
-                                           gboolean           *got_boundary);
+                                           gsize               boundary_len,
+                                           gsize              *nread,
+                                           gboolean           *got_boundary,
+                                           GCancellable       *cancellable,
+                                           GError            **error);
 
 SoupSocketIOStatus  soup_socket_write      (SoupSocket         *sock,
                                            gconstpointer       buffer,
-                                           guint               len,
-                                           guint              *nwrote);
+                                           gsize               len,
+                                           gsize              *nwrote,
+                                           GCancellable       *cancellable,
+                                           GError            **error);
 
+G_END_DECLS
 
 #endif /* SOUP_SOCKET_H */