diff options
author | Yonit Halperin <yhalperi@redhat.com> | 2011-09-18 10:31:38 +0300 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-20 15:25:54 +0100 |
commit | 9cf6d39b369f9c22615fc329e307126721125ecd (patch) | |
tree | 0a3a4e0d4289a7fa0a4c6cda6124ec9ffbfb45ab /spice.proto | |
parent | 264ccc73f1dd95a36bc1ffa9b99a3741f6a97ecc (diff) | |
download | spice-common-9cf6d39b369f9c22615fc329e307126721125ecd.tar.gz spice-common-9cf6d39b369f9c22615fc329e307126721125ecd.tar.xz spice-common-9cf6d39b369f9c22615fc329e307126721125ecd.zip |
server,proto: tell the clients to connect to the migration target before migraton starts
(1) send SPICE_MSG_MAIN_MIGRATE_BEGIN upon spice_server_migrate_connect
(to all the clients that support it)
(2) wait for SPICE_MSGC_MAIN_MIGRATE_(CONNECTED|CONNECT_ERROR) from all the relevant clients,
or a timeout, in order to complete client_migrate_info monitor command
(cherry picked from commit 5560c56ef05c74da5e0e0825dc1f134019593cad branch 0.8;
Was modified to support the separation of main channel from reds, and multiple clients)
Conflicts:
server/reds.c
Diffstat (limited to 'spice.proto')
-rw-r--r-- | spice.proto | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spice.proto b/spice.proto index abf3ec3..78c1fad 100644 --- a/spice.proto +++ b/spice.proto @@ -167,9 +167,8 @@ channel MainChannel : BaseChannel { uint16 sport; uint32 host_size; uint8 *host_data[host_size] @zero_terminated @marshall @nonnull; - pubkey_type pub_key_type; - uint32 pub_key_size; - uint8 *pub_key_data[pub_key_size] @zero_terminated @marshall @nonnull; + uint32 cert_subject_size; + uint8 *cert_subject_data[cert_subject_size] @zero_terminated @marshall; } @ctype(SpiceMsgMainMigrationBegin) migrate_begin = 101; Empty migrate_cancel; |