Commit Graph

9898 Commits

Author SHA1 Message Date
akallabeth
4ad3428693 Merge pull request #3221 from bmiklautz/fix_nightlies
pkg/deb: adapt channel paths
2016-03-14 10:08:25 +01:00
Bernhard Miklautz
e13a327790 Merge pull request #3212 from realjiangms/fix_default_audin
audin: Fixed default sys argument for audin
2016-03-14 09:57:33 +01:00
Armin Novak
77d82f14c5 Removed untranslatable strings from translated files. 2016-03-14 09:53:45 +01:00
Bernhard Miklautz
3bae203706 pkg/deb: adapt channel paths 2016-03-14 09:38:35 +01:00
Martin Fleisz
95541772cc Merge pull request #3213 from akallabeth/android_build_fixes
Android build and settings fixes
2016-03-14 09:20:30 +01:00
Marc-André Moreau
3cbd7c08f7 freerdp: fix freerdp_connect possible incorrect status code 2016-03-11 14:42:16 -05:00
Martin Fleisz
66ae3f2c77 Merge pull request #3177 from akallabeth/codec_reset_fix
Fixed codec reset, now resetting resolution too.
2016-03-11 11:22:59 +01:00
Hardening
19494bd75a Make systemd appender honor layout and log off 2016-03-10 23:41:12 +01:00
Armin Novak
f60b8d5e95 Replaced version patch with make argument. 2016-03-10 22:10:18 +01:00
Armin Novak
4a7816db11 Updated OpenSSL version in script. 2016-03-10 21:54:11 +01:00
Armin Novak
382626f10f Fixed settings load/store. 2016-03-10 21:52:40 +01:00
Armin Novak
cabcf7c479 Fixed paralell building issue. 2016-03-10 21:18:19 +01:00
zihao.jiang
40ea6e9228 audin: Fixed default sys argument for audin
PR #3173 fixed argument parsing. However it breaks the usage without specifying subsystem: "/microphone"
In particular, aFreerdp microphone redirect is broken as it exactly uses "/microphone"
This PR fixes the regression.
Fix: We should not call CommandLineParseArgumentsA if argc is only 1 (same case as rdpsnd_main.c)
2016-03-11 01:52:18 +08:00
Martin Fleisz
1feb03d67f Merge pull request #3210 from hardening/env_fix
Don't require HOME env var to be set for server-side code
2016-03-10 08:22:30 +01:00
David FORT
b3c0478305 Don't require HOME env var to be set for server-side code 2016-03-09 14:10:31 +01:00
Armin Novak
15498eaf26 Marked non translatable strings as such. 2016-03-08 20:53:32 +01:00
Armin Novak
1d4fd05db2 Reverted translation of internal VALUE arrays. 2016-03-08 20:53:32 +01:00
akallabeth
ff1eb258e8 Merge pull request #3172 from realjiangms/android_launch_by_scheme_2720
android: Allow freerdp mobile version to be launched from URI (freerdp://)
2016-03-08 20:50:30 +01:00
zihao.jiang
0927114e83 android: Allow freerdp mobile version to be launched from URI (freerdp://)
It would be good if we have a easy way to call aFreeRDP in another Android APP (Requirement also mentioned in #2720)
We can define a scheme (freerdp://) as unified way to launch FreeRDP from another APP or browser and connect to compatible RDP server
1. Define scheme freerdp://
2. General form could be freerdp://user@hostname:port/connect?key1=value&key2=-&key3=%2b&key4=
3. [user] part would be translated to /u:
4. [hostname:port] would be translated to /v:
5. The [user@hostname:port] part would be used as app title, currently it's just the progress dialog title
6. query parameters would be translated to command line arguments. Later same arguments will overwrite the formers:
    a. key1=value: 		=> /key1:value
    b. key2=-: 			=> -key2
    c. key3=%2b 		=> +key3 (%2b is url encoded +)
	d. key4= 			=> /key4
	e. Especially, drive=sdcard will be properly handled with local sdcard path. On my device it will be translated to /drive:sdcard,/storage/emulated/0

Owing to the refactor work in PR #3097, we now pass same command line argument to JNI for freerdp settings.
We just need to make the SessionActivity accept freerdp scheme and translate argument from URI form to command line form.
2016-03-09 03:22:02 +08:00
Martin Fleisz
30325f189f Merge pull request #3181 from akallabeth/wlog_filter_fix
Respecting filter in WLog_GetLogLevel
2016-03-08 10:05:57 +01:00
Marc-André Moreau
c78a142388 Merge branch 'master' of github.com:awakecoding/FreeRDP 2016-03-07 21:21:17 -05:00
Marc-André Moreau
d61c2d4535 winpr: fix ini utils leak 2016-03-07 21:21:06 -05:00
Marc-André Moreau
ceefc4b099 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2016-03-07 10:19:50 -05:00
Bernhard Miklautz
9f8baf38d0 Merge pull request #3206 from akallabeth/openssl_unification
Moved assistance to winpr crypto.
2016-03-07 15:39:59 +01:00
Armin Novak
bb3448f2a7 Set variable to NULL to prevent double free. 2016-03-07 13:12:38 +01:00
Armin Novak
2208a84cd4 Moved assistance to winpr crypto. 2016-03-07 11:51:13 +01:00
akallabeth
52f1e6b27a Merge pull request #3086 from DavBfr/fix-rdpdr
Fixes for rdpdr
2016-03-07 10:55:51 +01:00
akallabeth
ece552dad2 Merge pull request #3200 from dwmw2/master
winpr: Bump API version to 2.0
2016-03-07 10:50:35 +01:00
Armin Novak
83ef6427e5 Use common command line parser. 2016-03-07 09:45:15 +01:00
Armin Novak
4bb33e904a Reparse command line after RDP or assistance file. 2016-03-07 09:45:09 +01:00
Armin Novak
36241ed540 Fix memory leaks if parsed multiple times. 2016-03-07 09:45:04 +01:00
Martin Fleisz
f0cc927359 Merge pull request #3202 from akallabeth/file_bsd_fix
Fixed FreeBSD support for filetime settings.
2016-03-07 09:24:44 +01:00
Armin Novak
34b12362cb Fixed FreeBSD support for filetime settings. 2016-03-06 15:01:58 +01:00
David Woodhouse
701f54e07d winpr: Bump API version to 2.0
In commit 12bd0ec8 ("winpr: BUMP the API version to 1.2") it was stated
that the intention was to allow multiple winpr versions to be installed
in parallel.

However, it's not sufficient to change just the *minor* version of the
library. The soname is still 'libwinpr.so.1', and thus we still can't
coexist with earlier versions — in particular, we can't install FreeRDP2
in parallel with existing distribution packages of earlier versions.

Bump the soname so it does actually work
2016-03-04 13:22:58 +00:00
Hardening
fb63dd267c Merge pull request #3194 from nfedera/fix-convertfromunicode-hardening
ConvertFromUnicode fixes and misc hardening
2016-03-04 11:19:00 +01:00
Bernhard Miklautz
9fa85aea10 Merge pull request #1726 from grpomega/patch-3
Need Week instead of Day for TZ transistion
2016-03-04 11:17:42 +01:00
Norbert Federa
de4adeff0e fix logon info processing
since there have been reports that certain windows versions send
zero values in the cbDomain field of the Logon Info Version 2
(TS_LOGON_INFO_VERSION_2) struct we allow zero values for cbUserName
and cbDomain in rdp_recv_logon_info_v1 and rdp_recv_logon_info_v2.
2016-03-04 00:45:26 +01:00
Bernhard Miklautz
120bd2d8bd Merge pull request #3173 from akallabeth/audin_arg_fix
Fixed argument parsing for audin.
2016-03-03 20:39:31 +01:00
Martin Fleisz
151f4353f0 Merge pull request #3196 from akallabeth/exported_symbols_fix
Fixed symbol export for sound plugins.
2016-03-03 17:34:57 +01:00
Armin Novak
fb88ad0ee6 Fixed symbol export for sound plugins. 2016-03-03 17:17:13 +01:00
Norbert Federa
ef4b29e5b3 ConvertFromUnicode fixes and misc hardening
- Added missing ConvertFromUnicode checks
- If ConvertToUnicode allocates memory, guarantee the null termination
  similar to ConvertFromUnicode's implementation
- Fixed some TestUnicodeConversion.c CTest return values
- Added some CTests for ConvertFromUnicode and ConvertToUnicode
- Misc code and protocol hardening fixes in the surrounding code regions
  that have been touched
2016-03-03 16:56:19 +01:00
Bernhard Miklautz
167fd47860 Merge pull request #3192 from akallabeth/plugin_path_fix
Updated freerdp plugin path to use major version.
2016-03-03 13:58:42 +01:00
Armin Novak
ee2839fc7f Caching log filter after first use.
Reduce runtime penalty for log level checks by
remembering the log level found during first call.
2016-03-03 12:43:39 +01:00
Martin Fleisz
f15057569c Merge pull request #3191 from hardening/saveInfoPdu_fix
Fix parsing of saveSessionInfo PDU
2016-03-03 12:12:21 +01:00
David FORT
f5ce5e72dd Fix parsing of saveSessionInfo PDU
This should fix the case when no username is sent (issue #3186).
2016-03-03 11:45:12 +01:00
Armin Novak
767e6bbb65 Updated freerdp plugin path to use major version. 2016-03-03 11:36:59 +01:00
Martin Fleisz
2710ebf1c4 Merge pull request #3187 from akallabeth/client_name_fix
Gateway fix
2016-03-03 11:06:24 +01:00
Armin Novak
7dcba9a663 Removed additional '\0' from TUNNEL_AUTH message. 2016-03-03 09:11:28 +01:00
Hardening
9afa9282e6 Merge pull request #3184 from xhaakon/fix-ubuntu-gcc-build
Fix build on older 32-bit Ubuntu releases
2016-03-02 20:53:19 +01:00
Jakub Adam
bc750e9830 Fix build on older 32-bit Ubuntu releases
Some older 32-bit versions of gcc fail on '#elif __x86_64__'.
This applies at least to what Ubuntu 14.04 and 15.04 have as
the default compiler.
2016-03-02 19:40:38 +01:00