[Spice-devel] [PATCH v4 41/41] proto: Describe Quic image format from dissector

[Christophe Fergeau]

On Thu, Jul 23, 2015 at 04:54:58PM +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  spice.proto | 25 ++++++++++++++++++++++++-
>  1 file changed, 24 insertions(+), 1 deletion(-)
> 
> diff --git a/spice.proto b/spice.proto
> index 880a8be..270464f 100644
> --- a/spice.proto
> +++ b/spice.proto
> @@ -687,6 +687,29 @@ struct Surface {
>      uint32 surface_id;
>  } @ws_txt("Surface ID: %u", surface_id);
>  
> +enum32 quic_image_type {
> +    INVALID,
> +    GRAY,
> +    RGB16,
> +    RGB24,
> +    RGB32,
> +    RGBA
> +} @ws("QUIC image type", quic_type) @prefix(WSQUIC_IMAGE_TYPE_);
> +
> +struct ImageQuic {
> +    uint32 magic @ws_desc("QUIC magic (QUIC)");
> +    uint16 major @ws("QUIC major version", quic_major_version);
> +    uint16 minor @ws("QUIC minor version", quic_minor_version);
> +    quic_image_type type;
> +    uint32 width @ws("Width", quic_width);
> +    uint32 height @ws("Height", image_height);
> +    uint8 data[] @end @ws_txt("QUIC compressed image data (%u bytes)", data.nelements);
> +};
> +
> +struct ImageQuicData {
> +    uint32 data_size @bytes_count(dummy) @ws_txt("QUIC image size: %u bytes", data_size);
> +    ImageQuic image[bytes(data_size, dummy)] @nomarshal @chunk;
> +};

Imo having these definitions in spice.proto which are only used by the
dissector can be confusing. Is it possible to annotate them with
@ifdef(WIRESHARK), or does it make no sense?

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150730/826ad0fc/attachment.sig>