platform/upstream/freerdp.git
5 years agoImplemented GFX locking and enforce return value checks.
Armin Novak [Tue, 23 Oct 2018 09:52:06 +0000 (11:52 +0200)]
Implemented GFX locking and enforce return value checks.

To fix #4825 GFX functions must now aquire a lock before accessing surfaces.
This prevents simultaneous update of internal data by client and gfx threads.
Also enforce return value checks, where not already done.

5 years agoMerge pull request #5073 from akallabeth/trust_settings
Bernhard Miklautz [Thu, 29 Nov 2018 09:50:12 +0000 (09:50 +0000)]
Merge pull request #5073 from akallabeth/trust_settings

Fix #4764: Second try, use X509_STORE_CTX_set_purpose

5 years agoMerge pull request #5074 from akallabeth/ycbcr_padding_fix
David Fort [Thu, 29 Nov 2018 09:02:28 +0000 (10:02 +0100)]
Merge pull request #5074 from akallabeth/ycbcr_padding_fix

Fixed padding of general_yCbCrToRGB_16s8u_P3AC4R* functions.

5 years agoMerge pull request #5057 from akallabeth/order_settings_init_generic
David Fort [Wed, 28 Nov 2018 16:46:18 +0000 (17:46 +0100)]
Merge pull request #5057 from akallabeth/order_settings_init_generic

Unified initialization of OrderSupport

5 years agoFix #4764: Second try, use X509_STORE_CTX_set_purpose
Armin Novak [Wed, 28 Nov 2018 08:32:28 +0000 (09:32 +0100)]
Fix #4764: Second try, use X509_STORE_CTX_set_purpose

5 years agoFixed padding of general_yCbCrToRGB_16s8u_P3AC4R* functions.
Armin Novak [Wed, 28 Nov 2018 10:05:45 +0000 (11:05 +0100)]
Fixed padding of general_yCbCrToRGB_16s8u_P3AC4R* functions.

5 years agoMerge pull request #5066 from akallabeth/ssl_verify_fix
Bernhard Miklautz [Mon, 26 Nov 2018 13:01:00 +0000 (13:01 +0000)]
Merge pull request #5066 from akallabeth/ssl_verify_fix

Fix #4768: Set SSL verify purpose to ANY

5 years agoMerge pull request #5046 from akallabeth/silence_wlog
Bernhard Miklautz [Mon, 26 Nov 2018 11:10:59 +0000 (11:10 +0000)]
Merge pull request #5046 from akallabeth/silence_wlog

Do not compile extended debugging by default.

5 years agoMerge pull request #5067 from akallabeth/gfx_log_fix
Bernhard Miklautz [Mon, 26 Nov 2018 11:03:42 +0000 (11:03 +0000)]
Merge pull request #5067 from akallabeth/gfx_log_fix

Fixed error log for avc420_decompress failures.

5 years agoFix #4768: Set SSL verify purpose to ANY
Armin Novak [Mon, 26 Nov 2018 07:12:51 +0000 (08:12 +0100)]
Fix #4768: Set SSL verify purpose to ANY

Should actually be SSL server but since we allowed broken
purpose up until now keep that for the 2.0 series.

5 years agoMerge pull request #5065 from akallabeth/tcp_connect_multi_fix
Bernhard Miklautz [Mon, 26 Nov 2018 10:57:20 +0000 (10:57 +0000)]
Merge pull request #5065 from akallabeth/tcp_connect_multi_fix

Fixed a possible NULL dereference.

5 years agoFixed error log for avc420_decompress failures.
Armin Novak [Mon, 26 Nov 2018 10:33:23 +0000 (11:33 +0100)]
Fixed error log for avc420_decompress failures.

5 years agoMerge pull request #5064 from akallabeth/rdg_length_check_fix
MartinHaimberger [Fri, 23 Nov 2018 09:49:00 +0000 (10:49 +0100)]
Merge pull request #5064 from akallabeth/rdg_length_check_fix

Fixed a broken length check in rdg_process_packet

5 years agoFixed a possible NULL dereference.
Armin Novak [Fri, 23 Nov 2018 09:32:52 +0000 (10:32 +0100)]
Fixed a possible NULL dereference.

