summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2011-05-05 16:39:23 +0200
committerMarc-André Lureau <marcandre.lureau@gmail.com>2011-06-23 20:01:09 +0200
commitb503ff7ae2d9ce1f86b18469d9543a1f063a6245 (patch)
tree06c472855d54d157bc1734ba58f050ff5da0695f /common
parentc275d2b9b7347ac8b10381ad745e006622e64902 (diff)
downloadspice-gtk-b503ff7ae2d9ce1f86b18469d9543a1f063a6245.tar.gz
spice-gtk-b503ff7ae2d9ce1f86b18469d9543a1f063a6245.tar.xz
spice-gtk-b503ff7ae2d9ce1f86b18469d9543a1f063a6245.zip
add smartcard bits to spice.proto
Diffstat (limited to 'common')
-rw-r--r--common/marshallers.h5
-rw-r--r--common/messages.h17
2 files changed, 22 insertions, 0 deletions
diff --git a/common/marshallers.h b/common/marshallers.h
index 47faeff..b30773a 100644
--- a/common/marshallers.h
+++ b/common/marshallers.h
@@ -55,6 +55,11 @@ typedef struct {
void (*msgc_tunnel_socket_closed_ack)(SpiceMarshaller *m, SpiceMsgcTunnelSocketClosedAck *msg);
void (*msgc_tunnel_socket_data)(SpiceMarshaller *m, SpiceMsgcTunnelSocketData *msg);
void (*msgc_tunnel_socket_token)(SpiceMarshaller *m, SpiceMsgcTunnelSocketTokens *msg);
+ 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_reader_add)(SpiceMarshaller *m, VSCMsgReaderAdd *msg);
} SpiceMessageMarshallers;
SpiceMessageMarshallers *spice_message_marshallers_get(void);
diff --git a/common/messages.h b/common/messages.h
index 8151dc0..e70f4c6 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -32,6 +32,7 @@
#define _H_MESSAGES
#include <spice/protocol.h>
+#include <vscard_common.h>
#include "draw.h"
#ifdef __cplusplus
@@ -507,6 +508,22 @@ typedef struct SpiceMsgcTunnelSocketTokens {
uint32_t num_tokens;
} SpiceMsgcTunnelSocketTokens;
+typedef struct SpiceMsgSmartcard {
+ VSCMsgType type;
+ uint32_t length;
+ uint32_t reader_id;
+ uint8_t data[0];
+} SpiceMsgSmartcard;
+
+typedef struct SpiceMsgcSmartcard {
+ VSCMsgHeader header;
+ union {
+ VSCMsgError error;
+ VSCMsgATR atr_data;
+ VSCMsgReaderAdd add;
+ };
+} SpiceMsgcSmartcard;
+
#ifdef __cplusplus
}
#endif