luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

tls: Make g_tls_{client|server}_connection_new() return a GIOStream

Browse Source 
The main use case for these objects is as an IO stream, so it makes
sense to return them that way from the start.
This commit is contained in:
Benjamin Otte 2010-12-07 16:06:38 +01:00
parent c59ba60fbe
commit 07fd29c323
7 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gsocketclient.c
View File

@ -864,15 +864,16 @@ g_socket_client_connect (GSocketClient *client,
if (connection && client->priv->tls) if (connection && client->priv->tls)
{ {
GTlsClientConnection *tlsconn; GIOStream *tlsconn;
tlsconn = g_tls_client_connection_new (connection, connectable, &last_error); tlsconn = g_tls_client_connection_new (connection, connectable, &last_error);
g_object_unref (connection); g_object_unref (connection);
connection = (GIOStream *)tlsconn; connection = tlsconn;
if (tlsconn) if (tlsconn)
{ {
g_tls_client_connection_set_validation_flags (tlsconn, client->priv->tls_validation_flags); g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (tlsconn),
client->priv->tls_validation_flags);
if (!g_tls_connection_handshake (G_TLS_CONNECTION (tlsconn), if (!g_tls_connection_handshake (G_TLS_CONNECTION (tlsconn),
cancellable, &last_error)) cancellable, &last_error))
{ {
@ -1168,7 +1169,7 @@ g_socket_client_tls_handshake_callback (GObject *object,
static void static void
g_socket_client_tls_handshake (GSocketClientAsyncConnectData *data) g_socket_client_tls_handshake (GSocketClientAsyncConnectData *data)
{ {
GTlsClientConnection *tlsconn; GIOStream *tlsconn;
if (!data->client->priv->tls) if (!data->client->priv->tls)
{ {
@ -1181,7 +1182,8 @@ g_socket_client_tls_handshake (GSocketClientAsyncConnectData *data)
&data->last_error); &data->last_error);
if (tlsconn) if (tlsconn)
{ {
g_tls_client_connection_set_validation_flags (tlsconn, data->client->priv->tls_validation_flags); g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (tlsconn),
data->client->priv->tls_validation_flags);
g_tls_connection_handshake_async (G_TLS_CONNECTION (tlsconn), g_tls_connection_handshake_async (G_TLS_CONNECTION (tlsconn),
G_PRIORITY_DEFAULT, G_PRIORITY_DEFAULT,
data->cancellable, data->cancellable,

4
gio/gtlsclientconnection.c
View File

@ -158,7 +158,7 @@ g_tls_client_connection_default_init (GTlsClientConnectionInterface *iface)
* *
* Since: 2.28 * Since: 2.28
*/ */
GTlsClientConnection * GIOStream *
g_tls_client_connection_new (GIOStream *base_io_stream, g_tls_client_connection_new (GIOStream *base_io_stream,
GSocketConnectable *server_identity, GSocketConnectable *server_identity,
GError **error) GError **error)
@ -172,7 +172,7 @@ g_tls_client_connection_new (GIOStream *base_io_stream,
"base-io-stream", base_io_stream, "base-io-stream", base_io_stream,
"server-identity", server_identity, "server-identity", server_identity,
NULL); NULL);
return G_TLS_CLIENT_CONNECTION (conn); return G_IO_STREAM (conn);
} }
/** /**

2
gio/gtlsclientconnection.h
View File

@ -52,7 +52,7 @@ struct _GTlsClientConnectionInterface
GType g_tls_client_connection_get_type (void) G_GNUC_CONST; GType g_tls_client_connection_get_type (void) G_GNUC_CONST;
GTlsClientConnection *g_tls_client_connection_new (GIOStream *base_io_stream, GIOStream * g_tls_client_connection_new (GIOStream *base_io_stream,
GSocketConnectable *server_identity, GSocketConnectable *server_identity,
GError **error); GError **error);

4
gio/gtlsserverconnection.c
View File

@ -78,7 +78,7 @@ g_tls_server_connection_default_init (GTlsServerConnectionInterface *iface)
* *
* Since: 2.28 * Since: 2.28
*/ */
GTlsServerConnection * GIOStream *
g_tls_server_connection_new (GIOStream *base_io_stream, g_tls_server_connection_new (GIOStream *base_io_stream,
GTlsCertificate *certificate, GTlsCertificate *certificate,
GError **error) GError **error)
@ -92,5 +92,5 @@ g_tls_server_connection_new (GIOStream *base_io_stream,
"base-io-stream", base_io_stream, "base-io-stream", base_io_stream,
"certificate", certificate, "certificate", certificate,
NULL); NULL);
return G_TLS_SERVER_CONNECTION (conn); return G_IO_STREAM (conn);
} }

2
gio/gtlsserverconnection.h
View File

@ -52,7 +52,7 @@ struct _GTlsServerConnectionInterface
GType g_tls_server_connection_get_type (void) G_GNUC_CONST; GType g_tls_server_connection_get_type (void) G_GNUC_CONST;
GTlsServerConnection *g_tls_server_connection_new (GIOStream *base_io_stream, GIOStream * g_tls_server_connection_new (GIOStream *base_io_stream,
GTlsCertificate *certificate, GTlsCertificate *certificate,
GError **error); GError **error);

2
gio/tests/socket-client.c
View File

@ -203,7 +203,7 @@ main (int argc,
if (tls) if (tls)
{ {
GTlsClientConnection *tls_conn; GIOStream *tls_conn;
tls_conn = g_tls_client_connection_new (connection, connectable, &error); tls_conn = g_tls_client_connection_new (connection, connectable, &error);
if (!tls_conn) if (!tls_conn)

4
gio/tests/socket-server.c
View File

@ -211,7 +211,7 @@ main (int argc,
if (tlscert) if (tlscert)
{ {
GTlsServerConnection *tls_conn; GIOStream *tls_conn;
tls_conn = g_tls_server_connection_new (connection, tlscert, &error); tls_conn = g_tls_server_connection_new (connection, tlscert, &error);
if (!tls_conn) if (!tls_conn)
@ -230,7 +230,7 @@ main (int argc,
} }
g_object_unref (connection); g_object_unref (connection);
connection = G_IO_STREAM (tls_conn); connection = tls_conn;
} }
if (connection) if (connection)