diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-02-10 18:41:11 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-02-16 17:16:28 +0100 |
| commit | f95910fe6bbf64bb9b5cea7546a1778ba96ce782 (patch) | |
| tree | ca32a89428ee209e5de8c7da9f7c52139a91ef6b /nbd/nbd-internal.h | |
| parent | 69b49502d8b7b582af79fac5bef7b7ccc2dc9c1e (diff) | |
| download | qemu-f95910fe6bbf64bb9b5cea7546a1778ba96ce782.tar.gz | |
nbd: implement TLS support in the protocol negotiation
This extends the NBD protocol handling code so that it is capable
of negotiating TLS support during the connection setup. This involves
requesting the STARTTLS protocol option before any other NBD options.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1455129674-17255-14-git-send-email-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'nbd/nbd-internal.h')
| -rw-r--r-- | nbd/nbd-internal.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index 9960034612..db6ab65ced 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -11,6 +11,7 @@ #define NBD_INTERNAL_H #include "block/nbd.h" #include "sysemu/block-backend.h" +#include "io/channel-tls.h" #include "qemu/coroutine.h" #include "qemu/iov.h" @@ -78,6 +79,8 @@ #define NBD_OPT_EXPORT_NAME (1) #define NBD_OPT_ABORT (2) #define NBD_OPT_LIST (3) +#define NBD_OPT_PEEK_EXPORT (4) +#define NBD_OPT_STARTTLS (5) /* NBD errors are based on errno numbers, so there is a 1:1 mapping, * but only a limited set of errno values is specified in the protocol. @@ -108,4 +111,15 @@ static inline ssize_t write_sync(QIOChannel *ioc, void *buffer, size_t size) return nbd_wr_syncv(ioc, &iov, 1, 0, size, false); } +struct NBDTLSHandshakeData { + GMainLoop *loop; + bool complete; + Error *error; +}; + + +void nbd_tls_handshake(Object *src, + Error *err, + void *opaque); + #endif |