[Spice-commits] 2 commits - spice/protocol.h

[Alexander Larsson]

 spice/protocol.h |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit d9f01c38ee6e70f1728e7cdbf82c43de6968aba8
Author: Alexander Larsson <alexl at redhat.com>
Date:   Wed Mar 24 16:07:45 2010 +0100

    Bump minor to 3
    
    There is some confusion in the different branches on what the minors
    mean. We expect minor == 2 to mean support for
    SPICE_MSG_MAIN_MIGRATE_SWITCH_HOST and SpiceMsgMainMigrationBegin
    with added public key info. All other additions like tunneling are
    for minor 3 (although we might not do a release with minor 3, but
    rather the bump major).

diff --git a/spice/protocol.h b/spice/protocol.h
index 60016df..a0c5251 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -37,7 +37,7 @@
 
 #define SPICE_MAGIC (*(uint32_t*)"REDQ")
 #define SPICE_VERSION_MAJOR (~(uint32_t)0 - 1)
-#define SPICE_VERSION_MINOR 2
+#define SPICE_VERSION_MINOR 3
 
 // Encryption & Ticketing Parameters
 #define SPICE_MAX_PASSWORD_LENGTH 60
commit a668cb38e2711ed8b5d4a4f60d1868d263c05e28
Author: Alexander Larsson <alexl at redhat.com>
Date:   Wed Mar 24 16:07:15 2010 +0100

    Add SPICE_MSG_MAIN_MIGRATE_SWITCH_HOST message
    
    This is a simpler form of migration

diff --git a/spice/protocol.h b/spice/protocol.h
index 02709be..60016df 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -158,6 +158,8 @@ enum {
     SPICE_MSG_MAIN_AGENT_DATA,
     SPICE_MSG_MAIN_AGENT_TOKEN,
 
+    SPICE_MSG_MAIN_MIGRATE_SWITCH_HOST,
+
     SPICE_MSG_END_MAIN,
 };
 
@@ -223,6 +225,15 @@ typedef struct SPICE_ATTR_PACKED SpiceMsgMainMigrationBegin {
     uint32_t pub_key_size;
 } SpiceMsgMainMigrationBegin;
 
+typedef struct SPICE_ATTR_PACKED SpiceMsgMainMigrationSwitchHost {
+    uint16_t port;
+    uint16_t sport;
+    uint32_t host_offset;
+    uint32_t host_size;
+    uint32_t cert_subject_offset;
+    uint32_t cert_subject_size;
+} SpiceMsgMainMigrationSwitchHost;
+
 enum {
     SPICE_MIGRATE_NEED_FLUSH = (1 << 0),
     SPICE_MIGRATE_NEED_DATA_TRANSFER = (1 << 1),