diff options
Diffstat (limited to 'libsoup/soup-socket.h')
| -rw-r--r-- | libsoup/soup-socket.h | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h index 0f95dc6e..39bdb3d7 100644 --- a/libsoup/soup-socket.h +++ b/libsoup/soup-socket.h @@ -24,7 +24,6 @@ typedef struct { GObjectClass parent_class; /* signals */ - void (*connect_result) (SoupSocket *, guint); void (*readable) (SoupSocket *); void (*writable) (SoupSocket *); void (*disconnected) (SoupSocket *); @@ -32,6 +31,8 @@ typedef struct { void (*new_connection) (SoupSocket *, SoupSocket *); } SoupSocketClass; +#define SOUP_SOCKET_LOCAL_ADDRESS "local-address" +#define SOUP_SOCKET_REMOTE_ADDRESS "remote-address" #define SOUP_SOCKET_FLAG_NONBLOCKING "non-blocking" #define SOUP_SOCKET_FLAG_NODELAY "nodelay" #define SOUP_SOCKET_FLAG_REUSEADDR "reuseaddr" @@ -44,36 +45,26 @@ typedef struct { * SoupSocketCallback: * @sock: the #SoupSocket * @status: an HTTP status code indicating success or failure - * @user_data: the data passed to soup_socket_client_new_async() + * @user_data: the data passed to soup_socket_connect_async() * - * The callback function passed to soup_socket_client_new_async(). + * The callback function passed to soup_socket_connect_async(). **/ typedef void (*SoupSocketCallback) (SoupSocket *sock, guint status, gpointer user_data); -/** - * SoupSocketListenerCallback: - * @listener: the listening #SoupSocket - * @sock: the newly-received #SoupSocket - * @user_data: the data passed to soup_socket_server_new(). - * - * The callback function passed to soup_socket_server_new(), which - * receives new connections. - **/ -typedef void (*SoupSocketListenerCallback) (SoupSocket *listener, - SoupSocket *sock, - 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 *remote_addr); -gboolean soup_socket_listen (SoupSocket *sock, - SoupAddress *local_addr); +void soup_socket_connect_async (SoupSocket *sock, + SoupSocketCallback callback, + gpointer user_data); +guint soup_socket_connect_sync (SoupSocket *sock); + +gboolean soup_socket_listen (SoupSocket *sock); + gboolean soup_socket_start_ssl (SoupSocket *sock); gboolean soup_socket_start_proxy_ssl (SoupSocket *sock, const char *ssl_host); @@ -81,20 +72,6 @@ gboolean soup_socket_start_proxy_ssl (SoupSocket *sock, void soup_socket_disconnect (SoupSocket *sock); gboolean soup_socket_is_connected (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_ret); -SoupSocket *soup_socket_server_new (SoupAddress *local_addr, - gpointer ssl_creds, - SoupSocketListenerCallback callback, - gpointer user_data); - SoupAddress *soup_socket_get_local_address (SoupSocket *sock); SoupAddress *soup_socket_get_remote_address (SoupSocket *sock); |