Marc-André Moreau
067da290dd
Merge pull request #2027 from akallabeth/winpr-log
...
Replace stdout and logging defines with WLog, add logcat support
2014-08-11 10:38:28 -04:00
Marc-André Moreau
51ac7fffbd
Merge pull request #1993 from bmiklautz/merge/from-stable-1.1
...
Pick changes from stable-1.1 that are not yet on master
2014-08-11 10:28:10 -04:00
Armin Novak
d0c5d9bb9e
Fixed missing include.
2014-08-11 09:49:57 +02:00
Armin Novak
784696c1cd
Fixed missing includes and invalid replacement.
2014-08-11 09:38:08 +02:00
Armin Novak
8d8719e101
Replaced fprintf with DEBUG_WARN
2014-08-11 09:19:47 +02:00
Armin Novak
bcb5f90ee6
Replaced perror with DEBUG_WARN
2014-08-11 09:19:23 +02:00
Armin Novak
2436e41e63
Fixed warnings for comm tests.
2014-08-11 09:17:56 +02:00
Armin Novak
66b8905ac6
Using special log defines for channels now.
2014-08-11 09:12:01 +02:00
Bernhard Miklautz
cd974e874a
Merge pull request #2028 from v00d00/update-codecid
...
tmsf: CODEC_ID_* -> AV_CODEC_ID_*
2014-08-08 15:06:48 +02:00
Ian Whyman
8eb7f69a12
Backwards compat defines
2014-08-08 13:05:06 +01:00
Ian Whyman
f73e40d188
CODEC_ID_* -> AV_CODEC_ID_*
2014-08-08 09:05:03 +01:00
Armin Novak
0780c0993e
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:21:07 +02:00
Armin Novak
084da200cf
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:20:53 +02:00
Armin Novak
b897c6a433
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:20:35 +02:00
Armin Novak
b97099e815
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:20:13 +02:00
Armin Novak
e6ed76977a
DEBUG_PRINT now a define, resolves linking issues.
...
Using log name as logcat tag now.
Removed log name from default android log formatting.
2014-08-07 21:51:52 +02:00
Armin Novak
eecc8e2333
Removed debug.c
2014-08-07 21:38:11 +02:00
Armin Novak
158e1323de
Fixed compiler warnings.
2014-08-07 19:05:48 +02:00
Armin Novak
f00cb3d25c
Reverted previous replacements, not to be done for tests.
2014-08-07 19:05:22 +02:00
Armin Novak
a27706d129
Fixed missing includes.
2014-08-07 18:25:43 +02:00
Armin Novak
1a37435a26
Added redirection of ConsoleAppender to logcat, if used on android.
...
Using custom default format for log messages on android.
2014-08-07 17:47:59 +02:00
Armin Novak
219a760bad
Fixed logging, now using log functions.
2014-08-07 17:31:42 +02:00
Armin Novak
b252009d36
Replaced custom logging mechanism with WLog wrapper.
2014-08-07 16:51:49 +02:00
Armin Novak
f4c133eaf8
Replaced custom logging mechanism with WLog wrapper.
2014-08-07 16:51:24 +02:00
Bernhard Miklautz
362c992f33
Merge pull request #2011 from nfedera/fix-2014-07-31-01
...
winpr/utils/ssl: fix comp warning and wrong param
2014-07-31 11:43:01 +02:00
Norbert Federa
9bde12f26a
winpr/utils/ssl: fix comp warning and wrong param
2014-07-31 11:22:46 +02:00
Bernhard Miklautz
74b5f2c23b
Merge pull request #1985 from bmiklautz/fix/warnings
...
Fix compiler warnings and build
2014-07-30 19:45:12 +02:00
Hardening
7e98a75274
Merge pull request #2008 from itharbor/master
...
rdpsnd->Initialize requires two arguments
2014-07-30 10:14:56 +02:00
Robert Lockwood
b05c43c602
rdpsnd->Initialize requires two arguments
...
Fixes rdpsnd->Initialize() to have two arguments. Fixes compilation on XCode 5. To be tested.
2014-07-29 23:30:47 +01:00
Bernhard Miklautz
a124f6a7c6
fix comment style
...
// to /* */
2014-07-29 05:22:30 +02:00
Bernhard Miklautz
a9eed46e38
Fix warnings found in Xcode
2014-07-29 05:22:30 +02:00
Bernhard Miklautz
352dbd52e2
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.
2014-07-29 05:22:29 +02:00
Bernhard Miklautz
8c318da7b1
fix compiler warnings
2014-07-29 05:22:29 +02:00
Bernhard Miklautz
b8415af0d8
Fix compiler warnings.
...
This commit is based on pull request #1493
2014-07-29 05:22:29 +02:00
Marc-André Moreau
15d2b35574
Merge pull request #1982 from bmiklautz/feat/read_pdu
...
Transport re-factor and clean up
2014-07-28 16:32:06 -04:00
Marc-André Moreau
e65f8b119d
Merge pull request #2005 from nfedera/fix-2014-07-28-01
...
OpenSSL thread safety
2014-07-28 16:08:10 -04:00
Norbert Federa
cdcdec99bc
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).
2014-07-28 21:55:57 +02:00
Marc-André Moreau
4dd4d41a3f
Merge pull request #2000 from jbd1986/master
...
remove multimon/span logic from cmdline.c and move to new combined logic...
2014-07-28 15:55:18 -04:00
Justin DeFields
65aab2569d
Move multimon/span logic from cmdline.c to client.c post processing
2014-07-28 15:24:48 -04:00
Marc-André Moreau
1c1ef01691
Merge pull request #2004 from bmiklautz/fix/cmd_post
...
Fix/cmd post
2014-07-28 14:49:26 -04:00
Bernhard Miklautz
ff26a90489
return status instead of returning directly
2014-07-28 18:49:18 +02:00
Bernhard Miklautz
32bb18152a
cmdline post: cleanup in case of oom
2014-07-28 17:57:51 +02:00
Bernhard Miklautz
f06490b426
fix freerdp_client_settings_post_processing
2014-07-28 17:52:40 +02:00
Bernhard Miklautz
b17045ddd8
fix: typos and formating
2014-07-28 13:12:01 +02:00
Marc-André Moreau
6812383d05
Merge pull request #1991 from jbd1986/master-split-cmdline-special-items
...
Apply GatewayUseSameCredentials logic to RDP file parsing as well
2014-07-25 10:40:33 -04:00
Daryl Poe
3be316d66a
/kbd: option should be unsigned
...
(cherry picked from commit fc6b72017f
2014-07-25 11:32:29 +02:00
Daryl Poe
3794720455
correct Pause key sequence
...
(cherry picked from commit 46a00b5c9e
2014-07-25 11:31:50 +02:00
Justin DeFields
2e859a5d14
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
2014-07-24 16:07:14 -04:00
Marc-André Moreau
c544e9ee9f
Merge pull request #1990 from nfedera/fix-2014-07-24-01
...
winpr/sync: Added InitOnceExecuteOnce plus CTest
2014-07-24 15:34:06 -04:00
Norbert Federa
fae8f6fbf2
winpr/sync: Added InitOnceExecuteOnce plus CTest
2014-07-24 21:12:59 +02:00
