Implemented pre-connection protocol configuration.

Improved error handling across transport layer.
Improved unexpected app crash for PPC.
Improved transporter request received handlers tunneling.

1 files changed, 4 insertions, 4 deletions

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<String, FileSystemOperation> _operations;
         private Dictionary<ExternalBridgeReceiver, BasicTransporter> _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<string, FileSystemOperation>();
             externalBridge.RegisterRequestHandler(this);
-            _enableCompression = SettingsManager.Default.GetOrCreate<PPCSettings>().EnableExternalBridgeTransportCompression;
+            _settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
         }
 
         [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<ChunkDownloadRequest>(WebRtcChunkDownloadRequestReceived);