Commit 1939ccda authored by Peter Xu's avatar Peter Xu Committed by Daniel P. Berrangé
Browse files

qio: non-default context for TLS handshake 



A new parameter "context" is added to qio_channel_tls_handshake() is to
allow the TLS to be run on a non-default context.  Still, no functional
change.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 8005fdd8

chardev/char-socket.c

+1 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ static void tcp_chr_tls_init(Chardev *chr) 
    qio_channel_tls_handshake(tioc,

                              tcp_chr_tls_handshake,

                              chr,

                              NULL,

                              NULL);

}

include/io/channel-tls.h

+4 −1
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ qio_channel_tls_new_client(QIOChannel *master, 
 * @func: the callback to invoke when completed

 * @opaque: opaque data to pass to @func

 * @destroy: optional callback to free @opaque

 * @context: the context that TLS handshake will run with. If %NULL,

 *           the default context will be used

 *

 * Perform the TLS session handshake. This method

 * will return immediately and the handshake will
@@ -126,7 +128,8 @@ qio_channel_tls_new_client(QIOChannel *master, 
void qio_channel_tls_handshake(QIOChannelTLS *ioc,

                               QIOTaskFunc func,

                               gpointer opaque,

                               GDestroyNotify destroy);

                               GDestroyNotify destroy,

                               GMainContext *context);



/**

 * qio_channel_tls_get_session:

io/channel-tls.c

+34 −11
Original line number Diff line number Diff line
@@ -140,13 +140,19 @@ qio_channel_tls_new_client(QIOChannel *master, 
    return NULL;

}



struct QIOChannelTLSData {

    QIOTask *task;

    GMainContext *context;

};

typedef struct QIOChannelTLSData QIOChannelTLSData;



static gboolean qio_channel_tls_handshake_io(QIOChannel *ioc,

                                             GIOCondition condition,

                                             gpointer user_data);



static void qio_channel_tls_handshake_task(QIOChannelTLS *ioc,

                                           QIOTask *task)

                                           QIOTask *task,

                                           GMainContext *context)

{

    Error *err = NULL;

    QCryptoTLSSessionHandshakeStatus status;
@@ -171,6 +177,15 @@ static void qio_channel_tls_handshake_task(QIOChannelTLS *ioc, 
        qio_task_complete(task);

    } else {

        GIOCondition condition;

        QIOChannelTLSData *data = g_new0(typeof(*data), 1);



        data->task = task;

        data->context = context;



        if (context) {

            g_main_context_ref(context);

        }



        if (status == QCRYPTO_TLS_HANDSHAKE_SENDING) {

            condition = G_IO_OUT;

        } else {
@@ -178,11 +193,12 @@ static void qio_channel_tls_handshake_task(QIOChannelTLS *ioc, 
        }



        trace_qio_channel_tls_handshake_pending(ioc, status);

        qio_channel_add_watch(ioc->master,

        qio_channel_add_watch_full(ioc->master,

                                   condition,

                                   qio_channel_tls_handshake_io,

                              task,

                              NULL);

                                   data,

                                   NULL,

                                   context);

    }

}
@@ -191,12 +207,18 @@ static gboolean qio_channel_tls_handshake_io(QIOChannel *ioc, 
                                             GIOCondition condition,

                                             gpointer user_data)

{

    QIOTask *task = user_data;

    QIOChannelTLSData *data = user_data;

    QIOTask *task = data->task;

    GMainContext *context = data->context;

    QIOChannelTLS *tioc = QIO_CHANNEL_TLS(

        qio_task_get_source(task));



    qio_channel_tls_handshake_task(

       tioc, task);

    g_free(data);

    qio_channel_tls_handshake_task(tioc, task, context);



    if (context) {

        g_main_context_unref(context);

    }



    return FALSE;

}
@@ -204,7 +226,8 @@ static gboolean qio_channel_tls_handshake_io(QIOChannel *ioc, 
void qio_channel_tls_handshake(QIOChannelTLS *ioc,

                               QIOTaskFunc func,

                               gpointer opaque,

                               GDestroyNotify destroy)

                               GDestroyNotify destroy,

                               GMainContext *context)

{

    QIOTask *task;
@@ -212,7 +235,7 @@ void qio_channel_tls_handshake(QIOChannelTLS *ioc, 
                        func, opaque, destroy);



    trace_qio_channel_tls_handshake_start(ioc);

    qio_channel_tls_handshake_task(ioc, task);

    qio_channel_tls_handshake_task(ioc, task, context);

}

migration/tls.c

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ void migration_tls_channel_process_incoming(MigrationState *s, 
    qio_channel_tls_handshake(tioc,

                              migration_tls_incoming_handshake,

                              NULL,

                              NULL,

                              NULL);

}
@@ -159,5 +160,6 @@ void migration_tls_channel_connect(MigrationState *s, 
    qio_channel_tls_handshake(tioc,

                              migration_tls_outgoing_handshake,

                              s,

                              NULL,

                              NULL);

}

nbd/client.c

+1 −0
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc, 
    qio_channel_tls_handshake(tioc,

                              nbd_tls_handshake,

                              &data,

                              NULL,

                              NULL);



    if (!data.complete) {