Merge pull request connamara#276 from akamyshanov/hotfix-ssl

SSL Fixes
noreentry · Feb 26, 2016 · 3dbf55b · 3dbf55b
2 parents f6869e6 + 5f4bad6
commit 3dbf55b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/QuickFIXn/SocketSettings.cs b/QuickFIXn/SocketSettings.cs
@@ -13,7 +13,7 @@ namespace QuickFix
     /// Property setters are internal so they can be set in tests, otherwise the settings should
     /// be set using the <see cref="Configure"/> function
     /// </remarks>
-    public class SocketSettings
+    public class SocketSettings : ICloneable
     {
         public bool SocketNodelay = true;
         public Nullable<int> SocketReceiveBufferSize;
@@ -173,6 +173,14 @@ public void Configure(QuickFix.Dictionary dictionary)
             }
         }
 
+        object ICloneable.Clone()
+        {
+            return Clone();
+        }
 
+        public SocketSettings Clone()
+        {
+            return (SocketSettings)MemberwiseClone();
+        }
     }
 }
diff --git a/QuickFIXn/Transport/SocketInitiator.cs b/QuickFIXn/Transport/SocketInitiator.cs
@@ -54,6 +54,7 @@ public SocketInitiator(IApplication application, IMessageStoreFactory storeFacto
         public static void SocketInitiatorThreadStart(object socketInitiatorThread)
         {
             SocketInitiatorThread t = socketInitiatorThread as SocketInitiatorThread;
+            if (t == null) return;
             try
             {
                 t.Connect();
@@ -74,6 +75,10 @@ public static void SocketInitiatorThreadStart(object socketInitiatorThread)
             {
                 t.Session.Log.OnEvent("Connection failed: " + e.Message);
             }
+            catch (System.Security.Authentication.AuthenticationException ex) // some certificate problems
+            {
+                t.Session.Log.OnEvent("Connection failed (AuthenticationException): " + ex.Message);
+            }
             catch (Exception)
             {
                 // It might be the logger ObjectDisposedException, so don't try to log!
@@ -221,10 +226,11 @@ protected override void DoConnect(SessionID sessionID, Dictionary settings)
                 session.Log.OnEvent("Connecting to " + socketEndPoint.Address + " on port " + socketEndPoint.Port);
 
                 //Setup socket settings based on current section
-                socketSettings_.Configure(settings);
+                var socketSettings = socketSettings_.Clone();
+                socketSettings.Configure(settings);
 
                 // Create a Ssl-SocketInitiatorThread if a certificate is given
-                SocketInitiatorThread t = new SocketInitiatorThread(this, session, socketEndPoint, socketSettings_);                
+                SocketInitiatorThread t = new SocketInitiatorThread(this, session, socketEndPoint, socketSettings);                
                 t.Start();
                 AddThread(t);