diff options
| author | Peter Xu | 2018-03-05 07:43:24 +0100 |
|---|---|---|
| committer | Daniel P. Berrangé | 2018-03-06 11:19:07 +0100 |
| commit | 1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58 (patch) | |
| tree | c3b4811e045492e3d058f11c88b07589a8f19bca /nbd | |
| parent | qio: non-default context for async conn (diff) | |
| download | qemu-1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58.tar.gz qemu-1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58.tar.xz qemu-1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58.zip | |
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: Peter Xu <peterx@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'nbd')
| -rw-r--r-- | nbd/client.c | 1 | ||||
| -rw-r--r-- | nbd/server.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nbd/client.c b/nbd/client.c index 9c3fe4aaa6..dcad23a053 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -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) { diff --git a/nbd/server.c b/nbd/server.c index 4990a5826e..e714bfe6a1 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -599,6 +599,7 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client, qio_channel_tls_handshake(tioc, nbd_tls_handshake, &data, + NULL, NULL); if (!data.complete) { |