5 years agoUnified initialization of OrderSupport
Armin Novak [Thu, 22 Nov 2018 15:54:42 +0000 (16:54 +0100)]
Unified initialization of OrderSupport

Added a library internal function freerdp_settings_set_default_order_support
which initializes the OrderSupport array of settings.
Now clients no longer need to set this up on their own, if they
do not implement their own hardware accelerated order processing.

5 years agoMerge pull request #5035 from akallabeth/better_cmdline_format
Martin Fleisz [Fri, 23 Nov 2018 09:03:56 +0000 (10:03 +0100)]
Merge pull request #5035 from akallabeth/better_cmdline_format

Improved formatting of terminal help messages.

5 years agoMerge pull request #5053 from akallabeth/sample_client_update
Martin Fleisz [Fri, 23 Nov 2018 08:48:08 +0000 (09:48 +0100)]
Merge pull request #5053 from akallabeth/sample_client_update

Fix #5052: Updated client sample

5 years agoFixed a broken length check in rdg_process_packet
Armin Novak [Fri, 23 Nov 2018 08:45:09 +0000 (09:45 +0100)]
Fixed a broken length check in rdg_process_packet

HTTP gateway connections aborted due to this.
Additionally add more verbose error logging in RDG.

5 years agoMerge pull request #5060 from akallabeth/small_fixes
Bernhard Miklautz [Thu, 22 Nov 2018 22:22:57 +0000 (22:22 +0000)]
Merge pull request #5060 from akallabeth/small_fixes

Small fixes

5 years agoFix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high
akallabeth [Thu, 22 Nov 2018 18:10:05 +0000 (19:10 +0100)]
Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high

Need to check specifically for LIBRESSL_VERSION_NUMBER as they
set the version higher than OpenSSL 1.1 but without API support.

5 years agoFix #5059: Changed return type of peer_free to void.
akallabeth [Thu, 22 Nov 2018 18:08:25 +0000 (19:08 +0100)]
Fix #5059: Changed return type of peer_free to void.

5 years agoMerge pull request #5058 from akallabeth/wtsapi_warning_fix
David Fort [Thu, 22 Nov 2018 16:53:00 +0000 (17:53 +0100)]
Merge pull request #5058 from akallabeth/wtsapi_warning_fix

Initialize WtsApi32_WtsApiFunctionTable NULL

5 years agoInitialize WtsApi32_WtsApiFunctionTable NULL
Armin Novak [Thu, 22 Nov 2018 16:28:31 +0000 (17:28 +0100)]
Initialize WtsApi32_WtsApiFunctionTable NULL

5 years agoUnified strto[u]l in cmdline.c
Armin Novak [Thu, 22 Nov 2018 15:28:30 +0000 (16:28 +0100)]
Unified strto[u]l in cmdline.c

To clean up code all integer conversions are now done by
a helper function with proper checks in place.

5 years agoImproved formatting of terminal help messages.
Armin Novak [Tue, 20 Nov 2018 13:11:10 +0000 (14:11 +0100)]
Improved formatting of terminal help messages.

5 years agoMerge pull request #5056 from akallabeth/direct_fb_remove
David Fort [Thu, 22 Nov 2018 14:50:52 +0000 (15:50 +0100)]
Merge pull request #5056 from akallabeth/direct_fb_remove

Removed DirectFB client as it is unmaintained

5 years agoMerge pull request #5022 from akallabeth/gw_rdg_error_mapping
Martin Fleisz [Thu, 22 Nov 2018 14:10:58 +0000 (15:10 +0100)]
Merge pull request #5022 from akallabeth/gw_rdg_error_mapping

Improved error mapping and tightened checks in rdg_process_packet

5 years agoRemoved DirectFB client as it is unmaintained
Armin Novak [Thu, 22 Nov 2018 13:37:10 +0000 (14:37 +0100)]
Removed DirectFB client as it is unmaintained

DirectFB support was in search of a maintainer for ages and
no longer compiles.
Since nobody stepped up get rid of this unused code once and for all.

5 years agoSimplified string empty check.
Armin Novak [Thu, 22 Nov 2018 13:29:22 +0000 (14:29 +0100)]
Simplified string empty check.

5 years agoMerge pull request #5054 from akallabeth/spelling_fix
Martin Fleisz [Thu, 22 Nov 2018 13:03:01 +0000 (14:03 +0100)]
Merge pull request #5054 from akallabeth/spelling_fix

