diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-07-19 14:10:16 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-20 15:25:48 +0100 |
| commit | bdcfb2c83dd31e1a1fdd75944f632b76504cdb5d (patch) | |
| tree | 30e64886294f2c66b679ca42525c7c2467739a9b /spice1.proto | |
| parent | bfffc11787124bd85a363e7e5a5fd561ae6f2f7b (diff) | |
codegen: Various cleanups
Remove all uses of @end in the marshaller, instead just using
the C struct array-at-end-of-struct. To make this work we also remove
all use of @end for switches (making them C unions).
We drop the zero member of the notify message so that we can avoid this
use of @end for a primitive in the marshaller (plus its useless to send
over the wire).
We change the offsets and stuff in the migration messages to real pointers.
Diffstat (limited to 'spice1.proto')
| -rw-r--r-- | spice1.proto | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/spice1.proto b/spice1.proto index b4012bd..e38a214 100644 --- a/spice1.proto +++ b/spice1.proto @@ -166,13 +166,13 @@ channel MainChannel : BaseChannel { message { uint16 port; uint16 sport; - uint32 host_offset; + uint32 host_offset @zero; uint32 host_size; pubkey_type pub_key_type @minor(2); - uint32 pub_key_offset @minor(2); + uint32 pub_key_offset @minor(2) @zero; uint32 pub_key_size @minor(2); - uint8 host_data[host_size] @end @ctype(uint8_t) @zero_terminated @nomarshal; - uint8 pub_key_data[pub_key_size] @minor(2) @end @ctype(uint8_t) @zero_terminated @nomarshal; + uint8 host_data[host_size] @as_ptr @zero_terminated; + uint8 pub_key_data[pub_key_size] @minor(2) @as_ptr @zero_terminated; } @ctype(SpiceMsgMainMigrationBegin) migrate_begin = 101; Empty migrate_cancel; @@ -217,12 +217,12 @@ channel MainChannel : BaseChannel { message { uint16 port; uint16 sport; - uint32 host_offset; + uint32 host_offset @zero; uint32 host_size; - uint32 cert_subject_offset; + uint32 cert_subject_offset @zero; uint32 cert_subject_size; - uint8 host_data[host_size] @end @ctype(uint8_t) @zero_terminated; - uint8 cert_subject_data[cert_subject_size] @end @ctype(uint8_t) @zero_terminated; + uint8 host_data[host_size] @as_ptr @zero_terminated; + uint8 cert_subject_data[cert_subject_size] @as_ptr @zero_terminated; } @ctype(SpiceMsgMainMigrationSwitchHost) migrate_switch_host; client: |