io/channel-tls: fix handling of bigger read buffers
Since the TLS backend can read more data from the underlying QIOChannel we introduce a minimal child GSource to notify if we still have more data available to be read. Signed-off-by: Antoine Damhet <antoine.damhet@shadow.tech> Signed-off-by: Charles Frey <charles.frey@shadow.tech> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
33ee0d8e2f
commit
ffda5db65a
@ -389,12 +389,76 @@ static void qio_channel_tls_set_aio_fd_handler(QIOChannel *ioc,
|
||||
qio_channel_set_aio_fd_handler(tioc->master, ctx, io_read, io_write, opaque);
|
||||
}
|
||||
|
||||
typedef struct QIOChannelTLSSource QIOChannelTLSSource;
|
||||
struct QIOChannelTLSSource {
|
||||
GSource parent;
|
||||
QIOChannelTLS *tioc;
|
||||
};
|
||||
|
||||
static gboolean
|
||||
qio_channel_tls_source_check(GSource *source)
|
||||
{
|
||||
QIOChannelTLSSource *tsource = (QIOChannelTLSSource *)source;
|
||||
|
||||
return qcrypto_tls_session_check_pending(tsource->tioc->session) > 0;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
qio_channel_tls_source_prepare(GSource *source, gint *timeout)
|
||||
{
|
||||
*timeout = -1;
|
||||
return qio_channel_tls_source_check(source);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
qio_channel_tls_source_dispatch(GSource *source, GSourceFunc callback,
|
||||
gpointer user_data)
|
||||
{
|
||||
return G_SOURCE_CONTINUE;
|
||||
}
|
||||
|
||||
static void
|
||||
qio_channel_tls_source_finalize(GSource *source)
|
||||
{
|
||||
QIOChannelTLSSource *tsource = (QIOChannelTLSSource *)source;
|
||||
|
||||
object_unref(OBJECT(tsource->tioc));
|
||||
}
|
||||
|
||||
static GSourceFuncs qio_channel_tls_source_funcs = {
|
||||
qio_channel_tls_source_prepare,
|
||||
qio_channel_tls_source_check,
|
||||
qio_channel_tls_source_dispatch,
|
||||
qio_channel_tls_source_finalize
|
||||
};
|
||||
|
||||
static void
|
||||
qio_channel_tls_read_watch(QIOChannelTLS *tioc, GSource *source)
|
||||
{
|
||||
GSource *child;
|
||||
QIOChannelTLSSource *tlssource;
|
||||
|
||||
child = g_source_new(&qio_channel_tls_source_funcs,
|
||||
sizeof(QIOChannelTLSSource));
|
||||
tlssource = (QIOChannelTLSSource *)child;
|
||||
|
||||
tlssource->tioc = tioc;
|
||||
object_ref(OBJECT(tioc));
|
||||
|
||||
g_source_add_child_source(source, child);
|
||||
}
|
||||
|
||||
static GSource *qio_channel_tls_create_watch(QIOChannel *ioc,
|
||||
GIOCondition condition)
|
||||
{
|
||||
QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc);
|
||||
GSource *source = qio_channel_create_watch(tioc->master, condition);
|
||||
|
||||
return qio_channel_create_watch(tioc->master, condition);
|
||||
if (condition & G_IO_IN) {
|
||||
qio_channel_tls_read_watch(tioc, source);
|
||||
}
|
||||
|
||||
return source;
|
||||
}
|
||||
|
||||
QCryptoTLSSession *
|
||||
|
Loading…
Reference in New Issue
Block a user