Spelling fix in log message.

5 years agoSpelling fix in log message.
Armin Novak [Thu, 22 Nov 2018 11:06:30 +0000 (12:06 +0100)]
Spelling fix in log message.

Integrate spelling fix from debian patch from
Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

5 years agoMerge pull request #4998 from akallabeth/assistance_v2
Martin Fleisz [Thu, 22 Nov 2018 10:47:58 +0000 (11:47 +0100)]
Merge pull request #4998 from akallabeth/assistance_v2

assistance v2 support

5 years agoRemoved duplcate NULL checks.
Armin Novak [Thu, 22 Nov 2018 10:21:57 +0000 (11:21 +0100)]
Removed duplcate NULL checks.

5 years agoFixed NULL access checks.
Armin Novak [Thu, 22 Nov 2018 10:19:12 +0000 (11:19 +0100)]
Fixed NULL access checks.

5 years agoFixed freerdp_assistance_parse_address_list
Armin Novak [Thu, 22 Nov 2018 10:17:13 +0000 (11:17 +0100)]
Fixed freerdp_assistance_parse_address_list

* Return a proper error in case parsing fails.
* Don't duplicate string as we already operate on a duplicate.

5 years agoFixed test_msrsc_incident_file_type1 return checks.
Armin Novak [Thu, 22 Nov 2018 10:16:43 +0000 (11:16 +0100)]
Fixed test_msrsc_incident_file_type1 return checks.

5 years agoFixed memory leak in reallocate.
Armin Novak [Wed, 21 Nov 2018 14:03:30 +0000 (15:03 +0100)]
Fixed memory leak in reallocate.

5 years agoUpdated windows shadow server assistance usage.
Armin Novak [Mon, 12 Nov 2018 12:40:40 +0000 (13:40 +0100)]
Updated windows shadow server assistance usage.

5 years agoUse blocking sockets in freerdp_tcp_connect_multi
Armin Novak [Mon, 12 Nov 2018 11:37:33 +0000 (12:37 +0100)]
Use blocking sockets in freerdp_tcp_connect_multi

The non blocking connect in freerdp_tcp_connect_multi did not
work reliably.
Fall back to blocking connect (which might take longer until the connection
is established) instead of not being able to connect at all.

5 years agoFixed socket cleanup in connect multi.
Armin Novak [Mon, 12 Nov 2018 10:16:24 +0000 (11:16 +0100)]
Fixed socket cleanup in connect multi.

5 years agoDisable NLA for remote assistance.
Armin Novak [Mon, 12 Nov 2018 09:34:21 +0000 (10:34 +0100)]
Disable NLA for remote assistance.

5 years agoFixed version check for remote assistance channel.
Armin Novak [Mon, 12 Nov 2018 09:33:46 +0000 (10:33 +0100)]
Fixed version check for remote assistance channel.

5 years agoFixed assistance unit test.
Armin Novak [Mon, 12 Nov 2018 08:19:38 +0000 (09:19 +0100)]
Fixed assistance unit test.

5 years agoFixed event check in freerdp_tcp_connect_multi
Armin Novak [Fri, 9 Nov 2018 14:21:13 +0000 (15:21 +0100)]
Fixed event check in freerdp_tcp_connect_multi

5 years agoSet username from assistance file.
Armin Novak [Fri, 9 Nov 2018 14:20:37 +0000 (15:20 +0100)]
Set username from assistance file.

5 years agoUnified address parsing for assistance files.
Armin Novak [Fri, 9 Nov 2018 13:42:10 +0000 (14:42 +0100)]
Unified address parsing for assistance files.

5 years agoassistance v2 support
Armin Novak [Thu, 8 Nov 2018 08:27:57 +0000 (09:27 +0100)]
assistance v2 support

5 years agoMerge pull request #5051 from akallabeth/libressl_fix
Martin Fleisz [Thu, 22 Nov 2018 09:45:12 +0000 (10:45 +0100)]
Merge pull request #5051 from akallabeth/libressl_fix

Fix #5049: LibreSSL does not have SSL_CTX_set_security_level

5 years agoFix #5052: Updated client sample
Armin Novak [Thu, 22 Nov 2018 09:22:40 +0000 (10:22 +0100)]
Fix #5052: Updated client sample

