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:35 UTC
[guacamole-server] branch staging/1.1.0 updated (381ff1a -> 3e22526)
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git.
from 381ff1a GUACAMOLE-630: Merge expose terminal color/font changes.
add a5b62aa GUACAMOLE-249: Migrate to newer API (partial).
add 17d31d9 GUACAMOLE-249: Remove all legacy FreeRDP compatibility.
add 554251c GUACAMOLE-249: Remove usage of CLRCONV.
add 9b08a71 GUACAMOLE-249: Comment out remaining usage of SVC.
add e4a68d7 GUACAMOLE-249: Correct prototypes of glyph handlers.
add fbfbaff GUACAMOLE-249: Correct prototypes of pointer handlers.
add 82664b4 GUACAMOLE-249: Correct prototypes of GDI handlers.
add 3b56004 GUACAMOLE-249: Correct prototype of certificate verification callback. If accepting the certificate, request that FreeRDP not store it.
add 9fa9adb GUACAMOLE-249: Migrate to libwinpr "CF_*" constants for clipboard formats.
add ad7ab67 GUACAMOLE-249: The freerdp/gdi/gdi.h header is required to access contents of rdpGdi struct.
add 703ce5c GUACAMOLE-249: Remove usage of old FreeRDP channels interface.
add 6886665 GUACAMOLE-249: Comment out usage of old event interface.
add a76e307 GUACAMOLE-249: RDP "DisableEncryption" settings flag has been inverted and renamed to "UseRdpSecurityLayer".
add 2ed0d04 GUACAMOLE-249: Default to negotiated security mode, not old "RDP" encryption.
add 7332e63 GUACAMOLE-249: Add "nla-ext" option for extended NLA mode.
add 1e69209 GUACAMOLE-249: Correct remaining void returns from BOOL handlers.
add c311d8b GUACAMOLE-249: Rely on default bitmap/GDI/pointer handlers for all but those that must be overridden.
add 65fe6c9 GUACAMOLE-249: Correct incorrect syntax introduced by initial partial migration (commit a5b62aa82).
add 7a7ffc2 GUACAMOLE-249: Add missing pixel format parameter to pointer image copy.
add 7904d9c GUACAMOLE-249: Initialize FreeRDP's GDI implementation (default GDI handlers will otherwise fail).
add 17045d5 GUACAMOLE-249: Use reversed byte order for colors locally (verification needed).
add b89ed7f GUACAMOLE-249: Migrate wait mechanism to event handle interface.
add 16be3af GUACAMOLE-249: Load FreeRDP plugins regardless of entry point interface.
add cc7cd78 GUACAMOLE-249: Centralize handling of connected channels.
add 831606a GUACAMOLE-249: Use pkg-config to determine location of FreeRDP headers.
add b64b8f3 GUACAMOLE-249: Restore support for CLIPRDR channel.
add 8c7984d GUACAMOLE-249: Free GDI implementation. Do not allocate cache (unnecessary).
add 9dd1555 GUACAMOLE-249: Do not include CB_RESPONSE_OK flag in Format List PDU.
add de493ba GUACAMOLE-249: Send Format List Response PDU after successfully processing a Format List PDU.
add eab07b4 GUACAMOLE-249: Add trace-level logging of received and sent CLIPRDR PDUs.
add 07f6e6a GUACAMOLE-249: Remove guac_rdp_dvc_list, relying instead on the DVC channel collection within rdpSettings.
add 6dc8b57 GUACAMOLE-249: Update RAIL (RemoteApp) support to FreeRDP 2.0.0 API.
add 77a3239 GUACAMOLE-249: Migrate to plugin naming style used by FreeRDP 2.0.0.
add fa0ad26 GUACAMOLE-249: Update Docker build to use FreeRDP 2.0.0.
add 233c055 GUACAMOLE-249: Migrate SVC support to FreeRDP 2.0.0 plugin API.
add f3cef7e GUACAMOLE-249: Add example for testing arbitrary SVC support.
add 0497a33 GUACAMOLE-249: Migrate loading of RDPSND support ("guacsnd" plugin) to abstract function.
add 6f2b124 GUACAMOLE-249: Migrate RDPSND support to FreeRDP 2.0.0 plugin API.
add 68710a6 GUACAMOLE-249: Migrate loading of RDPDR support (guacdr plugin) to abstract function.
add ee4d91e GUACAMOLE-249: Migrate RDPDR support to FreeRDP 2.0.0 plugin API.
add a7352b1 GUACAMOLE-249: Remove lock around usage of FreeRDP (new library appears threadsafe).
add 7b93b3d GUACAMOLE-249: Gradually reassemble received chunks of RDPSND data.
add 352b9c5 GUACAMOLE-249: Add common SVC plugin implementation as future simplified basis for RDPSND, RDPDR, etc.
add 3255b18 GUACAMOLE-249: Remove "guacsvc" plugin in favor of leveraging common SVC implementation.
add 4612e79 GUACAMOLE-249: Remove "guacsnd" plugin in favor of leveraging common SVC implementation.
add 664586e GUACAMOLE-249: VirtualChannelEntryEx entry point is supposed to accept a PCHANNEL_ENTRY_POINTS_EX.
add 875d51c GUACAMOLE-249: Dynamically wrap channel entry points (FreeRDP will refuse to associate the same entry point with multiple channels).
add 827951d GUACAMOLE-249: Remove RDP constant definitions which are defined within FreeRDP headers.
add a63dcb4 GUACAMOLE-249: Rename and restructure RDP source files more sensibly.
add d7bbee3 GUACAMOLE-249: Reorganize includes to match code standard.
add 4752863 GUACAMOLE-249: Remove now-unnecessary status.h FreeRDP compatibility header.
add 024fc2a GUACAMOLE-249: Callbacks for "drdynvc" plugin should return CHANNEL_RC_OK, including entry point.
add bced87c GUACAMOLE-249: FreeRDP 2.0.0 requires the Clipboard Capabilities PDU to be manually sent.
add 0c70911 GUACAMOLE-249: Use correct start location of clipboard buffer (accidentally used pointer to end).
add 47a1dcc GUACAMOLE-249: Message flags of clipboard data response must be set to CB_RESPONSE_OK for data to be accepted.
add 6983199 GUACAMOLE-249: Remove prototype for guac_rdp_bitmap_decompress(), which is no longer defined nor used.
add 598b86a GUACAMOLE-249: Correct @file annotations within Doxygen comments of renamed headers.
add 6c239a7 GUACAMOLE-249: Use filesystem constants defined by FreeRDP and WinPR headers rather than defining our own.
add 12febd5 GUACAMOLE-249: Remove unused SEC_TO_UNIX_EPOCH constant.
add ab05502 GUACAMOLE-249: Correct missing/incorrect documentation for RDP callback parameters.
add fbb759a GUACAMOLE-249: Correct mismatched ifndef/define header include check.
add a54c61e GUACAMOLE-249: Support for OpaqueRect MUST NOT be claimed without supporting PatBlt. OpaqueRect implies PatBlt and vice versa.
add 36545cc GUACAMOLE-249: Document absolutely all parameters and return types for RDP support.
add d2083a1 GUACAMOLE-249: Refactor RDPDR to be more documentable. Document RDPDR fully.
add 6940875 GUACAMOLE-249: Refactor away old stream.h and guac_rdp_stream.
add 9ad3bc9 GUACAMOLE-249: Log RDPDR debug messages at GUAC_LOG_DEBUG level.
add 0926864 GUACAMOLE-249: Redirect FreeRDP log messages to debug level of guac_client_log().
add 8dda26a GUACAMOLE-249: Free rdpBitmap and rdpGlyph within custom free handlers (not automatically freed like rdpPointer).
add f334169 GUACAMOLE-249: RAIL plugin for FreeRDP 2.0.0 requires that the Client Execute PDU be sent manually.
add 7ef1dca GUACAMOLE-249: Convert absolutely all rdpBitmaps before attempting to draw.
add d7151e0 GUACAMOLE-249: Push FreeRDP settings in preconnect hander (OrderSupport is reset otherwise).
add 2d44123 GUACAMOLE-249: Do not draw background for glyphs when "redundant" (transparent).
add 36f2275 GUACAMOLE-249: Defer draws to unrealized (server-side) buffers until they are actually needed client-side.
add 1bc9384 GUACAMOLE-249: Claim support only for RDP orders that are explicitly supported, independently of any FreeRDP defaults.
add 902c5e1 GUACAMOLE-249: Alpha component must be in highest-order byte.
add 555973f GUACAMOLE-249: Remove unnecessary bitmap conversion - will happen automatically when FreeRDP invokes bitmap->Decompress().
add f57382f GUACAMOLE-249: Determine FreeRDP pixel format corresponding to local Cairo surfaces based on local platform endianness.
add 2bbc4bf GUACAMOLE-249: Move keyboard-related source back to root of RDP (ease merge). Not truly needed as much as the rest of the restructure.
add 9855d87 GUACAMOLE-249: Remove handlers for PatBlt and OpaqueRect. FreeRDP will not invoke these if the corresponding OrderSupport element is FALSE, thus they will never be called.
add e325dbc GUACAMOLE-249: Add/remove headers as necessary based on run through Include What You Use (IWYU) tool.
add a54a123 GUACAMOLE-249: Use ReadColor() / WriteColor() around FreeRDPConvertColor().
add 0677a9a GUACAMOLE-249: Common surface should still pay attention to dirty flag, regardless of the new special case for unrealized surfaces.
add 1f24c47 GUACAMOLE-249: Remove empty struct definitions added by Include What You Use.
add 80988cd GUACAMOLE-249: Provide SetNull and SetDefault implementations for rdpPointer.
add dc8c60f GUACAMOLE-249: freerdp_channels_data() is already the default value of ReceiveChannelData.
add 67c5bdf GUACAMOLE-249: Do not attempt to free SVC-specific data if it hasn't actually been allocated.
add 666c4fb GUACAMOLE-249: Do not include "extended mode" NLA in security negotiation as negotiation fails (see FreeRDP defaults).
add 55959b5 GUACAMOLE-249: Until parameter prompting is available, do not auto-negotiate for NLA if username and password have not been provided.
add 2139d40 GUACAMOLE-249: Remove accidental double spaces from RDP comments.
add feb376e GUACAMOLE-249: Fix misspelled "instruction" and "have" in comments.
add c4f6c51 GUACAMOLE-249: Remove accidentally-inserted "0" from end of comment.
add b3a713b GUACAMOLE-249: Clean up basename logic of file downloads. Add unit test.
add 62ee361 GUACAMOLE-249: Refactor guac_freerdp_channels_load_plugin() to log a warning if plugin limits are reached.
add f805a80 GUACAMOLE-249: Switch return type of guac_rdp_cache_bitmap() back to void - it doesn't fail, and isn't dictated by the FreeRDP API.
add a3d9a68 GUACAMOLE-249: Handle failure to send either response required for monitor ready.
add e9670df GUACAMOLE-249: Correct typo: "updating" should be "update".
add 92d97a3 GUACAMOLE-249: Correct typo: "indicating" should be "indicates".
add 01c731e GUACAMOLE-249: Clean up documentation for arbitrary pipe SVC. No need to say "automatically" everywhere.
add 5e9c7cd GUACAMOLE-249: Correct typo: "of common RDPDR header" should be "of the common RDPDR header".
add 4b1243f GUACAMOLE-249: Ensure CLIPRDR message handlers are accepted by compiler regardless of whether const is required.
add e984694 GUACAMOLE-249: Test endianness of platform without violating strict aliasing rules.
add 4282da6 GUACAMOLE-249: Restructure audio input such that audio buffer can be separately linked.
add eaae203 GUACAMOLE-249: Ensure RAIL message handlers are accepted by compiler regardless of whether const is required.
add 9a34caf GUACAMOLE-249: The FreeRDPConvertColor() function is also known as ConvertColor(), but was only available as ConvertColor() in older FreeRDP 2.0.0 release candidates.
add 308d7a0 GUACAMOLE-249: Support rdpGlyph callback format used in FreeRDP 2.0.0-rc3 and older (used UINT32 instead of INT32).
add e5fdda1 GUACAMOLE-249: Remove CLIPRDR callback typecasts, relying instead on configure tests to check need for const.
add 3dfd246 GUACAMOLE-249: Remove RAIL callback typecasts, relying instead on configure tests to check need for const.
add de3300e GUACAMOLE-249: Preserve CPPFLAGS such that modifications needed for FreeRDP tests affect only FreeRDP tests.
add 99b00a8 GUACAMOLE-249: Add -Werror to CPPFLAGS for FreeRDP tests to ensure tests fail when pointers are incompatible.
new 3e22526 GUACAMOLE-249: Merge migrate to FreeRDP 2.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +++++++
.../rdp/channels/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 +++++++
.../{kubernetes/ssl.h => rdp/channels/rail.h} | 22 +-
.../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/client-cliprdr.h | 35 --
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/compat/winpr-wtypes.h | 39 --
src/protocols/rdp/decompose.c | 1 -
src/protocols/rdp/doc/svc-example/.gitignore | 2 +
.../rdp/doc/svc-example/Makefile} | 27 +-
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/{vnc/auth.c => rdp/log.h} | 22 +-
src/protocols/rdp/ls.c | 122 ++++
src/{guacd/conf.h => protocols/rdp/ls.h} | 61 +-
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 +-
122 files changed, 6554 insertions(+), 7173 deletions(-)
rename src/protocols/rdp/{rdp_bitmap.c => bitmap.c} (56%)
rename src/protocols/rdp/{rdp_bitmap.h => bitmap.h} (57%)
rename src/protocols/rdp/{audio_input.c => channels/audio-input/audio-buffer.c} (69%)
rename src/protocols/rdp/{audio_input.h => channels/audio-input/audio-buffer.h} (88%)
create mode 100644 src/protocols/rdp/channels/audio-input/audio-input.c
copy src/{common/common/dot_cursor.h => protocols/rdp/channels/audio-input/audio-input.h} (51%)
create mode 100644 src/protocols/rdp/channels/cliprdr.c
create mode 100644 src/protocols/rdp/channels/cliprdr.h
create mode 100644 src/protocols/rdp/channels/common-svc.c
create mode 100644 src/protocols/rdp/channels/common-svc.h
rename src/protocols/rdp/{rdp_disp.c => channels/disp.c} (70%)
rename src/protocols/rdp/{rdp_disp.h => channels/disp.h} (75%)
create mode 100644 src/protocols/rdp/channels/pipe-svc.c
create mode 100644 src/protocols/rdp/channels/pipe-svc.h
create mode 100644 src/protocols/rdp/channels/rail.c
copy src/protocols/{kubernetes/ssl.h => rdp/channels/rail.h} (60%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages_dir_info.c => channels/rdpdr/rdpdr-fs-messages-dir-info.c} (71%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages_dir_info.h => channels/rdpdr/rdpdr-fs-messages-dir-info.h} (54%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages_file_info.c => channels/rdpdr/rdpdr-fs-messages-file-info.c} (51%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages_file_info.h => channels/rdpdr/rdpdr-fs-messages-file-info.h} (51%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages_vol_info.c => channels/rdpdr/rdpdr-fs-messages-vol-info.c} (60%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages_vol_info.h => channels/rdpdr/rdpdr-fs-messages-vol-info.h} (61%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages.c => channels/rdpdr/rdpdr-fs-messages.c} (56%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_messages.h => channels/rdpdr/rdpdr-fs-messages.h} (59%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_service.c => channels/rdpdr/rdpdr-fs.c} (61%)
rename src/protocols/rdp/{guac_rdpdr/rdpdr_fs_service.h => channels/rdpdr/rdpdr-fs.h} (70%)
create mode 100644 src/protocols/rdp/channels/rdpdr/rdpdr-messages.c
create mode 100644 src/protocols/rdp/channels/rdpdr/rdpdr-messages.h
rename src/protocols/rdp/{guac_rdpdr/rdpdr_printer.c => channels/rdpdr/rdpdr-printer.c} (71%)
create mode 100644 src/protocols/rdp/channels/rdpdr/rdpdr-printer.h
create mode 100644 src/protocols/rdp/channels/rdpdr/rdpdr.c
create mode 100644 src/protocols/rdp/channels/rdpdr/rdpdr.h
rename src/protocols/rdp/{guac_rdpsnd/rdpsnd_messages.c => channels/rdpsnd/rdpsnd-messages.c} (85%)
rename src/protocols/rdp/{guac_rdpsnd/rdpsnd_messages.h => channels/rdpsnd/rdpsnd-messages.h} (65%)
create mode 100644 src/protocols/rdp/channels/rdpsnd/rdpsnd.c
rename src/protocols/rdp/{guac_rdpsnd/rdpsnd_service.h => channels/rdpsnd/rdpsnd.h} (66%)
create mode 100644 src/protocols/rdp/color.c
rename src/protocols/rdp/{rdp_color.h => color.h} (61%)
delete mode 100644 src/protocols/rdp/compat/client-cliprdr.h
delete mode 100644 src/protocols/rdp/compat/rail.h
delete mode 100644 src/protocols/rdp/compat/winpr-stream.c
delete mode 100644 src/protocols/rdp/compat/winpr-stream.h
delete mode 100644 src/protocols/rdp/compat/winpr-wtypes.h
create mode 100644 src/protocols/rdp/doc/svc-example/.gitignore
copy src/{pulse/Makefile.am => protocols/rdp/doc/svc-example/Makefile} (77%)
create mode 100644 src/protocols/rdp/doc/svc-example/README.md
create mode 100644 src/protocols/rdp/doc/svc-example/svc-example.c
create mode 100644 src/protocols/rdp/download.c
create mode 100644 src/protocols/rdp/download.h
delete mode 100644 src/protocols/rdp/dvc.c
delete mode 100644 src/protocols/rdp/dvc.h
rename src/protocols/rdp/{rdp_fs.c => fs.c} (95%)
rename src/protocols/rdp/{rdp_fs.h => fs.h} (89%)
rename src/protocols/rdp/{rdp_gdi.c => gdi.c} (61%)
rename src/protocols/rdp/{rdp_gdi.h => gdi.h} (63%)
rename src/protocols/rdp/{rdp_glyph.c => glyph.c} (77%)
rename src/protocols/rdp/{rdp_glyph.h => glyph.h} (71%)
delete mode 100644 src/protocols/rdp/guac_rdpdr/rdpdr_messages.c
delete mode 100644 src/protocols/rdp/guac_rdpdr/rdpdr_messages.h
delete mode 100644 src/protocols/rdp/guac_rdpdr/rdpdr_printer.h
delete mode 100644 src/protocols/rdp/guac_rdpdr/rdpdr_service.c
delete mode 100644 src/protocols/rdp/guac_rdpdr/rdpdr_service.h
delete mode 100644 src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c
delete mode 100644 src/protocols/rdp/guac_svc/svc_service.c
delete mode 100644 src/protocols/rdp/guac_svc/svc_service.h
rename src/protocols/rdp/{rdp_keymap.c => keymap.c} (97%)
rename src/protocols/rdp/{rdp_keymap.h => keymap.h} (96%)
create mode 100644 src/protocols/rdp/log.c
copy src/protocols/{vnc/auth.c => rdp/log.h} (72%)
create mode 100644 src/protocols/rdp/ls.c
copy src/{guacd/conf.h => protocols/rdp/ls.h} (51%)
create mode 100644 src/protocols/rdp/plugins/channels.c
create mode 100644 src/protocols/rdp/plugins/channels.h
create mode 100755 src/protocols/rdp/plugins/generate-entry-wrappers.pl
create mode 100644 src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c
rename src/protocols/rdp/{guac_ai/ai_messages.c => plugins/guacai/guacai-messages.c} (95%)
rename src/protocols/rdp/{guac_ai/ai_messages.h => plugins/guacai/guacai-messages.h} (92%)
rename src/protocols/rdp/{guac_ai/ai_service.c => plugins/guacai/guacai.c} (82%)
rename src/protocols/rdp/{guac_ai/ai_service.h => plugins/guacai/guacai.h} (97%)
rename src/protocols/rdp/{ptr_string.c => plugins/ptr-string.c} (92%)
rename src/protocols/rdp/{ptr_string.h => plugins/ptr-string.h} (96%)
rename src/protocols/rdp/{rdp_pointer.c => pointer.c} (62%)
rename src/protocols/rdp/{rdp_pointer.h => pointer.h} (80%)
rename src/protocols/rdp/{rdp_print_job.c => print-job.c} (99%)
rename src/protocols/rdp/{rdp_print_job.h => print-job.h} (98%)
delete mode 100644 src/protocols/rdp/rdp_cliprdr.c
delete mode 100644 src/protocols/rdp/rdp_cliprdr.h
delete mode 100644 src/protocols/rdp/rdp_color.c
delete mode 100644 src/protocols/rdp/rdp_rail.c
delete mode 100644 src/protocols/rdp/rdp_rail.h
delete mode 100644 src/protocols/rdp/rdp_status.h
delete mode 100644 src/protocols/rdp/rdp_stream.c
delete mode 100644 src/protocols/rdp/rdp_stream.h
delete mode 100644 src/protocols/rdp/rdp_svc.c
delete mode 100644 src/protocols/rdp/rdp_svc.h
rename src/protocols/rdp/{rdp_settings.c => settings.c} (81%)
rename src/protocols/rdp/{rdp_settings.h => settings.h} (93%)
create mode 100644 src/protocols/rdp/tests/fs/basename.c
create mode 100644 src/protocols/rdp/upload.c
create mode 100644 src/protocols/rdp/upload.h
[guacamole-server] 01/01: GUACAMOLE-249: Merge migrate to FreeRDP
2.x
Posted by vn...@apache.org.
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(-)