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
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
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
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
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
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
Bernhard Miklautz
e818dd5679
Merge pull request #4549 from oshogbo/krb
...
Fix checking of krb in encrypt public key echo.
2018-04-09 16:26:18 +02:00
Mariusz Zaborski
dc2c826edd
Fix checking of krb in encrypt public key echo.
...
In commit 0e1a073384
there was a mistake -
originally code said different then kerberos. Because of that NLA authentication
of server side didn't work for me.
2018-04-09 15:09:38 +02:00
Armin Novak
7af9ba9171
Refactored reconnect and redirect API
...
Reconnect and redirect share the same code on disconnect.
Move that to a single function and export it as it may be required
to terminate the session properly before reconnect is called.
2018-04-09 14:04:30 +02:00
Armin Novak
0a7691de58
Fixed channel (dis)connect on redirect or reconnect.
2018-04-09 11:26:12 +02:00
Armin Novak
1698a54b04
Removed unnecessarty string duplications.
2018-04-09 11:26:05 +02:00
Mariusz Zaborski
00374382d9
There is no reason to restrict nSize to 2 the hostname can be empty on
...
UNIX-like machines.
2018-04-06 21:07:51 +02:00
Armin Novak
3762e06714
Fixed RDP debug message invalid function.
2018-04-06 11:34:24 +02:00
Armin Novak
b5668e35b0
Fixed format string mismatch.
2018-04-05 10:49:24 +02:00
Armin Novak
72d574b31e
Fixed type mismatches with H264 backend buffer pointers.
2018-04-05 10:48:45 +02:00
Armin Novak
26d9957608
Fix pointer type mismatch struct sockaddr_storage* and struct sockaddr*
2018-04-05 10:47:50 +02:00
MartinHaimberger
a9ecd6a6cc
Merge pull request #4535 from akallabeth/warning_fixes
...
Warning fixes
2018-04-05 10:20:43 +02:00
MartinHaimberger
0af63d4c6f
Merge pull request #4481 from akallabeth/fastpath_fix
...
Fastpath uncompressed length issue
2018-04-05 10:17:51 +02:00
Martin Fleisz
ff8b2c1b0e
core: Fix IPv6 handling on Windows
...
On Windows the sockaddr struct is smaller than sockaddr_in6.
This causes getsockname to fail because the buffer is too small.
The new code uses sockaddr_storage which should be large enough to
hold any supported protocol address structure.
See: http://pubs.opengroup.org/onlinepubs/009696699/basedefs/sys/socket.h.html
2018-04-04 17:19:18 +02:00
Armin Novak
e47d7eb968
Simplified fastpath buffer handling.
2018-04-04 13:24:43 +02:00
Armin Novak
f840150a54
Fixed missing return value checks.
2018-04-04 13:24:32 +02:00
Armin Novak
3f1ef0efc6
Removed unnecessary range check.
2018-04-04 10:45:32 +02:00
Armin Novak
2bda3a30b0
Fixed integer to float type cast.
2018-04-04 10:45:07 +02:00
Armin Novak
b0fe199060
Fixed intrinsic integer overflow.
...
Adding 128 in 8bit is not possible due to range [-128,127].
Instead subtract -128, that should eliminate the overflow.
2018-04-04 10:43:31 +02:00
Martin Fleisz
edce38613a
Merge pull request #4529 from akallabeth/wlog_cleanup_fix
...
Fix #4524 : Initialize with cleanup handler
2018-04-04 09:32:46 +02:00
Armin Novak
e0d112d548
Removed all calls to WLog_Init and WLog_Uninit
...
Since the calls are no longer required remove their usage.
2018-04-03 13:06:41 +02:00
Martin Fleisz
5c59b5f2b8
cssp: Fix handling of nonce
2018-03-29 21:42:14 +02:00
Martin Fleisz
eb1f693fc4
cssp: Separate client/server version handling ( #4502 )
2018-03-23 12:12:08 +01:00
Martin Fleisz
e9ba4b58ec
cssp: Fix warnings ( #4503 )
2018-03-21 12:57:58 +01:00
Martin Fleisz
8df96364f2
cssp: Add support for protocol version 6
2018-03-20 10:37:38 +01:00
Bernhard Miklautz
e7ae3f6bab
fix nla: don't use server version
...
FreeRDP currently only supports CredSSP protocol version 3. However the
current implementation always sent back the version received by the
server indicating that this version was supported.
With recent windows updates applied the protocol changed and this approach
doesn't work anymore (see
https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes).
With this fix FreeRDP always sends version 3 as supported version.
Credit goes to @mfleisz.
Fixes #4449
2018-03-14 14:04:56 +01:00