Commit Graph

3324 Commits

Author SHA1 Message Date
Mike Jumper
68a6285818
GUACAMOLE-625: Merge changes correcting failing build due to trailing whitespace in Makefile.am. 2020-01-24 08:09:32 -08:00
Nick Couchman
0e845a2914 GUACAMOLE-625: Remove trailing whitespace in Makefile.am and fix style 2020-01-24 10:32:25 -05:00
Virtually Nick
550e13ae9f
GUACAMOLE-625: Merge include Latin American RDP keymap 2020-01-24 10:07:10 -05:00
Adolfo Gómez García
b13fae7a9f GUACAMOLE-625: Included Latin American keymap 2020-01-24 10:50:23 +01:00
Nick Couchman
0aecca3e04 Merge staging/1.1.0 changes back to master. 2020-01-22 16:25:39 -05:00
Virtually Nick
a054073ec7
GUACAMOLE-935: Merge do not assign SVC plugin context as it may be automatically freed. 2020-01-22 16:23:38 -05:00
Michael Jumper
8ebe5c571a GUACAMOLE-935: Do not assign SVC plugin context as it may be automatically freed.
FreeRDP version 2.0.0-rc0 and older will automatically free whatever
entry_points->pInterface is set to when the channel plugin is unloaded.
This doesn't happen in later versions, but will result in a double-free
upon disconnect for 2.0.0-rc0 in our case. As we don't need pInterface,
we can safely set this to NULL and avoid the issue entirely.
2020-01-22 11:10:50 -08:00
James Muehlner
28f7d3694e Merge 1.1.0 changes back to master. 2020-01-21 23:30:27 -08:00
James Muehlner
3bc00c429a
GUACAMOLE-935: Merge fix for differing rdpBitmap free behavior. 2020-01-21 23:28:46 -08:00
Michael Jumper
87a3c7392b GUACAMOLE-935: Periods within regexes must be escaped if intended to match literal periods. 2020-01-21 22:35:26 -08:00
Michael Jumper
49df9f04e0 GUACAMOLE-935: Use C preprocessor to determine FreeRDP version rather than running a test program.
AC_RUN_IFELSE cannot be used when cross-compiling, whereas AC_EGREP_CPP
can.
2020-01-21 22:40:18 -08:00
Michael Jumper
26dfc533bd GUACAMOLE-935: Free internals of rdpBitmap only when required.
In FreeRDP 2.0.0-rc0 and earlier, Bitmap_Free(bitmap) invokes the free
handler of the given bitmap, frees bitmap->data, and then frees the
bitmap. The implementation-specific free handler needs to be aware only
of the implementation's own concerns.

After FreeRDP 2.0.0-rc0, Bitmap_Free(bitmap) only invokes the
implementation-specific free handler, and it's on the implementation to
know that bitmap->data must be manually freed with _aligned_free() and
bitmap must be freed with free(). The implementation-specific free
handler must be aware of the internals of the library.