5 years agoFix #5049: LibreSSL does not have SSL_CTX_set_security_level
Armin Novak [Thu, 22 Nov 2018 08:23:46 +0000 (09:23 +0100)]
Fix #5049: LibreSSL does not have SSL_CTX_set_security_level

5 years agoMerge pull request #5045 from akallabeth/license_double_free_fix
David Fort [Wed, 21 Nov 2018 15:03:18 +0000 (16:03 +0100)]
Merge pull request #5045 from akallabeth/license_double_free_fix

Fixed double free in license_free_binary_blob

5 years agoMerge pull request #5016 from akallabeth/windows_server_build_fix
Martin Fleisz [Wed, 21 Nov 2018 15:02:47 +0000 (16:02 +0100)]
Merge pull request #5016 from akallabeth/windows_server_build_fix

Windows server build fix

5 years agoDo not compile extended authentication debugging by default.
Armin Novak [Wed, 21 Nov 2018 14:36:31 +0000 (15:36 +0100)]
Do not compile extended authentication debugging by default.

5 years agoFixed double free in license_free_binary_blob
Armin Novak [Wed, 21 Nov 2018 14:03:42 +0000 (15:03 +0100)]
Fixed double free in license_free_binary_blob

5 years agoMerge pull request #5041 from akallabeth/compile_fix
MartinHaimberger [Wed, 21 Nov 2018 14:06:58 +0000 (15:06 +0100)]
Merge pull request #5041 from akallabeth/compile_fix

Fix #5037: Fix calls to ntlm_print_av_pair_list

5 years agoProper field to string debug functions for each response in RDG
Armin Novak [Wed, 21 Nov 2018 13:32:07 +0000 (14:32 +0100)]
Proper field to string debug functions for each response in RDG

5 years agoMerge pull request #5039 from mcsong/master
akallabeth [Wed, 21 Nov 2018 10:49:45 +0000 (11:49 +0100)]
Merge pull request #5039 from mcsong/master

Fixed recreate activity issue with bluetooth devices.

5 years agoFixed broken DEBUG_RDP log message.
Armin Novak [Wed, 21 Nov 2018 08:55:38 +0000 (09:55 +0100)]
Fixed broken DEBUG_RDP log message.

5 years agoFix #5037: Fix calls to ntlm_print_av_pair_list
Armin Novak [Wed, 21 Nov 2018 08:18:38 +0000 (09:18 +0100)]
Fix #5037: Fix calls to ntlm_print_av_pair_list

5 years agoFixed recreate activity issue when a bluetooth device connected or disconnected
mcsong [Tue, 20 Nov 2018 21:11:14 +0000 (13:11 -0800)]
Fixed recreate activity issue when a bluetooth device connected or disconnected

5 years agoFixed recreate activity issue when a bluetooth device connected or disconnected.
mcsong [Tue, 20 Nov 2018 20:57:07 +0000 (12:57 -0800)]
Fixed recreate activity issue when a bluetooth device connected or disconnected.

5 years agoMerge pull request #5008 from wintersandroid/master
akallabeth [Tue, 20 Nov 2018 11:14:28 +0000 (12:14 +0100)]
Merge pull request #5008 from wintersandroid/master

Android library build script fixes, and Android thread lock on remote disconnect.

5 years agoMerge pull request #5033 from bmiklautz/dev5
akallabeth [Tue, 20 Nov 2018 11:05:47 +0000 (12:05 +0100)]
Merge pull request #5033 from bmiklautz/dev5

new: development cycle dev5

5 years agonew: development cycle dev5
Bernhard Miklautz [Tue, 20 Nov 2018 10:49:34 +0000 (11:49 +0100)]
new: development cycle dev5

5 years agoMerge pull request #5032 from bmiklautz/rc4 2.0.0-rc4
akallabeth [Tue, 20 Nov 2018 10:43:51 +0000 (11:43 +0100)]
Merge pull request #5032 from bmiklautz/rc4

new: version 2.0.0-rc4

5 years agonew: version 2.0.0-rc4
Bernhard Miklautz [Mon, 12 Nov 2018 13:46:01 +0000 (14:46 +0100)]
new: version 2.0.0-rc4

ChangeLog and version updated

