Merge pull request connamara#1 from gbirchmeier/314

update from latest master, fix some typos

.gitignore

@@ -13,10 +13,11 @@ ChangeLog
 AcceptanceTest/AcceptanceTests*.html
 AcceptanceTest/AcceptanceTests*.xml
 AcceptanceTest/TestResult.xml
-AcceptanceTest/bin/Debug/*
-AcceptanceTest/bin/Release/*
+AcceptanceTest/bin/
+AcceptanceTest/obj/
 AcceptanceTest/log/
 AcceptanceTest/store/
+AcceptanceTest/cfg/at.cfg
 Examples/Executor/bin/*
 Examples/Executor/obj/*
 Examples/Executor/log/

AcceptanceTest/cfg/at_44.cfg

@@ -11,17 +11,5 @@ TargetCompID=TW
 ResetOnLogon=Y 
 FileStorePath=store 
 [SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
 BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml 
+DataDictionary=..\spec\fix\FIX44.xml 

AcceptanceTest/cfg/at_44_noreset.cfg

@@ -0,0 +1,15 @@
+[DEFAULT] 
+Verbose=Y 
+FileLogPath=log 
+ConnectionType=acceptor 
+SocketAcceptPort=5005 
+SocketReuseAddress=Y 
+StartTime=00:00:00 
+EndTime=00:00:00 
+SenderCompID=ISLD 
+TargetCompID=TW 
+ResetOnLogon=N
+FileStorePath=store 
+[SESSION] 
+BeginString=FIX.4.4 
+DataDictionary=..\spec\fix\FIX44.xml 

AcceptanceTest/cfg/at_50.cfg

@@ -10,23 +10,8 @@ SenderCompID=ISLD
 TargetCompID=TW 
 ResetOnLogon=Y 
 FileStorePath=store 
-[SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
-BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml
 [SESSION]
 BeginString=FIXT.1.1
 DefaultApplVerID=FIX.5.0
 AppDataDictionary=..\spec\fix\FIX50.xml
-TransportDataDictionary=..\spec\fix\FIXT11.xml
+TransportDataDictionary=..\spec\fix\FIXT11.xml

AcceptanceTest/cfg/at_50_sp1.cfg

@@ -10,21 +10,6 @@ SenderCompID=ISLD
 TargetCompID=TW 
 ResetOnLogon=Y 
 FileStorePath=store 
-[SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
-BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml
 [SESSION]
 BeginString=FIXT.1.1
 DefaultApplVerID=FIX.5.0SP1

AcceptanceTest/cfg/at_50_sp2.cfg

@@ -10,21 +10,6 @@ SenderCompID=ISLD
 TargetCompID=TW 
 ResetOnLogon=Y 
 FileStorePath=store 
-[SESSION] 
-BeginString=FIX.4.0 
-DataDictionary=..\spec\fix\FIX40.xml 
-[SESSION] 
-BeginString=FIX.4.1 
-DataDictionary=..\spec\fix\FIX41.xml 
-[SESSION] 
-BeginString=FIX.4.2 
-DataDictionary=..\spec\fix\FIX42.xml 
-[SESSION] 
-BeginString=FIX.4.3 
-DataDictionary=..\spec\fix\FIX43.xml 
-[SESSION] 
-BeginString=FIX.4.4 
-DataDictionary=..\spec\fix\FIX44.xml
 [SESSION]
 BeginString=FIXT.1.1
 DefaultApplVerID=FIX.5.0SP2

AcceptanceTest/definitions/server/fix44/SessionReset.def

@@ -20,7 +20,7 @@ E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIX.4.4
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.4
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
+eDISCONNECT

AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def

@@ -0,0 +1,40 @@
+# Issue #80: logon with reset _after_disconnect_
+
+iCONNECT
+# logon with reset, because this config has ResetOnLogon=N
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=5
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=6
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=7
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=8
49=TW
52=<TIME>
56=ISLD

+I8=FIX.4.4
35=0
34=9
49=TW
52=<TIME>
56=ISLD

+
+#Send TestRequest, expect HeartBeat response
+I8=FIX.4.4
35=1
34=10
49=TW
52=<TIME>
56=ISLD
112=1

+E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

+
+#Logout and response
+I8=FIX.4.4
35=5
34=11
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.4
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

+
+eDISCONNECT
+iCONNECT
+
+#send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

+#Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

+
+#Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
+I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

+E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

+
+# logout message and response
+I8=FIX.4.4
35=5
34=3
49=TW
52=<TIME>
56=ISLD

+E8=FIX.4.4
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

+
+eDISCONNECT

AcceptanceTest/definitions/server/fix50/SessionReset.def

@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=7

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
+eDISCONNECT

AcceptanceTest/definitions/server/fix50sp1/SessionReset.def

@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=8

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
+eDISCONNECT

AcceptanceTest/definitions/server/fix50sp2/SessionReset.def

@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=9

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
+eDISCONNECT

NEXT_VERSION.md

@@ -27,5 +27,8 @@ Changes since the last version (oldest first):
 * (minor) #286 - FieldBase.Equals() and .GetHashcode() (steffanu)
 * (patch) #287 - sync fix in Session class (steffanu)
 * (patch) #275 - SessionID.IsSet() should be used instead of !=SessionID.NOT_SET (akamyshanov)
-
+* (patch) #297 - revert #287
+* (patch) #290 - support for RefreshOnLogon (martinadams)
+* (patch)  #80 - fixes to tag-141-related sequence resets (TomasVetrovsky,akamyshanov,gbirchmeier)
+* (minor) #314 - New feature: add/remove sessions dynamically (martinadams)
 

QuickFIXn/AbstractInitiator.cs

@@ -21,6 +21,7 @@ public abstract class AbstractInitiator : IInitiator
         private HashSet<SessionID> disconnected_ = new HashSet<SessionID>();
         private bool isStopped_ = true;
         private Thread thread_;
+        private SessionFactory sessionFactory_ = null;
 
         #region Properties
 
@@ -59,18 +60,11 @@ public void Start()
                 throw new System.ObjectDisposedException(this.GetType().Name);
 
             // create all sessions
-            SessionFactory factory = new SessionFactory(_app, _storeFactory, _logFactory, _msgFactory);
+            sessionFactory_ = new SessionFactory(_app, _storeFactory, _logFactory, _msgFactory);
             foreach (SessionID sessionID in _settings.GetSessions())
             {
                 Dictionary dict = _settings.Get(sessionID);
-                string connectionType = dict.GetString(SessionSettings.CONNECTION_TYPE);
-
-                if ("initiator".Equals(connectionType))
-                {
-                    sessionIDs_.Add(sessionID);
-                    sessions_[sessionID] = factory.Create(sessionID, dict);
-                    SetDisconnected(sessionID);
-                }
+                AddSession(sessionID, dict);
             }
 
             if (0 == sessions_.Count)
@@ -83,6 +77,65 @@ public void Start()
             thread_.Start();
         }
 
+        /// <summary>
+        /// Add new session, either at start-up or as an ad-hoc operation
+        /// </summary>
+        /// <param name="sessionID">ID of new session<param>
+        /// <param name="dict">config settings for new session</param></param>
+        /// <returns>true if session added successfully, false if session already exists or is not an initiator</returns>
+        public bool AddSession(SessionID sessionID, Dictionary dict)
+        {
+            if (dict.GetString(SessionSettings.CONNECTION_TYPE) == "initiator" && !sessionIDs_.Contains(sessionID))
+            {
+                Session session = sessionFactory_.Create(sessionID, dict);
+                lock (sync_)
+                {
+                    if (!_settings.Has(sessionID))  // session won't be in settings if ad-hoc creation after startup
+                        _settings.Set(sessionID, dict);
+                    sessionIDs_.Add(sessionID);
+                    sessions_[sessionID] = session;
+                    SetDisconnected(sessionID);
+                }
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Ad-hoc removal of an existing session
+        /// </summary>
+        /// <param name="sessionID">ID of session to be removed</param>
+        /// <param name="terminateActiveSession">if true, force disconnection and removal of session even if it has an active connection</param>
+        /// <returns>true if session removed or not already present; false if could not be removed due to an active connection</returns>
+        public bool RemoveSession(SessionID sessionID, bool terminateActiveSession)
+        {
+            Session session = null;
+            bool disconnectRequired = false;
+            lock (sync_)
+            {
+                if (sessionIDs_.Contains(sessionID))
+                {
+                    session = sessions_[sessionID];
+                    if (session.IsLoggedOn && !terminateActiveSession)
+                        return false;
+
+                    sessions_.Remove(sessionID);
+                    _settings.Remove(sessionID);
+                    disconnectRequired = IsConnected(sessionID) || IsPending(sessionID);
+                    if (disconnectRequired)
+                        SetDisconnected(sessionID);
+                    disconnected_.Remove(sessionID);
+                    sessionIDs_.Remove(sessionID);
+                    OnRemove(sessionID);
+                }
+            }
+            if (disconnectRequired)
+                session.Disconnect("Dynamic session removal");
+            if (session != null)
+                session.Dispose();
+            return true;
+        }
+
         /// <summary>
         /// Logout existing session and close connection.  Attempt graceful disconnect first.
         /// </summary>
@@ -144,12 +197,13 @@ public void Stop(bool force)
             {
                 foreach (Session s in sessions_.Values)
                     s.Dispose();
+
+                sessions_.Clear();
+                sessionIDs_.Clear();
+                pending_.Clear();
+                connected_.Clear();
+                disconnected_.Clear();
             }
-            sessions_.Clear();
-            sessionIDs_.Clear();
-            pending_.Clear();
-            connected_.Clear();
-            disconnected_.Clear();
         }
 
         public bool IsLoggedOn
@@ -178,6 +232,14 @@ public bool IsLoggedOn
         protected virtual void OnConfigure(SessionSettings settings)
         { }
 
+        /// <summary>
+        /// Implement this to provide custom reaction behavior to an ad-hoc session removal.
+        /// (This is called after the session is removed.)
+        /// </summary>
+        /// <param name="sessionID">ID of session that was removed</param>
+        protected virtual void OnRemove(SessionID sessionID)
+        { }
+
         [System.Obsolete("This method's intended purpose is unclear.  Don't use it.")]
         protected virtual void OnInitialize(SessionSettings settings)
         { }
@@ -254,9 +316,12 @@ protected void SetDisconnected(SessionID sessionID)
         {
             lock (sync_)
             {
-                pending_.Remove(sessionID);
-                connected_.Remove(sessionID);
-                disconnected_.Add(sessionID);
+                if (sessionIDs_.Contains(sessionID))
+                {
+                    pending_.Remove(sessionID);
+                    connected_.Remove(sessionID);
+                    disconnected_.Add(sessionID);
+                }
             }
         }