See commit 8dda26a.
2020-01-21 22:35:26 -08:00
James Muehlner
75b658c6c9
GUACAMOLE-934: Merge support for the Play Sound PDU. 2020-01-21 22:08:44 -08:00
James Muehlner
24b6a3f357
GUACAMOLE-931: Merge FreeRDP user home directory safety checks. 2020-01-21 21:43:49 -08:00
Michael Jumper
b21d19d37d GUACAMOLE-934: Correct waveform calculation. Switch to triangle wave to reduce aliasing distortion. 2020-01-21 00:03:42 -08:00
Michael Jumper
b8148b0daf GUACAMOLE-934: Handle potential lack of available audio streams. 2020-01-20 21:16:36 -08:00
Michael Jumper
ddc09b161a GUACAMOLE-934: Add support for the Play Sound PDU. 2020-01-20 18:36:06 -08:00
Michael Jumper
32f8f20852 GUACAMOLE-931: Verify that home directory is both a directory and writable for sake of FreeRDP initialization. 2020-01-20 11:49:11 -08:00
Nick Couchman
a447b3dc1a Merge staging/1.1.0 changes back to master. 2020-01-20 03:51:47 -05:00
Virtually Nick
0cd9ba387b
GUACAMOLE-929: Merge update copyright date to 2020. 2020-01-20 03:50:29 -05:00
Michael Jumper
35e44db713 GUACAMOLE-929: Update copyright date to 2020. 2020-01-19 13:36:09 -08:00
Nick Couchman
cc8d879a12 Merge staging/1.1.0 changes back to master. 2020-01-18 06:16:54 -05:00
Virtually Nick
77f6168729
GUACAMOLE-928: Merge keep FreeRDP plugins of Docker image within /usr/local/guacamole 2020-01-18 06:15:23 -05:00
Virtually Nick
a384e749e2
GUACAMOLE-927: Merge automatically set $HOME for sake of FreeRDP initialization process 2020-01-18 06:13:45 -05:00
Michael Jumper
2c6be5afd1 GUACAMOLE-928: Keep all build artifacts of Docker image within /usr/local/guacamole, including FreeRDP plugins. 2020-01-17 16:15:31 -08:00
Michael Jumper
0676e70325 GUACAMOLE-927: Abort RDP connection if FreeRDP fails to initialize. 2020-01-17 15:54:56 -08:00
Michael Jumper
39f7d5a843 GUACAMOLE-927: Automatically set $HOME for sake of FreeRDP initialization process. 2020-01-17 15:50:47 -08:00
Nick Couchman
fd2c5b9259 Merge staging/1.1.0 changes back to master. 2020-01-16 15:06:56 -05:00
Virtually Nick
39defa27fa
GUACAMOLE-249: Merge automatically determine correct location for FreeRDP plugins. 2020-01-16 15:04:45 -05:00
Michael Jumper
be5cdf52c1 GUACAMOLE-249: Allow detected FreeRDP plugin directory to be overridden with --with-freerdp-plugin-dir. 2020-01-16 11:57:14 -08:00
Michael Jumper
37dceed8ec GUACAMOLE-249: Automatically determine correct location for FreeRDP plugins. 2020-01-15 21:55:27 -08:00
Virtually Nick
65b4722a1a
GUACAMOLE-249: Merge remove extra warning resulting from merge 2020-01-14 19:17:22 -05:00
Michael Jumper
fcac1a26f8 GUACAMOLE-249: Remove extra warning resulting from merge.
If the admin intentionally disables both copy and paste, then there is
no need to log a warning that this is the case; it was intentional. A
warning will likely set off alarm bells within production log monitoring
systems.
2020-01-14 15:50:23 -08:00
Nick Couchman
956c5f293e Merge staging/1.1.0 changes back to master. 2020-01-14 16:27:09 -05:00
Virtually Nick
3e22526ad9
GUACAMOLE-249: Merge migrate to FreeRDP 2.x 2020-01-14 14:21:26 -05:00
Michael Jumper
99b00a8cc0 GUACAMOLE-249: Add -Werror to CPPFLAGS for FreeRDP tests to ensure tests fail when pointers are incompatible. 2020-01-13 18:17:56 -08:00
Michael Jumper
de3300ed89 GUACAMOLE-249: Preserve CPPFLAGS such that modifications needed for FreeRDP tests affect only FreeRDP tests. 2020-01-13 18:17:32 -08:00
Michael Jumper
3dfd2467c3 GUACAMOLE-249: Remove RAIL callback typecasts, relying instead on configure tests to check need for const. 2020-01-13 16:34:02 -08:00
Michael Jumper
e5fdda1286 GUACAMOLE-249: Remove CLIPRDR callback typecasts, relying instead on configure tests to check need for const. 2020-01-13 16:34:02 -08:00
Michael Jumper
308d7a09a8 GUACAMOLE-249: Support rdpGlyph callback format used in FreeRDP 2.0.0-rc3 and older (used UINT32 instead of INT32). 2020-01-13 16:34:02 -08:00
Michael Jumper
9a34caf40f GUACAMOLE-249: The FreeRDPConvertColor() function is also known as ConvertColor(), but was only available as ConvertColor() in older FreeRDP 2.0.0 release candidates. 2020-01-13 16:08:17 -08:00
Michael Jumper
eaae203e94 GUACAMOLE-249: Ensure RAIL message handlers are accepted by compiler regardless of whether const is required. 2020-01-13 15:41:56 -08:00
Michael Jumper
4282da662f GUACAMOLE-249: Restructure audio input such that audio buffer can be separately linked.
On some platforms, the libguacai-client.so plugin for FreeRDP reports an
unlinked symbol:

    undefined symbol: guac_freerdp_dynamic_channel_collection_add	(/usr/local/lib/freerdp2/libguacai-client.so)

