Commit Graph

11919 Commits

Author SHA1 Message Date
Kyle Evans
45d8e2dfb2 Pull in libepoll-shim for the bits that require timerfd/epoll
libepoll-shim is our implementation of this API on top of kevent. It supplies
the same headers and a library, but we don't install it in any of the default
include search paths when it comes in through ports on an as-needed basis.

This set of changes is restricted to FREEBSD-compatible OS, which includes
DragonflyBSD and FreeBSD.
2018-05-01 23:42:25 -05:00
Kyle Evans
5e9c8c4bca Set BSD/FREEBSD for DragonflyBSD
DragonflyBSD was a fork of FreeBSD once upon a time. As far as FreeRDP is
concerned, DragonflyBSD is FreeBSD-compatible and DragonflyBSD in-fact uses
the FreeBSD ports tree (+ patches)
2018-05-01 23:38:48 -05:00
David Fort
8cba201999
Merge pull request #4548 from akallabeth/autoreconnect_fix
Autoreconnect fix
2018-04-27 09:39:30 +02:00
David Fort
782039c6aa
Merge pull request #4589 from oshogbo/token
Recognize only the cookie format anything else treat as token.
2018-04-26 11:59:15 +02:00
akallabeth
d5f9da2b3c
Merge pull request #4586 from Awingu/cbytes-fix
Fix inconsistent cchReaderLen value between WinScard and pcsc-lite.
2018-04-25 09:00:52 +02:00
akallabeth
df1e3037ec
Merge pull request #4588 from oshogbo/tokencookie
Fix comments where is cookie and where is token.
2018-04-25 08:54:59 +02:00
Mariusz Zaborski
6515453886 Recognize only the cookie format anything else treat as token.
If in the RDP file we will set loadbalanceinfo.
Instead of getting the cookie value we will get load balance info.

For example:
0000 03 00 00 2a 25 e0 00 00 00 00 00 74 73 76 3a 2f ...*%......tsv:/
0010 2f 56 4d 52 65 73 6f 75 72 63 65 2e 31 2e 41 48 /VMResource.1.AH
0020 0d 0a 01 00 08 00 0b 00 00 00                   ..........

The MSFT-SDLBTS document don't describe this behavior.

