diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 16:36:51 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:43 +0100 |
| commit | 6919048e6c17826bc19d3da7d9c801d2612f8f19 (patch) | |
| tree | e4711d05d1aa04a178a0022ca4f58f09e00bb05a | |
| parent | f1535cd9b29eefa397eba090b91cbb70f2fae53f (diff) | |
| download | spice-6919048e6c17826bc19d3da7d9c801d2612f8f19.tar.gz spice-6919048e6c17826bc19d3da7d9c801d2612f8f19.tar.xz spice-6919048e6c17826bc19d3da7d9c801d2612f8f19.zip | |
Change red_on_main_agent_data() to take RedsState arg
| -rw-r--r-- | server/main-channel.c | 2 | ||||
| -rw-r--r-- | server/reds.c | 6 | ||||
| -rw-r--r-- | server/reds.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/server/main-channel.c b/server/main-channel.c index 5f4478de..dfc5469a 100644 --- a/server/main-channel.c +++ b/server/main-channel.c @@ -915,7 +915,7 @@ static int main_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, uint break; } case SPICE_MSGC_MAIN_AGENT_DATA: { - reds_on_main_agent_data(mcc, message, size); + reds_on_main_agent_data(reds, mcc, message, size); break; } case SPICE_MSGC_MAIN_AGENT_TOKEN: { diff --git a/server/reds.c b/server/reds.c index aa99a5e9..d69ce68a 100644 --- a/server/reds.c +++ b/server/reds.c @@ -995,7 +995,7 @@ static void reds_client_monitors_config_cleanup(RedsState *reds) cmc->mcc = NULL; } -static void reds_on_main_agent_monitors_config( +static void reds_on_main_agent_monitors_config(RedsState *reds, MainChannelClient *mcc, void *message, size_t size) { VDAgentMessage *msg_header; @@ -1020,7 +1020,7 @@ static void reds_on_main_agent_monitors_config( reds_client_monitors_config_cleanup(reds); } -void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size) +void reds_on_main_agent_data(RedsState *reds, MainChannelClient *mcc, void *message, size_t size) { VDIPortState *dev_state = &reds->agent_state; VDIChunkHeader *header; @@ -1034,7 +1034,7 @@ void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size) case AGENT_MSG_FILTER_DISCARD: return; case AGENT_MSG_FILTER_MONITORS_CONFIG: - reds_on_main_agent_monitors_config(mcc, message, size); + reds_on_main_agent_monitors_config(reds, mcc, message, size); return; case AGENT_MSG_FILTER_PROTO_ERROR: red_channel_client_shutdown(main_channel_client_get_base(mcc)); diff --git a/server/reds.h b/server/reds.h index ed736dbc..e57b2a35 100644 --- a/server/reds.h +++ b/server/reds.h @@ -100,7 +100,7 @@ void reds_on_main_agent_start(RedsState *reds, MainChannelClient *mcc, uint32_t void reds_on_main_agent_tokens(MainChannelClient *mcc, uint32_t num_tokens); uint8_t *reds_get_agent_data_buffer(RedsState *reds, MainChannelClient *mcc, size_t size); void reds_release_agent_data_buffer(RedsState *reds, uint8_t *buf); -void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size); +void reds_on_main_agent_data(RedsState *reds, MainChannelClient *mcc, void *message, size_t size); void reds_on_main_migrate_connected(int seamless); //should be called when all the clients // are connected to the target int reds_handle_migrate_data(MainChannelClient *mcc, |