This symbol is actually unused within the plugin, but may be referenced
due to being defined within a function in a common piece of source
shared between the plugin and the RDP support.

Separating the actual common components such that they can be included
by both the RDP support and the libguacai-client.so plugin removes the
potential for unused pieces being flagged as missing.
2020-01-12 22:04:01 -08:00
Michael Jumper
e9846945c7 GUACAMOLE-249: Test endianness of platform without violating strict aliasing rules.
Dereferencing a uint8_t array as uint32_t causes a build failure with
some compilers as it breaks strict aliasing rules.
2020-01-12 14:34:44 -08:00
Michael Jumper
4b1243fbf8 GUACAMOLE-249: Ensure CLIPRDR message handlers are accepted by compiler regardless of whether const is required.
Without a typecast, errors like the following are generated by the
compiler:

    channels/cliprdr.c: In function 'guac_rdp_cliprdr_channel_connected':
    channels/cliprdr.c:477:27: error: assignment from incompatible pointer type [-Werror]
         cliprdr->MonitorReady = guac_rdp_cliprdr_monitor_ready;
                               ^
    channels/cliprdr.c:478:31: error: assignment from incompatible pointer type [-Werror]
         cliprdr->ServerFormatList = guac_rdp_cliprdr_format_list;
                                   ^
    channels/cliprdr.c:479:38: error: assignment from incompatible pointer type [-Werror]
         cliprdr->ServerFormatDataRequest = guac_rdp_cliprdr_format_data_request;
                                          ^
    channels/cliprdr.c:480:39: error: assignment from incompatible pointer type [-Werror]
         cliprdr->ServerFormatDataResponse = guac_rdp_cliprdr_format_data_response;
                                           ^
    cc1: all warnings being treated as errors

This is because FreeRDP commit 65812bd added const to the pointer
argument of each of these handlers, wheras older versions of FreeRDP
lack const here. Our implementations of these functions declare const
and thus do not match the older prototype, though they are compatible
with it.
2020-01-12 14:06:34 -08:00
Michael Jumper
5e9c7cdb42 GUACAMOLE-249: Correct typo: "of common RDPDR header" should be "of the common RDPDR header". 2020-01-11 20:24:12 -08:00
Michael Jumper
01c731e241 GUACAMOLE-249: Clean up documentation for arbitrary pipe SVC. No need to say "automatically" everywhere. 2020-01-11 20:22:23 -08:00
Michael Jumper
92d97a3244 GUACAMOLE-249: Correct typo: "indicating" should be "indicates". 2020-01-11 20:21:00 -08:00
Michael Jumper
e9670df145 GUACAMOLE-249: Correct typo: "updating" should be "update". 2020-01-11 20:19:51 -08:00
Michael Jumper
a3d9a685e8 GUACAMOLE-249: Handle failure to send either response required for monitor ready. 2020-01-11 20:18:27 -08:00