[Spice-commits] 3 commits - configure.ac NEWS spice/enums.h spice/protocol.h

[Yonit Halperin]

 NEWS             |    4 ++++
 configure.ac     |    2 +-
 spice/enums.h    |    5 ++---
 spice/protocol.h |    8 +++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 54ef19ea333423829357e5492094c6c1caf605ab
Author: Yonit Halperin <yhalperi at redhat.com>
Date:   Wed Dec 28 11:49:22 2011 +0200

    Release 0.10.1

diff --git a/NEWS b/NEWS
index 5645e65..dad5e48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Major changes in 0.10.1
+=======================
+* Add support for a header without sublist and serial (mini header)
+
 Major changes in 0.10.0
 =======================
 * no changes, released to match version with spice
diff --git a/configure.ac b/configure.ac
index 50d4451..e1c3861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
 
 m4_define([SPICE_MAJOR], 0)
 m4_define([SPICE_MINOR], 10)
-m4_define([SPICE_MICRO], 0)
+m4_define([SPICE_MICRO], 1)
 
 AC_INIT(spice-protocol, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice-protocol)
 
commit 49e2069467dff4d56536151e2486b60e922e9371
Author: Yonit Halperin <yhalperi at redhat.com>
Date:   Wed Dec 28 11:26:03 2011 +0200

    Add support for mini header: an header without sub list & without serial
    
    -Add SpiceMiniDataHeader.
    -Introduce capability SPICE_COMMON_CAP_MINI_HEADER.
    
    The advantage of using a header without sub list is to spare the 4 bytes that were sent
    for a lot of messages without sublist.
    Instead, messages that previously contained sub lists, will be split to two msgs.
    The first one will be SPICE_MSG_LIST, holding the sub list, and the second will be the
    main msg.
    When most of the messages do not contain sub lists, the overhead of the additional 10 bytes
    for the header of SPICE_MSG_LIST is negligible. In addition, if there is
    only one message in the list, it can be sent independently.
    
    Instead of sending the serial number of the messages, the client and
    the server will increment local counters upon sending/receiving a
    message.

diff --git a/spice/protocol.h b/spice/protocol.h
index ddfe84b..5c7f286 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -37,7 +37,7 @@
 
 #define SPICE_MAGIC (*(uint32_t*)"REDQ")
 #define SPICE_VERSION_MAJOR 2
-#define SPICE_VERSION_MINOR 1
+#define SPICE_VERSION_MINOR 2
 
 // Encryption & Ticketing Parameters
 #define SPICE_MAX_PASSWORD_LENGTH 60
@@ -55,6 +55,7 @@ enum {
     SPICE_COMMON_CAP_PROTOCOL_AUTH_SELECTION,
     SPICE_COMMON_CAP_AUTH_SPICE,
     SPICE_COMMON_CAP_AUTH_SASL,
+    SPICE_COMMON_CAP_MINI_HEADER,
 };
 
 typedef struct SPICE_ATTR_PACKED SpiceLinkMess {
@@ -89,6 +90,11 @@ typedef struct SPICE_ATTR_PACKED SpiceDataHeader {
     uint32_t sub_list; //offset to SpiceSubMessageList[]
 } SpiceDataHeader;
 
+typedef struct SPICE_ATTR_PACKED SpiceMiniDataHeader {
+    uint16_t type;
+    uint32_t size;
+} SpiceMiniDataHeader;
+
 typedef struct SPICE_ATTR_PACKED SpiceSubMessage {
     uint16_t type;
     uint32_t size;
commit 96ffd16e8a817cc08e7903ae227fb3ff11415196
Author: Yonit Halperin <yhalperi at redhat.com>
Date:   Tue Jan 10 10:02:33 2012 +0200

    enums.h: add SPICE_MSG_LIST
    
    - enums.h was generated from spice.proto
      * as a result SPICE_CHANNEL_USER_DEFINED_START, which was added
        manually, was removed. It is not used yet. If it is going to be used it
        can be added to protocol.h in the future.
    - The new msg body is SpiceSubMessageList

diff --git a/spice/enums.h b/spice/enums.h
index a587b00..7325180 100644
--- a/spice/enums.h
+++ b/spice/enums.h
@@ -331,9 +331,7 @@ enum {
     SPICE_CHANNEL_SMARTCARD,
     SPICE_CHANNEL_USBREDIR,
 
-    SPICE_END_CHANNEL,
-
-    SPICE_CHANNEL_USER_DEFINED_START = 128
+    SPICE_END_CHANNEL
 };
 
 enum {
@@ -344,6 +342,7 @@ enum {
     SPICE_MSG_WAIT_FOR_CHANNELS,
     SPICE_MSG_DISCONNECTING,
     SPICE_MSG_NOTIFY,
+    SPICE_MSG_LIST,
 };
 
 enum {