pxcloud/spice-common
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-common synced 2026-08-12 09:34:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

smartcard: build fixes for spice server

Browse Source 
Define different enums that have a SPICE_ prefix to not conflict with same
value enums from libcacard/vsccard_common.h, and continue to use the same
SPICE_MSG_SMARTCARD_DATA and SPICE_MSGC_SMARTCARD_DATA enum that is used by the
server and clients (spice-gtk, spicec) alike.
This commit is contained in:
Alon Levy 2012-06-14 12:40:47 +03:00
parent a976c16cf3
commit 535b52db66
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/client_marshallers.h
View File

@ -66,7 +66,7 @@ typedef struct {
void (*msgc_smartcard_atr)(SpiceMarshaller *m, VSCMsgATR *msg);
void (*msgc_smartcard_error)(SpiceMarshaller *m, VSCMsgError *msg);
void (*msgc_smartcard_header)(SpiceMarshaller *m, VSCMsgHeader *msg);
void (*msgc_smartcard_msg)(SpiceMarshaller *m, SpiceMsgcSmartcard *msg, SpiceMarshaller **reader_name_out);
void (*msgc_smartcard_data)(SpiceMarshaller *m, SpiceMsgcSmartcard *msg, SpiceMarshaller **reader_name_out);
void (*msgc_smartcard_reader_add)(SpiceMarshaller *m, VSCMsgReaderAdd *msg);
#endif
} SpiceMessageMarshallers;

6
spice.proto
View File

@ -1139,7 +1139,7 @@ enum32 vsc_message_type {
APDU,
Flush,
FlushComplete
} @prefix(VSC_);
};
struct VscMessageHeader {
vsc_message_type type;
@ -1170,7 +1170,7 @@ channel SmartcardChannel : BaseChannel {
uint32 reader_id;
uint32 length;
uint8 data[] @end;
} @ctype(SpiceMsgSmartcard) msg = 101;
} @ctype(SpiceMsgSmartcard) data = 101;
client:
message {
@ -1184,7 +1184,7 @@ channel SmartcardChannel : BaseChannel {
case Error:
VscMessageError error;
} u @anon;
} @ctype(SpiceMsgcSmartcard) msg = 101;
} @ctype(SpiceMsgcSmartcard) data = 101;
message {
vsc_message_type type;