diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c index 43cca5b3..2eba211e 100644 --- a/src/protocols/rdp/rdp.c +++ b/src/protocols/rdp/rdp.c @@ -582,6 +582,7 @@ static int guac_rdp_handle_connection(guac_client* client) { } /* Check for channel events */ +#if 0 wMessage* event = freerdp_channels_pop_event(channels); if (event) { @@ -594,6 +595,7 @@ static int guac_rdp_handle_connection(guac_client* client) { freerdp_event_free(event); } +#endif pthread_mutex_unlock(&(rdp_client->rdp_lock)); diff --git a/src/protocols/rdp/rdp_cliprdr.c b/src/protocols/rdp/rdp_cliprdr.c index 735d3329..52960e01 100644 --- a/src/protocols/rdp/rdp_cliprdr.c +++ b/src/protocols/rdp/rdp_cliprdr.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -36,7 +35,7 @@ #include void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event) { - +#if 0 switch (event->event_type) { case CliprdrChannel_MonitorReady: @@ -64,11 +63,11 @@ void guac_rdp_process_cliprdr_event(guac_client* client, wMessage* event) { GetMessageType(event->id)); } - +#endif } void guac_rdp_process_cb_monitor_ready(guac_client* client, wMessage* event) { - +#if 0 rdpChannels* channels = ((guac_rdp_client*) client->data)->rdp_inst->context->channels; @@ -87,7 +86,7 @@ void guac_rdp_process_cb_monitor_ready(guac_client* client, wMessage* event) { format_list->num_formats = 2; freerdp_channels_send_event(channels, (wMessage*) format_list); - +#endif } /** @@ -101,7 +100,7 @@ void guac_rdp_process_cb_monitor_ready(guac_client* client, wMessage* event) { * documented values used by the CLIPRDR channel for clipboard format IDs. */ static void __guac_rdp_cb_request_format(guac_client* client, int format) { - +#if 0 guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; rdpChannels* channels = rdp_client->rdp_inst->context->channels; @@ -118,7 +117,7 @@ static void __guac_rdp_cb_request_format(guac_client* client, int format) { /* Send request */ freerdp_channels_send_event(channels, (wMessage*) data_request); - +#endif } void guac_rdp_process_cb_format_list(guac_client* client, @@ -158,7 +157,7 @@ void guac_rdp_process_cb_format_list(guac_client* client, void guac_rdp_process_cb_data_request(guac_client* client, RDP_CB_DATA_REQUEST_EVENT* event) { - +#if 0 guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; rdpChannels* channels = rdp_client->rdp_inst->context->channels; @@ -201,7 +200,7 @@ void guac_rdp_process_cb_data_request(guac_client* client, /* Send response */ freerdp_channels_send_event(channels, (wMessage*) data_response); - +#endif } void guac_rdp_process_cb_data_response(guac_client* client, diff --git a/src/protocols/rdp/rdp_rail.c b/src/protocols/rdp/rdp_rail.c index 56ba6358..b351ea6f 100644 --- a/src/protocols/rdp/rdp_rail.c +++ b/src/protocols/rdp/rdp_rail.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -61,7 +60,7 @@ void guac_rdp_process_rail_event(guac_client* client, wMessage* event) { } void guac_rdp_process_rail_get_sysparam(guac_client* client, wMessage* event) { - +#if 0 wMessage* response; RAIL_SYSPARAM_ORDER* sysparam; @@ -93,6 +92,6 @@ void guac_rdp_process_rail_get_sysparam(guac_client* client, wMessage* event) { /* Send response */ freerdp_channels_send_event(channels, response); - +#endif } diff --git a/src/protocols/rdp/rdp_stream.c b/src/protocols/rdp/rdp_stream.c index b90b4365..1e1d4708 100644 --- a/src/protocols/rdp/rdp_stream.c +++ b/src/protocols/rdp/rdp_stream.c @@ -123,6 +123,7 @@ int guac_rdp_upload_file_handler(guac_user* user, guac_stream* stream, int guac_rdp_svc_pipe_handler(guac_user* user, guac_stream* stream, char* mimetype, char* name) { +#if 0 guac_rdp_stream* rdp_stream; guac_rdp_svc* svc = guac_rdp_get_svc(user->client, name); @@ -146,6 +147,7 @@ int guac_rdp_svc_pipe_handler(guac_user* user, guac_stream* stream, stream->blob_handler = guac_rdp_svc_blob_handler; rdp_stream->type = GUAC_RDP_INBOUND_SVC_STREAM; rdp_stream->svc = svc; +#endif return 0; @@ -221,10 +223,12 @@ int guac_rdp_upload_blob_handler(guac_user* user, guac_stream* stream, int guac_rdp_svc_blob_handler(guac_user* user, guac_stream* stream, void* data, int length) { +#if 0 guac_rdp_stream* rdp_stream = (guac_rdp_stream*) stream->data; /* Write blob data to SVC directly */ guac_rdp_svc_write(rdp_stream->svc, data, length); +#endif guac_protocol_send_ack(user->socket, stream, "OK (DATA RECEIVED)", GUAC_PROTOCOL_STATUS_SUCCESS); @@ -280,6 +284,7 @@ int guac_rdp_clipboard_end_handler(guac_user* user, guac_stream* stream) { guac_common_clipboard_append(rdp_client->clipboard, "", 1); /* Notify RDP server of new data, if connected */ +#if 0 freerdp* rdp_inst = rdp_client->rdp_inst; if (rdp_inst != NULL) { @@ -300,6 +305,7 @@ int guac_rdp_clipboard_end_handler(guac_user* user, guac_stream* stream) { freerdp_channels_send_event(channels, (wMessage*) format_list); } +#endif return 0; }