5 years agoMerge pull request #5031 from akallabeth/cve_fixes_final
Bernhard Miklautz [Tue, 20 Nov 2018 10:20:43 +0000 (10:20 +0000)]
Merge pull request #5031 from akallabeth/cve_fixes_final

Cve fixes

5 years agoRefactored ntlm_av_pairs API
Armin Novak [Mon, 22 Oct 2018 14:59:28 +0000 (16:59 +0200)]
Refactored ntlm_av_pairs API

Tightened checks, cleaned up code and improved redability.

5 years agoFixed CVE-2018-8784
Armin Novak [Mon, 22 Oct 2018 15:51:26 +0000 (17:51 +0200)]
Fixed CVE-2018-8784

Thanks to Eyal Itkin from Check Point Software Technologies.

5 years agoFixed CVE-2018-8788
Armin Novak [Mon, 22 Oct 2018 14:52:21 +0000 (16:52 +0200)]
Fixed CVE-2018-8788

Thanks to Eyal Itkin from Check Point Software Technologies.

5 years agoFixed CVE-2018-8787
Armin Novak [Mon, 22 Oct 2018 14:30:20 +0000 (16:30 +0200)]
Fixed CVE-2018-8787

Thanks to Eyal Itkin from Check Point Software Technologies.

5 years agoFixed CVE-2018-8786
Armin Novak [Mon, 22 Oct 2018 14:25:13 +0000 (16:25 +0200)]
Fixed CVE-2018-8786

Thanks to Eyal Itkin from Check Point Software Technologies.

5 years agoFixed CVE-2018-8785
Armin Novak [Mon, 22 Oct 2018 14:20:34 +0000 (16:20 +0200)]
Fixed CVE-2018-8785

Thanks to Eyal Itkin from Check Point Software Technologies.

5 years agoFixed CVE-2018-8789
Armin Novak [Mon, 22 Oct 2018 14:00:03 +0000 (16:00 +0200)]
Fixed CVE-2018-8789

Thanks to Eyal Itkin from Check Point Software Technologies.

5 years agoMerge pull request #4953 from akallabeth/region_signed
Bernhard Miklautz [Tue, 20 Nov 2018 10:07:30 +0000 (10:07 +0000)]
Merge pull request #4953 from akallabeth/region_signed

signed gdi regions to adjust negative coordinates

5 years agoMerge pull request #5030 from akallabeth/pointer_cache_optional
Martin Fleisz [Tue, 20 Nov 2018 09:53:40 +0000 (10:53 +0100)]
Merge pull request #5030 from akallabeth/pointer_cache_optional

Fix #4864: Register pointer cache after PostConnect is called

5 years agoFix #4864: Register pointer cache after PostConnect is called
Armin Novak [Tue, 20 Nov 2018 08:09:52 +0000 (09:09 +0100)]
Fix #4864: Register pointer cache after PostConnect is called

With #4950 client side pointer implementation was made optional.
This addresses an issue that each client had to call
pointer_cache_register_callbacks on its own.

5 years agoFixed invalid NULL check
Armin Novak [Tue, 20 Nov 2018 08:38:02 +0000 (09:38 +0100)]
Fixed invalid NULL check

5 years agoMerge pull request #5029 from mcsong/master
akallabeth [Tue, 20 Nov 2018 08:00:39 +0000 (09:00 +0100)]
Merge pull request #5029 from mcsong/master

added korean translation for aFreeRDP

5 years agoadded korean translation
mcsong [Mon, 19 Nov 2018 22:38:48 +0000 (14:38 -0800)]
added korean translation

5 years agoClip coordinates for lineTo and polyLine
Armin Novak [Mon, 19 Nov 2018 16:24:24 +0000 (17:24 +0100)]
Clip coordinates for lineTo and polyLine

5 years agoFixed signed/unsigned warnings.
Armin Novak [Mon, 19 Nov 2018 16:24:06 +0000 (17:24 +0100)]
Fixed signed/unsigned warnings.

5 years agoFixed glyph cache bounds setting.
Armin Novak [Mon, 19 Nov 2018 12:58:53 +0000 (13:58 +0100)]
Fixed glyph cache bounds setting.

5 years agoFixed gdi_BitBlt coordinate clipping.
Armin Novak [Tue, 13 Nov 2018 16:06:09 +0000 (17:06 +0100)]
Fixed gdi_BitBlt coordinate clipping.

