diff options
| author | Uri Lublin <uril@redhat.com> | 2011-01-09 10:17:49 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2011-02-10 20:55:07 +0100 |
| commit | bb1a6898f9dae1955553cdb66c22c05085f81a65 (patch) | |
| tree | 997380a4a519f18475d5c4ff5cd1644108d092e6 | |
| parent | 82bce84206118bb5f69438916eee8824d5ad5b14 (diff) | |
| download | spice-bb1a6898f9dae1955553cdb66c22c05085f81a65.tar.gz spice-bb1a6898f9dae1955553cdb66c22c05085f81a65.tar.xz spice-bb1a6898f9dae1955553cdb66c22c05085f81a65.zip | |
spice-client migration: fix minor for old migration support.
For not too old spice-migration, minor is 1.
For older (ancient) spice-migration, minor is 0.
Affects only VM migration while a spice client is connected.
| -rw-r--r-- | client/red_client.cpp | 2 | ||||
| -rw-r--r-- | spice1.proto | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/client/red_client.cpp b/client/red_client.cpp index 46d56022..bb4f6883 100644 --- a/client/red_client.cpp +++ b/client/red_client.cpp @@ -255,7 +255,7 @@ void Migrate::start(const SpiceMsgMainMigrationBegin* migrate) { DBG(0, ""); abort(); - if ((_client.get_peer_major() == 1) && (_client.get_peer_minor() < 2)) { + if ((_client.get_peer_major() == 1) && (_client.get_peer_minor() < 1)) { LOG_INFO("server minor version incompatible for destination authentication" "(missing dest pubkey in SpiceMsgMainMigrationBegin)"); OldRedMigrationBegin* old_migrate = (OldRedMigrationBegin*)migrate; diff --git a/spice1.proto b/spice1.proto index ebb2d6f6..fa2524bb 100644 --- a/spice1.proto +++ b/spice1.proto @@ -168,11 +168,11 @@ channel MainChannel : BaseChannel { uint16 sport; uint32 host_offset @zero; uint32 host_size; - pubkey_type pub_key_type @minor(2); - uint32 pub_key_offset @minor(2) @zero; - uint32 pub_key_size @minor(2); + pubkey_type pub_key_type @minor(1); + uint32 pub_key_offset @minor(1) @zero; + uint32 pub_key_size @minor(1); uint8 host_data[host_size] @as_ptr @zero_terminated; - uint8 pub_key_data[pub_key_size] @minor(2) @as_ptr @zero_terminated; + uint8 pub_key_data[pub_key_size] @minor(1) @as_ptr @zero_terminated; } @ctype(SpiceMsgMainMigrationBegin) migrate_begin = 101; Empty migrate_cancel; |