You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2020/01/14 19:21:36 UTC
[guacamole-server] 01/01: GUACAMOLE-249: Merge migrate to FreeRDP
2.x
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 3e22526ad967d30c0729157f0b2ed2fd1c00b14e
Merge: 381ff1a 99b00a8
Author: Virtually Nick <ne...@users.noreply.github.com>
AuthorDate: Tue Jan 14 14:21:26 2020 -0500
GUACAMOLE-249: Merge migrate to FreeRDP 2.x
Dockerfile | 7 +-
configure.ac | 549 +++---------------
src/common/surface.c | 29 +-
src/guacd-docker/bin/link-freerdp-plugins.sh | 2 +-
src/protocols/rdp/.gitignore | 1 +
src/protocols/rdp/Makefile.am | 376 +++++--------
src/protocols/rdp/{rdp_bitmap.c => bitmap.c} | 132 +----
src/protocols/rdp/{rdp_bitmap.h => bitmap.h} | 100 +---
.../audio-input/audio-buffer.c} | 170 +-----
.../audio-input/audio-buffer.h} | 40 +-
.../rdp/channels/audio-input/audio-input.c | 195 +++++++
.../audio-input/audio-input.h} | 42 +-
src/protocols/rdp/channels/cliprdr.c | 620 +++++++++++++++++++++
src/protocols/rdp/channels/cliprdr.h | 146 +++++
src/protocols/rdp/channels/common-svc.c | 101 ++++
src/protocols/rdp/channels/common-svc.h | 229 ++++++++
src/protocols/rdp/{rdp_disp.c => channels/disp.c} | 76 ++-
src/protocols/rdp/{rdp_disp.h => channels/disp.h} | 74 ++-
src/protocols/rdp/channels/pipe-svc.c | 230 ++++++++
src/protocols/rdp/channels/pipe-svc.h | 188 +++++++
src/protocols/rdp/channels/rail.c | 211 +++++++
.../{compat/client-cliprdr.h => channels/rail.h} | 26 +-
.../rdpdr/rdpdr-fs-messages-dir-info.c} | 89 +--
.../rdpdr/rdpdr-fs-messages-dir-info.h} | 56 +-
.../rdpdr/rdpdr-fs-messages-file-info.c} | 169 +++---
.../rdpdr/rdpdr-fs-messages-file-info.h} | 72 ++-
.../rdpdr/rdpdr-fs-messages-vol-info.c} | 92 ++-
.../rdpdr/rdpdr-fs-messages-vol-info.h} | 30 +-
.../rdpdr/rdpdr-fs-messages.c} | 271 +++++----
.../rdpdr/rdpdr-fs-messages.h} | 53 +-
.../rdpdr/rdpdr-fs.c} | 73 ++-
.../rdpdr/rdpdr-fs.h} | 30 +-
src/protocols/rdp/channels/rdpdr/rdpdr-messages.c | 349 ++++++++++++
src/protocols/rdp/channels/rdpdr/rdpdr-messages.h | 136 +++++
.../rdpdr/rdpdr-printer.c} | 87 ++-
src/protocols/rdp/channels/rdpdr/rdpdr-printer.h | 81 +++
src/protocols/rdp/channels/rdpdr/rdpdr.c | 184 ++++++
src/protocols/rdp/channels/rdpdr/rdpdr.h | 250 +++++++++
.../rdpsnd/rdpsnd-messages.c} | 71 +--
.../rdpsnd/rdpsnd-messages.h} | 111 +---
src/protocols/rdp/channels/rdpsnd/rdpsnd.c | 105 ++++
.../rdpsnd_service.h => channels/rdpsnd/rdpsnd.h} | 67 +--
src/protocols/rdp/client.c | 41 +-
src/protocols/rdp/client.h | 2 -
src/protocols/rdp/color.c | 76 +++
src/protocols/rdp/{rdp_color.h => color.h} | 25 +-
src/protocols/rdp/compat/rail.h | 39 --
src/protocols/rdp/compat/winpr-stream.c | 47 --
src/protocols/rdp/compat/winpr-stream.h | 71 ---
src/protocols/rdp/decompose.c | 1 -
src/protocols/rdp/doc/svc-example/.gitignore | 2 +
.../Makefile.am => doc/svc-example/Makefile} | 46 +-
src/protocols/rdp/doc/svc-example/README.md | 169 ++++++
src/protocols/rdp/doc/svc-example/svc-example.c | 71 +++
src/protocols/rdp/download.c | 222 ++++++++
src/protocols/rdp/download.h | 69 +++
src/protocols/rdp/dvc.c | 183 ------
src/protocols/rdp/dvc.h | 138 -----
src/protocols/rdp/error.c | 2 -
src/protocols/rdp/{rdp_fs.c => fs.c} | 67 ++-
src/protocols/rdp/{rdp_fs.h => fs.h} | 108 +---
src/protocols/rdp/{rdp_gdi.c => gdi.c} | 195 +------
src/protocols/rdp/{rdp_gdi.h => gdi.h} | 83 ++-
src/protocols/rdp/{rdp_glyph.c => glyph.c} | 51 +-
src/protocols/rdp/{rdp_glyph.h => glyph.h} | 73 ++-
src/protocols/rdp/guac_rdpdr/rdpdr_messages.c | 286 ----------
src/protocols/rdp/guac_rdpdr/rdpdr_messages.h | 221 --------
src/protocols/rdp/guac_rdpdr/rdpdr_printer.h | 48 --
src/protocols/rdp/guac_rdpdr/rdpdr_service.c | 313 -----------
src/protocols/rdp/guac_rdpdr/rdpdr_service.h | 184 ------
src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c | 144 -----
src/protocols/rdp/guac_svc/svc_service.c | 150 -----
src/protocols/rdp/guac_svc/svc_service.h | 77 ---
src/protocols/rdp/input.c | 20 +-
src/protocols/rdp/keyboard.c | 30 +-
src/protocols/rdp/keyboard.h | 6 +-
src/protocols/rdp/{rdp_keymap.c => keymap.c} | 4 +-
src/protocols/rdp/{rdp_keymap.h => keymap.h} | 11 +-
src/protocols/rdp/keymaps/generate.pl | 7 +-
src/protocols/rdp/log.c | 74 +++
src/protocols/rdp/{compat/winpr-wtypes.h => log.h} | 26 +-
src/protocols/rdp/ls.c | 122 ++++
src/protocols/rdp/{sftp.h => ls.h} | 60 +-
src/protocols/rdp/plugins/channels.c | 142 +++++
src/protocols/rdp/plugins/channels.h | 207 +++++++
.../rdp/plugins/generate-entry-wrappers.pl | 77 +++
.../rdp/plugins/guac-common-svc/guac-common-svc.c | 306 ++++++++++
.../guacai/guacai-messages.c} | 32 +-
.../guacai/guacai-messages.h} | 21 +-
.../ai_service.c => plugins/guacai/guacai.c} | 90 +--
.../ai_service.h => plugins/guacai/guacai.h} | 8 +-
.../rdp/{ptr_string.c => plugins/ptr-string.c} | 6 +-
.../rdp/{ptr_string.h => plugins/ptr-string.h} | 6 +-
src/protocols/rdp/{rdp_pointer.c => pointer.c} | 61 +-
src/protocols/rdp/{rdp_pointer.h => pointer.h} | 28 +-
src/protocols/rdp/{rdp_print_job.c => print-job.c} | 4 +-
src/protocols/rdp/{rdp_print_job.h => print-job.h} | 5 +-
src/protocols/rdp/rdp.c | 569 ++++---------------
src/protocols/rdp/rdp.h | 49 +-
src/protocols/rdp/rdp_cliprdr.c | 270 ---------
src/protocols/rdp/rdp_cliprdr.h | 120 ----
src/protocols/rdp/rdp_color.c | 62 ---
src/protocols/rdp/rdp_rail.c | 122 ----
src/protocols/rdp/rdp_rail.h | 58 --
src/protocols/rdp/rdp_status.h | 66 ---
src/protocols/rdp/rdp_stream.c | 594 --------------------
src/protocols/rdp/rdp_stream.h | 226 --------
src/protocols/rdp/rdp_svc.c | 176 ------
src/protocols/rdp/rdp_svc.h | 168 ------
src/protocols/rdp/{rdp_settings.c => settings.c} | 281 ++--------
src/protocols/rdp/{rdp_settings.h => settings.h} | 41 +-
src/protocols/rdp/sftp.c | 3 -
src/protocols/rdp/sftp.h | 2 -
src/protocols/rdp/tests/Makefile.am | 1 +
src/protocols/rdp/tests/fs/basename.c | 59 ++
src/protocols/rdp/tests/fs/normalize_path.c | 2 +-
src/protocols/rdp/unicode.c | 4 +-
src/protocols/rdp/upload.c | 236 ++++++++
src/protocols/rdp/upload.h | 72 +++
src/protocols/rdp/user.c | 21 +-
120 files changed, 6576 insertions(+), 7103 deletions(-)