For this reason lets treat the token as anything ended with seqance
CR and CL. To be honest we already did that because in the core/connection.c
file where we are seting the routing_token to the LoadBalanceInfo.
2018-04-24 15:00:00 +02:00
Mariusz Zaborski
b9ddf2046c Fix comments where is cookie and where is token. 2018-04-24 14:34:45 +02:00
Ruben De Visscher
1835a39aaf Fix inconsistent cBytes value between WinScard and pcsc-lite. 2018-04-24 10:33:44 +02:00
Martin Fleisz
c5572b087a
Merge pull request #4539 from p-pautov/rdg_fixes
RDG HTTP transport fixes and refactoring
2018-04-19 11:04:08 +02:00
Martin Fleisz
b228deb998
Merge pull request #4543 from oshogbo/master
Fix variable passsed to HashCallback with MIC.
2018-04-18 14:50:31 +02:00
Mariusz Zaborski
509afe252d Remove MessageIntegrityCheck from context. 2018-04-17 15:03:27 +02:00
akallabeth
9de311feee
Merge pull request #4572 from weberhofer/patch-1
Include geometry.h in video channel
2018-04-17 10:51:49 +02:00
Johannes Weberhofer
277fc1ca4b
Include geometry.h in video channel
Fix for #4562
2018-04-17 08:20:54 +02:00
Pavel Pautov
c866923897 Avoid buffer to struct cast. 2018-04-16 19:06:16 -07:00
Pavel Pautov
8fc0ea7199 Send correct packet size in case of PAA. Some cleanup. 2018-04-16 19:06:16 -07:00
Pavel Pautov
bbee19ced2 Content-Length and Transfer-Encoding are mutually exclusive. 2018-04-16 19:06:16 -07:00
Pavel Pautov
ec42228b2a Consolidate IN/OUT data connections establishment into common function and clean up related code. 2018-04-16 19:06:16 -07:00
Pavel Pautov
00256bba1d Move NTLM auth related code into dedicated functions. 2018-04-16 19:06:16 -07:00
Pavel Pautov
269dec6377 Consolidate rdg_tls_out_connect/rdg_tls_in_connect into single function. This also fixes connections to RDG server via proxy. 2018-04-16 19:06:13 -07:00
Pavel Pautov
e639e2caf3 Removed unused "readEvent" - no one checks if it was set.
Removed needless rdg_check_event_handles declaration.
2018-04-16 16:05:40 -07:00
Pavel Pautov
1530bcf916 Consolidate rdg_send_in_channel_request/rdg_send_out_channel_request into single function. 2018-04-16 16:05:40 -07:00
Pavel Pautov
0fbf8f8957 Explicitly skip "seed" payload on RDG OUT connection, to avoid issues when it's split over several SSL records. 2018-04-16 16:05:40 -07:00
Pavel Pautov
44cb710496 Moved some repeated "read all" code into function. 2018-04-16 16:05:40 -07:00
Armin Novak
1feca7768e Fixed redirection with session brokers.
* Only reconnect channels on redirect, if they have already been connected.
* Prefer TargetNetAddress over FQDN to connect.
2018-04-16 16:46:48 +02:00
Bernhard Miklautz
fc6780a865
Merge pull request #4567 from akallabeth/sanitizer_checks_refined
Refined checks for sanitizers.
2018-04-12 15:52:38 +02:00
David Fort
81ea42098f
Merge pull request #4568 from akallabeth/rails_bad_window_fix
Check for window existence in remote app mode before access
2018-04-12 15:25:35 +02:00
Armin Novak
5628ed5e7d Check for window existence in remote app mode before access
X11 is asynchronous, so events arriving in xf_event_PropertyNotify
may access a window that has already been discarded. Check that before
reading properties.
2018-04-12 14:39:37 +02:00
Armin Novak
c9373cee06 Refined checks for sanitizers. 2018-04-12 12:41:19 +02:00
Martin Fleisz
855af9e941
Merge pull request #4557 from akallabeth/connect_error_fix
Set connection error if TCP connect fails.
2018-04-12 12:10:56 +02:00
David Fort
14cce798e8
Merge pull request #4544 from oshogbo/nSize
Don't restrict the hostname size.
2018-04-12 11:11:57 +02:00
Martin Fleisz
d1b4b410fc
Merge pull request #4547 from andreesteve/gatewayip
Gateway client (RDG) must connect to same IP/server for both channels
2018-04-12 10:43:34 +02:00
Martin Fleisz
e297a4f0e2
Merge pull request #4563 from oshogbo/pointer
Don't assume that the pointer function are set.
2018-04-11 17:10:48 +02:00
Mariusz Zaborski
0e25335c8f Don't assume that the pointer function are set. 2018-04-11 16:12:39 +02:00
Norbert Federa
648f66670b
Merge pull request #4561 from bmiklautz/200dev3
build: set version to 2.0.0-dev3
2018-04-11 14:45:35 +02:00
Bernhard Miklautz
d309a1ba33 build: set version to 2.0.0-dev3
start 2.0.0-rc3 development cycle
2018-04-11 13:36:33 +02:00
Martin Fleisz
7a7b180277
Merge pull request #4560 from bmiklautz/200rc2
release: version 2.0.0-rc2
2018-04-11 13:25:31 +02:00
Bernhard Miklautz
c98a90ea69 release: version 2.0.0-rc2 2018-04-11 12:44:06 +02:00
Bernhard Miklautz
6383b2e33e
Merge pull request #3542 from akallabeth/thread_sanitizer
Added memory and thread sanitizer.
2018-04-11 11:01:38 +02:00
Bernhard Miklautz
f85563de43
Merge pull request #4558 from mfleisz/openssl11_fix_win
cmake: Fix finding OpenSSL 1.1.0 libs on Windows platforms
2018-04-11 10:59:27 +02:00
Bernhard Miklautz
c0afb8bd6b
Merge pull request #4322 from akallabeth/rail_fixes
Rail fixes for GFX mode
2018-04-11 10:49:44 +02:00
Martin Fleisz
dfd269e207 cmake: Fix finding OpenSSL 1.1.0 libs on Windows platforms 2018-04-11 10:18:46 +02:00
Armin Novak
685f5a8d20 Do not clear last error if not reconnecting. 2018-04-11 10:06:11 +02:00
Armin Novak
2fc31fcb37 Set connection error if TCP connect fails. 2018-04-11 09:09:23 +02:00
Andre Esteve
d240069b5e Gateway (RDG) use same IP for both channels 2018-04-10 20:59:33 -07:00
Martin Fleisz
04b29575fe
Merge pull request #4552 from perkerk/win-10-cursors-again
Fix Windows 10 cursors drawing as black
2018-04-10 11:12:31 +02:00
Eric Brown
ee87b98850 Fix issues found by build bot 2018-04-10 02:55:15 -05:00
Eric Brown
71c949f61a Fix Windows 10 cursors drawing as black 2018-04-09 13:59:42 -05:00
akallabeth
09c766cdeb
Merge pull request #4551 from oshogbo/nego_0
Fix setting of negotiated security protocol.
2018-04-09 19:00:48 +02:00
Mariusz Zaborski
480abdde91 Fix setting of negotiated security protocol.
PROTOCOL_RDP is equals 0 so if we and it with anything is still 0.
Correct way of doing it is to compare two values.
2018-04-09 17:14:37 +02:00