From a9b1c4cb5c4d945565e72e80ac0f938a49da3e5f Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sat, 22 Aug 2020 05:15:57 +0300 Subject: Implemented pre-connection protocol configuration. Improved error handling across transport layer. Improved unexpected app crash for PPC. Improved transporter request received handlers tunneling. --- .../PPC/Tango.PPC.Common/FileSystem/DefaultFileSystemService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/FileSystem') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/FileSystem/DefaultFileSystemService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/FileSystem/DefaultFileSystemService.cs index 958c1aa12..8272ea34d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/FileSystem/DefaultFileSystemService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/FileSystem/DefaultFileSystemService.cs @@ -34,7 +34,7 @@ namespace Tango.PPC.Common.FileSystem private FileSystemManager _manager; private Dictionary _operations; private Dictionary _webRtcClients; - private bool _enableCompression; + private PPCSettings _settings; public bool Enabled { get; set; } = true; public bool EnableWebRTC { get; set; } = true; @@ -45,7 +45,7 @@ namespace Tango.PPC.Common.FileSystem _manager = new FileSystemManager(); _operations = new Dictionary(); externalBridge.RegisterRequestHandler(this); - _enableCompression = SettingsManager.Default.GetOrCreate().EnableExternalBridgeTransportCompression; + _settings = SettingsManager.Default.GetOrCreate(); } [ExternalBridgeRequestHandlerMethod(typeof(InitWebRtcRequest), RequestHandlerLoggingMode.LogRequestNameAndContent)] @@ -71,7 +71,7 @@ namespace Tango.PPC.Common.FileSystem LogManager.Log("Initializing WebRTC transport adapter on 'Passive' mode."); var webRtcAdapter = new WebRtcTransportAdapter(receiver, WebRtcTransportAdapterMode.Passive, request.DataChannelName) { - EnableCompression = _enableCompression + EnableCompression = receiver.Adapter.EnableCompression }; webRtcAdapter.Ready += (x, e) => { @@ -79,7 +79,7 @@ namespace Tango.PPC.Common.FileSystem }; BasicTransporter webRtcTransporter = new BasicTransporter(webRtcAdapter); - webRtcTransporter = new BasicTransporter(webRtcAdapter); + webRtcTransporter.GenericProtocol = receiver.GenericProtocol; webRtcTransporter.ComponentName = "File System Passive WebRTC Transporter"; webRtcTransporter.UseKeepAlive = false; webRtcTransporter.RegisterRequestHandler(WebRtcChunkDownloadRequestReceived); -- cgit v1.3.1