The main use case for these objects is as an IO stream, so it makes
sense to return them that way from the start.
if (connection && client->priv->tls)
{
if (connection && client->priv->tls)
{
- GTlsClientConnection *tlsconn;
tlsconn = g_tls_client_connection_new (connection, connectable, &last_error);
g_object_unref (connection);
tlsconn = g_tls_client_connection_new (connection, connectable, &last_error);
g_object_unref (connection);
- connection = (GIOStream *)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),
cancellable, &last_error))
{
if (!g_tls_connection_handshake (G_TLS_CONNECTION (tlsconn),
cancellable, &last_error))
{
static void
g_socket_client_tls_handshake (GSocketClientAsyncConnectData *data)
{
static void
g_socket_client_tls_handshake (GSocketClientAsyncConnectData *data)
{
- GTlsClientConnection *tlsconn;
if (!data->client->priv->tls)
{
if (!data->client->priv->tls)
{
&data->last_error);
if (tlsconn)
{
&data->last_error);
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_PRIORITY_DEFAULT,
data->cancellable,
g_tls_connection_handshake_async (G_TLS_CONNECTION (tlsconn),
G_PRIORITY_DEFAULT,
data->cancellable,
g_tls_client_connection_new (GIOStream *base_io_stream,
GSocketConnectable *server_identity,
GError **error)
g_tls_client_connection_new (GIOStream *base_io_stream,
GSocketConnectable *server_identity,
GError **error)
"base-io-stream", base_io_stream,
"server-identity", server_identity,
NULL);
"base-io-stream", base_io_stream,
"server-identity", server_identity,
NULL);
- return G_TLS_CLIENT_CONNECTION (conn);
+ return G_IO_STREAM (conn);
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,
GError **error);
GSocketConnectable *server_identity,
GError **error);
g_tls_server_connection_new (GIOStream *base_io_stream,
GTlsCertificate *certificate,
GError **error)
g_tls_server_connection_new (GIOStream *base_io_stream,
GTlsCertificate *certificate,
GError **error)
"base-io-stream", base_io_stream,
"certificate", certificate,
NULL);
"base-io-stream", base_io_stream,
"certificate", certificate,
NULL);
- return G_TLS_SERVER_CONNECTION (conn);
+ return G_IO_STREAM (conn);
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,
GError **error);
GTlsCertificate *certificate,
GError **error);
- GTlsClientConnection *tls_conn;
tls_conn = g_tls_client_connection_new (connection, connectable, &error);
if (!tls_conn)
tls_conn = g_tls_client_connection_new (connection, connectable, &error);
if (!tls_conn)
- GTlsServerConnection *tls_conn;
tls_conn = g_tls_server_connection_new (connection, tlscert, &error);
if (!tls_conn)
tls_conn = g_tls_server_connection_new (connection, tlscert, &error);
if (!tls_conn)
}
g_object_unref (connection);
}
g_object_unref (connection);
- connection = G_IO_STREAM (tls_conn);