5 years agoFixed opaque rect bounding rectangle.
Armin Novak [Mon, 22 Oct 2018 12:12:22 +0000 (14:12 +0200)]
Fixed opaque rect bounding rectangle.

5 years agosigned gdi regions to adjust negative coordinates
akallabeth [Fri, 19 Oct 2018 15:02:33 +0000 (17:02 +0200)]
signed gdi regions to adjust negative coordinates

5 years agoMerge pull request #5021 from akallabeth/profiler_api_rework
Martin Fleisz [Mon, 19 Nov 2018 09:20:52 +0000 (10:20 +0100)]
Merge pull request #5021 from akallabeth/profiler_api_rework

Fixed profiler API

5 years agoMerge pull request #4940 from akallabeth/check_window_order_support
Bernhard Miklautz [Mon, 19 Nov 2018 09:15:14 +0000 (09:15 +0000)]
Merge pull request #4940 from akallabeth/check_window_order_support

Added checks for order type window support.

5 years agoMerge pull request #5025 from DustPuppyNet/openssl_1_1_1
Bernhard Miklautz [Mon, 19 Nov 2018 08:57:53 +0000 (08:57 +0000)]
Merge pull request #5025 from DustPuppyNet/openssl_1_1_1

fix for connection with openssl 1.1.1

5 years agoRevert store password variable
Mathew Winters [Sun, 18 Nov 2018 19:27:36 +0000 (08:27 +1300)]
Revert store password variable

5 years ago* remove obsolete SSLv23_client_method in tls_connect()
Christian Gall [Sun, 18 Nov 2018 14:09:37 +0000 (14:09 +0000)]
* remove obsolete SSLv23_client_method in tls_connect()
* set min TLS Version

5 years agoMerge pull request #5023 from ileGITimo/master
Bernhard Miklautz [Sat, 17 Nov 2018 18:47:08 +0000 (18:47 +0000)]
Merge pull request #5023 from ileGITimo/master

call xf_SetWindowTitle before XMapWindow

5 years agocall xf_SetWindowTitle before XMapWindow, so window manager can act on window name
ileGITimo [Sat, 17 Nov 2018 14:32:52 +0000 (06:32 -0800)]
call xf_SetWindowTitle before XMapWindow, so window manager can act on window name

5 years agoSkip redirection resolve test if we're connecting via gateway.
Armin Novak [Fri, 16 Nov 2018 14:48:10 +0000 (15:48 +0100)]
Skip redirection resolve test if we're connecting via gateway.

5 years agoImproved error mapping and tightened checks in rdg_process_packet
Armin Novak [Fri, 16 Nov 2018 14:41:19 +0000 (15:41 +0100)]
Improved error mapping and tightened checks in rdg_process_packet

5 years agoFixed profiler API
Armin Novak [Thu, 15 Nov 2018 16:52:43 +0000 (17:52 +0100)]
Fixed profiler API

* Duplicate the name internally to avoid issues with stack
* Made API opaque and removed direct dereferencing of struct.

5 years agoMerge pull request #5018 from hardening/windowpos
Bernhard Miklautz [Thu, 15 Nov 2018 16:46:57 +0000 (16:46 +0000)]
Merge pull request #5018 from hardening/windowpos

cmdline: add window-position argument to set initial window position

5 years agoMerge pull request #4989 from akallabeth/dsp_encode_resample
Bernhard Miklautz [Thu, 15 Nov 2018 15:54:56 +0000 (15:54 +0000)]
Merge pull request #4989 from akallabeth/dsp_encode_resample

Added resampling to freerdp_dsp_encode.

5 years agoMerge pull request #4976 from hardening/rfx_flush
Bernhard Miklautz [Thu, 15 Nov 2018 15:25:25 +0000 (15:25 +0000)]
Merge pull request #4976 from hardening/rfx_flush

remotefx: fix rlgr last bits of encoder

5 years agoMerge pull request #4964 from akallabeth/rdg_fixes
Bernhard Miklautz [Thu, 15 Nov 2018 13:48:22 +0000 (13:48 +0000)]
Merge pull request #4964 from akallabeth/rdg_fixes

Rdg/RPC and gateway fixes