Bernhard Miklautz [Tue, 12 Aug 2014 13:54:44 +0000 (15:54 +0200)]
Merge pull request #2035 from bmiklautz/fix/fingerprint
crypto: fix fingerprint
Bernhard Miklautz [Tue, 12 Aug 2014 13:40:53 +0000 (15:40 +0200)]
crypto: fix fingerprint
Latest logging changes introduced a problem with fingerprint generation.
The last byte wasn't added.
Marc-André Moreau [Mon, 11 Aug 2014 23:08:08 +0000 (19:08 -0400)]
Merge pull request #2033 from awakecoding/master
RLGR, Progressive, RDP8.1 H264, MS-RDPEDISP
Marc-André Moreau [Mon, 11 Aug 2014 23:00:00 +0000 (19:00 -0400)]
Merge pull request #1983 from ntwerdochlib/fileclip-updates
clipboard: File clipping updates
Marc-André Moreau [Mon, 11 Aug 2014 22:56:07 +0000 (18:56 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
include/freerdp/channels/log.h
Marc-André Moreau [Mon, 11 Aug 2014 22:54:43 +0000 (18:54 -0400)]
Merge pull request #2032 from ntwerdochlib/master
Minor tweak to CLOG_PRINT macro. Initialalize tag buffer to NULL. Use ...
Marc-André Moreau [Mon, 11 Aug 2014 22:51:22 +0000 (18:51 -0400)]
freerdp: fix possible clog memory corruption
Marc-André Moreau [Mon, 11 Aug 2014 22:48:42 +0000 (18:48 -0400)]
libfreerdp-codec: cleanup and fix __lzcnt on Windows
Nicholas Twerdochlib [Mon, 11 Aug 2014 22:48:11 +0000 (18:48 -0400)]
Minor tweak to CLOG_PRINT macro. Initialalize tag buffer to NULL. Use strncat as a fail safe.
Marc-André Moreau [Mon, 11 Aug 2014 21:25:38 +0000 (17:25 -0400)]
Merge branch 'egfx' of github.com:awakecoding/FreeRDP
Marc-André Moreau [Mon, 11 Aug 2014 15:23:23 +0000 (11:23 -0400)]
libfreerdp-core: fix reconnection using client random
Marc-André Moreau [Mon, 11 Aug 2014 14:38:28 +0000 (10:38 -0400)]
Merge pull request #2027 from akallabeth/winpr-log
Replace stdout and logging defines with WLog, add logcat support
Marc-André Moreau [Mon, 11 Aug 2014 14:36:07 +0000 (10:36 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
channels/disp/client/disp_main.c
Marc-André Moreau [Mon, 11 Aug 2014 14:28:10 +0000 (10:28 -0400)]
Merge pull request #1993 from bmiklautz/merge/from-stable-1.1
Pick changes from stable-1.1 that are not yet on master
Armin Novak [Mon, 11 Aug 2014 07:49:57 +0000 (09:49 +0200)]
Fixed missing include.
Armin Novak [Mon, 11 Aug 2014 07:38:08 +0000 (09:38 +0200)]
Fixed missing includes and invalid replacement.
Armin Novak [Mon, 11 Aug 2014 07:19:47 +0000 (09:19 +0200)]
Replaced fprintf with DEBUG_WARN
Armin Novak [Mon, 11 Aug 2014 07:19:23 +0000 (09:19 +0200)]
Replaced perror with DEBUG_WARN
Armin Novak [Mon, 11 Aug 2014 07:17:56 +0000 (09:17 +0200)]
Fixed warnings for comm tests.
Armin Novak [Mon, 11 Aug 2014 07:12:01 +0000 (09:12 +0200)]
Using special log defines for channels now.
Benoit LeBlanc [Fri, 8 Aug 2014 15:42:53 +0000 (11:42 -0400)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Bernhard Miklautz [Fri, 8 Aug 2014 13:06:48 +0000 (15:06 +0200)]
Merge pull request #2028 from v00d00/update-codecid
tmsf: CODEC_ID_* -> AV_CODEC_ID_*
Ian Whyman [Fri, 8 Aug 2014 12:05:06 +0000 (13:05 +0100)]
Backwards compat defines
Ian Whyman [Fri, 8 Aug 2014 08:05:03 +0000 (09:05 +0100)]
CODEC_ID_* -> AV_CODEC_ID_*
Armin Novak [Thu, 7 Aug 2014 20:21:07 +0000 (22:21 +0200)]
Replaced fprintf(stderr with DEBUG_WARN
Armin Novak [Thu, 7 Aug 2014 20:20:53 +0000 (22:20 +0200)]
Replaced fprintf(stderr with DEBUG_WARN
Armin Novak [Thu, 7 Aug 2014 20:20:35 +0000 (22:20 +0200)]
Replaced fprintf(stderr with DEBUG_WARN
Armin Novak [Thu, 7 Aug 2014 20:20:13 +0000 (22:20 +0200)]
Replaced fprintf(stderr with DEBUG_WARN
Armin Novak [Thu, 7 Aug 2014 19:51:52 +0000 (21:51 +0200)]
DEBUG_PRINT now a define, resolves linking issues.
Using log name as logcat tag now.
Removed log name from default android log formatting.
Armin Novak [Thu, 7 Aug 2014 19:38:11 +0000 (21:38 +0200)]
Removed debug.c
Armin Novak [Thu, 7 Aug 2014 17:05:48 +0000 (19:05 +0200)]
Fixed compiler warnings.
Armin Novak [Thu, 7 Aug 2014 17:05:22 +0000 (19:05 +0200)]
Reverted previous replacements, not to be done for tests.
Armin Novak [Thu, 7 Aug 2014 16:25:43 +0000 (18:25 +0200)]
Fixed missing includes.
Armin Novak [Thu, 7 Aug 2014 15:47:59 +0000 (17:47 +0200)]
Added redirection of ConsoleAppender to logcat, if used on android.
Using custom default format for log messages on android.
Armin Novak [Thu, 7 Aug 2014 15:31:42 +0000 (17:31 +0200)]
Fixed logging, now using log functions.
Armin Novak [Thu, 7 Aug 2014 14:51:49 +0000 (16:51 +0200)]
Replaced custom logging mechanism with WLog wrapper.
Armin Novak [Thu, 7 Aug 2014 14:51:24 +0000 (16:51 +0200)]
Replaced custom logging mechanism with WLog wrapper.
Benoît LeBlanc [Wed, 6 Aug 2014 21:02:21 +0000 (17:02 -0400)]
fix gdi_resize: set primary_buffer to NULL to avoid use after free
Marc-André Moreau [Wed, 6 Aug 2014 14:23:14 +0000 (10:23 -0400)]
libfreerdp-codec: start processing tiles in progressive rfx
Marc-André Moreau [Wed, 6 Aug 2014 01:41:58 +0000 (21:41 -0400)]
libfreerdp-codec: remove old RemoteFX RLGR implementation in favour of faster one
Marc-André Moreau [Wed, 6 Aug 2014 01:26:47 +0000 (21:26 -0400)]
libfreerdp-codec: add RLGR3 support in new RLGR function
Marc-André Moreau [Tue, 5 Aug 2014 21:22:20 +0000 (17:22 -0400)]
libfreerdp-codec: optimize RLGR1
Marc-André Moreau [Tue, 5 Aug 2014 21:07:06 +0000 (17:07 -0400)]
libfreerdp-codec: fix progressive RLGR1 decode
Marc-André Moreau [Tue, 5 Aug 2014 13:55:54 +0000 (09:55 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
libfreerdp/codec/h264.c
Marc-André Moreau [Sun, 3 Aug 2014 04:08:22 +0000 (00:08 -0400)]
libfreerdp-codec: improve progressive rfx rlgr1
Marc-André Moreau [Sun, 3 Aug 2014 02:26:05 +0000 (22:26 -0400)]
libfreerdp-codec: improve rfx progressive RLGR1 implementation
Marc-André Moreau [Sat, 2 Aug 2014 15:24:47 +0000 (11:24 -0400)]
libfreerdp-codec: initial RLGR1 progressive implementation
Marc-André Moreau [Fri, 1 Aug 2014 13:44:00 +0000 (09:44 -0400)]
libfreerdp-codec: simplify block reading logic
Marc-André Moreau [Thu, 31 Jul 2014 19:08:54 +0000 (15:08 -0400)]
libfreerdp-codec: start processing progressive tiles
Bernhard Miklautz [Thu, 31 Jul 2014 09:43:01 +0000 (11:43 +0200)]
Merge pull request #2011 from nfedera/fix-2014-07-31-01
winpr/utils/ssl: fix comp warning and wrong param
Norbert Federa [Thu, 31 Jul 2014 09:22:46 +0000 (11:22 +0200)]
winpr/utils/ssl: fix comp warning and wrong param
Bernhard Miklautz [Wed, 30 Jul 2014 17:45:12 +0000 (19:45 +0200)]
Merge pull request #1985 from bmiklautz/fix/warnings
Fix compiler warnings and build
Hardening [Wed, 30 Jul 2014 08:14:56 +0000 (10:14 +0200)]
Merge pull request #2008 from itharbor/master
rdpsnd->Initialize requires two arguments
Robert Lockwood [Tue, 29 Jul 2014 22:30:47 +0000 (23:30 +0100)]
rdpsnd->Initialize requires two arguments
Fixes rdpsnd->Initialize() to have two arguments. Fixes compilation on XCode 5. To be tested.
Marc-André Moreau [Tue, 29 Jul 2014 21:37:46 +0000 (17:37 -0400)]
libfreerdp-codec: complete parsing of progressive codec block arrays
Marc-André Moreau [Tue, 29 Jul 2014 17:41:57 +0000 (13:41 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Marc-André Moreau [Tue, 29 Jul 2014 17:41:21 +0000 (13:41 -0400)]
libfreerdp-codec: fix build on Windows
Marc-André Moreau [Tue, 29 Jul 2014 16:38:29 +0000 (12:38 -0400)]
libfreerdp-codec: more parsing of progressive data blocks
Marc-André Moreau [Tue, 29 Jul 2014 13:54:29 +0000 (09:54 -0400)]
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
Marc-André Moreau [Tue, 29 Jul 2014 03:41:16 +0000 (23:41 -0400)]
libfreerdp-codec: start parsing progressive codec
Bernhard Miklautz [Wed, 23 Jul 2014 21:53:43 +0000 (23:53 +0200)]
fix comment style
// to /* */
Bernhard Miklautz [Wed, 23 Jul 2014 18:22:30 +0000 (20:22 +0200)]
Fix warnings found in Xcode
Bernhard Miklautz [Wed, 23 Jul 2014 17:08:30 +0000 (19:08 +0200)]
winpr/comm: don't build on apple
Since code is only defined on linux building comm causes /usr/bin/ranlib
to warn about empty objects and the test doesn't build at all on apple.
Bernhard Miklautz [Wed, 23 Jul 2014 17:08:06 +0000 (19:08 +0200)]
fix compiler warnings
Bernhard Miklautz [Wed, 23 Jul 2014 15:26:49 +0000 (17:26 +0200)]
Fix compiler warnings.
This commit is based on pull request #1493
Marc-André Moreau [Mon, 28 Jul 2014 21:42:23 +0000 (17:42 -0400)]
libfreerdp-codec: stub progressive codec decompressor
Marc-André Moreau [Mon, 28 Jul 2014 21:22:02 +0000 (17:22 -0400)]
libfreerdp-codec: fix OpenH264 usage thanks to @erbth's hack
Marc-André Moreau [Mon, 28 Jul 2014 21:04:03 +0000 (17:04 -0400)]
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
Marc-André Moreau [Mon, 28 Jul 2014 20:59:29 +0000 (16:59 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Marc-André Moreau [Mon, 28 Jul 2014 20:58:32 +0000 (16:58 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
client/common/client.c
Marc-André Moreau [Mon, 28 Jul 2014 20:47:56 +0000 (16:47 -0400)]
Merge branch 'master' of github.com:awakecoding/FreeRDP
Marc-André Moreau [Mon, 28 Jul 2014 20:47:42 +0000 (16:47 -0400)]
channels: cleanup RDP8 virtual channels
Marc-André Moreau [Mon, 28 Jul 2014 20:32:06 +0000 (16:32 -0400)]
Merge pull request #1982 from bmiklautz/feat/read_pdu
Transport re-factor and clean up
Marc-André Moreau [Mon, 28 Jul 2014 20:08:10 +0000 (16:08 -0400)]
Merge pull request #2005 from nfedera/fix-2014-07-28-01
OpenSSL thread safety
Norbert Federa [Mon, 28 Jul 2014 19:55:57 +0000 (21:55 +0200)]
OpenSSL thread safety
freerdp/winpr had the following issues:
* The non reentrant SSL_library_init() was called concurrently (crash)
* Missing code/api to set the eventually required OpenSSL static and dynamic locking callbacks
* Missing code/api to free the application-global or thread-local OpenSSL data and tables
This commit creates two new winpr functions:
BOOL winpr_InitializeSSL(DWORD flags):
Use the flag WINPR_SSL_INIT_ALREADY_INITIALIZED if you want to tell winpr that
your application has already initialized OpenSSL.
If required use the flag WINPR_SSL_INIT_ENABLE_LOCKING to tell winpr that it
should set the OpenSSL static and dynamic locking callbacks.
Otherwise just call it with the flag WINPR_SSL_INIT_DEFAULT.
The recommended way is that your application calls this function once before
any threads are created. However, in order to support lazy OpenSSL library
initialization winpr_InitializeSSL() can also safely be called multiple times
and concurrently because it uses the new InitOnceExecuteOnce() function to
guarantee that the initialization is only performed successfully once during
the life time of the calling process.
BOOL winpr_CleanupSSL(DWORD flags):
If you create a thread that uses SSL you should call this function before the
thread returns using the flag WINPR_SSL_CLEANUP_THREAD in order to clean up
the thread-local OpenSSL data and tables.
Call the function with the flag WINPR_SSL_CLEANUP_GLOBAL before terminating
your application.
Note: This commit only replaced the current occurences of the
SSL_load_error_strings(); SSL_library_init(); pairs in the freerdp source
with winpr_InitializeSSL(). None of the server or client applications has been
changed according to the recommended usage described above (TBDL).
Marc-André Moreau [Mon, 28 Jul 2014 19:55:18 +0000 (15:55 -0400)]
Merge pull request #2000 from jbd1986/master
remove multimon/span logic from cmdline.c and move to new combined logic...
Justin DeFields [Mon, 28 Jul 2014 19:24:48 +0000 (15:24 -0400)]
Move multimon/span logic from cmdline.c to client.c post processing
Marc-André Moreau [Mon, 28 Jul 2014 18:49:26 +0000 (14:49 -0400)]
Merge pull request #2004 from bmiklautz/fix/cmd_post
Fix/cmd post
Bernhard Miklautz [Mon, 28 Jul 2014 16:49:18 +0000 (18:49 +0200)]
return status instead of returning directly
Bernhard Miklautz [Mon, 28 Jul 2014 15:57:51 +0000 (17:57 +0200)]
cmdline post: cleanup in case of oom
Bernhard Miklautz [Mon, 28 Jul 2014 15:52:40 +0000 (17:52 +0200)]
fix freerdp_client_settings_post_processing
Bernhard Miklautz [Mon, 28 Jul 2014 11:12:01 +0000 (13:12 +0200)]
fix: typos and formating
Marc-André Moreau [Sat, 26 Jul 2014 19:23:39 +0000 (15:23 -0400)]
libwinpr-wtsapi: fix WtsApi32.dll dynamic loading on Windows
Marc-André Moreau [Sat, 26 Jul 2014 18:43:10 +0000 (14:43 -0400)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Fri, 25 Jul 2014 14:40:33 +0000 (10:40 -0400)]
Merge pull request #1991 from jbd1986/master-split-cmdline-special-items
Apply GatewayUseSameCredentials logic to RDP file parsing as well
Daryl Poe [Fri, 4 Apr 2014 20:09:48 +0000 (14:09 -0600)]
/kbd: option should be unsigned
(cherry picked from commit
fc6b72017f61bebca0108432d0483a45f92d7fc4)
Daryl Poe [Wed, 4 Jun 2014 21:41:17 +0000 (15:41 -0600)]
correct Pause key sequence
(cherry picked from commit
46a00b5c9e23163600b83b2bafa7e20eda387393)
Justin DeFields [Thu, 24 Jul 2014 20:07:14 +0000 (16:07 -0400)]
Removed GatewayUseSameCredentials logic from cmdline.c, and placed it after both cmdline and rpd file have been parsed. This provides proper GatewayUseSameCredentials support for the rdp file
Marc-André Moreau [Thu, 24 Jul 2014 19:34:06 +0000 (15:34 -0400)]
Merge pull request #1990 from nfedera/fix-2014-07-24-01
winpr/sync: Added InitOnceExecuteOnce plus CTest
Norbert Federa [Thu, 24 Jul 2014 19:07:44 +0000 (21:07 +0200)]
winpr/sync: Added InitOnceExecuteOnce plus CTest
Hardening [Thu, 24 Jul 2014 16:10:50 +0000 (18:10 +0200)]
Merge pull request #1989 from bmiklautz/feat/fast-path
core: improve fast-path multifragment handling
Bernhard Miklautz [Tue, 22 Jul 2014 17:14:43 +0000 (19:14 +0200)]
refactor transport_read_pdu and check_fds
transport_check_fds and transport_read_pdu had almost the same
functionality: reading and validating one pdu at a time.
Now transport_read_pdu reads one pdu from the transport layer and verifies
that the pdu data is valid - as before.
transport_read_pdu also ensures that the stream is sealed and
rewound when the pdu is received completely.
transport_check_fds just uses transport_read_pdu and does *not* do
the verification a second time based on the stream.
Besides the clean up this fixes the following problems:
* transport_read always read 4 bytes. Fast-path input synchronize pdus
are only 3 bytes long. In this case on byte got lost in the stream
buffer which lead to "de-synchronization" of server and
client.
* Size check in tpdu_read_connection_confirm - already read bytes
weren't taken into account.
Bernhard Miklautz [Tue, 22 Jul 2014 09:19:38 +0000 (11:19 +0200)]
transport refactor
rename transport_read to transport_read_pdu. This name is more
descriptive what the function actually does.
Bernhard Miklautz [Thu, 24 Jul 2014 14:29:46 +0000 (16:29 +0200)]
core: improve fast-path multifragment handling
* make sure fast-path packages are not fragmented if no
multifragment support was announced
* handle special server side case where the multifragment size
received from the client is smaller than one maximum fast-path
PDU size
Nicholas Twerdochlib [Wed, 23 Jul 2014 13:37:24 +0000 (09:37 -0400)]
clipboard: Update disabling call of cliprdr_send_tempdir() since there is now guarantee the TEMP path on the client will be accessible by the server.
Perhaps this should be a command line option?
Nicholas Twerdochlib [Wed, 23 Jul 2014 13:35:42 +0000 (09:35 -0400)]
clipboard: Update to file clipping to remove use of old style clipboard chain.
Bernhard Miklautz [Tue, 22 Jul 2014 23:00:00 +0000 (01:00 +0200)]
Merge pull request #1973 from floppym/file-modes
Remove execute bit from many files
Mike Gilbert [Sun, 20 Jul 2014 04:52:35 +0000 (00:52 -0400)]
Remove execute bit from many files
Benoit LeBlanc [Fri, 18 Jul 2014 16:02:52 +0000 (12:02 -0400)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Bernhard Miklautz [Fri, 18 Jul 2014 09:14:18 +0000 (11:14 +0200)]
Merge pull request #1970 from dbungert/cipher
Add arguments for managing tls ciphers & netmon