From 7fadeb5cafaa95a08f9ccc0a2c88a2eb36b012f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 23:57:50 +0000
Subject: [PATCH 01/58] Bump golang.org/x/crypto from 0.15.0 to 0.17.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.15.0 to 0.17.0.
- [Commits](https://github.com/golang/crypto/compare/v0.15.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 2f5cf33c4..3f81d2bc1 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
diff --git a/go.sum b/go.sum
index f3c70cab6..2f4e1aba7 100644
--- a/go.sum
+++ b/go.sum
@@ -53,8 +53,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

From 359401580fa443d182a333e763ca2f8741db5a40 Mon Sep 17 00:00:00 2001
From: Alexandros Kyriakakis <alexandros.kyriakakis@alpaca.markets>
Date: Wed, 31 Jan 2024 18:35:00 +0200
Subject: [PATCH 02/58] TRD-1749: Escape send queued when blocked on connection
 side (#18)

---
 session.go | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/session.go b/session.go
index b359245e2..db5198e04 100644
--- a/session.go
+++ b/session.go
@@ -235,12 +235,16 @@ func (s *session) queueForSend(msg *Message) error {
 
 	s.toSend = append(s.toSend, msgBytes)
 
+	s.notifyMessageOut()
+
+	return nil
+}
+
+func (s *session) notifyMessageOut() {
 	select {
 	case s.messageEvent <- true:
 	default:
 	}
-
-	return nil
 }
 
 // send will validate, persist, queue the message. If the session is logged on, send all messages in the queue.
@@ -347,8 +351,12 @@ func (s *session) persist(seqNum int, msgBytes []byte) error {
 }
 
 func (s *session) sendQueued() {
-	for _, msgBytes := range s.toSend {
-		s.sendBytes(msgBytes)
+	for i, msgBytes := range s.toSend {
+		if !s.sendBytes(msgBytes) {
+			s.toSend = s.toSend[i:]
+			s.notifyMessageOut()
+			return
+		}
 	}
 
 	s.dropQueued()
@@ -366,15 +374,20 @@ func (s *session) EnqueueBytesAndSend(msg []byte) {
 	s.sendQueued()
 }
 
-func (s *session) sendBytes(msg []byte) {
+func (s *session) sendBytes(msg []byte) bool {
 	if s.messageOut == nil {
 		s.log.OnEventf("Failed to send: disconnected")
-		return
+		return false
 	}
 
-	s.log.OnOutgoing(msg)
-	s.messageOut <- msg
-	s.stateTimer.Reset(s.HeartBtInt)
+	select {
+	case s.messageOut <- msg:
+		s.log.OnOutgoing(msg)
+		s.stateTimer.Reset(s.HeartBtInt)
+		return true
+	default:
+		return false
+	}
 }
 
 func (s *session) doTargetTooHigh(reject targetTooHigh) (nextState resendState, err error) {

From d7f296817876225b1063f0e4e3ac5ed6800cc7fa Mon Sep 17 00:00:00 2001
From: AlexandrosKyriakakis <alexandros.kyriakakis@alpaca.markets>
Date: Tue, 30 Jan 2024 19:08:45 +0200
Subject: [PATCH 03/58] Escape send queued when blocked on connection side

use default instead of a timer

refactor send queued

In case of Log On messages block until sent
---
 logon_state_test.go |  4 ++--
 session.go          | 46 ++++++++++++++++++++++++++++++++-------------
 session_state.go    |  2 +-
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/logon_state_test.go b/logon_state_test.go
index 96afc2e90..ee47a2be6 100644
--- a/logon_state_test.go
+++ b/logon_state_test.go
@@ -333,7 +333,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonSeqNumTooHigh() {
 	s.Require().Nil(err)
 	s.MessageType(string(msgTypeLogon), sentMessage)
 
-	s.session.sendQueued()
+	s.session.sendQueued(true)
 	s.MessageType(string(msgTypeResendRequest), s.MockApp.lastToAdmin)
 	s.FieldEquals(tagBeginSeqNo, 1, s.MockApp.lastToAdmin.Body)
 
@@ -373,7 +373,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonSeqNumTooLow() {
 	s.Require().Nil(err)
 	s.MessageType(string(msgTypeLogout), sentMessage)
 
-	s.session.sendQueued()
+	s.session.sendQueued(true)
 	s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
 	s.FieldEquals(tagText, "MsgSeqNum too low, expecting 2 but received 1", s.MockApp.lastToAdmin.Body)
 }
diff --git a/session.go b/session.go
index b359245e2..1bf60b122 100644
--- a/session.go
+++ b/session.go
@@ -235,12 +235,16 @@ func (s *session) queueForSend(msg *Message) error {
 
 	s.toSend = append(s.toSend, msgBytes)
 
+	s.notifyMessageOut()
+
+	return nil
+}
+
+func (s *session) notifyMessageOut() {
 	select {
 	case s.messageEvent <- true:
 	default:
 	}
-
-	return nil
 }
 
 // send will validate, persist, queue the message. If the session is logged on, send all messages in the queue.
@@ -261,7 +265,7 @@ func (s *session) sendInReplyTo(msg *Message, inReplyTo *Message) error {
 	}
 
 	s.toSend = append(s.toSend, msgBytes)
-	s.sendQueued()
+	s.sendQueued(true)
 
 	return nil
 }
@@ -290,7 +294,7 @@ func (s *session) dropAndSendInReplyTo(msg *Message, inReplyTo *Message) error {
 
 	s.dropQueued()
 	s.toSend = append(s.toSend, msgBytes)
-	s.sendQueued()
+	s.sendQueued(true)
 
 	return nil
 }
@@ -346,9 +350,13 @@ func (s *session) persist(seqNum int, msgBytes []byte) error {
 	return s.store.IncrNextSenderMsgSeqNum()
 }
 
-func (s *session) sendQueued() {
-	for _, msgBytes := range s.toSend {
-		s.sendBytes(msgBytes)
+func (s *session) sendQueued(blockUntilSent bool) {
+	for i, msgBytes := range s.toSend {
+		if !s.sendBytes(msgBytes, blockUntilSent) {
+			s.toSend = s.toSend[i:]
+			s.notifyMessageOut()
+			return
+		}
 	}
 
 	s.dropQueued()
@@ -363,18 +371,30 @@ func (s *session) EnqueueBytesAndSend(msg []byte) {
 	defer s.sendMutex.Unlock()
 
 	s.toSend = append(s.toSend, msg)
-	s.sendQueued()
+	s.sendQueued(true)
 }
 
-func (s *session) sendBytes(msg []byte) {
+func (s *session) sendBytes(msg []byte, blockUntilSent bool) bool {
 	if s.messageOut == nil {
 		s.log.OnEventf("Failed to send: disconnected")
-		return
+		return false
+	}
+
+	if blockUntilSent {
+		s.messageOut <- msg
+		s.log.OnOutgoing(msg)
+		s.stateTimer.Reset(s.HeartBtInt)
+		return true
 	}
 
-	s.log.OnOutgoing(msg)
-	s.messageOut <- msg
-	s.stateTimer.Reset(s.HeartBtInt)
+	select {
+	case s.messageOut <- msg:
+		s.log.OnOutgoing(msg)
+		s.stateTimer.Reset(s.HeartBtInt)
+		return true
+	default:
+		return false
+	}
 }
 
 func (s *session) doTargetTooHigh(reject targetTooHigh) (nextState resendState, err error) {
diff --git a/session_state.go b/session_state.go
index 230ac8613..527556209 100644
--- a/session_state.go
+++ b/session_state.go
@@ -105,7 +105,7 @@ func (sm *stateMachine) SendAppMessages(session *session) {
 	defer session.sendMutex.Unlock()
 
 	if session.IsLoggedOn() {
-		session.sendQueued()
+		session.sendQueued(false)
 	} else {
 		session.dropQueued()
 	}

From 6eaa8ce004539ced3f1919ad7c22620d566814db Mon Sep 17 00:00:00 2001
From: Alexandros Kyriakakis <alexandros.kyriakakis@alpaca.markets>
Date: Thu, 1 Feb 2024 14:58:37 +0200
Subject: [PATCH 04/58] Bug: For Logon/Logout/Resend/SequenceReset messages we
 should wait until sent (#21)

## Issue
When log on request was queued because cannot be send due to connection
not ready,
Then it goes through the [main session
loop](https://github.com/alpacahq/quickfix/blob/5dcde41f3e6e68e93e1fd381761cd9c7843aec43/session.go#L821-L841)
which leads to
[SendAppMessages](https://github.com/alpacahq/quickfix/blob/5dcde41f3e6e68e93e1fd381761cd9c7843aec43/session_state.go#L107-L111)

But, since session is not logged on yet because the message queued is
the log on message, we drop the `toSend` queued messages so we lose the
log on message itself.


## Proposed solution
For important messages like Logon/Logout/Resend/SequenceReset we block
until sent.
---
 logon_state_test.go |  4 ++--
 session.go          | 19 +++++++++++++------
 session_state.go    |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/logon_state_test.go b/logon_state_test.go
index 96afc2e90..ee47a2be6 100644
--- a/logon_state_test.go
+++ b/logon_state_test.go
@@ -333,7 +333,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonSeqNumTooHigh() {
 	s.Require().Nil(err)
 	s.MessageType(string(msgTypeLogon), sentMessage)
 
-	s.session.sendQueued()
+	s.session.sendQueued(true)
 	s.MessageType(string(msgTypeResendRequest), s.MockApp.lastToAdmin)
 	s.FieldEquals(tagBeginSeqNo, 1, s.MockApp.lastToAdmin.Body)
 
@@ -373,7 +373,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonSeqNumTooLow() {
 	s.Require().Nil(err)
 	s.MessageType(string(msgTypeLogout), sentMessage)
 
-	s.session.sendQueued()
+	s.session.sendQueued(true)
 	s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
 	s.FieldEquals(tagText, "MsgSeqNum too low, expecting 2 but received 1", s.MockApp.lastToAdmin.Body)
 }
diff --git a/session.go b/session.go
index db5198e04..1bf60b122 100644
--- a/session.go
+++ b/session.go
@@ -265,7 +265,7 @@ func (s *session) sendInReplyTo(msg *Message, inReplyTo *Message) error {
 	}
 
 	s.toSend = append(s.toSend, msgBytes)
-	s.sendQueued()
+	s.sendQueued(true)
 
 	return nil
 }
@@ -294,7 +294,7 @@ func (s *session) dropAndSendInReplyTo(msg *Message, inReplyTo *Message) error {
 
 	s.dropQueued()
 	s.toSend = append(s.toSend, msgBytes)
-	s.sendQueued()
+	s.sendQueued(true)
 
 	return nil
 }
@@ -350,9 +350,9 @@ func (s *session) persist(seqNum int, msgBytes []byte) error {
 	return s.store.IncrNextSenderMsgSeqNum()
 }
 
-func (s *session) sendQueued() {
+func (s *session) sendQueued(blockUntilSent bool) {
 	for i, msgBytes := range s.toSend {
-		if !s.sendBytes(msgBytes) {
+		if !s.sendBytes(msgBytes, blockUntilSent) {
 			s.toSend = s.toSend[i:]
 			s.notifyMessageOut()
 			return
@@ -371,15 +371,22 @@ func (s *session) EnqueueBytesAndSend(msg []byte) {
 	defer s.sendMutex.Unlock()
 
 	s.toSend = append(s.toSend, msg)
-	s.sendQueued()
+	s.sendQueued(true)
 }
 
-func (s *session) sendBytes(msg []byte) bool {
+func (s *session) sendBytes(msg []byte, blockUntilSent bool) bool {
 	if s.messageOut == nil {
 		s.log.OnEventf("Failed to send: disconnected")
 		return false
 	}
 
+	if blockUntilSent {
+		s.messageOut <- msg
+		s.log.OnOutgoing(msg)
+		s.stateTimer.Reset(s.HeartBtInt)
+		return true
+	}
+
 	select {
 	case s.messageOut <- msg:
 		s.log.OnOutgoing(msg)
diff --git a/session_state.go b/session_state.go
index 230ac8613..527556209 100644
--- a/session_state.go
+++ b/session_state.go
@@ -105,7 +105,7 @@ func (sm *stateMachine) SendAppMessages(session *session) {
 	defer session.sendMutex.Unlock()
 
 	if session.IsLoggedOn() {
-		session.sendQueued()
+		session.sendQueued(false)
 	} else {
 		session.dropQueued()
 	}

From de36465571d9345dd905fdea5d52d7b204dfe4ca Mon Sep 17 00:00:00 2001
From: albert <albertsundjaja@gmail.com>
Date: Wed, 10 Apr 2024 13:49:19 +1000
Subject: [PATCH 05/58] add test for multiple repeating groups in a message

partly revert change in #368 due to breaking the unit test added in this PR
---
 validation.go      |  1 -
 validation_test.go | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/validation.go b/validation.go
index 72bb06628..58fbea80e 100644
--- a/validation.go
+++ b/validation.go
@@ -246,7 +246,6 @@ func validateVisitGroupField(fieldDef *datadictionary.FieldDef, fieldStack []Tag
 			if childDefs[0].Required() {
 				return fieldStack, RequiredTagMissing(Tag(childDefs[0].Tag()))
 			}
-			fieldStack = fieldStack[1:]
 		}
 
 		childDefs = childDefs[1:]
diff --git a/validation_test.go b/validation_test.go
index fc97944b7..85bbaf4a2 100644
--- a/validation_test.go
+++ b/validation_test.go
@@ -74,6 +74,7 @@ func TestValidate(t *testing.T) {
 		tcInvalidTagCheckDisabledFixT(),
 		tcInvalidTagCheckEnabled(),
 		tcInvalidTagCheckEnabledFixT(),
+		tcMultipleRepeatingGroupFields(),
 	}
 
 	msg := NewMessage()
@@ -923,6 +924,17 @@ func tcFloatValidationFixT() validateTest {
 	}
 }
 
+func tcMultipleRepeatingGroupFields() validateTest {
+	dict, _ := datadictionary.Parse("spec/FIX43.xml")
+	validator := NewValidator(defaultValidatorSettings, dict, nil)
+	return validateTest{
+		TestName:             "Multiple repeating group fields in a message",
+		Validator:            validator,
+		MessageBytes:         []byte("8=FIX.4.3
9=176
35=D
34=2
49=TW
52=20140329-22:38:45
56=ISLD
11=ID
453=2
448=PARTYID
452=3
523=SUBID
448=PARTYID2
452=3
78=1
79=ACCOUNT
80=1
21=1
40=1
54=1
38=200
55=INTC
60=20140329-22:38:45
10=178
"),
+		DoNotExpectReject:    true,
+	}
+}
+
 func TestValidateVisitField(t *testing.T) {
 	fieldType0 := datadictionary.NewFieldType("myfield", 11, "STRING")
 	fieldDef0 := &datadictionary.FieldDef{FieldType: fieldType0}

From aa39aa8ed3367c5cff029ad284f50c5a416d77cc Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Tue, 16 Apr 2024 16:18:39 -0500
Subject: [PATCH 06/58] Update linter

---
 .github/workflows/ci.yaml | 105 +++++++++++++++++++-------------------
 .golangci.yml             |   7 ++-
 2 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d589126a6..c42e674b0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,61 +21,60 @@ jobs:
     name: Linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.21'
-          cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.51
+          version: v1.57.2
 
-  build:
-    name: build
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: [1.21]
-        store-type:
-          -
-          - memory
-          - file
-          - mongo
-        fix-version:
-          -
-          - fix40
-          - fix41
-          - fix42
-          - fix43
-          - fix44
-          - fix50
-          - fix50sp1
-          - fix50sp2
-    steps:
-      - name: Setup
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go }}
-      - name: Check out source
-        uses: actions/checkout@v2
-      - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.8.0
-        with:
-          mongodb-replica-set: replicaset
-      - name: Install ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.0'
-      - name: Unit  test
-        env:
-          FIX_TEST: ${{ matrix.fix-version }}
-          STORE_TYPE: ${{ matrix.store-type }}
-        run: if [ -z $FIX_TEST ] && [ -z $STORE_TYPE ]; then make build-src && make test-ci; fi
-      - name: Acceptance test
-        env:
-          GO111MODULE: on
-          MONGODB_TEST_CXN: mongodb://localhost:27017
-          FIX_TEST: ${{ matrix.fix-version }}
-          STORE_TYPE: ${{ matrix.store-type }}
-        run: if [ $FIX_TEST ] && [ $STORE_TYPE ]; then make generate-ci && make build && make $FIX_TEST; fi
+  # build:
+  #   name: build
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       go: [1.21]
+  #       store-type:
+  #         -
+  #         - memory
+  #         - file
+  #         - mongo
+  #       fix-version:
+  #         -
+  #         - fix40
+  #         - fix41
+  #         - fix42
+  #         - fix43
+  #         - fix44
+  #         - fix50
+  #         - fix50sp1
+  #         - fix50sp2
+  #   steps:
+  #     - name: Setup
+  #       uses: actions/setup-go@v2
+  #       with:
+  #         go-version: ${{ matrix.go }}
+  #     - name: Check out source
+  #       uses: actions/checkout@v2
+  #     - name: Start MongoDB
+  #       uses: supercharge/mongodb-github-action@1.8.0
+  #       with:
+  #         mongodb-replica-set: replicaset
+  #     - name: Install ruby
+  #       uses: ruby/setup-ruby@v1
+  #       with:
+  #         ruby-version: '3.0'
+  #     - name: Unit  test
+  #       env:
+  #         FIX_TEST: ${{ matrix.fix-version }}
+  #         STORE_TYPE: ${{ matrix.store-type }}
+  #       run: if [ -z $FIX_TEST ] && [ -z $STORE_TYPE ]; then make build-src && make test-ci; fi
+  #     - name: Acceptance test
+  #       env:
+  #         GO111MODULE: on
+  #         MONGODB_TEST_CXN: mongodb://localhost:27017
+  #         FIX_TEST: ${{ matrix.fix-version }}
+  #         STORE_TYPE: ${{ matrix.store-type }}
+  #       run: if [ $FIX_TEST ] && [ $STORE_TYPE ]; then make generate-ci && make build && make $FIX_TEST; fi
diff --git a/.golangci.yml b/.golangci.yml
index b1bd0cccd..4d61e0126 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,11 @@
 run:
   timeout: 10m
-  skip-dirs:
+  # skip-dirs:
+  #   - gen
+  #   - vendor
+
+issues:
+  exclude-dirs:
     - gen
     - vendor
 

From a203213139ac511bef263901ec1f1452d9cd3e95 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Wed, 17 Apr 2024 21:22:52 -0500
Subject: [PATCH 07/58] Statify updated linter rules

---
 .github/workflows/ci.yaml        | 96 ++++++++++++++++----------------
 .golangci.yml                    |  1 +
 Makefile                         |  2 +-
 datadictionary/datadictionary.go |  2 +-
 logon_state.go                   |  2 +-
 logout_state.go                  |  2 +-
 memorystore.go                   |  2 +-
 message.go                       | 28 +++++-----
 null_log.go                      | 10 ++--
 quickfix_test.go                 | 14 ++---
 session_factory_test.go          |  2 +-
 store/sql/sqlstore.go            |  6 +-
 validation.go                    |  6 +-
 13 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c42e674b0..4d58289a2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,51 +30,51 @@ jobs:
         with:
           version: v1.57.2
 
-  # build:
-  #   name: build
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       go: [1.21]
-  #       store-type:
-  #         -
-  #         - memory
-  #         - file
-  #         - mongo
-  #       fix-version:
-  #         -
-  #         - fix40
-  #         - fix41
-  #         - fix42
-  #         - fix43
-  #         - fix44
-  #         - fix50
-  #         - fix50sp1
-  #         - fix50sp2
-  #   steps:
-  #     - name: Setup
-  #       uses: actions/setup-go@v2
-  #       with:
-  #         go-version: ${{ matrix.go }}
-  #     - name: Check out source
-  #       uses: actions/checkout@v2
-  #     - name: Start MongoDB
-  #       uses: supercharge/mongodb-github-action@1.8.0
-  #       with:
-  #         mongodb-replica-set: replicaset
-  #     - name: Install ruby
-  #       uses: ruby/setup-ruby@v1
-  #       with:
-  #         ruby-version: '3.0'
-  #     - name: Unit  test
-  #       env:
-  #         FIX_TEST: ${{ matrix.fix-version }}
-  #         STORE_TYPE: ${{ matrix.store-type }}
-  #       run: if [ -z $FIX_TEST ] && [ -z $STORE_TYPE ]; then make build-src && make test-ci; fi
-  #     - name: Acceptance test
-  #       env:
-  #         GO111MODULE: on
-  #         MONGODB_TEST_CXN: mongodb://localhost:27017
-  #         FIX_TEST: ${{ matrix.fix-version }}
-  #         STORE_TYPE: ${{ matrix.store-type }}
-  #       run: if [ $FIX_TEST ] && [ $STORE_TYPE ]; then make generate-ci && make build && make $FIX_TEST; fi
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+        store-type:
+          -
+          - memory
+          - file
+          - mongo
+        fix-version:
+          -
+          - fix40
+          - fix41
+          - fix42
+          - fix43
+          - fix44
+          - fix50
+          - fix50sp1
+          - fix50sp2
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.8.0
+        with:
+          mongodb-replica-set: replicaset
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - name: Unit  test
+        env:
+          FIX_TEST: ${{ matrix.fix-version }}
+          STORE_TYPE: ${{ matrix.store-type }}
+        run: if [ -z $FIX_TEST ] && [ -z $STORE_TYPE ]; then make build-src && make test-ci; fi
+      - name: Acceptance test
+        env:
+          GO111MODULE: on
+          MONGODB_TEST_CXN: mongodb://localhost:27017
+          FIX_TEST: ${{ matrix.fix-version }}
+          STORE_TYPE: ${{ matrix.store-type }}
+        run: if [ $FIX_TEST ] && [ $STORE_TYPE ]; then make generate-ci && make build && make $FIX_TEST; fi
diff --git a/.golangci.yml b/.golangci.yml
index 4d61e0126..b0bd0347b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,6 @@
 run:
   timeout: 10m
+  # deprecated config - 
   # skip-dirs:
   #   - gen
   #   - vendor
diff --git a/Makefile b/Makefile
index 9d2f26817..b05c5d72f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ test:
 linters-install:
 	@golangci-lint --version >/dev/null 2>&1 || { \
 		echo "installing linting tools..."; \
-		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.50.1; \
+		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.57.2; \
 	}
 
 lint: linters-install
diff --git a/datadictionary/datadictionary.go b/datadictionary/datadictionary.go
index b032d078e..218439497 100644
--- a/datadictionary/datadictionary.go
+++ b/datadictionary/datadictionary.go
@@ -315,7 +315,7 @@ func Parse(path string) (*DataDictionary, error) {
 func ParseSrc(xmlSrc io.Reader) (*DataDictionary, error) {
 	doc := new(XMLDoc)
 	decoder := xml.NewDecoder(xmlSrc)
-	decoder.CharsetReader = func(encoding string, input io.Reader) (io.Reader, error) {
+	decoder.CharsetReader = func(_ string, input io.Reader) (io.Reader, error) {
 		return input, nil
 	}
 
diff --git a/logon_state.go b/logon_state.go
index 05c970838..7ad8b6602 100644
--- a/logon_state.go
+++ b/logon_state.go
@@ -68,7 +68,7 @@ func (s logonState) Timeout(session *session, e internal.Event) (nextState sessi
 	return s
 }
 
-func (s logonState) Stop(session *session) (nextState sessionState) {
+func (s logonState) Stop(_ *session) (nextState sessionState) {
 	return latentState{}
 }
 
diff --git a/logout_state.go b/logout_state.go
index cee8e9bd8..04defce54 100644
--- a/logout_state.go
+++ b/logout_state.go
@@ -40,6 +40,6 @@ func (state logoutState) Timeout(session *session, event internal.Event) (nextSt
 	return state
 }
 
-func (state logoutState) Stop(session *session) (nextstate sessionState) {
+func (state logoutState) Stop(_ *session) (nextstate sessionState) {
 	return state
 }
diff --git a/memorystore.go b/memorystore.go
index 5773f09b5..2379016e2 100644
--- a/memorystore.go
+++ b/memorystore.go
@@ -109,7 +109,7 @@ func (store *memoryStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, err
 
 type memoryStoreFactory struct{}
 
-func (f memoryStoreFactory) Create(sessionID SessionID) (MessageStore, error) {
+func (f memoryStoreFactory) Create(_ SessionID) (MessageStore, error) {
 	m := new(memoryStore)
 	if err := m.Reset(); err != nil {
 		return m, errors.Wrap(err, "reset")
diff --git a/message.go b/message.go
index 566b48eb7..73da79169 100644
--- a/message.go
+++ b/message.go
@@ -152,7 +152,7 @@ func ParseMessageWithDataDictionary(
 	msg *Message,
 	rawMessage *bytes.Buffer,
 	transportDataDictionary *datadictionary.DataDictionary,
-	applicationDataDictionary *datadictionary.DataDictionary,
+	_ *datadictionary.DataDictionary,
 ) (err error) {
 	msg.Header.Clear()
 	msg.Body.Clear()
@@ -322,7 +322,7 @@ func (m *Message) IsMsgTypeOf(msgType string) bool {
 func (m *Message) reverseRoute() *Message {
 	reverseMsg := NewMessage()
 
-	copy := func(src Tag, dest Tag) {
+	copyFunc := func(src Tag, dest Tag) {
 		var field FIXString
 		if m.Header.GetField(src, &field) == nil {
 			if len(field) != 0 {
@@ -331,25 +331,25 @@ func (m *Message) reverseRoute() *Message {
 		}
 	}
 
-	copy(tagSenderCompID, tagTargetCompID)
-	copy(tagSenderSubID, tagTargetSubID)
-	copy(tagSenderLocationID, tagTargetLocationID)
+	copyFunc(tagSenderCompID, tagTargetCompID)
+	copyFunc(tagSenderSubID, tagTargetSubID)
+	copyFunc(tagSenderLocationID, tagTargetLocationID)
 
-	copy(tagTargetCompID, tagSenderCompID)
-	copy(tagTargetSubID, tagSenderSubID)
-	copy(tagTargetLocationID, tagSenderLocationID)
+	copyFunc(tagTargetCompID, tagSenderCompID)
+	copyFunc(tagTargetSubID, tagSenderSubID)
+	copyFunc(tagTargetLocationID, tagSenderLocationID)
 
-	copy(tagOnBehalfOfCompID, tagDeliverToCompID)
-	copy(tagOnBehalfOfSubID, tagDeliverToSubID)
-	copy(tagDeliverToCompID, tagOnBehalfOfCompID)
-	copy(tagDeliverToSubID, tagOnBehalfOfSubID)
+	copyFunc(tagOnBehalfOfCompID, tagDeliverToCompID)
+	copyFunc(tagOnBehalfOfSubID, tagDeliverToSubID)
+	copyFunc(tagDeliverToCompID, tagOnBehalfOfCompID)
+	copyFunc(tagDeliverToSubID, tagOnBehalfOfSubID)
 
 	// Tags added in 4.1.
 	var beginString FIXString
 	if m.Header.GetField(tagBeginString, &beginString) == nil {
 		if string(beginString) != BeginStringFIX40 {
-			copy(tagOnBehalfOfLocationID, tagDeliverToLocationID)
-			copy(tagDeliverToLocationID, tagOnBehalfOfLocationID)
+			copyFunc(tagOnBehalfOfLocationID, tagDeliverToLocationID)
+			copyFunc(tagDeliverToLocationID, tagOnBehalfOfLocationID)
 		}
 	}
 
diff --git a/null_log.go b/null_log.go
index 106dcae42..c6c0e4327 100644
--- a/null_log.go
+++ b/null_log.go
@@ -17,17 +17,17 @@ package quickfix
 
 type nullLog struct{}
 
-func (l nullLog) OnIncoming([]byte)                        {}
-func (l nullLog) OnOutgoing([]byte)                        {}
-func (l nullLog) OnEvent(string)                           {}
-func (l nullLog) OnEventf(format string, a ...interface{}) {}
+func (l nullLog) OnIncoming([]byte)                   {}
+func (l nullLog) OnOutgoing([]byte)                   {}
+func (l nullLog) OnEvent(string)                      {}
+func (l nullLog) OnEventf(_ string, _ ...interface{}) {}
 
 type nullLogFactory struct{}
 
 func (nullLogFactory) Create() (Log, error) {
 	return nullLog{}, nil
 }
-func (nullLogFactory) CreateSessionLog(sessionID SessionID) (Log, error) {
+func (nullLogFactory) CreateSessionLog(_ SessionID) (Log, error) {
 	return nullLog{}, nil
 }
 
diff --git a/quickfix_test.go b/quickfix_test.go
index beb8792bc..db308b48e 100644
--- a/quickfix_test.go
+++ b/quickfix_test.go
@@ -85,18 +85,18 @@ type MockApp struct {
 	lastToApp       *Message
 }
 
-func (e *MockApp) OnCreate(sessionID SessionID) {
+func (e *MockApp) OnCreate(_ SessionID) {
 }
 
-func (e *MockApp) OnLogon(sessionID SessionID) {
+func (e *MockApp) OnLogon(_ SessionID) {
 	e.Called()
 }
 
-func (e *MockApp) OnLogout(sessionID SessionID) {
+func (e *MockApp) OnLogout(_ SessionID) {
 	e.Called()
 }
 
-func (e *MockApp) FromAdmin(msg *Message, sessionID SessionID) (reject MessageRejectError) {
+func (e *MockApp) FromAdmin(_ *Message, _ SessionID) (reject MessageRejectError) {
 	if err, ok := e.Called().Get(0).(MessageRejectError); ok {
 		return err
 	}
@@ -104,7 +104,7 @@ func (e *MockApp) FromAdmin(msg *Message, sessionID SessionID) (reject MessageRe
 	return nil
 }
 
-func (e *MockApp) ToAdmin(msg *Message, sessionID SessionID) {
+func (e *MockApp) ToAdmin(msg *Message, _ SessionID) {
 	e.Called()
 
 	if e.decorateToAdmin != nil {
@@ -114,12 +114,12 @@ func (e *MockApp) ToAdmin(msg *Message, sessionID SessionID) {
 	e.lastToAdmin = msg
 }
 
-func (e *MockApp) ToApp(msg *Message, sessionID SessionID) (err error) {
+func (e *MockApp) ToApp(msg *Message, _ SessionID) (err error) {
 	e.lastToApp = msg
 	return e.Called().Error(0)
 }
 
-func (e *MockApp) FromApp(msg *Message, sessionID SessionID) (reject MessageRejectError) {
+func (e *MockApp) FromApp(_ *Message, _ SessionID) (reject MessageRejectError) {
 	if err, ok := e.Called().Get(0).(MessageRejectError); ok {
 		return err
 	}
diff --git a/session_factory_test.go b/session_factory_test.go
index ada14350c..d14c5b221 100644
--- a/session_factory_test.go
+++ b/session_factory_test.go
@@ -373,7 +373,7 @@ func (s *SessionFactorySuite) TestInvalidWeekdays() {
 	}
 
 	for _, testcase := range testcases {
-		s.T().Run(testcase.label, func(t *testing.T) {
+		s.T().Run(testcase.label, func(_ *testing.T) {
 			s.SessionSettings.Set(config.Weekdays, testcase.input)
 
 			_, err := s.newSession(s.SessionID, s.MessageStoreFactory, s.SessionSettings, s.LogFactory, s.App)
diff --git a/store/sql/sqlstore.go b/store/sql/sqlstore.go
index c54ac517f..7550e3012 100644
--- a/store/sql/sqlstore.go
+++ b/store/sql/sqlstore.go
@@ -50,10 +50,10 @@ func sqlString(raw string, placeholder placeholderFunc) string {
 		return raw
 	}
 	idx := 0
-	return rePlaceholder.ReplaceAllStringFunc(raw, func(s string) string {
-		new := placeholder(idx)
+	return rePlaceholder.ReplaceAllStringFunc(raw, func(_ string) string {
+		p := placeholder(idx)
 		idx++
-		return new
+		return p
 	})
 }
 
diff --git a/validation.go b/validation.go
index 72bb06628..3dddbf00f 100644
--- a/validation.go
+++ b/validation.go
@@ -149,7 +149,7 @@ func validateFIXT(transportDD, appDD *datadictionary.DataDictionary, settings Va
 	return nil
 }
 
-func validateMsgType(d *datadictionary.DataDictionary, msgType string, msg *Message) MessageRejectError {
+func validateMsgType(d *datadictionary.DataDictionary, msgType string, _ *Message) MessageRejectError {
 	if _, validMsgType := d.Messages[msgType]; !validMsgType {
 		return InvalidMessageType()
 	}
@@ -296,7 +296,7 @@ func validateRequired(transportDD *datadictionary.DataDictionary, appDD *datadic
 	return nil
 }
 
-func validateRequiredFieldMap(msg *Message, requiredTags map[int]struct{}, fieldMap FieldMap) MessageRejectError {
+func validateRequiredFieldMap(_ *Message, requiredTags map[int]struct{}, fieldMap FieldMap) MessageRejectError {
 	for required := range requiredTags {
 		requiredTag := Tag(required)
 		if !fieldMap.Has(requiredTag) {
@@ -328,7 +328,7 @@ func validateFields(transportDD *datadictionary.DataDictionary, appDD *datadicti
 	return nil
 }
 
-func validateField(d *datadictionary.DataDictionary, validFields datadictionary.TagSet, field TagValue) MessageRejectError {
+func validateField(d *datadictionary.DataDictionary, _ datadictionary.TagSet, field TagValue) MessageRejectError {
 	if len(field.value) == 0 {
 		return TagSpecifiedWithoutAValue(field.tag)
 	}

From 96baad84471a4e621eff4a45165bdc275020c105 Mon Sep 17 00:00:00 2001
From: yanghao <yanghao@webull.com>
Date: Mon, 22 Apr 2024 08:57:12 -0400
Subject: [PATCH 08/58] feat: change proxyproto pkg to support proxy proto v2

---
 accepter_test.go | 2 +-
 acceptor.go      | 2 +-
 go.mod           | 1 +
 go.sum           | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/accepter_test.go b/accepter_test.go
index 0d9f6487b..54bfff845 100644
--- a/accepter_test.go
+++ b/accepter_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/quickfixgo/quickfix/config"
 
-	proxyproto "github.com/armon/go-proxyproto"
+	proxyproto "github.com/pires/go-proxyproto"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/acceptor.go b/acceptor.go
index 879cdb17f..968be9efb 100644
--- a/acceptor.go
+++ b/acceptor.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"sync"
 
-	proxyproto "github.com/armon/go-proxyproto"
+	proxyproto "github.com/pires/go-proxyproto"
 
 	"github.com/quickfixgo/quickfix/config"
 )
diff --git a/go.mod b/go.mod
index 2f5cf33c4..2b50e4c02 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.21
 require (
 	github.com/armon/go-proxyproto v0.1.0
 	github.com/mattn/go-sqlite3 v1.14.18
+	github.com/pires/go-proxyproto v0.7.0
 	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/stretchr/testify v1.8.4
diff --git a/go.sum b/go.sum
index f3c70cab6..d178baaab 100644
--- a/go.sum
+++ b/go.sum
@@ -23,6 +23,8 @@ github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/montanaflynn/stats v0.6.6 h1:Duep6KMIDpY4Yo11iFsvyqJDyfzLF9+sndUKT+v64GQ=
 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
+github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
+github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

From 1518a203051b33370b28586a75a842eb844bd366 Mon Sep 17 00:00:00 2001
From: yanghao <yanghao@webull.com>
Date: Mon, 22 Apr 2024 09:25:05 -0400
Subject: [PATCH 09/58] fix: try to fix linter failed

---
 validation_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/validation_test.go b/validation_test.go
index 85bbaf4a2..861dd863e 100644
--- a/validation_test.go
+++ b/validation_test.go
@@ -928,10 +928,10 @@ func tcMultipleRepeatingGroupFields() validateTest {
 	dict, _ := datadictionary.Parse("spec/FIX43.xml")
 	validator := NewValidator(defaultValidatorSettings, dict, nil)
 	return validateTest{
-		TestName:             "Multiple repeating group fields in a message",
-		Validator:            validator,
-		MessageBytes:         []byte("8=FIX.4.3
9=176
35=D
34=2
49=TW
52=20140329-22:38:45
56=ISLD
11=ID
453=2
448=PARTYID
452=3
523=SUBID
448=PARTYID2
452=3
78=1
79=ACCOUNT
80=1
21=1
40=1
54=1
38=200
55=INTC
60=20140329-22:38:45
10=178
"),
-		DoNotExpectReject:    true,
+		TestName:          "Multiple repeating group fields in a message",
+		Validator:         validator,
+		MessageBytes:      []byte("8=FIX.4.3
9=176
35=D
34=2
49=TW
52=20140329-22:38:45
56=ISLD
11=ID
453=2
448=PARTYID
452=3
523=SUBID
448=PARTYID2
452=3
78=1
79=ACCOUNT
80=1
21=1
40=1
54=1
38=200
55=INTC
60=20140329-22:38:45
10=178
"),
+		DoNotExpectReject: true,
 	}
 }
 

From ad9438a454524977960bf99ab09cfabcf9ed8c07 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Tue, 23 Apr 2024 15:33:40 -0500
Subject: [PATCH 10/58] Update deps

---
 go.mod | 11 +++++------
 go.sum | 31 ++++++++++---------------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/go.mod b/go.mod
index 79325ae45..8b36cf024 100644
--- a/go.mod
+++ b/go.mod
@@ -3,14 +3,13 @@ module github.com/quickfixgo/quickfix
 go 1.21
 
 require (
-	github.com/armon/go-proxyproto v0.1.0
-	github.com/mattn/go-sqlite3 v1.14.18
+	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/pires/go-proxyproto v0.7.0
 	github.com/pkg/errors v0.9.1
-	github.com/shopspring/decimal v1.3.1
+	github.com/shopspring/decimal v1.4.0
 	github.com/stretchr/testify v1.8.4
-	go.mongodb.org/mongo-driver v1.13.0
-	golang.org/x/net v0.18.0
+	go.mongodb.org/mongo-driver v1.15.0
+	golang.org/x/net v0.24.0
 )
 
 require (
@@ -25,7 +24,7 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
diff --git a/go.sum b/go.sum
index 759546724..a7e47992c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,15 +1,11 @@
-github.com/armon/go-proxyproto v0.1.0 h1:TWWcSsjco7o2itn6r25/5AqKBiWmsiuzsUDLT/MTl7k=
-github.com/armon/go-proxyproto v0.1.0/go.mod h1:Xj90dce2VKbHzRAeiVQAMBtj4M5oidoXJ8lmgyW21mw=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
 github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
@@ -18,9 +14,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
-github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/montanaflynn/stats v0.6.6 h1:Duep6KMIDpY4Yo11iFsvyqJDyfzLF9+sndUKT+v64GQ=
 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
@@ -29,8 +24,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
@@ -45,26 +40,23 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
 github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
-github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
 github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mongodb.org/mongo-driver v1.13.0 h1:67DgFFjYOCMWdtTEmKFpV3ffWlFnh+CYZ8ZS/tXWUfY=
-go.mongodb.org/mongo-driver v1.13.0/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
+go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc=
+go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
@@ -72,7 +64,6 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -80,10 +71,8 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

From 2f15490245bd902038f62934a1f08fb448bcd850 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Tue, 23 Apr 2024 15:48:53 -0500
Subject: [PATCH 11/58] v0.9.2 release notes

---
 CHANGELOG.md        | 8 ++++++++
 fix_decimal_test.go | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a17b6aff..157000a68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,12 @@
+## 0.9.2 (April 23, 2024)
+
+### BUG FIXES
+* Prevent message queue blocking in the case of network connection trouble https://github.com/quickfixgo/quickfix/pull/615 https://github.com/quickfixgo/quickfix/pull/628
+* Corrects validation of multiple repeating groups with different fields https://github.com/quickfixgo/quickfix/pull/623
+
 ## 0.9.1 (April 15, 2024)
+
+### BUG FIXES
 * Preserve original body when resending https://github.com/quickfixgo/quickfix/pull/624
 
 ## 0.9.0 (November 13, 2023)
diff --git a/fix_decimal_test.go b/fix_decimal_test.go
index f6fc3d53c..7c8d3a265 100644
--- a/fix_decimal_test.go
+++ b/fix_decimal_test.go
@@ -60,7 +60,7 @@ func TestFIXDecimalRead(t *testing.T) {
 		require.Equal(t, test.expectError, err != nil)
 
 		if !test.expectError {
-			assert.True(t, test.expected.Equals(field.Decimal), "Expected %s got %s", test.expected, field.Decimal)
+			assert.True(t, test.expected.Equal(field.Decimal), "Expected %s got %s", test.expected, field.Decimal)
 		}
 	}
 }

From e2a2f27797497e8d713ada1609e7c829db8253c3 Mon Sep 17 00:00:00 2001
From: yanghao <yanghao@webull.com>
Date: Thu, 25 Apr 2024 05:03:37 -0400
Subject: [PATCH 12/58] feat: AllowUnknownMessageFields &
 CheckUserDefinedFields

---
 config/configuration.go |   2 +
 session_factory.go      |  12 +++
 validation.go           |  80 ++++++++++++++-----
 validation_test.go      | 170 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 244 insertions(+), 20 deletions(-)

diff --git a/config/configuration.go b/config/configuration.go
index 2c73ac369..b5fa7c28a 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -66,6 +66,8 @@ const (
 	MaxLatency                   string = "MaxLatency"
 	PersistMessages              string = "PersistMessages"
 	RejectInvalidMessage         string = "RejectInvalidMessage"
+	AllowUnknownMessageFields    string = "AllowUnknownMessageFields"
+	CheckUserDefinedFields       string = "CheckUserDefinedFields"
 	DynamicSessions              string = "DynamicSessions"
 	DynamicQualifier             string = "DynamicQualifier"
 )
diff --git a/session_factory.go b/session_factory.go
index f28e552bd..37818deb9 100644
--- a/session_factory.go
+++ b/session_factory.go
@@ -99,6 +99,18 @@ func (f sessionFactory) newSession(
 		}
 	}
 
+	if settings.HasSetting(config.AllowUnknownMessageFields) {
+		if validatorSettings.AllowUnknownMessageFields, err = settings.BoolSetting(config.AllowUnknownMessageFields); err != nil {
+			return
+		}
+	}
+
+	if settings.HasSetting(config.CheckUserDefinedFields) {
+		if validatorSettings.CheckUserDefinedFields, err = settings.BoolSetting(config.CheckUserDefinedFields); err != nil {
+			return
+		}
+	}
+
 	if sessionID.IsFIXT() {
 		if s.DefaultApplVerID, err = settings.Setting(config.DefaultApplVerID); err != nil {
 			return
diff --git a/validation.go b/validation.go
index 23564ca3d..e9b718138 100644
--- a/validation.go
+++ b/validation.go
@@ -19,6 +19,10 @@ import (
 	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
+const (
+	UserDefinedTagMin int = 5000
+)
+
 // Validator validates a FIX message.
 type Validator interface {
 	Validate(*Message) MessageRejectError
@@ -26,15 +30,19 @@ type Validator interface {
 
 // ValidatorSettings describe validation behavior.
 type ValidatorSettings struct {
-	CheckFieldsOutOfOrder bool
-	RejectInvalidMessage  bool
+	CheckFieldsOutOfOrder     bool
+	RejectInvalidMessage      bool
+	AllowUnknownMessageFields bool
+	CheckUserDefinedFields    bool
 }
 
 // Default configuration for message validation.
 // See http://www.quickfixengine.org/quickfix/doc/html/configuration.html.
 var defaultValidatorSettings = ValidatorSettings{
-	CheckFieldsOutOfOrder: true,
-	RejectInvalidMessage:  true,
+	CheckFieldsOutOfOrder:     true,
+	RejectInvalidMessage:      true,
+	AllowUnknownMessageFields: false,
+	CheckUserDefinedFields:    true,
 }
 
 type fixValidator struct {
@@ -109,11 +117,11 @@ func validateFIX(d *datadictionary.DataDictionary, settings ValidatorSettings, m
 	}
 
 	if settings.RejectInvalidMessage {
-		if err := validateFields(d, d, msgType, msg); err != nil {
+		if err := validateFields(d, d, settings, msgType, msg); err != nil {
 			return err
 		}
 
-		if err := validateWalk(d, d, msgType, msg); err != nil {
+		if err := validateWalk(d, d, settings, msgType, msg); err != nil {
 			return err
 		}
 	}
@@ -137,11 +145,11 @@ func validateFIXT(transportDD, appDD *datadictionary.DataDictionary, settings Va
 	}
 
 	if settings.RejectInvalidMessage {
-		if err := validateFields(transportDD, appDD, msgType, msg); err != nil {
+		if err := validateFields(transportDD, appDD, settings, msgType, msg); err != nil {
 			return err
 		}
 
-		if err := validateWalk(transportDD, appDD, msgType, msg); err != nil {
+		if err := validateWalk(transportDD, appDD, settings, msgType, msg); err != nil {
 			return err
 		}
 	}
@@ -156,7 +164,7 @@ func validateMsgType(d *datadictionary.DataDictionary, msgType string, _ *Messag
 	return nil
 }
 
-func validateWalk(transportDD *datadictionary.DataDictionary, appDD *datadictionary.DataDictionary, msgType string, msg *Message) MessageRejectError {
+func validateWalk(transportDD *datadictionary.DataDictionary, appDD *datadictionary.DataDictionary, settings ValidatorSettings, msgType string, msg *Message) MessageRejectError {
 	remainingFields := msg.fields
 	iteratedTags := make(datadictionary.TagSet)
 
@@ -178,15 +186,19 @@ func validateWalk(transportDD *datadictionary.DataDictionary, appDD *datadiction
 			messageDef = appDD.Messages[msgType]
 		}
 
-		if fieldDef, ok = messageDef.Fields[int(tag)]; !ok {
-			return TagNotDefinedForThisMessageType(tag)
-		}
-
 		if _, duplicate := iteratedTags[int(tag)]; duplicate {
 			return tagAppearsMoreThanOnce(tag)
 		}
 		iteratedTags.Add(int(tag))
 
+		if fieldDef, ok = messageDef.Fields[int(tag)]; !ok {
+			if !checkFieldNotDefined(settings, tag) {
+				return TagNotDefinedForThisMessageType(tag)
+			}
+			remainingFields = remainingFields[1:]
+			continue
+		}
+
 		if remainingFields, err = validateVisitField(fieldDef, remainingFields); err != nil {
 			return err
 		}
@@ -306,19 +318,24 @@ func validateRequiredFieldMap(_ *Message, requiredTags map[int]struct{}, fieldMa
 	return nil
 }
 
-func validateFields(transportDD *datadictionary.DataDictionary, appDD *datadictionary.DataDictionary, msgType string, message *Message) MessageRejectError {
+func validateFields(transportDD *datadictionary.DataDictionary,
+	appDD *datadictionary.DataDictionary,
+	settings ValidatorSettings,
+	msgType string,
+	message *Message,
+) MessageRejectError {
 	for _, field := range message.fields {
 		switch {
 		case field.tag.IsHeader():
-			if err := validateField(transportDD, transportDD.Header.Tags, field); err != nil {
+			if err := validateField(transportDD, settings, transportDD.Header.Tags, field); err != nil {
 				return err
 			}
 		case field.tag.IsTrailer():
-			if err := validateField(transportDD, transportDD.Trailer.Tags, field); err != nil {
+			if err := validateField(transportDD, settings, transportDD.Trailer.Tags, field); err != nil {
 				return err
 			}
 		default:
-			if err := validateField(appDD, appDD.Messages[msgType].Tags, field); err != nil {
+			if err := validateField(appDD, settings, appDD.Messages[msgType].Tags, field); err != nil {
 				return err
 			}
 		}
@@ -327,15 +344,39 @@ func validateFields(transportDD *datadictionary.DataDictionary, appDD *datadicti
 	return nil
 }
 
-func validateField(d *datadictionary.DataDictionary, _ datadictionary.TagSet, field TagValue) MessageRejectError {
+func getFieldType(d *datadictionary.DataDictionary, field int) (*datadictionary.FieldType, bool) {
+	fieldType, isMessageField := d.FieldTypeByTag[field]
+	return fieldType, isMessageField
+}
+
+func checkFieldNotDefined(settings ValidatorSettings, field Tag) bool {
+	fail := false
+	if int(field) < UserDefinedTagMin {
+		fail = !settings.AllowUnknownMessageFields
+	} else {
+		fail = settings.CheckUserDefinedFields
+	}
+	return !fail
+}
+
+func validateField(d *datadictionary.DataDictionary,
+	settings ValidatorSettings,
+	_ datadictionary.TagSet,
+	field TagValue,
+) MessageRejectError {
 	if len(field.value) == 0 {
 		return TagSpecifiedWithoutAValue(field.tag)
 	}
 
-	if _, valid := d.FieldTypeByTag[int(field.tag)]; !valid {
+	fieldType, isMessageField := getFieldType(d, int(field.tag))
+	if !isMessageField && !checkFieldNotDefined(settings, field.tag) {
 		return InvalidTagNumber(field.tag)
 	}
 
+	if !isMessageField {
+		return nil
+	}
+
 	allowedValues := d.FieldTypeByTag[int(field.tag)].Enums
 	if len(allowedValues) != 0 {
 		if _, validValue := allowedValues[string(field.value)]; !validValue {
@@ -343,7 +384,6 @@ func validateField(d *datadictionary.DataDictionary, _ datadictionary.TagSet, fi
 		}
 	}
 
-	fieldType := d.FieldTypeByTag[int(field.tag)]
 	var prototype FieldValue
 	switch fieldType.Type {
 	case "MULTIPLESTRINGVALUE", "MULTIPLEVALUESTRING":
diff --git a/validation_test.go b/validation_test.go
index 861dd863e..1647dc94e 100644
--- a/validation_test.go
+++ b/validation_test.go
@@ -74,6 +74,14 @@ func TestValidate(t *testing.T) {
 		tcInvalidTagCheckDisabledFixT(),
 		tcInvalidTagCheckEnabled(),
 		tcInvalidTagCheckEnabledFixT(),
+		tcAllowUnknownMessageFieldsEnabled(),
+		tcAllowUnknownMessageFieldsEnabledFixT(),
+		tcAllowUnknownMessageFieldsDisabled(),
+		tcAllowUnknownMessageFieldsDisabledFixT(),
+		tcCheckUserDefinedFieldsEnabled(),
+		tcCheckUserDefinedFieldsEnabledFixT(),
+		tcCheckUserDefinedFieldsDisabled(),
+		tcCheckUserDefinedFieldsDisabledFixT(),
 		tcMultipleRepeatingGroupFields(),
 	}
 
@@ -786,6 +794,168 @@ func tcInvalidTagCheckEnabledFixT() validateTest {
 	}
 }
 
+func tcAllowUnknownMessageFieldsEnabled() validateTest {
+	dict, _ := datadictionary.Parse("spec/FIX40.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.AllowUnknownMessageFields = true
+	validator := NewValidator(customValidatorSettings, dict, nil)
+
+	builder := createFIX40NewOrderSingle()
+	tag := Tag(41)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:          "Allow Unknown Message Fields - Enabled",
+		Validator:         validator,
+		MessageBytes:      msgBytes,
+		DoNotExpectReject: true,
+	}
+}
+
+func tcAllowUnknownMessageFieldsEnabledFixT() validateTest {
+	tDict, _ := datadictionary.Parse("spec/FIXT11.xml")
+	appDict, _ := datadictionary.Parse("spec/FIX50SP2.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.AllowUnknownMessageFields = true
+	validator := NewValidator(customValidatorSettings, appDict, tDict)
+
+	builder := createFIX50SP2NewOrderSingle()
+	tag := Tag(41)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:          "Allow Unknown Message Fields - Enabled FIXT",
+		Validator:         validator,
+		MessageBytes:      msgBytes,
+		DoNotExpectReject: true,
+	}
+}
+
+func tcAllowUnknownMessageFieldsDisabled() validateTest {
+	dict, _ := datadictionary.Parse("spec/FIX40.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.AllowUnknownMessageFields = false
+	validator := NewValidator(customValidatorSettings, dict, nil)
+
+	builder := createFIX40NewOrderSingle()
+	tag := Tag(41)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:             "Allow Unknown Message Fields - Disabled",
+		Validator:            validator,
+		MessageBytes:         msgBytes,
+		DoNotExpectReject:    false,
+		ExpectedRejectReason: rejectReasonTagNotDefinedForThisMessageType,
+		ExpectedRefTagID:     &tag,
+	}
+}
+
+func tcAllowUnknownMessageFieldsDisabledFixT() validateTest {
+	tDict, _ := datadictionary.Parse("spec/FIXT11.xml")
+	appDict, _ := datadictionary.Parse("spec/FIX50SP2.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.RejectInvalidMessage = true
+	validator := NewValidator(customValidatorSettings, appDict, tDict)
+
+	builder := createFIX50SP2NewOrderSingle()
+	tag := Tag(41)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:             "Allow Unknown Message Fields - Disabled FIXT",
+		Validator:            validator,
+		MessageBytes:         msgBytes,
+		DoNotExpectReject:    false,
+		ExpectedRejectReason: rejectReasonTagNotDefinedForThisMessageType,
+		ExpectedRefTagID:     &tag,
+	}
+}
+
+func tcCheckUserDefinedFieldsEnabled() validateTest {
+	dict, _ := datadictionary.Parse("spec/FIX40.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.CheckUserDefinedFields = true
+	validator := NewValidator(customValidatorSettings, dict, nil)
+
+	builder := createFIX40NewOrderSingle()
+	tag := Tag(9999)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:          "Check User Defined Fields - Enabled",
+		Validator:         validator,
+		MessageBytes:      msgBytes,
+		DoNotExpectReject: false,
+		ExpectedRefTagID:  &tag,
+	}
+}
+
+func tcCheckUserDefinedFieldsEnabledFixT() validateTest {
+	tDict, _ := datadictionary.Parse("spec/FIXT11.xml")
+	appDict, _ := datadictionary.Parse("spec/FIX50SP2.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.RejectInvalidMessage = true
+	validator := NewValidator(customValidatorSettings, appDict, tDict)
+
+	builder := createFIX50SP2NewOrderSingle()
+	tag := Tag(9999)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:          "Check User Defined Fields - Enabled FIXT",
+		Validator:         validator,
+		MessageBytes:      msgBytes,
+		DoNotExpectReject: false,
+		ExpectedRefTagID:  &tag,
+	}
+}
+
+func tcCheckUserDefinedFieldsDisabled() validateTest {
+	dict, _ := datadictionary.Parse("spec/FIX40.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.CheckUserDefinedFields = false
+	validator := NewValidator(customValidatorSettings, dict, nil)
+
+	builder := createFIX40NewOrderSingle()
+	tag := Tag(9999)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:          "Check User Defined Fields - Disabled",
+		Validator:         validator,
+		MessageBytes:      msgBytes,
+		DoNotExpectReject: true,
+	}
+}
+
+func tcCheckUserDefinedFieldsDisabledFixT() validateTest {
+	tDict, _ := datadictionary.Parse("spec/FIXT11.xml")
+	appDict, _ := datadictionary.Parse("spec/FIX50SP2.xml")
+	customValidatorSettings := defaultValidatorSettings
+	customValidatorSettings.CheckUserDefinedFields = false
+	validator := NewValidator(customValidatorSettings, appDict, tDict)
+
+	builder := createFIX50SP2NewOrderSingle()
+	tag := Tag(9999)
+	builder.Body.SetField(tag, FIXString("hello"))
+	msgBytes := builder.build()
+
+	return validateTest{
+		TestName:          "Check User Defined Fields - Disabled FIXT",
+		Validator:         validator,
+		MessageBytes:      msgBytes,
+		DoNotExpectReject: true,
+	}
+}
+
 func tcTagSpecifiedOutOfRequiredOrderDisabledHeader() validateTest {
 	dict, _ := datadictionary.Parse("spec/FIX40.xml")
 	customValidatorSettings := defaultValidatorSettings

From 74fd67b4acc4dd8ca03d92dec7e565fc39f96f0a Mon Sep 17 00:00:00 2001
From: yanghao <yanghao@webull.com>
Date: Thu, 25 Apr 2024 05:11:31 -0400
Subject: [PATCH 13/58] change options to keep same with quickfixj

---
 config/configuration.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/configuration.go b/config/configuration.go
index b5fa7c28a..bf3044dba 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -66,8 +66,8 @@ const (
 	MaxLatency                   string = "MaxLatency"
 	PersistMessages              string = "PersistMessages"
 	RejectInvalidMessage         string = "RejectInvalidMessage"
-	AllowUnknownMessageFields    string = "AllowUnknownMessageFields"
-	CheckUserDefinedFields       string = "CheckUserDefinedFields"
+	AllowUnknownMessageFields    string = "AllowUnknownMsgFields"
+	CheckUserDefinedFields       string = "ValidateUserDefinedFields"
 	DynamicSessions              string = "DynamicSessions"
 	DynamicQualifier             string = "DynamicQualifier"
 )

From b9e203b4538236a168b9a09866b1f00b6e12f887 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Thu, 25 Apr 2024 17:09:02 -0500
Subject: [PATCH 14/58] Corrects ResetOnLogon for initiators

---
 Makefile         | 24 +++++++++++++++---------
 session.go       |  3 +--
 session_state.go |  8 ++++++++
 session_test.go  | 10 +++++++---
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index b05c5d72f..b68843f3c 100644
--- a/Makefile
+++ b/Makefile
@@ -28,24 +28,30 @@ lint: linters-install
 # ---------------------------------------------------------------
 # Targets related to running acceptance tests -
 
+ifdef STORE_TYPE
+STORE := $(STORE_TYPE)
+else
+STORE := memory
+endif
+
 build-test-srv:
-	cd _test; go build -o echo_server ./test-server/
+	cd _test; go build -v -o echo_server ./test-server/
 fix40:
-	cd _test; ./runat.sh $@.cfg 5001 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5001 $(STORE) "definitions/server/$@/*.def"
 fix41:
-	cd _test; ./runat.sh $@.cfg 5002 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5002 $(STORE) "definitions/server/$@/*.def"
 fix42:
-	cd _test; ./runat.sh $@.cfg 5003 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5003 $(STORE) "definitions/server/$@/*.def"
 fix43:
-	cd _test; ./runat.sh $@.cfg 5004 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5004 $(STORE) "definitions/server/$@/*.def"
 fix44:
-	cd _test; ./runat.sh $@.cfg 5005 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5005 $(STORE) "definitions/server/$@/*.def"
 fix50:
-	cd _test; ./runat.sh $@.cfg 5006 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5006 $(STORE) "definitions/server/$@/*.def"
 fix50sp1:
-	cd _test; ./runat.sh $@.cfg 5007 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5007 $(STORE) "definitions/server/$@/*.def"
 fix50sp2:
-	cd _test; ./runat.sh $@.cfg 5008 $(STORE_TYPE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5008 $(STORE) "definitions/server/$@/*.def"
 
 ACCEPT_SUITE=fix40 fix41 fix42 fix43 fix44 fix50 fix50sp1 fix50sp2 
 accept: $(ACCEPT_SUITE)
diff --git a/session.go b/session.go
index 1bf60b122..5ab8c5edc 100644
--- a/session.go
+++ b/session.go
@@ -310,8 +310,6 @@ func (s *session) prepMessageForSend(msg *Message, inReplyTo *Message) (msgBytes
 	}
 
 	if isAdminMessageType(msgType) {
-		s.application.ToAdmin(msg, s.sessionID)
-
 		if bytes.Equal(msgType, msgTypeLogon) {
 			var resetSeqNumFlag FIXBoolean
 			if msg.Body.Has(tagResetSeqNumFlag) {
@@ -330,6 +328,7 @@ func (s *session) prepMessageForSend(msg *Message, inReplyTo *Message) (msgBytes
 				msg.Header.SetField(tagMsgSeqNum, FIXInt(seqNum))
 			}
 		}
+		s.application.ToAdmin(msg, s.sessionID)
 	} else {
 		if err = s.application.ToApp(msg, s.sessionID); err != nil {
 			return
diff --git a/session_state.go b/session_state.go
index 527556209..2c8b84d3c 100644
--- a/session_state.go
+++ b/session_state.go
@@ -49,6 +49,14 @@ func (sm *stateMachine) Connect(session *session) {
 			return
 		}
 	}
+
+	if session.ResetOnLogon {
+		if err := session.store.Reset(); err != nil {
+			session.logError(err)
+			return
+		}
+	}
+
 	session.log.OnEvent("Sending logon request")
 	if err := session.sendLogon(); err != nil {
 		session.logError(err)
diff --git a/session_test.go b/session_test.go
index b9a70c9b5..9308ec4f0 100644
--- a/session_test.go
+++ b/session_test.go
@@ -673,14 +673,18 @@ func (s *SessionSuite) TestInitiateLogonResetSeqNumFlag() {
 	}
 	s.session.State = latentState{}
 	s.session.HeartBtInt = time.Duration(45) * time.Second
+	s.Require().Nil(s.store.Reset())
+	s.NextSenderMsgSeqNum(1)
+	s.NextTargetMsgSeqNum(1)
 	s.IncrNextTargetMsgSeqNum()
 	s.IncrNextSenderMsgSeqNum()
+	s.session.ResetOnLogon = true
 	s.session.InitiateLogon = true
 
+	s.NextSenderMsgSeqNum(2)
+	s.NextTargetMsgSeqNum(2)
+
 	s.MockApp.On("ToAdmin")
-	s.MockApp.decorateToAdmin = func(msg *Message) {
-		msg.Body.SetField(tagResetSeqNumFlag, FIXBoolean(true))
-	}
 	s.session.onAdmin(adminMsg)
 
 	s.MockApp.AssertExpectations(s.T())

From d5914471817c475393c8abc07cc0a0e97b4b0678 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Wed, 1 May 2024 12:40:12 -0500
Subject: [PATCH 15/58] Failing unit test for message with repeating group

---
 message_test.go | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/message_test.go b/message_test.go
index fa60b3fd1..392690f92 100644
--- a/message_test.go
+++ b/message_test.go
@@ -146,6 +146,29 @@ func (s *MessageSuite) TestReBuild() {
 	s.True(bytes.Equal(s.msg.bodyBytes, expectedBodyBytes), "Incorrect body bytes, got %s", string(s.msg.bodyBytes))
 }
 
+func (s *MessageSuite) TestRebuildWithRepeatingGroup() {
+
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string
+	rawMsg := bytes.NewBufferString("8=FIX.4.4
9=210
35=D
34=2
347=UTF-8
52=20231231-20:19:41
49=01001
50=01001a
56=TEST
44=12
11=13976
1=10100400
21=1
386=1
336=NOPL
55=SYMABC
54=1
60=20231231-20:19:41
38=1
40=2
59=0
453=1
448=4501
447=D
452=28
354=6
355=Public
10=104
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+
+	// this method does result in test passing. 
+	//s.msg.buildWithBodyBytes(s.msg.bodyBytes)
+
+	expectedBytes := []byte("8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
347=UTF-8
44=12
11=13976
1=10100400
21=1
386=1
336=NOPL
55=SYMABC
54=1
60=20231231-20:19:41
38=1
40=2
59=0
453=1
448=4501
447=D
452=28
354=6
355=Public
10=104
")
+
+	// Then the bytes should be the same with repeating group properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n +%s\n -%s", rebuildBytes, expectedBytes)
+}
+
 func (s *MessageSuite) TestReBuildWithRepeatingGroupForResend() {
 	// Given the following message with a repeating group
 	origHeader := "8=FIXT.1.1
9=161
35=8
34=3
49=ISLD
52=20240415-03:43:17.923
56=TW
"

From 66598652962cae72b89271ecc5310f0bd4442639 Mon Sep 17 00:00:00 2001
From: SNORRIS721 <stn721@gmail.com>
Date: Fri, 3 May 2024 10:36:01 -0500
Subject: [PATCH 16/58] Unregistering sessions on initiator close

---
 initiator.go            |  8 ++++++++
 session_factory_test.go | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/initiator.go b/initiator.go
index 1b48ce4ce..b8735e388 100644
--- a/initiator.go
+++ b/initiator.go
@@ -73,6 +73,14 @@ func (i *Initiator) Stop() {
 	default:
 	}
 	close(i.stopChan)
+
+	for sessionID := range i.sessionSettings {
+		err := UnregisterSession(sessionID)
+		if err != nil {
+			return
+		}
+	}
+
 	i.wg.Wait()
 }
 
diff --git a/session_factory_test.go b/session_factory_test.go
index d14c5b221..349e7580c 100644
--- a/session_factory_test.go
+++ b/session_factory_test.go
@@ -472,6 +472,23 @@ func (s *SessionFactorySuite) TestNewSessionBuildInitiators() {
 	s.Equal("127.0.0.1:5000", session.SocketConnectAddress[0])
 }
 
+func (s *SessionFactorySuite) TestDuplicateSession() {
+	s.sessionFactory.BuildInitiators = true
+	s.SessionSettings.Set(config.HeartBtInt, "34")
+	s.SessionSettings.Set(config.SocketConnectHost, "127.0.0.1")
+	s.SessionSettings.Set(config.SocketConnectPort, "5000")
+
+	session, err := s.createSession(s.SessionID, s.MessageStoreFactory, s.SessionSettings, s.LogFactory, s.App)
+	s.Nil(err)
+	s.True(session.InitiateLogon)
+	_, err = s.createSession(s.SessionID, s.MessageStoreFactory, s.SessionSettings, s.LogFactory, s.App)
+	s.NotNil(err)
+	s.Equal("Duplicate SessionID", err.Error())
+	UnregisterSession(s.SessionID)
+	_, err = s.createSession(s.SessionID, s.MessageStoreFactory, s.SessionSettings, s.LogFactory, s.App)
+	s.Nil(err)
+}
+
 func (s *SessionFactorySuite) TestNewSessionBuildAcceptors() {
 	s.sessionFactory.BuildInitiators = false
 	s.SessionSettings.Set(config.HeartBtInt, "34")

From cf3fb987067e504e3c9105e95161008d496f5f55 Mon Sep 17 00:00:00 2001
From: SNORRIS721 <stn721@gmail.com>
Date: Fri, 3 May 2024 13:50:51 -0500
Subject: [PATCH 17/58] Unregistering sessions on acceptor stop

---
 acceptor.go  | 7 +++++++
 initiator.go | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/acceptor.go b/acceptor.go
index 968be9efb..da4cd9bb0 100644
--- a/acceptor.go
+++ b/acceptor.go
@@ -144,6 +144,13 @@ func (a *Acceptor) Stop() {
 		session.stop()
 	}
 	a.sessionGroup.Wait()
+
+	for sessionID := range a.sessions {
+		err := UnregisterSession(sessionID)
+		if err != nil {
+			return
+		}
+	}
 }
 
 // RemoteAddr gets remote IP address for a given session.
diff --git a/initiator.go b/initiator.go
index b8735e388..eeff30fc0 100644
--- a/initiator.go
+++ b/initiator.go
@@ -74,14 +74,14 @@ func (i *Initiator) Stop() {
 	}
 	close(i.stopChan)
 
+	i.wg.Wait()
+
 	for sessionID := range i.sessionSettings {
 		err := UnregisterSession(sessionID)
 		if err != nil {
 			return
 		}
 	}
-
-	i.wg.Wait()
 }
 
 // NewInitiator creates and initializes a new Initiator.

From 668e1f4e7693f03d969711cb1fe430ac91dfb9f2 Mon Sep 17 00:00:00 2001
From: SNORRIS721 <stn721@gmail.com>
Date: Wed, 8 May 2024 12:36:14 -0500
Subject: [PATCH 18/58] Changing filestore.offsets from map[int]msgDef to
 sync.Map

---
 store/file/filestore.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/store/file/filestore.go b/store/file/filestore.go
index 4a3dadb5d..43c647a97 100644
--- a/store/file/filestore.go
+++ b/store/file/filestore.go
@@ -22,6 +22,7 @@ import (
 	"path"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/pkg/errors"
@@ -42,7 +43,7 @@ type fileStoreFactory struct {
 type fileStore struct {
 	sessionID          quickfix.SessionID
 	cache              quickfix.MessageStore
-	offsets            map[int]msgDef
+	offsets            sync.Map
 	bodyFname          string
 	headerFname        string
 	sessionFname       string
@@ -106,7 +107,7 @@ func newFileStore(sessionID quickfix.SessionID, dirname string, fileSync bool) (
 	store := &fileStore{
 		sessionID:          sessionID,
 		cache:              memStore,
-		offsets:            make(map[int]msgDef),
+		offsets:            sync.Map{},
 		bodyFname:          path.Join(dirname, fmt.Sprintf("%s.%s", sessionPrefix, "body")),
 		headerFname:        path.Join(dirname, fmt.Sprintf("%s.%s", sessionPrefix, "header")),
 		sessionFname:       path.Join(dirname, fmt.Sprintf("%s.%s", sessionPrefix, "session")),
@@ -206,7 +207,7 @@ func (store *fileStore) populateCache() (creationTimePopulated bool, err error)
 			if cnt, err := fmt.Fscanf(tmpHeaderFile, "%d,%d,%d\n", &seqNum, &offset, &size); err != nil || cnt != 3 {
 				break
 			}
-			store.offsets[seqNum] = msgDef{offset: offset, size: size}
+			store.offsets.Store(seqNum, msgDef{offset: offset, size: size})
 		}
 	}
 
@@ -347,7 +348,7 @@ func (store *fileStore) SaveMessage(seqNum int, msg []byte) error {
 		}
 	}
 
-	store.offsets[seqNum] = msgDef{offset: offset, size: len(msg)}
+	store.offsets.Store(seqNum, msgDef{offset: offset, size: len(msg)})
 	return nil
 }
 
@@ -360,7 +361,7 @@ func (store *fileStore) SaveMessageAndIncrNextSenderMsgSeqNum(seqNum int, msg []
 }
 
 func (store *fileStore) getMessage(seqNum int) (msg []byte, found bool, err error) {
-	msgInfo, found := store.offsets[seqNum]
+	msgInfo, found := store.offsets.Load(seqNum)
 	if !found {
 		return
 	}

From ff456d7fc377bc7527c76561e5d099943104ea3c Mon Sep 17 00:00:00 2001
From: SNORRIS721 <stn721@gmail.com>
Date: Wed, 8 May 2024 13:04:25 -0500
Subject: [PATCH 19/58] fixing msgdef type error

---
 store/file/filestore.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/store/file/filestore.go b/store/file/filestore.go
index 43c647a97..1c6e26889 100644
--- a/store/file/filestore.go
+++ b/store/file/filestore.go
@@ -361,10 +361,11 @@ func (store *fileStore) SaveMessageAndIncrNextSenderMsgSeqNum(seqNum int, msg []
 }
 
 func (store *fileStore) getMessage(seqNum int) (msg []byte, found bool, err error) {
-	msgInfo, found := store.offsets.Load(seqNum)
+	msgInfoTemp, found := store.offsets.Load(seqNum)
 	if !found {
 		return
 	}
+	msgInfo := msgInfoTemp.(msgDef)
 
 	msg = make([]byte, msgInfo.size)
 	if _, err = store.bodyFile.ReadAt(msg, msgInfo.offset); err != nil {

From 60846b973de7105a88300b660d2db3a64f7a05c1 Mon Sep 17 00:00:00 2001
From: SNORRIS721 <stn721@gmail.com>
Date: Wed, 8 May 2024 15:51:32 -0500
Subject: [PATCH 20/58] adding error handling to type cast

---
 store/file/filestore.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/store/file/filestore.go b/store/file/filestore.go
index 1c6e26889..0cc1e3c33 100644
--- a/store/file/filestore.go
+++ b/store/file/filestore.go
@@ -365,7 +365,10 @@ func (store *fileStore) getMessage(seqNum int) (msg []byte, found bool, err erro
 	if !found {
 		return
 	}
-	msgInfo := msgInfoTemp.(msgDef)
+	msgInfo, ok := msgInfoTemp.(msgDef)
+	if !ok {
+		return nil, true, fmt.Errorf("incorrect msgInfo type while reading file: %s", store.bodyFname)
+	}
 
 	msg = make([]byte, msgInfo.size)
 	if _, err = store.bodyFile.ReadAt(msg, msgInfo.offset); err != nil {

From fbe0cd7163d9284bacf2238c673e878c04fa520d Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Thu, 9 May 2024 13:52:37 -0500
Subject: [PATCH 21/58] v0.9.3 release notes

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 157000a68..512df8d89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.9.3 (May 9, 2024)
+
+### BUG FIXES
+* Change filestore.offsets from map[int]msgDef to sync.Map https://github.com/quickfixgo/quickfix/pull/639
+* Unregister sessions on stop https://github.com/quickfixgo/quickfix/pull/637
+* Corrects ResetOnLogon behavior for initiators https://github.com/quickfixgo/quickfix/pull/635
+
+### FEATURES
+* Add AllowUnknownMessageFields & CheckUserDefinedFields settings as included in QuickFIX/J https://github.com/quickfixgo/quickfix/pull/632
+
 ## 0.9.2 (April 23, 2024)
 
 ### BUG FIXES

From 6889cf10c445cd62f6de53165d2ec27ebc01d167 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Thu, 16 May 2024 13:46:42 -0500
Subject: [PATCH 22/58] Adds proper parsing for repeating groups to keep group
 field order

---
 in_session.go   |   6 +-
 message.go      | 283 ++++++++++++++++++++++++++++++++++++++----------
 message_test.go | 228 ++++++++++++++++++++++++++++++++++++--
 session.go      |   1 +
 4 files changed, 452 insertions(+), 66 deletions(-)

diff --git a/in_session.go b/in_session.go
index f157f3ea2..6f189bf49 100644
--- a/in_session.go
+++ b/in_session.go
@@ -232,7 +232,11 @@ func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int
 	nextSeqNum := seqNum
 	msg := NewMessage()
 	for _, msgBytes := range msgs {
-		_ = ParseMessageWithDataDictionary(msg, bytes.NewBuffer(msgBytes), session.transportDataDictionary, session.appDataDictionary)
+		err = ParseMessageWithDataDictionary(msg, bytes.NewBuffer(msgBytes), session.transportDataDictionary, session.appDataDictionary)
+		if err != nil {
+			session.log.OnEventf("Resend Msg Parse Error: %v, %v", err.Error(), bytes.NewBuffer(msgBytes).String())
+			return // We cant continue with a message that cant be parsed correctly.
+		}
 		msgType, _ := msg.Header.GetBytes(tagMsgType)
 		sentMessageSeqNum, _ := msg.Header.GetInt(tagMsgSeqNum)
 
diff --git a/message.go b/message.go
index 73da79169..26a6b90c1 100644
--- a/message.go
+++ b/message.go
@@ -27,6 +27,19 @@ import (
 // Header is first section of a FIX Message.
 type Header struct{ FieldMap }
 
+// msgparser contains message parsing vars needed to parse a string into a message.
+type msgParser struct {
+	msg *Message
+	transportDataDictionary *datadictionary.DataDictionary
+	appDataDictionary *datadictionary.DataDictionary
+	rawBytes []byte
+	fieldIndex int
+	parsedFieldBytes *TagValue
+	trailerBytes []byte
+	foundBody bool
+	foundTrailer bool
+}
+
 // in the message header, the first 3 tags in the message header must be 8,9,35.
 func headerFieldOrdering(i, j Tag) bool {
 	var ordering = func(t Tag) uint32 {
@@ -152,116 +165,127 @@ func ParseMessageWithDataDictionary(
 	msg *Message,
 	rawMessage *bytes.Buffer,
 	transportDataDictionary *datadictionary.DataDictionary,
-	_ *datadictionary.DataDictionary,
+	appDataDictionary *datadictionary.DataDictionary,
 ) (err error) {
-	msg.Header.Clear()
-	msg.Body.Clear()
-	msg.Trailer.Clear()
-	msg.rawMessage = rawMessage
+	// Create msgparser before we go any further.
+	mp := &msgParser{
+		msg: msg,
+		transportDataDictionary: transportDataDictionary,
+		appDataDictionary: appDataDictionary,
+	}
+	mp.msg.rawMessage = rawMessage
+	mp.rawBytes = rawMessage.Bytes()
 
-	rawBytes := rawMessage.Bytes()
+	return doParsing(mp)
+}
+
+// doParsing executes the message parsing process.
+func doParsing(mp *msgParser) (err error) {
+	// Initialize for parsing.
+	mp.msg.Header.Clear()
+	mp.msg.Body.Clear()
+	mp.msg.Trailer.Clear()
 
-	// Allocate fields in one chunk.
+	// Allocate expected message fields in one chunk.
 	fieldCount := 0
-	for _, b := range rawBytes {
+	for _, b := range mp.rawBytes {
 		if b == '\001' {
 			fieldCount++
 		}
 	}
-
 	if fieldCount == 0 {
-		return parseError{OrigError: fmt.Sprintf("No Fields detected in %s", string(rawBytes))}
+		return parseError{OrigError: fmt.Sprintf("No Fields detected in %s", string(mp.rawBytes))}
 	}
-
-	if cap(msg.fields) < fieldCount {
-		msg.fields = make([]TagValue, fieldCount)
+	if cap(mp.msg.fields) < fieldCount {
+		mp.msg.fields = make([]TagValue, fieldCount)
 	} else {
-		msg.fields = msg.fields[0:fieldCount]
+		mp.msg.fields = mp.msg.fields[0:fieldCount]
 	}
 
-	fieldIndex := 0
-
 	// Message must start with begin string, body length, msg type.
-	if rawBytes, err = extractSpecificField(&msg.fields[fieldIndex], tagBeginString, rawBytes); err != nil {
+	// Get begin string.
+	if mp.rawBytes, err = extractSpecificField(&mp.msg.fields[mp.fieldIndex], tagBeginString, mp.rawBytes); err != nil {
 		return
 	}
+	mp.msg.Header.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
 
-	msg.Header.add(msg.fields[fieldIndex : fieldIndex+1])
-	fieldIndex++
-
-	parsedFieldBytes := &msg.fields[fieldIndex]
-	if rawBytes, err = extractSpecificField(parsedFieldBytes, tagBodyLength, rawBytes); err != nil {
+	// Get body length.
+	mp.fieldIndex++
+	mp.parsedFieldBytes = &mp.msg.fields[mp.fieldIndex]
+	if mp.rawBytes, err = extractSpecificField(mp.parsedFieldBytes, tagBodyLength, mp.rawBytes); err != nil {
 		return
 	}
+	mp.msg.Header.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
 
-	msg.Header.add(msg.fields[fieldIndex : fieldIndex+1])
-	fieldIndex++
-
-	parsedFieldBytes = &msg.fields[fieldIndex]
-	if rawBytes, err = extractSpecificField(parsedFieldBytes, tagMsgType, rawBytes); err != nil {
+	// Get msg type.
+	mp.fieldIndex++
+	mp.parsedFieldBytes = &mp.msg.fields[mp.fieldIndex]
+	if mp.rawBytes, err = extractSpecificField(mp.parsedFieldBytes, tagMsgType, mp.rawBytes); err != nil {
 		return
 	}
+	mp.msg.Header.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
+
 
+	// Start parsing.
+	mp.fieldIndex++
 	xmlDataLen := 0
 	xmlDataMsg := false
-
-	msg.Header.add(msg.fields[fieldIndex : fieldIndex+1])
-	fieldIndex++
-
-	trailerBytes := []byte{}
-	foundBody := false
-	foundTrailer := false
+	mp.trailerBytes = []byte{}
+	mp.foundBody = false
+	mp.foundTrailer = false
 	for {
-		parsedFieldBytes = &msg.fields[fieldIndex]
+		mp.parsedFieldBytes = &mp.msg.fields[mp.fieldIndex]
 		if xmlDataLen > 0 {
-			rawBytes, err = extractXMLDataField(parsedFieldBytes, rawBytes, xmlDataLen)
+			mp.rawBytes, err = extractXMLDataField(mp.parsedFieldBytes, mp.rawBytes, xmlDataLen)
 			xmlDataLen = 0
 			xmlDataMsg = true
 		} else {
-			rawBytes, err = extractField(parsedFieldBytes, rawBytes)
+			mp.rawBytes, err = extractField(mp.parsedFieldBytes, mp.rawBytes)
 		}
 		if err != nil {
 			return
 		}
 
 		switch {
-		case isHeaderField(parsedFieldBytes.tag, transportDataDictionary):
-			msg.Header.add(msg.fields[fieldIndex : fieldIndex+1])
-		case isTrailerField(parsedFieldBytes.tag, transportDataDictionary):
-			msg.Trailer.add(msg.fields[fieldIndex : fieldIndex+1])
-			foundTrailer = true
+		case isHeaderField(mp.parsedFieldBytes.tag, mp.transportDataDictionary):
+			mp.msg.Header.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
+		case isTrailerField(mp.parsedFieldBytes.tag, mp.transportDataDictionary):
+			mp.msg.Trailer.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
+			mp.foundTrailer = true
+		case isNumInGroupField(mp.msg, []Tag{mp.parsedFieldBytes.tag}, mp.appDataDictionary):
+			parseGroup(mp, []Tag{mp.parsedFieldBytes.tag})
 		default:
-			foundBody = true
-			trailerBytes = rawBytes
-			msg.Body.add(msg.fields[fieldIndex : fieldIndex+1])
+			mp.foundBody = true
+			mp.trailerBytes = mp.rawBytes
+			mp.msg.Body.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
 		}
-		if parsedFieldBytes.tag == tagCheckSum {
+		if mp.parsedFieldBytes.tag == tagCheckSum {
 			break
 		}
 
-		if !foundBody {
-			msg.bodyBytes = rawBytes
+		if !mp.foundBody {
+			mp.msg.bodyBytes = mp.rawBytes
 		}
 
-		if parsedFieldBytes.tag == tagXMLDataLen {
-			xmlDataLen, _ = msg.Header.GetInt(tagXMLDataLen)
+		if mp.parsedFieldBytes.tag == tagXMLDataLen {
+			xmlDataLen, _ = mp.msg.Header.GetInt(tagXMLDataLen)
 		}
-		fieldIndex++
+		mp.fieldIndex++
 	}
 
 	// This will happen if there are no fields in the body
-	if foundTrailer && !foundBody {
-		trailerBytes = rawBytes
-		msg.bodyBytes = nil
+	if mp.foundTrailer && !mp.foundBody {
+		mp.trailerBytes = mp.rawBytes
+		mp.msg.bodyBytes = nil
 	}
 
 	// Body length would only be larger than trailer if fields out of order.
-	if len(msg.bodyBytes) > len(trailerBytes) {
-		msg.bodyBytes = msg.bodyBytes[:len(msg.bodyBytes)-len(trailerBytes)]
+	if len(mp.msg.bodyBytes) > len(mp.trailerBytes) {
+		mp.msg.bodyBytes = mp.msg.bodyBytes[:len(mp.msg.bodyBytes)-len(mp.trailerBytes)]
 	}
 
 	length := 0
-	for _, field := range msg.fields {
+	for _, field := range mp.msg.fields {
 		switch field.tag {
 		case tagBeginString, tagBodyLength, tagCheckSum: // Tags do not contribute to length.
 		default:
@@ -269,7 +293,7 @@ func ParseMessageWithDataDictionary(
 		}
 	}
 
-	bodyLength, err := msg.Header.GetInt(tagBodyLength)
+	bodyLength, err := mp.msg.Header.GetInt(tagBodyLength)
 	if err != nil {
 		err = parseError{OrigError: err.Error()}
 	} else if length != bodyLength && !xmlDataMsg {
@@ -279,6 +303,149 @@ func ParseMessageWithDataDictionary(
 	return
 }
 
+// parseGroup iterates through a repeating group to maintain correct order of those fields.
+func parseGroup(mp *msgParser, tags []Tag) {
+	mp.foundBody = true
+	dm := mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1]
+	fields := getGroupFields(mp.msg, tags, mp.appDataDictionary)
+	
+	for {
+		mp.fieldIndex++
+		mp.parsedFieldBytes = &mp.msg.fields[mp.fieldIndex]
+		mp.rawBytes, _ = extractField(mp.parsedFieldBytes, mp.rawBytes)
+		mp.trailerBytes = mp.rawBytes
+
+		// Is this field a member for the group.
+		if isGroupMember(mp.parsedFieldBytes.tag, fields) {
+			// Is this field a nested repeating group.
+			if isNumInGroupField(mp.msg, append(tags, mp.parsedFieldBytes.tag), mp.appDataDictionary) {
+				dm = append(dm, *mp.parsedFieldBytes)
+				tags = append(tags, mp.parsedFieldBytes.tag)
+				fields = getGroupFields(mp.msg, tags, mp.appDataDictionary)
+				continue
+			}
+			// Add the field member to the group.
+			dm = append(dm, *mp.parsedFieldBytes)
+		} else if isHeaderField(mp.parsedFieldBytes.tag, mp.transportDataDictionary) {
+			// Found a header tag for some reason.. 
+			mp.msg.Body.add(dm)
+			mp.msg.Header.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
+			break
+		} else if isTrailerField(mp.parsedFieldBytes.tag, mp.transportDataDictionary) {
+			// Found the trailer at the end of the message.
+			mp.msg.Body.add(dm)
+			mp.msg.Trailer.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
+			mp.foundTrailer = true
+			break
+		} else {
+			// Found a body field outside the group.
+			searchTags := []Tag{mp.parsedFieldBytes.tag}
+			// Is this a new group not inside the existing group.
+			if isNumInGroupField(mp.msg, searchTags, mp.appDataDictionary) {
+				// Add the current repeating group.
+				mp.msg.Body.add(dm)
+				// Cycle again with the new group.
+				dm = mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1]
+				fields = getGroupFields(mp.msg, searchTags, mp.appDataDictionary)
+				continue
+			} else {
+					if len(tags) > 1 {
+						searchTags = tags[:len(tags)-1]
+					}
+					// Did this tag occur after a nested group and belongs to the parent group.	
+					if isNumInGroupField(mp.msg, searchTags, mp.appDataDictionary) {
+						// Add the field member to the group.
+						dm = append(dm, *mp.parsedFieldBytes)
+						// Continue parsing the parent group.
+						fields = getGroupFields(mp.msg, searchTags, mp.appDataDictionary)
+						continue
+					}
+					// Add the repeating group.
+					mp.msg.Body.add(dm)
+					// Add the next body field.
+					mp.msg.Body.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
+			}
+			break
+		}
+	}
+}
+
+// isNumInGroupField evaluates if this tag is the start of a repeating group.
+// tags slice will contain multiple tags if the tag in question is found while processing a group already.
+func isNumInGroupField(msg *Message, tags []Tag, appDataDictionary *datadictionary.DataDictionary) bool {
+	if appDataDictionary != nil {
+		msgt, err := msg.MsgType()
+		if err != nil {
+			return false
+		}
+		mm, ok := appDataDictionary.Messages[msgt]
+		if ok {
+			fields := mm.Fields
+			for idx, tag := range tags {
+				fd, ok := fields[int(tag)]
+				if ok {
+					if idx == len(tags) - 1 {
+						if len(fd.Fields) > 0 {
+							return true
+						}
+					} else {
+						// Map nested fields.
+						newFields := make(map[int]*datadictionary.FieldDef)
+						for _, ff := range fd.Fields {
+							newFields[ff.Tag()] = ff
+						}
+						fields = newFields
+					}
+				}
+			}
+		}
+	}
+	return false
+}
+
+// getGroupFields gets the relevant fields for parsing a repeating group if this tag is the start of a repeating group.
+// tags slice will contain multiple tags if the tag in question is found while processing a group already.
+func getGroupFields(msg *Message, tags []Tag, appDataDictionary *datadictionary.DataDictionary) (fields []*datadictionary.FieldDef) {
+	if appDataDictionary != nil {
+		msgt, err := msg.MsgType()
+		if err != nil {
+			return
+		}
+		mm, ok := appDataDictionary.Messages[msgt]
+		if ok {
+			fields := mm.Fields
+			for idx, tag := range tags {
+				fd, ok := fields[int(tag)]
+				if ok {
+					if idx == len(tags) - 1 {
+						if len(fd.Fields) > 0 {
+							return fd.Fields
+						}
+					} else {
+						// Map nested fields.
+						newFields := make(map[int]*datadictionary.FieldDef)
+						for _, ff := range fd.Fields {
+							newFields[ff.Tag()] = ff
+						}
+						fields = newFields
+					}
+				}
+			}
+		}
+	}
+	return
+}
+
+// isGroupMember evaluates if this tag belongs to a repeating group.
+func isGroupMember(tag Tag, fields []*datadictionary.FieldDef) bool {
+	for _, f := range fields{
+		if f.Tag() == int(tag) {
+			return true
+		}
+	}
+	return false
+}
+
 func isHeaderField(tag Tag, dataDict *datadictionary.DataDictionary) bool {
 	if tag.IsHeader() {
 		return true
diff --git a/message_test.go b/message_test.go
index 392690f92..13d3e3eac 100644
--- a/message_test.go
+++ b/message_test.go
@@ -146,12 +146,35 @@ func (s *MessageSuite) TestReBuild() {
 	s.True(bytes.Equal(s.msg.bodyBytes, expectedBodyBytes), "Incorrect body bytes, got %s", string(s.msg.bodyBytes))
 }
 
-func (s *MessageSuite) TestRebuildWithRepeatingGroup() {
+func (s *MessageSuite) TestRebuildOneRepeatingGroupWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string with a 453 repeating group.
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=165
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=1
448=4501
447=D
452=28
"+
+	"10=026
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
 
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=165
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=1
448=4501
447=D
452=28
"+
+	"10=026
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
+
+func (s *MessageSuite) TestRebuildTwoRepeatingGroupsWithDictionary() {
 	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
 	s.Nil(dictErr)
 
-	// Given message bytes from a valid string
+	// Given message bytes from a valid string with a 386 repeating group and a 453 repeating group.
 	rawMsg := bytes.NewBufferString("8=FIX.4.4
9=210
35=D
34=2
347=UTF-8
52=20231231-20:19:41
49=01001
50=01001a
56=TEST
44=12
11=13976
1=10100400
21=1
386=1
336=NOPL
55=SYMABC
54=1
60=20231231-20:19:41
38=1
40=2
59=0
453=1
448=4501
447=D
452=28
354=6
355=Public
10=104
")
 
 	// When we parse it into a message
@@ -159,14 +182,205 @@ func (s *MessageSuite) TestRebuildWithRepeatingGroup() {
 
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
+	expectedBytes := []byte("8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
347=UTF-8
1=10100400
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
354=6
355=Public
386=1
336=NOPL
453=1
448=4501
447=D
452=28
10=104
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
 
-	// this method does result in test passing. 
-	//s.msg.buildWithBodyBytes(s.msg.bodyBytes)
+func (s *MessageSuite) TestRebuildOneRepeatingGroupWithTwoMembersWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
 
-	expectedBytes := []byte("8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
347=UTF-8
44=12
11=13976
1=10100400
21=1
386=1
336=NOPL
55=SYMABC
54=1
60=20231231-20:19:41
38=1
40=2
59=0
453=1
448=4501
447=D
452=28
354=6
355=Public
10=104
")
+	// Given message bytes from a valid string with a 453 repeating group that has 2 child groups.
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=187
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=044
")
 
-	// Then the bytes should be the same with repeating group properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n +%s\n -%s", rebuildBytes, expectedBytes)
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=187
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=044
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
+
+func (s *MessageSuite) TestRebuildTwoSequentialRepeatingGroupWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string with both a 78 and 453 repeating group that each have 2 child groups.
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=2
79=acct1
79=acct2
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=243
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=2
79=acct1
79=acct2
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=243
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
+
+func (s *MessageSuite) TestRebuildNestedRepeatingGroupWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string with a 78 repeating group that has 
+	// a nested 539 group and then another 80 tag in the 78 group
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=177
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
80=100
"+
+	"10=206
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=177
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
80=100
"+
+	"10=206
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
+
+func (s *MessageSuite) TestRebuildDoubleNestedRepeatingGroupWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string with a 78 repeating group that has a 
+	// double nested 539 and then 804 groups and then another 80 tag in the 78 group
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=202
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
80=100
"+
+	"10=117
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=202
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
80=100
"+
+	"10=117
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
+
+func (s *MessageSuite) TestRebuildDoubleNestedThenAnotherRepeatingGroupWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string with a 78 repeating group that has a double nested 539 and then 804 groups 
+	// and then another repeating group 453 with two children.
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=245
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=106
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=245
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=106
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
+
+func (s *MessageSuite) TestRebuildDoubleNestedThenBodyTagThenAnotherRepeatingGroupWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string with a 78 repeating group that has a double nested 539 and then 804 groups 
+	// then a 376 body tag and then another repeating group 453 with two children.
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=256
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
376=compid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=198
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=256
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
376=compid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
+	"10=198
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+}
+
+func (s *MessageSuite) TestRebuildDoubleNestedWithTwoMembersRepeatingGroupWithDictionary() {
+	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
+	s.Nil(dictErr)
+
+	// Given message bytes from a valid string with a 78 repeating group that 
+	// has a double nested 539 and then 804 groups all with two children.
+	rawMsg := bytes.NewBufferString(
+	"8=FIX.4.4
9=406
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
"+
+	"78=1
79=acct1
"+
+		"539=2
"+
+			"524=nestedid
"+
+			"804=2
"+
+				"545=doublenestedid
"+
+				"545=doublenestedid2
"+
+			"524=nestedid2
"+
+			"804=2
"+
+				"545=doublenestedid
"+
+				"545=doublenestedid2
"+
+	"79=acct2
"+
+		"539=2
"+
+			"524=nestedid
"+
+			"804=2
"+
+				"545=doublenestedid
"+
+				"545=doublenestedid2
"+
+			"524=nestedid2
"+
+			"804=2
"+
+				"545=doublenestedid
"+
+				"545=doublenestedid2
"+
+	"10=046
")
+
+	// When we parse it into a message
+	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
+
+	// And then rebuild the message bytes
+	rebuildBytes := s.msg.build()
+	expectedBytes := []byte(
+	"8=FIX.4.4
9=406
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
+	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
"+
+	"78=1
79=acct1
539=2
524=nestedid
804=2
545=doublenestedid
545=doublenestedid2
524=nestedid2
804=2
545=doublenestedid
545=doublenestedid2
"+
+	"79=acct2
539=2
524=nestedid
804=2
545=doublenestedid
545=doublenestedid2
524=nestedid2
804=2
545=doublenestedid
545=doublenestedid2
"+
+	"10=046
")
+	
+	// Then the bytes should have repeating groups properly ordered
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
 }
 
 func (s *MessageSuite) TestReBuildWithRepeatingGroupForResend() {
diff --git a/session.go b/session.go
index 5ab8c5edc..29d0b89e9 100644
--- a/session.go
+++ b/session.go
@@ -335,6 +335,7 @@ func (s *session) prepMessageForSend(msg *Message, inReplyTo *Message) (msgBytes
 		}
 	}
 
+	// Message converted to bytes here.
 	msgBytes = msg.build()
 	err = s.persist(seqNum, msgBytes)
 

From 3517c8b55165a224e4ad7cd06d64d2ef689715c1 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Thu, 16 May 2024 14:57:43 -0500
Subject: [PATCH 23/58] Linter fixes

---
 Makefile        |   4 ++
 message.go      |  63 ++++++++--------
 message_test.go | 186 ++++++++++++++++++++++++------------------------
 3 files changed, 128 insertions(+), 125 deletions(-)

diff --git a/Makefile b/Makefile
index b68843f3c..75a60a66e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,10 @@ linters-install:
 lint: linters-install
 	golangci-lint run
 
+# An easy way to run the linter without going through the install process -
+# docker run -t --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.57.2 golangci-lint run -v
+# See https://golangci-lint.run/welcome/install/ for more details.
+
 # ---------------------------------------------------------------
 # Targets related to running acceptance tests -
 
diff --git a/message.go b/message.go
index 26a6b90c1..11afd7669 100644
--- a/message.go
+++ b/message.go
@@ -29,15 +29,15 @@ type Header struct{ FieldMap }
 
 // msgparser contains message parsing vars needed to parse a string into a message.
 type msgParser struct {
-	msg *Message
+	msg                     *Message
 	transportDataDictionary *datadictionary.DataDictionary
-	appDataDictionary *datadictionary.DataDictionary
-	rawBytes []byte
-	fieldIndex int
-	parsedFieldBytes *TagValue
-	trailerBytes []byte
-	foundBody bool
-	foundTrailer bool
+	appDataDictionary       *datadictionary.DataDictionary
+	rawBytes                []byte
+	fieldIndex              int
+	parsedFieldBytes        *TagValue
+	trailerBytes            []byte
+	foundBody               bool
+	foundTrailer            bool
 }
 
 // in the message header, the first 3 tags in the message header must be 8,9,35.
@@ -169,9 +169,9 @@ func ParseMessageWithDataDictionary(
 ) (err error) {
 	// Create msgparser before we go any further.
 	mp := &msgParser{
-		msg: msg,
+		msg:                     msg,
 		transportDataDictionary: transportDataDictionary,
-		appDataDictionary: appDataDictionary,
+		appDataDictionary:       appDataDictionary,
 	}
 	mp.msg.rawMessage = rawMessage
 	mp.rawBytes = rawMessage.Bytes()
@@ -225,7 +225,6 @@ func doParsing(mp *msgParser) (err error) {
 	}
 	mp.msg.Header.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
 
-
 	// Start parsing.
 	mp.fieldIndex++
 	xmlDataLen := 0
@@ -308,7 +307,7 @@ func parseGroup(mp *msgParser, tags []Tag) {
 	mp.foundBody = true
 	dm := mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1]
 	fields := getGroupFields(mp.msg, tags, mp.appDataDictionary)
-	
+
 	for {
 		mp.fieldIndex++
 		mp.parsedFieldBytes = &mp.msg.fields[mp.fieldIndex]
@@ -327,7 +326,7 @@ func parseGroup(mp *msgParser, tags []Tag) {
 			// Add the field member to the group.
 			dm = append(dm, *mp.parsedFieldBytes)
 		} else if isHeaderField(mp.parsedFieldBytes.tag, mp.transportDataDictionary) {
-			// Found a header tag for some reason.. 
+			// Found a header tag for some reason..
 			mp.msg.Body.add(dm)
 			mp.msg.Header.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
 			break
@@ -348,23 +347,23 @@ func parseGroup(mp *msgParser, tags []Tag) {
 				dm = mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1]
 				fields = getGroupFields(mp.msg, searchTags, mp.appDataDictionary)
 				continue
-			} else {
-					if len(tags) > 1 {
-						searchTags = tags[:len(tags)-1]
-					}
-					// Did this tag occur after a nested group and belongs to the parent group.	
-					if isNumInGroupField(mp.msg, searchTags, mp.appDataDictionary) {
-						// Add the field member to the group.
-						dm = append(dm, *mp.parsedFieldBytes)
-						// Continue parsing the parent group.
-						fields = getGroupFields(mp.msg, searchTags, mp.appDataDictionary)
-						continue
-					}
-					// Add the repeating group.
-					mp.msg.Body.add(dm)
-					// Add the next body field.
-					mp.msg.Body.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
 			}
+			if len(tags) > 1 {
+				searchTags = tags[:len(tags)-1]
+			}
+			// Did this tag occur after a nested group and belongs to the parent group.
+			if isNumInGroupField(mp.msg, searchTags, mp.appDataDictionary) {
+				// Add the field member to the group.
+				dm = append(dm, *mp.parsedFieldBytes)
+				// Continue parsing the parent group.
+				fields = getGroupFields(mp.msg, searchTags, mp.appDataDictionary)
+				continue
+			}
+			// Add the repeating group.
+			mp.msg.Body.add(dm)
+			// Add the next body field.
+			mp.msg.Body.add(mp.msg.fields[mp.fieldIndex : mp.fieldIndex+1])
+
 			break
 		}
 	}
@@ -384,7 +383,7 @@ func isNumInGroupField(msg *Message, tags []Tag, appDataDictionary *datadictiona
 			for idx, tag := range tags {
 				fd, ok := fields[int(tag)]
 				if ok {
-					if idx == len(tags) - 1 {
+					if idx == len(tags)-1 {
 						if len(fd.Fields) > 0 {
 							return true
 						}
@@ -417,7 +416,7 @@ func getGroupFields(msg *Message, tags []Tag, appDataDictionary *datadictionary.
 			for idx, tag := range tags {
 				fd, ok := fields[int(tag)]
 				if ok {
-					if idx == len(tags) - 1 {
+					if idx == len(tags)-1 {
 						if len(fd.Fields) > 0 {
 							return fd.Fields
 						}
@@ -438,7 +437,7 @@ func getGroupFields(msg *Message, tags []Tag, appDataDictionary *datadictionary.
 
 // isGroupMember evaluates if this tag belongs to a repeating group.
 func isGroupMember(tag Tag, fields []*datadictionary.FieldDef) bool {
-	for _, f := range fields{
+	for _, f := range fields {
 		if f.Tag() == int(tag) {
 			return true
 		}
diff --git a/message_test.go b/message_test.go
index 13d3e3eac..b02508cd9 100644
--- a/message_test.go
+++ b/message_test.go
@@ -152,9 +152,9 @@ func (s *MessageSuite) TestRebuildOneRepeatingGroupWithDictionary() {
 
 	// Given message bytes from a valid string with a 453 repeating group.
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=165
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=1
448=4501
447=D
452=28
"+
-	"10=026
")
+		"8=FIX.4.4
9=165
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=1
448=4501
447=D
452=28
" +
+			"10=026
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -162,12 +162,12 @@ func (s *MessageSuite) TestRebuildOneRepeatingGroupWithDictionary() {
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=165
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=1
448=4501
447=D
452=28
"+
-	"10=026
")
-	
+		"8=FIX.4.4
9=165
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=1
448=4501
447=D
452=28
" +
+			"10=026
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildTwoRepeatingGroupsWithDictionary() {
@@ -183,9 +183,9 @@ func (s *MessageSuite) TestRebuildTwoRepeatingGroupsWithDictionary() {
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte("8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
347=UTF-8
1=10100400
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
354=6
355=Public
386=1
336=NOPL
453=1
448=4501
447=D
452=28
10=104
")
-	
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildOneRepeatingGroupWithTwoMembersWithDictionary() {
@@ -194,9 +194,9 @@ func (s *MessageSuite) TestRebuildOneRepeatingGroupWithTwoMembersWithDictionary(
 
 	// Given message bytes from a valid string with a 453 repeating group that has 2 child groups.
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=187
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=044
")
+		"8=FIX.4.4
9=187
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=044
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -204,12 +204,12 @@ func (s *MessageSuite) TestRebuildOneRepeatingGroupWithTwoMembersWithDictionary(
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=187
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=044
")
-	
+		"8=FIX.4.4
9=187
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=044
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildTwoSequentialRepeatingGroupWithDictionary() {
@@ -218,9 +218,9 @@ func (s *MessageSuite) TestRebuildTwoSequentialRepeatingGroupWithDictionary() {
 
 	// Given message bytes from a valid string with both a 78 and 453 repeating group that each have 2 child groups.
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=2
79=acct1
79=acct2
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=243
")
+		"8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=2
79=acct1
79=acct2
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=243
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -228,24 +228,24 @@ func (s *MessageSuite) TestRebuildTwoSequentialRepeatingGroupWithDictionary() {
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=2
79=acct1
79=acct2
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=243
")
-	
+		"8=FIX.4.4
9=210
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=2
79=acct1
79=acct2
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=243
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildNestedRepeatingGroupWithDictionary() {
 	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
 	s.Nil(dictErr)
 
-	// Given message bytes from a valid string with a 78 repeating group that has 
+	// Given message bytes from a valid string with a 78 repeating group that has
 	// a nested 539 group and then another 80 tag in the 78 group
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=177
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
80=100
"+
-	"10=206
")
+		"8=FIX.4.4
9=177
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
80=100
" +
+			"10=206
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -253,24 +253,24 @@ func (s *MessageSuite) TestRebuildNestedRepeatingGroupWithDictionary() {
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=177
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
80=100
"+
-	"10=206
")
-	
+		"8=FIX.4.4
9=177
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
80=100
" +
+			"10=206
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildDoubleNestedRepeatingGroupWithDictionary() {
 	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
 	s.Nil(dictErr)
 
-	// Given message bytes from a valid string with a 78 repeating group that has a 
+	// Given message bytes from a valid string with a 78 repeating group that has a
 	// double nested 539 and then 804 groups and then another 80 tag in the 78 group
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=202
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
80=100
"+
-	"10=117
")
+		"8=FIX.4.4
9=202
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
80=100
" +
+			"10=117
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -278,24 +278,24 @@ func (s *MessageSuite) TestRebuildDoubleNestedRepeatingGroupWithDictionary() {
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=202
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
80=100
"+
-	"10=117
")
-	
+		"8=FIX.4.4
9=202
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
80=100
" +
+			"10=117
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildDoubleNestedThenAnotherRepeatingGroupWithDictionary() {
 	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
 	s.Nil(dictErr)
 
-	// Given message bytes from a valid string with a 78 repeating group that has a double nested 539 and then 804 groups 
+	// Given message bytes from a valid string with a 78 repeating group that has a double nested 539 and then 804 groups
 	// and then another repeating group 453 with two children.
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=245
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=106
")
+		"8=FIX.4.4
9=245
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=106
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -303,24 +303,24 @@ func (s *MessageSuite) TestRebuildDoubleNestedThenAnotherRepeatingGroupWithDicti
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=245
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=106
")
-	
+		"8=FIX.4.4
9=245
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=106
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildDoubleNestedThenBodyTagThenAnotherRepeatingGroupWithDictionary() {
 	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
 	s.Nil(dictErr)
 
-	// Given message bytes from a valid string with a 78 repeating group that has a double nested 539 and then 804 groups 
+	// Given message bytes from a valid string with a 78 repeating group that has a double nested 539 and then 804 groups
 	// then a 376 body tag and then another repeating group 453 with two children.
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=256
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
376=compid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=198
")
+		"8=FIX.4.4
9=256
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
376=compid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=198
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -328,44 +328,44 @@ func (s *MessageSuite) TestRebuildDoubleNestedThenBodyTagThenAnotherRepeatingGro
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=256
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
376=compid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
"+
-	"10=198
")
-	
+		"8=FIX.4.4
9=256
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
78=1
79=acct1
539=1
524=nestedid
804=1
545=doublenestedid
376=compid
453=2
448=4501
447=D
452=28
448=4502
447=D
452=28
" +
+			"10=198
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestRebuildDoubleNestedWithTwoMembersRepeatingGroupWithDictionary() {
 	dict, dictErr := datadictionary.Parse("spec/FIX44.xml")
 	s.Nil(dictErr)
 
-	// Given message bytes from a valid string with a 78 repeating group that 
+	// Given message bytes from a valid string with a 78 repeating group that
 	// has a double nested 539 and then 804 groups all with two children.
 	rawMsg := bytes.NewBufferString(
-	"8=FIX.4.4
9=406
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
"+
-	"78=1
79=acct1
"+
-		"539=2
"+
-			"524=nestedid
"+
-			"804=2
"+
-				"545=doublenestedid
"+
-				"545=doublenestedid2
"+
-			"524=nestedid2
"+
-			"804=2
"+
-				"545=doublenestedid
"+
-				"545=doublenestedid2
"+
-	"79=acct2
"+
-		"539=2
"+
-			"524=nestedid
"+
-			"804=2
"+
-				"545=doublenestedid
"+
-				"545=doublenestedid2
"+
-			"524=nestedid2
"+
-			"804=2
"+
-				"545=doublenestedid
"+
-				"545=doublenestedid2
"+
-	"10=046
")
+		"8=FIX.4.4
9=406
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
" +
+			"78=1
79=acct1
" +
+			"539=2
" +
+			"524=nestedid
" +
+			"804=2
" +
+			"545=doublenestedid
" +
+			"545=doublenestedid2
" +
+			"524=nestedid2
" +
+			"804=2
" +
+			"545=doublenestedid
" +
+			"545=doublenestedid2
" +
+			"79=acct2
" +
+			"539=2
" +
+			"524=nestedid
" +
+			"804=2
" +
+			"545=doublenestedid
" +
+			"545=doublenestedid2
" +
+			"524=nestedid2
" +
+			"804=2
" +
+			"545=doublenestedid
" +
+			"545=doublenestedid2
" +
+			"10=046
")
 
 	// When we parse it into a message
 	s.Nil(ParseMessageWithDataDictionary(s.msg, rawMsg, dict, dict))
@@ -373,14 +373,14 @@ func (s *MessageSuite) TestRebuildDoubleNestedWithTwoMembersRepeatingGroupWithDi
 	// And then rebuild the message bytes
 	rebuildBytes := s.msg.build()
 	expectedBytes := []byte(
-	"8=FIX.4.4
9=406
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
"+
-	"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
"+
-	"78=1
79=acct1
539=2
524=nestedid
804=2
545=doublenestedid
545=doublenestedid2
524=nestedid2
804=2
545=doublenestedid
545=doublenestedid2
"+
-	"79=acct2
539=2
524=nestedid
804=2
545=doublenestedid
545=doublenestedid2
524=nestedid2
804=2
545=doublenestedid
545=doublenestedid2
"+
-	"10=046
")
-	
+		"8=FIX.4.4
9=406
35=D
34=2
49=01001
50=01001a
52=20231231-20:19:41
56=TEST
" +
+			"1=acct1
11=13976
21=1
38=1
40=2
44=12
54=1
55=SYMABC
59=0
60=20231231-20:19:41
" +
+			"78=1
79=acct1
539=2
524=nestedid
804=2
545=doublenestedid
545=doublenestedid2
524=nestedid2
804=2
545=doublenestedid
545=doublenestedid2
" +
+			"79=acct2
539=2
524=nestedid
804=2
545=doublenestedid
545=doublenestedid2
524=nestedid2
804=2
545=doublenestedid
545=doublenestedid2
" +
+			"10=046
")
+
 	// Then the bytes should have repeating groups properly ordered
-	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes,)
+	s.True(bytes.Equal(expectedBytes, rebuildBytes), "Unexpected bytes,\n expected: %s\n but got: %s", expectedBytes, rebuildBytes)
 }
 
 func (s *MessageSuite) TestReBuildWithRepeatingGroupForResend() {

From 525b62c13ef17a7b31851720d09fcb241b490fe1 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Fri, 17 May 2024 10:14:29 -0500
Subject: [PATCH 24/58] Adds log to readLoop

---
 acceptor.go   | 2 +-
 connection.go | 3 ++-
 initiator.go  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/acceptor.go b/acceptor.go
index da4cd9bb0..f5b9b281c 100644
--- a/acceptor.go
+++ b/acceptor.go
@@ -356,7 +356,7 @@ func (a *Acceptor) handleConnection(netConn net.Conn) {
 
 	go func() {
 		msgIn <- fixIn{msgBytes, parser.lastRead}
-		readLoop(parser, msgIn)
+		readLoop(parser, msgIn, a.globalLog)
 	}()
 
 	writeLoop(netConn, msgOut, a.globalLog)
diff --git a/connection.go b/connection.go
index c006560f4..99a4c465e 100644
--- a/connection.go
+++ b/connection.go
@@ -30,12 +30,13 @@ func writeLoop(connection io.Writer, messageOut chan []byte, log Log) {
 	}
 }
 
-func readLoop(parser *parser, msgIn chan fixIn) {
+func readLoop(parser *parser, msgIn chan fixIn, log Log) {
 	defer close(msgIn)
 
 	for {
 		msg, err := parser.ReadMessage()
 		if err != nil {
+			log.OnEvent(err.Error())
 			return
 		}
 		msgIn <- fixIn{msg, parser.lastRead}
diff --git a/initiator.go b/initiator.go
index eeff30fc0..8f7a76200 100644
--- a/initiator.go
+++ b/initiator.go
@@ -198,7 +198,7 @@ func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, di
 			goto reconnect
 		}
 
-		go readLoop(newParser(bufio.NewReader(netConn)), msgIn)
+		go readLoop(newParser(bufio.NewReader(netConn)), msgIn, session.log)
 		disconnected = make(chan interface{})
 		go func() {
 			writeLoop(netConn, msgOut, session.log)

From 035d82eccae9091a139fad760c50c8b229665d5f Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Fri, 17 May 2024 10:30:57 -0500
Subject: [PATCH 25/58] Adds nullLog

---
 connection_internal_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/connection_internal_test.go b/connection_internal_test.go
index 1ee4d13e8..081b3c110 100644
--- a/connection_internal_test.go
+++ b/connection_internal_test.go
@@ -45,7 +45,7 @@ func TestReadLoop(t *testing.T) {
 	stream := "hello8=FIX.4.0
9=5
blah
10=103
garbage8=FIX.4.0
9=4
foo
10=103
"
 
 	parser := newParser(strings.NewReader(stream))
-	go readLoop(parser, msgIn)
+	go readLoop(parser, msgIn, nullLog{})
 
 	var tests = []struct {
 		expectedMsg   string

From 7e71cbc851bbb33e0fc43d5cab9c3dd16d3b2615 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Wed, 29 May 2024 23:24:07 -0500
Subject: [PATCH 26/58] v0.9.4 release notes

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 512df8d89..258e21aff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.9.4 (May 29, 2024)
+
+### ENHANCEMENTS
+* Adds log to readLoop just like writeLoop https://github.com/quickfixgo/quickfix/pull/642
+
+### BUG FIXES
+* Maintain repeating group field order when parsing messages  https://github.com/quickfixgo/quickfix/pull/636
+
 ## 0.9.3 (May 9, 2024)
 
 ### BUG FIXES

From c855c338bde47832b273f6f6b39458f04c1d2d25 Mon Sep 17 00:00:00 2001
From: momin-javed <momin.javed@alpaca.markets>
Date: Fri, 14 Jun 2024 15:31:04 +0530
Subject: [PATCH 27/58] Do not increment targetMsgSeqNum for out of sequence
 logout and test requests

---
 in_session.go      | 25 +++++++++++++++++++++----
 in_session_test.go | 17 +++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/in_session.go b/in_session.go
index 6f189bf49..62304d005 100644
--- a/in_session.go
+++ b/in_session.go
@@ -102,14 +102,23 @@ func (state inSession) handleLogout(session *session, msg *Message) (nextState s
 		session.log.OnEvent("Received logout response")
 	}
 
-	if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
-		session.logError(err)
-	}
-
 	if session.ResetOnLogout {
 		if err := session.dropAndReset(); err != nil {
 			session.logError(err)
 		}
+		return latentState{}
+	}
+
+	if err := session.checkTargetTooLow(msg); err != nil {
+		return latentState{}
+	}
+
+	if err := session.checkTargetTooHigh(msg); err != nil {
+		return latentState{}
+	}
+
+	if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
+		session.logError(err)
 	}
 
 	return latentState{}
@@ -131,6 +140,14 @@ func (state inSession) handleTestRequest(session *session, msg *Message) (nextSt
 		}
 	}
 
+	if err := session.checkTargetTooLow(msg); err != nil {
+		return state
+	}
+
+	if err := session.checkTargetTooHigh(msg); err != nil {
+		return state
+	}
+
 	if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
 		return handleStateError(session, err)
 	}
diff --git a/in_session_test.go b/in_session_test.go
index aa9f87084..8973e4ef0 100644
--- a/in_session_test.go
+++ b/in_session_test.go
@@ -96,6 +96,23 @@ func (s *InSessionTestSuite) TestLogoutResetOnLogout() {
 	s.NoMessageQueued()
 }
 
+func (s *InSessionTestSuite) TestLogoutTargetTooHigh() {
+	s.MessageFactory.seqNum = 5
+
+	s.MockApp.On("FromAdmin").Return(nil)
+	s.MockApp.On("ToAdmin")
+	s.MockApp.On("OnLogout")
+	s.session.fixMsgIn(s.session, s.Logout())
+
+	s.MockApp.AssertExpectations(s.T())
+	s.State(latentState{})
+
+	s.LastToAdminMessageSent()
+	s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
+	s.NextTargetMsgSeqNum(1)
+	s.NextSenderMsgSeqNum(2)
+}
+
 func (s *InSessionTestSuite) TestTimeoutNeedHeartbeat() {
 	s.MockApp.On("ToAdmin").Return(nil)
 	s.session.Timeout(s.session, internal.NeedHeartbeat)

From a60af80ed30435dd26a636423ffa1cc6432ad3ca Mon Sep 17 00:00:00 2001
From: momin-javed <momin.javed@alpaca.markets>
Date: Wed, 26 Jun 2024 00:45:06 +0530
Subject: [PATCH 28/58] Revert redundant TestRequest change

---
 in_session.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/in_session.go b/in_session.go
index 62304d005..816b4b240 100644
--- a/in_session.go
+++ b/in_session.go
@@ -140,14 +140,6 @@ func (state inSession) handleTestRequest(session *session, msg *Message) (nextSt
 		}
 	}
 
-	if err := session.checkTargetTooLow(msg); err != nil {
-		return state
-	}
-
-	if err := session.checkTargetTooHigh(msg); err != nil {
-		return state
-	}
-
 	if err := session.store.IncrNextTargetMsgSeqNum(); err != nil {
 		return handleStateError(session, err)
 	}

From 91700d11896963ab5ec1377eec037e2ec822be0f Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Tue, 2 Jul 2024 13:26:08 -0500
Subject: [PATCH 29/58] Port config documentation into proper go doc format.

---
 config/configuration.go | 1042 ++++++++++++++++++++++++++++++++++++---
 config/doc.go           |  409 ---------------
 2 files changed, 975 insertions(+), 476 deletions(-)
 delete mode 100644 config/doc.go

diff --git a/config/configuration.go b/config/configuration.go
index bf3044dba..f524f5005 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -1,73 +1,981 @@
+/*
+Package config declares settings for configuring QuickFIX/Go.
+
+A quickfix acceptor or initiator can maintain multiple FIX
+sessions. A FIX session is defined in QuickFIX as a unique
+combination of a BeginString (the FIX version number), a
+SenderCompID (your ID), and a TargetCompID (the
+ID of your counterparty). A SessionQualifier can also be
+used in rare cases to disambiguate otherwise identical sessions.
+
+The quickfix.ParseSettings(reader io.Reader) func will pull settings
+out of any stream, most commonly, a file stream.
+If you decide to write your own components,
+(storage for a particular database, a new kind of connector
+etc...), you may also use the session settings to store settings
+for your custom component.
+
+A settings file is set up with two types of headings, a
+[DEFAULT] heading and a [SESSION] heading.
+
+[DEFAULT] is where you can define settings that all sessions use by default.
+
+[SESSION] tells QuickFIX/Go that a new Session is being defined.
+
+If you do not provide a setting that QuickFIX/Go needs, it will throw an error
+telling you what setting is missing or improperly formatted.
+
+# Sample Configuration Settings File:
+
+	# default settings for sessions
+	[DEFAULT]
+	ConnectionType=initiator
+	ReconnectInterval=60
+	SenderCompID=TW
+
+	# session definition
+	[SESSION]
+	# inherit ConnectionType, ReconnectInterval and SenderCompID from default
+	BeginString=FIX.4.1
+	TargetCompID=ARCA
+	StartTime=12:30:00
+	EndTime=23:30:00
+	HeartBtInt=20
+	SocketConnectPort=9823
+	SocketConnectHost=123.123.123.123
+	DataDictionary=somewhere/FIX41.xml
+
+	[SESSION]
+	BeginString=FIX.4.0
+	TargetCompID=ISLD
+	StartTime=12:00:00
+	EndTime=23:00:00
+	HeartBtInt=30
+	SocketConnectPort=8323
+	SocketConnectHost=23.23.23.23
+	DataDictionary=somewhere/FIX40.xml
+
+	[SESSION]
+	BeginString=FIX.4.2
+	TargetCompID=INCA
+	StartTime=12:30:00
+	EndTime=21:30:00
+	# overide default setting for RecconnectInterval
+	ReconnectInterval=30
+	HeartBtInt=30
+	SocketConnectPort=6523
+	SocketConnectHost=3.3.3.3
+	# (optional) alternate connection ports and hosts to cycle through on failover
+	SocketConnectPort1=8392
+	SocketConnectHost1=8.8.8.8
+	SocketConnectPort2=2932
+	SocketConnectHost2=12.12.12.12
+	DataDictionary=somewhere/FIX42.xml
+*/
 package config
 
-// NOTE: Additions to this file should be made to both config/doc.go and http://www.quickfixgo.org/docs/
+const (
+	// Session settings.
+
+	// BeginString is the version of FIX this session should use.
+	//
+	// Required: Yes
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	// 	- FIXT.1.1
+	//  - FIX.4.4
+	//  - FIX.4.3
+	//  - FIX.4.2
+	//  - FIX.4.1
+	//  - FIX.4.0
+	BeginString string = "BeginString"
+
+	// SenderCompID is your ID as associated with this FIX session.
+	//
+	// Required: Yes, unless configuring an acceptor with DynamicSessions=Y
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A case-sensitive alpha-numeric string.
+	SenderCompID string = "SenderCompID"
+
+	// SenderSubID is your subID as associated with this FIX session.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A case-sensitive alpha-numeric string.
+	SenderSubID string = "SenderSubID"
+
+	// SenderLocationID is your locationID as associated with this FIX session.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A case-sensitive alpha-numeric string.
+	SenderLocationID string = "SenderLocationID"
+
+	// TargetCompID is the counterparty's ID as associated with this FIX session.
+	//
+	// Required: Yes, unless configuring an acceptor with DynamicSessions=Y
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A case-sensitive alpha-numeric string.
+	TargetCompID string = "TargetCompID"
+
+	// TargetSubID is the counterparty's subID as associated with this FIX session.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A case-sensitive alpha-numeric string.
+	TargetSubID string = "TargetSubID"
+
+	// TargetLocationID is the counterparty's locationID as associated with this FIX session.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A case-sensitive alpha-numeric string.
+	TargetLocationID string = "TargetLocationID"
+
+	// SessionQualifier is an additional qualifier to disambiguate otherwise identical sessions.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A case-sensitive alpha-numeric string.
+	SessionQualifier string = "SessionQualifier"
+
+	// DefaultApplVerID specifies the default application version ID for the session.
+	// This can either be the ApplVerID enum (see the ApplVerID field) or the BeginString for the default version.
+	//
+	// Required: Only for FIXT 1.1 (and newer). Ignored for earlier transport versions.
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - FIX.5.0SP2
+	//  - FIX.5.0SP1
+	//  - FIX.5.0
+	//  - FIX.4.4
+	//  - FIX.4.3
+	//  - FIX.4.2
+	//  - FIX.4.1
+	//  - FIX.4.0
+	//  - 9
+	//  - 8
+	//  - 7
+	//  - 6
+	//  - 5
+	//  - 4
+	//  - 3
+	//  - 2
+	DefaultApplVerID string = "DefaultApplVerID"
+
+	// StartTime is the time of day that this FIX session becomes activated.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A time in the format of HH:MM:SS, time is represented in time zone configured by TimeZone
+	StartTime string = "StartTime"
+
+	// EndTime is the time of day that this FIX session becomes deactivated.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A time in the format of HH:MM:SS, time is represented in time zone configured by TimeZone
+	EndTime string = "EndTime"
+
+	// StartDay is the starting day of week for the session,
+	// used to configure week-long sessions,
+	// and can be used in combination with StartTime.
+	// Incompatible with the Weekdays setting.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
+	StartDay string = "StartDay"
+
+	// EndDay is the ending day of week for the session,
+	// used to configure week-long sessions,
+	// and can be used in combination with EndTime.
+	// Incompatible with the Weekdays setting.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
+	EndDay string = "EndDay"
+
+	// Weekdays is for daily sessions that are only active on specific days of the week.
+	// Use in combination with StartTime and EndTime.
+	// Incompatible with StartDay and EndDay.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Comma delimited list of days of the week in English, or 3 letter abbreviation (e.g. "Monday,Tuesday,Wednesday" or "Mon,Tue,Wed" would both be valid values).
+	Weekdays string = "Weekdays"
+
+	// TimeZone sets the time zone for this session; if specified, StartTime and EndTime will be converted from this zone to UTC.
+	// Times in messages will still be set to UTC as this is required by FIX specifications.
+	//
+	// Required: No
+	//
+	// Default: UTC
+	//
+	// Valid Values:
+	//  - IANA Time zone ID (America/New_York, Asia/Tokyo, Europe/London, etc.)
+	//  - Local (The zone on host)
+	TimeZone string = "TimeZone"
+
+	// TimeStampPrecision determines precision for timestamps in (Orig)SendingTime fields in outbound messages.
+	// Only available for FIX.4.2 and greater, FIX versions earlier than FIX.4.2 will use timestamp resolution in seconds.
+	//
+	// Required: No
+	//
+	// Default: MILLIS
+	//
+	// Valid Values:
+	//  - SECONDS
+	//  - MILLIS
+	//  - MICROS
+	//  - NANOS
+	TimeStampPrecision string = "TimeStampPrecision"
+
+	// ResetOnLogon determines if sequence numbers should be reset when receiving a logon request.
+	// Valid for FIX Acceptors only.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	ResetOnLogon string = "ResetOnLogon"
+
+	// RefreshOnLogon determines if session state should be restored from persistence layer when logging on.
+	// Useful for creating hot failover sessions.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	RefreshOnLogon string = "RefreshOnLogon"
+
+	// ResetOnLogout determines if sequence numbers should be reset to 1 after a normal logout termination.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	ResetOnLogout string = "ResetOnLogout"
+
+	// ResetOnDisconnect determines if sequence numbers should be reset to 1 after an abnormal termination.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	ResetOnDisconnect string = "ResetOnDisconnect"
+)
+
+const (
+	// Validation settings.
+
+	// DataDictionary is the path to an XML definition file for validating incoming FIX messages.
+	// If this is not set, only basic message validation will be done.
+	// If messages contain repeating groups, this is required to parse them correctly.
+	// This setting should only be used with FIX transport versions older than FIXT.1.1.
+	// See TransportDataDictionary and AppDataDictionary for FIXT.1.1 messages.
+	// Value must be a path to a valid XML data dictionary file.
+	//
+	// QuickFIX/Go repo contains the following standard dictionaries in the spec/ directory:
+	//  - FIX44.xml
+	//  - FIX43.xml
+	//  - FIX42.xml
+	//  - FIX41.xml
+	//  - FIX40.xml
+	//
+	// Required: No, but strongly recommended
+	//
+	// Default: No dictionary, and QuickFIX/Go does not attempt to load any standard dictionaries
+	//
+	// Valid Values:
+	//  - A filepath to a XML file with read access.
+	DataDictionary string = "DataDictionary"
+
+	// TransportDataDictionary is the path to an XML definition file for validating admin (transport) messages.
+	// This setting is only valid for FIXT.1.1 (or newer) sessions.
+	// See DataDictionary for older transport versions (FIX.4.0 - FIX.4.4) for additional information.
+	// Value must be a path to a valid XML data dictionary file.
+	//
+	// QuickFIX/Go repo contains the following standard dictionary in the spec/ directory
+	//  - FIXT1.1.xml
+	//
+	// Required: No, but strongly recommended. Required if also using AppDataDictionary
+	//
+	// Default: No dictionary, and QuickFIX/Go does not attempt to load any standard dictionaries
+	//
+	// Valid Values:
+	//  - A filepath to a XML file with read access.
+	TransportDataDictionary string = "TransportDataDictionary"
+
+	// AppDataDictionary is the path to an XML definition file for validating application messages.
+	// This setting is only valid for FIXT.1.1 (or newer) sessions.
+	// See DataDictionary for older transport versions (FIX.4.0 - FIX.4.4) for additional information.
+	// Value must be a path to a valid XML data dictionary file.
+	//
+	// This setting supports the possibility of a custom application data dictionary for each session.
+	// This setting can be used as a prefix to specify multiple application dictionaries for the FIXT transport.
+	//
+	// For example:
+	//  DefaultApplVerID=FIX.4.2
+	//  # For default application version ID
+	//  AppDataDictionary=FIX42.xml
+	//  # For nondefault application version ID
+	//  # Use BeginString suffix for app version
+	//  AppDataDictionary.FIX.4.4=FIX44.xml
+	//
+	// QuickFIX/Go repo contains the following standard dictionaries in the spec/ directory
+	//  - FIX50SP2.xml
+	//  - FIX50SP1.xml
+	//  - FIX50.xml
+	//  - FIX44.xml
+	//  - FIX43.xml
+	//  - FIX42.xml
+	//  - FIX41.xml
+	//  - FIX40.xml
+	//
+	// Required: No, but strongly recommended. Required if also using TransportDataDictionary
+	//
+	// Default: No dictionary, and QuickFIX/Go does not attempt to load any standard dictionaries
+	//
+	// Valid Values:
+	//  - A filepath to a XML file with read access.
+	AppDataDictionary string = "AppDataDictionary"
+
+	// RejectInvalidMessage is set by detault to Y, meaning that on reception of a message
+	// that fails data dictionary validation, a reject will be issued to the counter-party in responnse.
+	//
+	// Required: No
+	//
+	// Default: Y
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	RejectInvalidMessage string = "RejectInvalidMessage"
+
+	// AllowUnknownMessageFields is set by default to N, meaning that non user-defined fields (field with tag < 5000)
+	// will be rejected if they are not defined in the data dictionary,
+	// or are present in messages they do not belong to.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	AllowUnknownMessageFields string = "AllowUnknownMsgFields"
+
+	// CheckUserDefinedFields if set to N, user-defined fields (field with tag >= 5000) will not be rejected
+	// if they are not defined in the data dictionary, or are present in messages they do not belong to.
+	//
+	// Required: No
+	//
+	// Default: Y
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	CheckUserDefinedFields string = "ValidateUserDefinedFields"
+
+	// ValidateFieldsOutOfOrder if set to N, fields that are out of order (i.e. body fields in the header, or header fields in the body)
+	// will not be rejected. Useful for connecting to systems which do not properly order fields.
+	//
+	// Required: No
+	//
+	// Default: Y
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	ValidateFieldsOutOfOrder string = "ValidateFieldsOutOfOrder"
+
+	// CheckLatency if set to Y, messages must be received from the counter-party within a defined number of seconds.
+	// It is useful to turn this off if a system uses localtime for it's timestamps instead of GMT.
+	//
+	// Required: No
+	//
+	// Default: Y
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	CheckLatency string = "CheckLatency"
+
+	// MaxLatency if CheckLatency is set to Y, this defines the number of seconds latency allowed for a message to be processed.
+	// Value must be positive integer.
+	//
+	// Required: No
+	//
+	// Default: 120
+	//
+	// Valid Values:
+	//  - Any positive integer
+	MaxLatency string = "MaxLatency"
+)
 
-// Const configuration settings.
 const (
-	BeginString                  string = "BeginString"
-	SenderCompID                 string = "SenderCompID"
-	SenderSubID                  string = "SenderSubID"
-	SenderLocationID             string = "SenderLocationID"
-	TargetCompID                 string = "TargetCompID"
-	TargetSubID                  string = "TargetSubID"
-	TargetLocationID             string = "TargetLocationID"
-	SessionQualifier             string = "SessionQualifier"
-	SocketAcceptHost             string = "SocketAcceptHost"
-	SocketAcceptPort             string = "SocketAcceptPort"
-	SocketConnectHost            string = "SocketConnectHost"
-	SocketConnectPort            string = "SocketConnectPort"
-	SocketPrivateKeyFile         string = "SocketPrivateKeyFile"
-	SocketCertificateFile        string = "SocketCertificateFile"
-	SocketCAFile                 string = "SocketCAFile"
-	SocketInsecureSkipVerify     string = "SocketInsecureSkipVerify"
-	SocketServerName             string = "SocketServerName"
-	SocketMinimumTLSVersion      string = "SocketMinimumTLSVersion"
-	SocketTimeout                string = "SocketTimeout"
-	SocketUseSSL                 string = "SocketUseSSL"
-	ProxyType                    string = "ProxyType"
-	ProxyHost                    string = "ProxyHost"
-	ProxyPort                    string = "ProxyPort"
-	ProxyUser                    string = "ProxyUser"
-	ProxyPassword                string = "ProxyPassword"
-	UseTCPProxy                  string = "UseTCPProxy"
-	DefaultApplVerID             string = "DefaultApplVerID"
-	StartTime                    string = "StartTime"
-	EndTime                      string = "EndTime"
-	StartDay                     string = "StartDay"
-	EndDay                       string = "EndDay"
-	Weekdays                     string = "Weekdays"
-	TimeZone                     string = "TimeZone"
-	DataDictionary               string = "DataDictionary"
-	TransportDataDictionary      string = "TransportDataDictionary"
-	AppDataDictionary            string = "AppDataDictionary"
-	ResetOnLogon                 string = "ResetOnLogon"
-	RefreshOnLogon               string = "RefreshOnLogon"
-	ResetOnLogout                string = "ResetOnLogout"
-	ResetOnDisconnect            string = "ResetOnDisconnect"
-	ReconnectInterval            string = "ReconnectInterval"
-	LogoutTimeout                string = "LogoutTimeout"
-	LogonTimeout                 string = "LogonTimeout"
-	HeartBtInt                   string = "HeartBtInt"
-	HeartBtIntOverride           string = "HeartBtIntOverride"
-	FileLogPath                  string = "FileLogPath"
-	FileStorePath                string = "FileStorePath"
-	FileStoreSync                string = "FileStoreSync"
-	SQLStoreDriver               string = "SQLStoreDriver"
-	SQLStoreDataSourceName       string = "SQLStoreDataSourceName"
-	SQLStoreConnMaxLifetime      string = "SQLStoreConnMaxLifetime"
-	MongoStoreConnection         string = "MongoStoreConnection"
-	MongoStoreDatabase           string = "MongoStoreDatabase"
-	MongoStoreReplicaSet         string = "MongoStoreReplicaSet"
-	ValidateFieldsOutOfOrder     string = "ValidateFieldsOutOfOrder"
-	ResendRequestChunkSize       string = "ResendRequestChunkSize"
+	// Initiator-only settings.
+
+	// ReconnectInterval defines the time between reconnection attempts in seconds.
+	// Only used for initiators.
+	// Value must be positive integer.
+	//
+	// Required: No
+	//
+	// Default: 30
+	//
+	// Valid Values:
+	//  - Any positive integer
+	ReconnectInterval string = "ReconnectInterval"
+
+	// LogoutTimeout defines the number of seconds to wait for a logout response before disconnecting.
+	// Only used for initiators.
+	// Value must be positive integer.
+	//
+	// Required: No
+	//
+	// Default: 2
+	//
+	// Valid Values:
+	//  - Any positive integer
+	LogoutTimeout string = "LogoutTimeout"
+
+	// LogonTimeout defines the number of seconds to wait for a logon response before disconnecting.
+	// Only used for initiators.
+	// Value must be positive integer.
+	//
+	// Required: No
+	//
+	// Default: 10
+	//
+	// Valid Values:
+	//  - Any positive integer
+	LogonTimeout string = "LogonTimeout"
+
+	// HeartBtInt sets the FIX session heartbeat interval in seconds.
+	// Only used for initiators (unless acceptor sets HeartBtIntOverride to Y).
+	// Value must be positive integer.
+	//
+	// Required: Yes for initiators or acceptors with HeartBtIntOverride
+	//
+	// Default: None
+	//
+	// Valid Values:
+	//  - Any positive integer
+	HeartBtInt string = "HeartBtInt"
+
+	// SocketConnectHost sets the host to attempt to connect to.
+	// In config files you can also set SocketConnectHost<n> where n is a positive integer.
+	// This allows for alternate socket hosts for connecting to a session for failover.
+	// (i.e.) SocketConnectHost1, SocketConnectHost2... must be consecutive and have a matching SocketConnectPort<n>.
+	//
+	// Required: Yes for initiators
+	//
+	// Default: None
+	//
+	// Valid Values:
+	//  - A valid IPv4 or IPv6 address or a domain name
+	SocketConnectHost string = "SocketConnectHost"
+
+	// SocketConnectPort sets the socket port for connecting to a session.
+	// In config files you can also set SocketConnectPort<n> where n is a positive integer.
+	// This allows for alternate socket ports for connecting to a session for failover.
+	// (i.e.) SocketConnectPort1, SocketConnectPort2... must be consecutive and have a matching SocketConnectHost<n>.
+	//
+	// Required: Yes for initiators
+	//
+	// Default: None
+	//
+	// Valid Values:
+	//  - A positive integer
+	SocketConnectPort string = "SocketConnectPort"
+
+	// SocketTimeout sets the duration of timeout for TLS handshake.
+	// Only used for initiators.
+	//
+	// Example Values:
+	//  - SocketTimeout=30s # 30 seconds
+	//  - SocketTimeout=60m # 60 minutes
+	//
+	// Required: No
+	//
+	// Default: 0 (no timeout)
+	//
+	// Valid Values:
+	//  - A valid go time.Duration
+	SocketTimeout string = "SocketTimeout"
+
+	// ProxyType sets the type of proxy server to connect to.
+	// Only used for initiators.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - socks
+	ProxyType string = "ProxyType"
+
+	// ProxyHost provides the address of the proxy server to connect to.
+	// Only used for initiators.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A valid IPv4 or IPv6 address or a domain name
+	ProxyHost string = "ProxyHost"
+
+	// ProxyPort provides the port of the proxy server to connect to.
+	// Only used for initiators.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Any positive integer
+	ProxyPort string = "ProxyPort"
+
+	// ProxyUser sets the username for the proxy server connection.
+	// Only used for initiators.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Any string
+	ProxyUser string = "ProxyUser"
+
+	// ProxyPassword sets the password for the proxy server connection.
+	// Only used for initiators.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Any string
+	ProxyPassword string = "ProxyPassword"
+)
+
+const (
+	// Acceptor-only settings.
+
+	// SocketAcceptHost sets the address for listening on incoming connections.
+	// Used for acceptors only.
+	//
+	// Common examples:
+	//  - 127.0.0.1 (for testing on localhost)
+	//  - 0.0.0.0 (explicitly specify every available interface)
+	//
+	// Required: No
+	//
+	// Default: Listens on all available network interfaces.
+	//
+	// Valid Values:
+	//  - A valid IPv4 or IPv6 address or a domain name
+	SocketAcceptHost string = "SocketAcceptHost"
+
+	// SocketAcceptPort sets the socket port for listening to incoming connections.
+	// Used for acceptors only.
+	//
+	// Required: Yes for acceptors
+	//
+	// Default: None
+	//
+	// Valid Values:
+	//  - A positive integer, representing a valid open socket port
+	SocketAcceptPort string = "SocketAcceptPort"
+
+	// HeartBtIntOverride if set to Y, will use the HeartBtInt value in the acceptor's config file for the heartbeat interval rather than what the initiator dictates.
+	// Used for acceptors only.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	HeartBtIntOverride string = "HeartBtIntOverride"
+
+	// UseTCPProxy if set to Y, use TCP proxy for servers listening behind HAProxy of Amazon ELB load balancers.
+	// The server can then receive the address of the client instead of the load balancer's.
+	// Used for acceptors only.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	UseTCPProxy string = "UseTCPProxy"
+
+	// DynamicSessions if set to Y, allows sessions to connect to this acceptor
+	// without explicitly stating SenderCompID/TargetCompID in the config file for the acceptor.
+	// Used for acceptors only.
+	//
+	// Use DynamicQualifier=Y if initiator client sessions are using the same SenderCompID.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	DynamicSessions string = "DynamicSessions"
+
+	// DynamicQualifier is used in conjunction with DynamicSessions.
+	// If set to Y, allows sessions to connect to this acceptor
+	// when initiator client sessions are using the same SenderCompID.
+	// Used for acceptors only.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	DynamicQualifier string = "DynamicQualifier"
+)
+
+const (
+	// Security settings.
+
+	// SocketPrivateKeyFile is the filepath for the private key to use for secure TLS connections.
+	// Must be used with SocketCertificateFile.
+	// Must contain PEM encoded data.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A filepath to a file with read access.
+	SocketPrivateKeyFile string = "SocketPrivateKeyFile"
+
+	// SocketCertificateFile is the filepath for the certificate to use for secure TLS connections.
+	// Must be used with SocketPrivateKeyFile.
+	// Must contain PEM encoded data.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A filepath to a file with read access.
+	SocketCertificateFile string = "SocketCertificateFile"
+
+	// SocketCAFile is an optional filepath for a root CA to use for secure TLS connections.
+	// For acceptors, client certificates will be verified against this CA.
+	// For initiators, clients will use the CA to verify the server certificate.
+	// If not configurated, initiators will verify the server certificate using the host's root CA set.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A filepath to a file with read access.
+	SocketCAFile string = "SocketCAFile"
+
+	// SocketInsecureSkipVerify controls whether a client verifies the server's certificate chain and host name.
+	// If SocketInsecureSkipVerify is set to Y, crypto/tls accepts any certificate presented by the server and any host name in that certificate.
+	// In this mode, TLS is susceptible to machine-in-the-middle attacks unless custom verification is used.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	SocketInsecureSkipVerify string = "SocketInsecureSkipVerify"
+
+	// SocketServerName sets the expected server name on a returned certificate, unless SocketInsecureSkipVerify is true.
+	// This is for the TLS Server Name Indication extension.
+	// Only used for initiators.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Any string
+	SocketServerName string = "SocketServerName"
+
+	// SocketMinimumTLSVersion specifies the minimum TLS version to use when creating a secure connection.
+	//
+	// Required: No
+	//
+	// Default: TLS12.
+	//
+	// Valid Values:
+	//  - SSL30
+	//  - TLS10
+	//  - TLS11
+	//  - TLS12
+	SocketMinimumTLSVersion string = "SocketMinimumTLSVersion"
+
+	// SocketUseSSL if set to Y, an initiator will use TLS even if client certificates are not present.
+	// It is set to N by default, meaning TLS will not be used if SocketPrivateKeyFile or SocketCertificateFile are not supplied.
+	//
+	// This is used for initiators in the case where you do not need to provide client certificates, but still need to use
+	// a TLS connection and should verify the server certificate(s).
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	SocketUseSSL string = "SocketUseSSL"
+)
+
+const (
+	// Logging settings.
+
+	// FileLogPath sets the directory path in which to write log files to.
+	// This will create the directory path if it does not already exist.
+	// FileLogPath is only relevant if also using quickfix.NewFileLogFactory(..) in code
+	// when creating your LogFactory for your initiator or acceptor.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A valid path
+	FileLogPath string = "FileLogPath"
+)
+
+const (
+	// Storage settings.
+
+	// PersistMessages if set to N, no messages will be persisted.
+	// This will force QuickFIX/Go to always send GapFills instead of resending messages.
+	// Use this if you know you never want to resend a message.
+	// This is useful for market data streams when logging all incoming messages is not important.
+	//
+	// Required: No
+	//
+	// Default: Y
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	PersistMessages string = "PersistMessages"
+
+	// FileStorePath sets the directory path in which to write sequence number and message files.
+	// This will create the directory path if it does not already exist.
+	// FileStorePath is only relevant if also using file.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// Required: Only if using files as your MessageStore
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A valid path
+	FileStorePath string = "FileStorePath"
+
+	// FileStoreSync controls whether the FileStore syncs to the hard drive on every write.
+	// It's safer to sync, but it's also much slower.
+	// FileStoreSync is only relevant if also using file.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// Required: No
+	//
+	// Default: Y
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	FileStoreSync string = "FileStoreSync"
+
+	// SQLStoreDriver sets the name of the database driver to use (see https://go.dev/wiki/SQLDrivers for the list of available drivers).
+	// SQLStoreDriver is only relevant if also using sql.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// Required: Only if using a sql db as your MessageStore
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - See https://go.dev/wiki/SQLDrivers
+	SQLStoreDriver string = "SQLStoreDriver"
+
+	// SQLStoreDataSourceName sets the driver-specific data source name of the database to use.
+	// This usually consists of at least a database name and connection information.
+	// SQLStoreDataSourceName is only relevant if also using sql.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// See https://pkg.go.dev/database/sql#Open for more information.
+	//
+	// Required: Only if using a sql db as your MessageStore
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string correspondinng to a datasource
+	SQLStoreDataSourceName string = "SQLStoreDataSourceName"
+
+	// SQLStoreConnMaxLifetime sets the maximum duration of time that a database connection may be reused.
+	// See https://pkg.go.dev/database/sql#DB.SetConnMaxLifetime for more information.
+	//
+	// If your database server has a config option to close inactive connections after some duration (e.g. MySQL "wait_timeout"),
+	// set SQLStoreConnMaxLifetime to a value less than that duration.
+	//
+	// Example Values:
+	//  - SQLStoreConnMaxLifetime=14400s # 14400 seconds
+	//  - SQLStoreConnMaxLifetime=2h45m  # 2 hours and 45 minutes
+	//
+	// SQLStoreConnMaxLifetime is only relevant if also using sql.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// Required: No
+	//
+	// Default: 0 (forever)
+	//
+	// Valid Values:
+	//  - A valid go time.Duration
+	SQLStoreConnMaxLifetime string = "SQLStoreConnMaxLifetime"
+
+	// MongoStoreConnection sets the MongoDB connection URL to use.
+	//
+	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
+	//
+	// MongoStoreConnection is only relevant if also using mongo.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// Required: Only if using MongoDB as your MessageStore
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string representing a MongoDB connection
+	MongoStoreConnection string = "MongoStoreConnection"
+
+	// MongoStoreDatabase sets the MongoDB-specific name of the database to use.
+	//
+	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
+	//
+	// MongoStoreDatabase is only relevant if also using mongo.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// Required: Only if using MongoDB as your MessageStore
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string corresponding to a MongoDB database
+	MongoStoreDatabase string = "MongoStoreDatabase"
+
+	// MongoStoreReplicaSet sets the MongoDB replica set to use.
+	// This is optional.
+	//
+	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
+	//
+	// MongoStoreReplicaSet is only relevant if also using mongo.NewStoreFactory(..) in code
+	// when creating your MessageStoreFactory for your initiator or acceptor.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string corresponding to a MongoDB replica set
+	MongoStoreReplicaSet string = "MongoStoreReplicaSet"
+)
+
+const (
+	// Misc settings.
+
+	// ResendRequestChunkSize is a setting to limit the size of a resend request in case of missing messages.
+	// This is useful when the remote FIX engine does not allow to ask for more than <n> messages for a ResendRequest.
+	//
+	// I.e. if the ResendRequestChunkSize is set to 5 and a gap of 7 messages is detected, a first resend request will be sent for 5 messages.
+	// When this gap has been filled, another resend request for 2 messages will be sent.
+	// If the ResendRequestChunkSize is set to 0, only one ResendRequest for all the missing messages will be sent.
+	//
+	// Required: No
+	//
+	// Default: 0 (do not chunk resends)
+	//
+	// Valid Values:
+	//  - A positive integer
+	ResendRequestChunkSize string = "ResendRequestChunkSize"
+
+	// EnableLastMsgSeqNumProcessed tells the FIX engine to add the last message sequence number processed
+	// to outgoing message headers (using optional tag 369).
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
 	EnableLastMsgSeqNumProcessed string = "EnableLastMsgSeqNumProcessed"
-	CheckLatency                 string = "CheckLatency"
-	TimeStampPrecision           string = "TimeStampPrecision"
-	MaxLatency                   string = "MaxLatency"
-	PersistMessages              string = "PersistMessages"
-	RejectInvalidMessage         string = "RejectInvalidMessage"
-	AllowUnknownMessageFields    string = "AllowUnknownMsgFields"
-	CheckUserDefinedFields       string = "ValidateUserDefinedFields"
-	DynamicSessions              string = "DynamicSessions"
-	DynamicQualifier             string = "DynamicQualifier"
 )
diff --git a/config/doc.go b/config/doc.go
deleted file mode 100644
index 911a4458a..000000000
--- a/config/doc.go
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
-Package config declares application and session settings for QuickFIX/Go
-
-# BeginString
-
-Version of FIX this session should use. Valid values:
-
-	FIXT.1.1
-	FIX.4.4
-	FIX.4.3
-	FIX.4.2
-	FIX.4.1
-	FIX.4.0
-
-# SenderCompID
-
-Your ID as associated with this FIX session. Value is	case-sensitive alpha-numeric string.
-
-# SenderSubID
-
-(Optional) Your subID as associated with this FIX session.  Value is case-sensitive alpha-numeric string.
-
-# SenderLocationID
-
-(Optional) Your locationID as associated with this FIX session.  Value is case-sensitive alpha-numeric string.
-
-# TargetCompID
-
-Counter parties ID as associated with this FIX session. Value is case-sensitive alpha-numeric string.
-
-# TargetSubID
-
-(Optional) Counterparty's subID as associated with this FIX session.  Value is case-sensitive alpha-numeric string.
-
-# TargetLocationID
-
-(Optional) Counterparty's locationID as associated with this FIX session. Value is case-sensitive alpha-numeric string.
-
-# SessionQualifier
-
-Additional qualifier to disambiguate otherwise identical sessions. Value is	case-sensitive alpha-numeric string.
-
-# DefaultApplVerID
-
-Required only for FIXT 1.1 (and newer). Ignored for earlier transport versions. Specifies the default application version ID for the session. This can either be the ApplVerID enum (see the ApplVerID field) or the BeginString for the default version.	Valid Values:
-
-	FIX.5.0SP2
-	FIX.5.0SP1
-	FIX.5.0
-	FIX.4.4
-	FIX.4.3
-	FIX.4.2
-	FIX.4.1
-	FIX.4.0
-	9
-	8
-	7
-	6
-	5
-	4
-	3
-	2
-
-# TimeZone
-
-Time zone for this session; if specified, the session start and end will be converted from this zone to UTC.  Valid Values:
-
-	IANA Time zone ID (America/New_York, Asia/Tokyo, Europe/London, etc.)
-	Local (The Zone on host)
-
-Defaults to UTC.
-
-# StartTime
-
-Time of day that this FIX session becomes activated. Valid Values:
-
-	time in the format of HH:MM:SS, time is represented in time zone configured by TimeZone
-
-# EndTime
-
-Time of day that this FIX session becomes deactivated. Valid Values:
-
-	time in the format of HH:MM:SS, time is represented in time zone configured by TimeZone
-
-# StartDay
-
-For week long sessions, the starting day of week for the session. Use in combination with StartTime. Incompatible with Weekdays. Valid Values:
-
-	Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
-
-# EndDay
-
-For week long sessions, the ending day of week for the session. Use in combination with EndTime. Incompatible with Weekdays. Valid Values:
-
-	Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
-
-# Weekdays
-
-For daily sessions that are only active on specific days of the week. Use in combination with StartTime and EndTime. Incompatible with StartDay and EndDay. Valid Values:
-
-	Comma delimited list of days of the week in English, or 3 letter abbreviation (e.g. "Monday,Tuesday,Wednesday" or "Mon,Tue,Wed" would both be valid values).
-
-# EnableLastMsgSeqNumProcessed
-
-Add the last message sequence number processed in the header (optional tag 369).  Valid Values:
-
-	Y
-	N
-
-Defaults to N.
-
-# ResendRequestChunkSize
-
-Setting to limit the size of a resend request in case of missing messages. This is useful when the remote FIX engine does not allow to ask for more than n message for a ResendRequest.  E.g. if the ResendRequestChunkSize is set to 5 and a gap of 7 messages is detected, a first resend request will be sent for 5 messages. When this gap has been filled, another resend request for 2 messages will be sent. If the ResendRequestChunkSize is set to 0, only one ResendRequest for all the missing messages will be sent. Value must be positive integer. Defaults to 0 (disables splitting).
-
-# ResetOnLogon
-
-Determines if sequence numbers should be reset when receiving a logon request. Acceptors only.	Valid Values:
-
-	Y
-	N
-
-Defaults to N.
-
-# ResetOnLogout
-
-Determines if sequence numbers should be reset to 1 after a normal logout termination. Valid Values:
-
-	Y
-	N
-
-Defaults to N.
-
-# ResetOnDisconnect
-
-Determines if sequence numbers should be reset to 1 after an abnormal termination. Valid Values:
-
-	Y
-	N
-
-Defaults to N.
-
-# RefreshOnLogon
-
-Determines if session state should be restored from persistence layer when logging on. Useful for creating hot failover sessions. Valid Values:
-
-	Y
-	N
-
-Defaults to N.
-
-# TimeStampPrecision
-
-Determines precision for timestamps in (Orig)SendingTime fields that are sent out. Only available for FIX.4.2 and greater, FIX versions earlier than FIX.4.2 will use timestamp resolution in seconds. Valid Values:
-
-	SECONDS
-	MILLIS
-	MICROS
-	NANOS
-
-Defaults to MILLIS.
-
-# Validation
-
-The following settings are specific to message validation.
-
-# DataDictionary
-
-XML definition file for validating incoming FIX messages. If no DataDictionary is supplied, only basic message validation will be done.
-
-This setting should only be used with FIX transport versions older than FIXT.1.1. See TransportDataDictionary and AppDataDictionary for FIXT.1.1 settings. Value must be a valid XML data dictionary file. QuickFIX/Go comes with the following defaults in the spec directory
-
-	FIX44.xml
-	FIX43.xml
-	FIX42.xml
-	FIX41.xml
-	FIX40.xml
-
-# TransportDataDictionary
-
-XML definition file for validating admin (transport) messages. This setting is only valid for FIXT.1.1 (or newer) sessions.  See DataDictionary for older transport versions (FIX.4.0 - FIX.4.4) for additional information. Value must be a valid XML data dictionary file, QuickFIX/Go comes with the following defaults in the spec directory
-
-	FIXT1.1.xml
-
-# AppDataDictionary
-
-XML definition file for validating application messages. This setting is only valid for FIXT.1.1 (or newer) sessions. See DataDictionary for older transport versions (FIX.4.0 - FIX.4.4) for additional information.
-
-This setting supports the possibility of a custom application data dictionary for each session. This setting would only be used with FIXT 1.1 and new transport protocols. This setting can be used as a prefix to specify multiple application dictionaries for the FIXT transport. For example:
-
-	DefaultApplVerID=FIX.4.2
-	# For default application version ID
-	AppDataDictionary=FIX42.xml
-	# For nondefault application version ID
-	# Use BeginString suffix for app version
-	AppDataDictionary.FIX.4.4=FIX44.xml
-
-Value must be a valid XML data dictionary file. QuickFIX/Go comes with the following defaults in the spec directory
-
-	FIX50SP2.xml
-	FIX50SP1.xml
-	FIX50.xml
-	FIX44.xml
-	FIX43.xml
-	FIX42.xml
-	FIX41.xml
-	FIX40.xml
-
-# ValidateFieldsOutOfOrder
-
-If set to N, fields that are out of order (i.e. body fields in the header, or header fields in the body) will not be rejected. Useful for connecting to systems which do not properly order fields. Valid Values:
-
-	Y
-	N
-
-Defaults to Y.
-
-# RejectInvalidMessage
-
-If RejectInvalidMessage is set to N, zero errors will be thrown on reception of message that fails data dictionary validation. Valid Values:
-
-	Y
-	N
-
-Defaults to Y.
-
-# CheckLatency
-
-If set to Y, messages must be received from the counterparty within a defined number of seconds. It is useful to turn this off if a system uses localtime for it's timestamps instead of GMT. Valid Values:
-
-	Y
-	N
-
-Defaults to Y.
-
-# MaxLatency
-
-If CheckLatency is set to Y, this defines the number of seconds latency allowed for a message to be processed. Value must be positive integer.
-
-Defaults to 120.
-
-# ReconnectInterval
-
-Time between reconnection attempts in seconds. Only used for initiators.    Value must be positive integer.
-
-# Defaults to 30
-
-# LogoutTimeout
-
-Session setting for logout timeout in seconds. Only used for initiators. Value must be positive integer.
-
-# Defaults to 2
-
-# LogonTimeout
-
-Session setting for logon timeout in seconds. Only used for initiators. Value must be positive integer.
-
-# Defaults to 10
-
-# HeartBtInt
-
-Heartbeat interval in seconds. Only used for initiators (unless HeartBtIntOverride is Y).	Value must be positive integer.
-
-# HeartBtIntOverride
-
-If set to Y, will use the HeartBtInt interval rather than what the initiator dictates. Only used for acceptors. Valid Values:
-
-	Y
-	N
-
-Defaults to N.
-
-# SocketConnectPort
-
-Socket port for connecting to a session. Only used for initiators. Must be positive integer
-
-# SocketConnectHost
-
-Host to connect to. Only used for initiators. Value must be a valid IPv4 or IPv6 address or a domain name
-
-SocketConnectPort<n>
-
-Alternate socket ports for connecting to a session for failover, where n is a positive integer. (i.e.) SocketConnectPort1, SocketConnectPort2... must be consecutive and have a matching SocketConnectHost[n]. Value must be a positive integer.
-
-SocketConnectHost<n>
-
-Alternate socket hosts for connecting to a session for failover, where n is a positive integer. (i.e.) SocketConnectHost1, SocketConnectHost2... must be consecutive and have a matching SocketConnectPort[n]. Value must be a valid IPv4 or IPv6 address or a domain name
-
-# SocketTimeout
-
-Duration of timeout for TLS handshake. Only used for initiators.
-
-Example Values:
-
-	SocketTimeout=30s # 30 seconds
-	SocketTimeout=60m # 60 minutes
-
-Defaults to 0(means nothing timeout).
-
-# SocketAcceptHost
-
-Socket host address for listening on incoming connections, only used for acceptors. By default acceptors listen on all available interfaces.
-
-# SocketAcceptPort
-
-Socket port for listening to incoming connections, only used for acceptors. Value must be a positive integer, valid open socket port.
-
-# SocketPrivateKeyFile
-
-Private key to use for secure TLS connections.  Must be used with SocketCertificateFile.
-
-# SocketCertificateFile
-
-Certificate to use for secure TLS connections. Must be used with SocketPrivateKeyFile.
-
-# SocketCAFile
-
-Optional root CA to use for secure TLS connections. For acceptors, client certificates will be verified against this CA.  For initiators, clients will use the CA to verify the server certificate. If not configurated, initiators will verify the server certificate using the host's root CA set.
-
-# SocketServerName
-
-The expected server name on a returned certificate, unless SocketInsecureSkipVerify is true. This is for the TLS Server Name Indication extension. Initiator only.
-
-# SocketMinimumTLSVersion
-
-Specify the Minimum TLS version to use when creating a secure connection. The valid choices are SSL30, TLS10, TLS11, TLS12. Defaults to TLS12.
-
-# SocketUseSSL
-
-Use SSL for initiators even if client certificates are not present. If set to N or omitted, TLS will not be used if SocketPrivateKeyFile or SocketCertificateFile are not supplied.
-
-# ProxyType
-
-Proxy type. Valid Values:
-
-	socks
-
-# ProxyHost
-
-# Proxy server IP address in the format of x.x.x.x or a domain name
-
-# ProxyPort
-
-# Proxy server port
-
-# ProxyUser
-
-# Proxy user
-
-# ProxyPassword
-
-# Proxy password
-
-# UseTCPProxy
-
-Use TCP proxy for servers listening behind HAProxy of Amazon ELB load balancers. The server can then receive the address of the client instead of the load balancer's.	Valid Values:
-
-	Y
-	N
-
-# PersistMessages
-
-If set to N, no messages will be persisted. This will force QuickFIX/Go to always send GapFills instead of resending messages. Use this if you know you never want to resend a message. Useful for market data streams.  Valid Values:
-
-	Y
-	N
-
-Defaults to Y.
-
-# FileLogPath
-
-Directory to store logs.	Value must be valid directory for storing files, application must have write access.
-
-# FileStorePath
-
-Directory to store sequence number and message files.  Only used with FileStoreFactory.
-
-# MongoStoreConnection
-
-The MongoDB connection URL to use (see https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more info).  Only used with MongoStoreFactory.
-
-# MongoStoreDatabase
-
-The MongoDB-specific name of the database to use.  Only used with MongoStoreFactory.
-
-# MongoStoreReplicaSet
-
-The MongoDB-specific name of the replica set to use. Optional, only used with MongoStoreFactory.
-
-# SQLStoreDriver
-
-The name of the database driver to use (see https://github.com/golang/go/wiki/SQLDrivers for the list of available drivers).  Only used with SqlStoreFactory.
-
-# SQLStoreDataSourceName
-
-The driver-specific data source name of the database to use.  Only used with SqlStoreFactory.
-
-# SQLStoreConnMaxLifetime
-
-SetConnMaxLifetime sets the maximum duration of time that a database connection may be reused (see https://golang.org/pkg/database/sql/#DB.SetConnMaxLifetime).  Defaults to zero, which causes connections to be reused forever.  Only used with SqlStoreFactory.
-
-If your database server has a config option to close inactive connections after some duration (e.g. MySQL "wait_timeout"), set SQLConnMaxLifetime to a value less than that duration.
-
-Example Values:
-
-	SQLConnMaxLifetime=14400s # 14400 seconds
-	SQLConnMaxLifetime=2h45m  # 2 hours and 45 minutes
-*/
-package config

From 1c2db3a7131eb08f7e5294e46fb7a3d2aa872c57 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Wed, 3 Jul 2024 15:42:19 -0500
Subject: [PATCH 30/58] Adds resendreqchunksize and lastseqnumprocessed test
 suites, refactors test runners

---
 .github/workflows/ci.yaml                     | 218 ++++++++++++++++--
 Makefile                                      |  22 +-
 _test/cfg/lastseqnumprocessed/fix42.cfg       |  11 +
 _test/cfg/lastseqnumprocessed/fix43.cfg       |  11 +
 _test/cfg/lastseqnumprocessed/fix44.cfg       |  11 +
 _test/cfg/lastseqnumprocessed/fix50.cfg       |  14 ++
 _test/cfg/lastseqnumprocessed/fix50sp1.cfg    |  14 ++
 _test/cfg/lastseqnumprocessed/fix50sp2.cfg    |  14 ++
 _test/cfg/resendreqchunksize/fix40.cfg        |  11 +
 _test/cfg/resendreqchunksize/fix41.cfg        |  11 +
 _test/{ => cfg/resendreqchunksize}/fix42.cfg  |   1 +
 _test/cfg/resendreqchunksize/fix43.cfg        |  11 +
 _test/cfg/resendreqchunksize/fix44.cfg        |  11 +
 _test/cfg/resendreqchunksize/fix50.cfg        |  14 ++
 _test/cfg/resendreqchunksize/fix50sp1.cfg     |  14 ++
 _test/cfg/resendreqchunksize/fix50sp2.cfg     |  14 ++
 _test/{ => cfg/server}/fix40.cfg              |   0
 _test/{ => cfg/server}/fix41.cfg              |   0
 _test/cfg/server/fix42.cfg                    |  10 +
 _test/{ => cfg/server}/fix43.cfg              |   0
 _test/{ => cfg/server}/fix44.cfg              |   0
 _test/{ => cfg/server}/fix50.cfg              |   0
 _test/{ => cfg/server}/fix50sp1.cfg           |   0
 _test/{ => cfg/server}/fix50sp2.cfg           |   0
 .../fix42/LastProcessedMsgSeqNum.def          |  21 ++
 .../fix43/LastProcessedMsgSeqNum.def          |  21 ++
 .../fix44/LastProcessedMsgSeqNum.def          |  21 ++
 .../fix50/LastProcessedMsgSeqNum.def          |  21 ++
 .../fix50sp1/LastProcessedMsgSeqNum.def       |  21 ++
 .../fix50sp2/LastProcessedMsgSeqNum.def       |  21 ++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 .../SequenceGapFollowedByMessageResent.def    |  37 +++
 ...eGapFollowedBySequenceResetWithGapFill.def |  41 ++++
 resend_state.go                               |  16 ++
 47 files changed, 1157 insertions(+), 21 deletions(-)
 create mode 100644 _test/cfg/lastseqnumprocessed/fix42.cfg
 create mode 100644 _test/cfg/lastseqnumprocessed/fix43.cfg
 create mode 100644 _test/cfg/lastseqnumprocessed/fix44.cfg
 create mode 100644 _test/cfg/lastseqnumprocessed/fix50.cfg
 create mode 100644 _test/cfg/lastseqnumprocessed/fix50sp1.cfg
 create mode 100644 _test/cfg/lastseqnumprocessed/fix50sp2.cfg
 create mode 100644 _test/cfg/resendreqchunksize/fix40.cfg
 create mode 100644 _test/cfg/resendreqchunksize/fix41.cfg
 rename _test/{ => cfg/resendreqchunksize}/fix42.cfg (87%)
 create mode 100644 _test/cfg/resendreqchunksize/fix43.cfg
 create mode 100644 _test/cfg/resendreqchunksize/fix44.cfg
 create mode 100644 _test/cfg/resendreqchunksize/fix50.cfg
 create mode 100644 _test/cfg/resendreqchunksize/fix50sp1.cfg
 create mode 100644 _test/cfg/resendreqchunksize/fix50sp2.cfg
 rename _test/{ => cfg/server}/fix40.cfg (100%)
 rename _test/{ => cfg/server}/fix41.cfg (100%)
 create mode 100644 _test/cfg/server/fix42.cfg
 rename _test/{ => cfg/server}/fix43.cfg (100%)
 rename _test/{ => cfg/server}/fix44.cfg (100%)
 rename _test/{ => cfg/server}/fix50.cfg (100%)
 rename _test/{ => cfg/server}/fix50sp1.cfg (100%)
 rename _test/{ => cfg/server}/fix50sp2.cfg (100%)
 create mode 100644 _test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def
 create mode 100644 _test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def
 create mode 100644 _test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def
 create mode 100644 _test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def
 create mode 100644 _test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def
 create mode 100644 _test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def
 create mode 100644 _test/definitions/resendreqchunksize/fix40/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix40/SequenceGapFollowedBySequenceResetWithGapFill.def
 create mode 100644 _test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def
 create mode 100644 _test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def
 create mode 100644 _test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def
 create mode 100644 _test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def
 create mode 100644 _test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def
 create mode 100644 _test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def
 create mode 100644 _test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def
 create mode 100644 _test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4d58289a2..a1ff334be 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -31,18 +31,118 @@ jobs:
           version: v1.57.2
 
   build:
-    name: build
+    name: Build Source
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Build
+        run: make build-src
+
+  unittest:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.8.0
+        with:
+          mongodb-replica-set: replicaset
+      - name: Unit test
+        env:
+          MONGODB_TEST_CXN: mongodb://localhost:27017
+        run: make test-ci
+
+  servermem:
+    name: Server MemoryStore Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+        fix-version:
+          - fix40
+          - fix41
+          - fix42
+          - fix43
+          - fix44
+          - fix50
+          - fix50sp1
+          - fix50sp2
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - name: Acceptance test
+        env:
+          GO111MODULE: on
+          FIX_TEST: ${{ matrix.fix-version }}
+          STORE_TYPE: memory
+          ACCEPTANCE_SET: server
+        run: make generate-ci && make build && make $FIX_TEST
+
+  serverfile:
+    name: Server FileStore Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+        fix-version:
+          - fix40
+          - fix41
+          - fix42
+          - fix43
+          - fix44
+          - fix50
+          - fix50sp1
+          - fix50sp2
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - name: Acceptance test
+        env:
+          GO111MODULE: on
+          FIX_TEST: ${{ matrix.fix-version }}
+          STORE_TYPE: file
+          ACCEPTANCE_SET: server
+        run: make generate-ci && make build && make $FIX_TEST
+
+  servermongo:
+    name: Server MongoStore Suite
     runs-on: ubuntu-latest
     strategy:
       matrix:
         go: [1.21]
-        store-type:
-          -
-          - memory
-          - file
-          - mongo
         fix-version:
-          -
           - fix40
           - fix41
           - fix42
@@ -66,15 +166,107 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
-      - name: Unit  test
+      - name: Acceptance test
+        env:
+          GO111MODULE: on
+          MONGODB_TEST_CXN: mongodb://localhost:27017
+          FIX_TEST: ${{ matrix.fix-version }}
+          STORE_TYPE: mongo
+          ACCEPTANCE_SET: server
+        run: make generate-ci && make build && make $FIX_TEST
+
+  resendreqchunksize:
+    name: ResendRequestChunkSize Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+        fix-version:
+          - fix40
+          - fix41
+          - fix42
+          - fix43
+          - fix44
+          - fix50
+          - fix50sp1
+          - fix50sp2
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - name: Acceptance test
         env:
+          GO111MODULE: on
           FIX_TEST: ${{ matrix.fix-version }}
-          STORE_TYPE: ${{ matrix.store-type }}
-        run: if [ -z $FIX_TEST ] && [ -z $STORE_TYPE ]; then make build-src && make test-ci; fi
+          STORE_TYPE: memory
+          ACCEPTANCE_SET: resendreqchunksize
+        run: make generate-ci && make build && make $FIX_TEST
+
+  lastseqnumprocessed:
+    name: LastSeqNumProcessed Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+        fix-version:
+          - fix42
+          - fix43
+          - fix44
+          - fix50
+          - fix50sp1
+          - fix50sp2
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
       - name: Acceptance test
         env:
           GO111MODULE: on
-          MONGODB_TEST_CXN: mongodb://localhost:27017
           FIX_TEST: ${{ matrix.fix-version }}
-          STORE_TYPE: ${{ matrix.store-type }}
-        run: if [ $FIX_TEST ] && [ $STORE_TYPE ]; then make generate-ci && make build && make $FIX_TEST; fi
+          STORE_TYPE: memory
+          ACCEPTANCE_SET: lastseqnumprocessed
+        run: make generate-ci && make build && make $FIX_TEST
+
+  # nextexpectedseqnum:
+  #   name: NextExpectedSeqNum Suite
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       go: [1.21]
+  #       fix-version:
+  #         - fix44
+  #         - fix50
+  #         - fix50sp1
+  #         - fix50sp2
+  #   steps:
+  #     - name: Setup
+  #       uses: actions/setup-go@v2
+  #       with:
+  #         go-version: ${{ matrix.go }}
+  #     - name: Check out source
+  #       uses: actions/checkout@v2
+  #     - name: Install ruby
+  #       uses: ruby/setup-ruby@v1
+  #       with:
+  #         ruby-version: '3.0'
+  #     - name: Acceptance test
+  #       env:
+  #         GO111MODULE: on
+  #         FIX_TEST: ${{ matrix.fix-version }}
+  #         STORE_TYPE: memory
+  #         ACCEPTANCE_SET: nextexpectedseqnum
+  #       run: make generate-ci && make build && make $FIX_TEST
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 75a60a66e..8d3c2c6cc 100644
--- a/Makefile
+++ b/Makefile
@@ -38,24 +38,30 @@ else
 STORE := memory
 endif
 
+ifdef ACCEPTANCE_SET
+TEST_SET := $(ACCEPTANCE_SET)
+else
+TEST_SET := server
+endif
+
 build-test-srv:
 	cd _test; go build -v -o echo_server ./test-server/
 fix40:
-	cd _test; ./runat.sh $@.cfg 5001 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5001 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 fix41:
-	cd _test; ./runat.sh $@.cfg 5002 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5002 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 fix42:
-	cd _test; ./runat.sh $@.cfg 5003 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5003 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 fix43:
-	cd _test; ./runat.sh $@.cfg 5004 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5004 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 fix44:
-	cd _test; ./runat.sh $@.cfg 5005 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5005 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 fix50:
-	cd _test; ./runat.sh $@.cfg 5006 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5006 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 fix50sp1:
-	cd _test; ./runat.sh $@.cfg 5007 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5007 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 fix50sp2:
-	cd _test; ./runat.sh $@.cfg 5008 $(STORE) "definitions/server/$@/*.def"
+	cd _test; ./runat.sh cfg/$(TEST_SET)/$@.cfg 5008 $(STORE) "definitions/$(TEST_SET)/$@/*.def"
 
 ACCEPT_SUITE=fix40 fix41 fix42 fix43 fix44 fix50 fix50sp1 fix50sp2 
 accept: $(ACCEPT_SUITE)
diff --git a/_test/cfg/lastseqnumprocessed/fix42.cfg b/_test/cfg/lastseqnumprocessed/fix42.cfg
new file mode 100644
index 000000000..1ed8e572a
--- /dev/null
+++ b/_test/cfg/lastseqnumprocessed/fix42.cfg
@@ -0,0 +1,11 @@
+[DEFAULT]
+SocketAcceptPort=5003
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.2
+DataDictionary=../spec/FIX42.xml
+EnableLastMsgSeqNumProcessed=Y
\ No newline at end of file
diff --git a/_test/cfg/lastseqnumprocessed/fix43.cfg b/_test/cfg/lastseqnumprocessed/fix43.cfg
new file mode 100644
index 000000000..4675e6b5d
--- /dev/null
+++ b/_test/cfg/lastseqnumprocessed/fix43.cfg
@@ -0,0 +1,11 @@
+[DEFAULT]
+SocketAcceptPort=5004
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.3
+DataDictionary=../spec/FIX43.xml
+EnableLastMsgSeqNumProcessed=Y
\ No newline at end of file
diff --git a/_test/cfg/lastseqnumprocessed/fix44.cfg b/_test/cfg/lastseqnumprocessed/fix44.cfg
new file mode 100644
index 000000000..0f3cc8c24
--- /dev/null
+++ b/_test/cfg/lastseqnumprocessed/fix44.cfg
@@ -0,0 +1,11 @@
+[DEFAULT]
+SocketAcceptPort=5005
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.4
+DataDictionary=../spec/FIX44.xml
+EnableLastMsgSeqNumProcessed=Y
\ No newline at end of file
diff --git a/_test/cfg/lastseqnumprocessed/fix50.cfg b/_test/cfg/lastseqnumprocessed/fix50.cfg
new file mode 100644
index 000000000..f3c7c37ad
--- /dev/null
+++ b/_test/cfg/lastseqnumprocessed/fix50.cfg
@@ -0,0 +1,14 @@
+[DEFAULT]
+SocketAcceptPort=5006
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+SessionQualifier=FIX50
+DefaultApplVerID=FIX.5.0
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50.xml
+EnableLastMsgSeqNumProcessed=Y
\ No newline at end of file
diff --git a/_test/cfg/lastseqnumprocessed/fix50sp1.cfg b/_test/cfg/lastseqnumprocessed/fix50sp1.cfg
new file mode 100644
index 000000000..4757e9e93
--- /dev/null
+++ b/_test/cfg/lastseqnumprocessed/fix50sp1.cfg
@@ -0,0 +1,14 @@
+[DEFAULT]
+SocketAcceptPort=5007
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+SessionQualifier=FIX50SP1
+DefaultApplVerID=FIX.5.0SP1
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50SP1.xml
+EnableLastMsgSeqNumProcessed=Y
\ No newline at end of file
diff --git a/_test/cfg/lastseqnumprocessed/fix50sp2.cfg b/_test/cfg/lastseqnumprocessed/fix50sp2.cfg
new file mode 100644
index 000000000..1ae2c09b1
--- /dev/null
+++ b/_test/cfg/lastseqnumprocessed/fix50sp2.cfg
@@ -0,0 +1,14 @@
+[DEFAULT]
+SocketAcceptPort=5008
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+SessionQualifier=FIX50SP2
+DefaultApplVerID=FIX.5.0SP2
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50SP2.xml
+EnableLastMsgSeqNumProcessed=Y
\ No newline at end of file
diff --git a/_test/cfg/resendreqchunksize/fix40.cfg b/_test/cfg/resendreqchunksize/fix40.cfg
new file mode 100644
index 000000000..a2b8210f2
--- /dev/null
+++ b/_test/cfg/resendreqchunksize/fix40.cfg
@@ -0,0 +1,11 @@
+[DEFAULT]
+SocketAcceptPort=5001
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.0
+DataDictionary=../spec/FIX40.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/cfg/resendreqchunksize/fix41.cfg b/_test/cfg/resendreqchunksize/fix41.cfg
new file mode 100644
index 000000000..07ad38aa4
--- /dev/null
+++ b/_test/cfg/resendreqchunksize/fix41.cfg
@@ -0,0 +1,11 @@
+[DEFAULT]
+SocketAcceptPort=5002
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.1
+DataDictionary=../spec/FIX41.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/fix42.cfg b/_test/cfg/resendreqchunksize/fix42.cfg
similarity index 87%
rename from _test/fix42.cfg
rename to _test/cfg/resendreqchunksize/fix42.cfg
index 3bbfe829f..b6bdb2318 100644
--- a/_test/fix42.cfg
+++ b/_test/cfg/resendreqchunksize/fix42.cfg
@@ -8,3 +8,4 @@ FileLogPath=tmp
 [SESSION]
 BeginString=FIX.4.2
 DataDictionary=../spec/FIX42.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/cfg/resendreqchunksize/fix43.cfg b/_test/cfg/resendreqchunksize/fix43.cfg
new file mode 100644
index 000000000..875ac7d1d
--- /dev/null
+++ b/_test/cfg/resendreqchunksize/fix43.cfg
@@ -0,0 +1,11 @@
+[DEFAULT]
+SocketAcceptPort=5004
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.3
+DataDictionary=../spec/FIX43.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/cfg/resendreqchunksize/fix44.cfg b/_test/cfg/resendreqchunksize/fix44.cfg
new file mode 100644
index 000000000..ad88660aa
--- /dev/null
+++ b/_test/cfg/resendreqchunksize/fix44.cfg
@@ -0,0 +1,11 @@
+[DEFAULT]
+SocketAcceptPort=5005
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.4
+DataDictionary=../spec/FIX44.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/cfg/resendreqchunksize/fix50.cfg b/_test/cfg/resendreqchunksize/fix50.cfg
new file mode 100644
index 000000000..516096b28
--- /dev/null
+++ b/_test/cfg/resendreqchunksize/fix50.cfg
@@ -0,0 +1,14 @@
+[DEFAULT]
+SocketAcceptPort=5006
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+SessionQualifier=FIX50
+DefaultApplVerID=FIX.5.0
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/cfg/resendreqchunksize/fix50sp1.cfg b/_test/cfg/resendreqchunksize/fix50sp1.cfg
new file mode 100644
index 000000000..b89038936
--- /dev/null
+++ b/_test/cfg/resendreqchunksize/fix50sp1.cfg
@@ -0,0 +1,14 @@
+[DEFAULT]
+SocketAcceptPort=5007
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+SessionQualifier=FIX50SP1
+DefaultApplVerID=FIX.5.0SP1
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50SP1.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/cfg/resendreqchunksize/fix50sp2.cfg b/_test/cfg/resendreqchunksize/fix50sp2.cfg
new file mode 100644
index 000000000..5bbaed9a3
--- /dev/null
+++ b/_test/cfg/resendreqchunksize/fix50sp2.cfg
@@ -0,0 +1,14 @@
+[DEFAULT]
+SocketAcceptPort=5008
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+SessionQualifier=FIX50SP2
+DefaultApplVerID=FIX.5.0SP2
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50SP2.xml
+ResendRequestChunkSize=5
\ No newline at end of file
diff --git a/_test/fix40.cfg b/_test/cfg/server/fix40.cfg
similarity index 100%
rename from _test/fix40.cfg
rename to _test/cfg/server/fix40.cfg
diff --git a/_test/fix41.cfg b/_test/cfg/server/fix41.cfg
similarity index 100%
rename from _test/fix41.cfg
rename to _test/cfg/server/fix41.cfg
diff --git a/_test/cfg/server/fix42.cfg b/_test/cfg/server/fix42.cfg
new file mode 100644
index 000000000..b81521c27
--- /dev/null
+++ b/_test/cfg/server/fix42.cfg
@@ -0,0 +1,10 @@
+[DEFAULT]
+SocketAcceptPort=5003
+SenderCompID=ISLD
+TargetCompID=TW
+ResetOnLogon=Y
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.2
+DataDictionary=../spec/FIX42.xml
\ No newline at end of file
diff --git a/_test/fix43.cfg b/_test/cfg/server/fix43.cfg
similarity index 100%
rename from _test/fix43.cfg
rename to _test/cfg/server/fix43.cfg
diff --git a/_test/fix44.cfg b/_test/cfg/server/fix44.cfg
similarity index 100%
rename from _test/fix44.cfg
rename to _test/cfg/server/fix44.cfg
diff --git a/_test/fix50.cfg b/_test/cfg/server/fix50.cfg
similarity index 100%
rename from _test/fix50.cfg
rename to _test/cfg/server/fix50.cfg
diff --git a/_test/fix50sp1.cfg b/_test/cfg/server/fix50sp1.cfg
similarity index 100%
rename from _test/fix50sp1.cfg
rename to _test/cfg/server/fix50sp1.cfg
diff --git a/_test/fix50sp2.cfg b/_test/cfg/server/fix50sp2.cfg
similarity index 100%
rename from _test/fix50sp2.cfg
rename to _test/cfg/server/fix50sp2.cfg
diff --git a/_test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def
new file mode 100644
index 000000000..1486575da
--- /dev/null
+++ b/_test/definitions/lastseqnumprocessed/fix42/LastProcessedMsgSeqNum.def
@@ -0,0 +1,21 @@
+iCONNECT
+
+I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2

+E8=FIX.4.2
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
10=0

+
+I8=FIX.4.2
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

+E8=FIX.4.2
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

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

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

+
+E8=FIX.4.2
9=55
35=0
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
369=4
10=0

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

+E8=FIX.4.2
9=55
35=5
34=4
49=ISLD
52=00000000-00:00:00.000
56=TW
369=5
10=0

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def
new file mode 100644
index 000000000..e87be0773
--- /dev/null
+++ b/_test/definitions/lastseqnumprocessed/fix43/LastProcessedMsgSeqNum.def
@@ -0,0 +1,21 @@
+iCONNECT
+
+I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2

+E8=FIX.4.3
9=66
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
369=1
98=0
108=2
10=0

+
+I8=FIX.4.3
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

+E8=FIX.4.3
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

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

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

+
+E8=FIX.4.3
9=55
35=0
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
369=4
10=0

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

+E8=FIX.4.3
9=55
35=5
34=4
49=ISLD
52=00000000-00:00:00.000
56=TW
369=5
10=0

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def
new file mode 100644
index 000000000..be02244f1
--- /dev/null
+++ b/_test/definitions/lastseqnumprocessed/fix44/LastProcessedMsgSeqNum.def
@@ -0,0 +1,21 @@
+iCONNECT
+
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2

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

+
+I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

+E8=FIX.4.4
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

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

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

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

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def
new file mode 100644
index 000000000..9484e9299
--- /dev/null
+++ b/_test/definitions/lastseqnumprocessed/fix50/LastProcessedMsgSeqNum.def
@@ -0,0 +1,21 @@
+iCONNECT
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2
1137=7

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

+
+I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

+E8=FIXT.1.1
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

+
+I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD
369=2

+
+I8=FIXT.1.1
35=0
34=4
49=TW
52=<TIME>
56=ISLD
369=2

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

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def
new file mode 100644
index 000000000..b09b04a40
--- /dev/null
+++ b/_test/definitions/lastseqnumprocessed/fix50sp1/LastProcessedMsgSeqNum.def
@@ -0,0 +1,21 @@
+iCONNECT
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2
1137=8

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

+
+I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

+E8=FIXT.1.1
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

+
+I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD
369=2

+
+I8=FIXT.1.1
35=0
34=4
49=TW
52=<TIME>
56=ISLD
369=2

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

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def b/_test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def
new file mode 100644
index 000000000..e94dcbee4
--- /dev/null
+++ b/_test/definitions/lastseqnumprocessed/fix50sp2/LastProcessedMsgSeqNum.def
@@ -0,0 +1,21 @@
+iCONNECT
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
369=0
98=0
108=2
1137=9

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

+
+I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
369=1
112=HELLO

+E8=FIXT.1.1
9=65
35=0
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
369=2
112=HELLO
10=0

+
+I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD
369=2

+
+I8=FIXT.1.1
35=0
34=4
49=TW
52=<TIME>
56=ISLD
369=2

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

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix40/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix40/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..7c0af6e93
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix40/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.0
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.0
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.0
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.0
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.0
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIX.4.0
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.0
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIX.4.0
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.0
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.0
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.0
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.0
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+
+# Receive Resend request for messages 9 to infinity
+E8=FIX.4.0
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=999999
10=0

+I8=FIX.4.0
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.0
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.0
9=54
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

+E8=FIX.4.0
9=45
35=5
34=7
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix40/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix40/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..982776a6c
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix40/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.0
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.0
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.0
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.0
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.0
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIX.4.0
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.0
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIX.4.0
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.0
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.0
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.0
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=999999
10=0

+# Send a GapFill up to the last message 15
+I8=FIX.4.0
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.0
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.0
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

+E8=FIX.4.0
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..d32fcfe72
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.1
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIX.4.1
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.1
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIX.4.1
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.1
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.1
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.1
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+I8=FIX.4.1
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+
+# Receive Resend request for messages 9 to infinity
+E8=FIX.4.1
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=999999
10=0

+I8=FIX.4.1
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.1
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.1
9=54
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

+E8=FIX.4.1
9=45
35=5
34=7
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..ec414aef6
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+I8=FIX.4.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC

+E8=FIX.4.1
9=81
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIX.4.1
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.1
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIX.4.1
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.1
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.1
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=999999
10=0

+# Send a GapFill up to the last message 15
+I8=FIX.4.1
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.1
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.1
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

+E8=FIX.4.1
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..0380bf01f
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIX.4.2
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIX.4.2
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.2
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIX.4.2
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.2
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIX.4.2
9=58
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIX.4.2
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.2
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.2
9=58
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..0e2842311
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.2
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.2
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIX.4.2
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.2
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIX.4.2
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.2
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIX.4.2
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.2
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.2
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.2
9=59
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIX.4.2
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.2
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.2
9=58
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..7a53185b7
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.3
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIX.4.3
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.3
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIX.4.3
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.3
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIX.4.3
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.3
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.3
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.3
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.3
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIX.4.3
9=58
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIX.4.3
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.3
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.3
9=58
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..9401dd6b3
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.3
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.3
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.3
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIX.4.3
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.3
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIX.4.3
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.3
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIX.4.3
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.3
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.3
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.3
9=59
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIX.4.3
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.3
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.3
9=58
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..59ce6f208
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIX.4.4
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIX.4.4
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.4
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIX.4.4
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIX.4.4
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIX.4.4
9=58
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIX.4.4
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.4
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.4
9=58
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..d40f04cc0
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30

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

+
+I8=FIX.4.4
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIX.4.4
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIX.4.4
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIX.4.4
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIX.4.4
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIX.4.4
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.4
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.4
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.4
9=59
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIX.4.4
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIX.4.4
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIX.4.4
9=58
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..9dbb21eb7
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=7

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

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIXT.1.1
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIXT.1.1
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIXT.1.1
9=58
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIXT.1.1
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=58
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=12
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..1106ee5a3
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

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

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIXT.1.1
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIXT.1.1
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIXT.1.1
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIXT.1.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIXT.1.1
9=59
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIXT.1.1
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=58
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+
+# logout message and response
+I8=FIXT.1.1
35=5
34=17
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..9d047c4ec
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=8

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

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIXT.1.1
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIXT.1.1
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIXT.1.1
9=58
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIXT.1.1
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=58
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=12
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..846f09b14
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix50sp1/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=8

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

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIXT.1.1
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIXT.1.1
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIXT.1.1
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIXT.1.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIXT.1.1
9=59
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIXT.1.1
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=58
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+
+# logout message and response
+I8=FIXT.1.1
35=5
34=17
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def
new file mode 100644
index 000000000..4659731e1
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedByMessageResent.def
@@ -0,0 +1,37 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

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

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 10 when last message sent was 3
+I8=FIXT.1.1
35=0
34=10
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+I8=FIXT.1.1
35=D
34=4
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=5
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=6
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=7
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+I8=FIXT.1.1
35=D
34=8
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+# Receive Resend request for messages 9 to infinity
+E8=FIXT.1.1
9=58
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=0
10=0

+I8=FIXT.1.1
35=D
34=9
49=TW
52=<TIME>
56=ISLD
97=Y
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=11
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=58
35=0
34=6
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=12
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def
new file mode 100644
index 000000000..943b9790f
--- /dev/null
+++ b/_test/definitions/resendreqchunksize/fix50sp2/SequenceGapFollowedBySequenceResetWithGapFill.def
@@ -0,0 +1,41 @@
+# If message sequence number is too high, send a resend request for
+# missing messages
+
+iCONNECT
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=9

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

+
+I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+I8=FIXT.1.1
35=D
34=3
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

+E8=FIXT.1.1
9=106
35=D
34=3
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=00000000-00:00:00
10=0

+
+# Sending message 15 when last message sent was 3
+I8=FIXT.1.1
35=0
34=15
49=TW
52=<TIME>
56=ISLD

+
+# Receive Resend request for messages 4 to (4+5-1 = 8)
+E8=FIXT.1.1
9=58
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

+# Send a GapFill up to the last message 8
+I8=FIXT.1.1
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

+
+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIXT.1.1
9=59
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIXT.1.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

+
+# Receive Resend request for messages 12 to 15)
+E8=FIXT.1.1
9=59
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

+# Send a GapFill up to the last message 15
+I8=FIXT.1.1
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+
+#Sent test request to validate no seq num issue
+I8=FIXT.1.1
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

+E8=FIXT.1.1
9=58
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

+
+
+# logout message and response
+I8=FIXT.1.1
35=5
34=17
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/resend_state.go b/resend_state.go
index 8a46e36e3..f3f601e9c 100644
--- a/resend_state.go
+++ b/resend_state.go
@@ -56,6 +56,22 @@ func (s resendState) FixMsgIn(session *session, msg *Message) (nextState session
 		return nextResendState
 	}
 
+	var gapFillFlag FIXBoolean
+	if msg.Body.Has(tagGapFillFlag) {
+		if err := msg.Body.GetField(tagGapFillFlag, &gapFillFlag); err != nil {
+			return handleStateError(session, err)
+		}
+	}
+
+	if bool(gapFillFlag) && s.currentResendRangeEnd != 0 && s.currentResendRangeEnd == session.store.NextTargetMsgSeqNum() {
+		nextResendState, err := session.sendResendRequest(session.store.NextTargetMsgSeqNum(), s.resendRangeEnd)
+		if err != nil {
+			return handleStateError(session, err)
+		}
+		nextResendState.messageStash = s.messageStash
+		return nextResendState
+	}
+
 	if s.resendRangeEnd >= session.store.NextTargetMsgSeqNum() {
 		return s
 	}

From 3c665541d00fe73ba00861452cab590e5ec1e903 Mon Sep 17 00:00:00 2001
From: Sylvain Rabot <sylvain@abstraction.fr>
Date: Wed, 17 Jul 2024 12:03:43 +0200
Subject: [PATCH 31/58] Use bytes.Count to count the number of message fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not a huge improvement but an improvement nonetheless.

```
goos: darwin
goarch: arm64
pkg: github.com/quickfixgo/quickfix
               │    old3     │                new3                │
               │   sec/op    │   sec/op     vs base               │
ParseMessage-8   680.6n ± 0%   650.0n ± 0%  -4.49% (p=0.000 n=20)
```

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
---
 message.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/message.go b/message.go
index 11afd7669..b91fe58e9 100644
--- a/message.go
+++ b/message.go
@@ -187,12 +187,7 @@ func doParsing(mp *msgParser) (err error) {
 	mp.msg.Trailer.Clear()
 
 	// Allocate expected message fields in one chunk.
-	fieldCount := 0
-	for _, b := range mp.rawBytes {
-		if b == '\001' {
-			fieldCount++
-		}
-	}
+	fieldCount := bytes.Count(mp.rawBytes, []byte{'\001'})
 	if fieldCount == 0 {
 		return parseError{OrigError: fmt.Sprintf("No Fields detected in %s", string(mp.rawBytes))}
 	}

From f725b988fe6746cfab6516ab97ee13dc90471856 Mon Sep 17 00:00:00 2001
From: Sylvain Rabot <sylvain@abstraction.fr>
Date: Wed, 17 Jul 2024 22:00:28 +0200
Subject: [PATCH 32/58] Optimize tag value parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
goos: darwin
goarch: arm64
pkg: github.com/quickfixgo/quickfix
               │     old     │          new-no-indexbyte          │
               │   sec/op    │   sec/op     vs base               │
ParseMessage-8   695.2n ± 1%   628.2n ± 1%  -9.64% (p=0.000 n=20)
```

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
---
 tag_value.go | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/tag_value.go b/tag_value.go
index 6e721862f..28bba7a7a 100644
--- a/tag_value.go
+++ b/tag_value.go
@@ -39,8 +39,28 @@ func (tv *TagValue) init(tag Tag, value []byte) {
 }
 
 func (tv *TagValue) parse(rawFieldBytes []byte) error {
-	sepIndex := bytes.IndexByte(rawFieldBytes, '=')
+	var sepIndex int
 
+	// Most of the Fix tags are 4 or less characters long, so we can optimize
+	// for that by checking the 5 first characters without looping over the
+	// whole byte slice.
+	if len(rawFieldBytes) >= 5 {
+		if rawFieldBytes[1] == '=' {
+			sepIndex = 1
+			goto PARSE
+		} else if rawFieldBytes[2] == '=' {
+			sepIndex = 2
+			goto PARSE
+		} else if rawFieldBytes[3] == '=' {
+			sepIndex = 3
+			goto PARSE
+		} else if rawFieldBytes[4] == '=' {
+			sepIndex = 4
+			goto PARSE
+		}
+	}
+
+	sepIndex = bytes.IndexByte(rawFieldBytes, '=')
 	switch sepIndex {
 	case -1:
 		return fmt.Errorf("tagValue.Parse: No '=' in '%s'", rawFieldBytes)
@@ -48,6 +68,7 @@ func (tv *TagValue) parse(rawFieldBytes []byte) error {
 		return fmt.Errorf("tagValue.Parse: No tag in '%s'", rawFieldBytes)
 	}
 
+PARSE:
 	parsedTag, err := atoi(rawFieldBytes[:sepIndex])
 	if err != nil {
 		return fmt.Errorf("tagValue.Parse: %s", err.Error())

From af66cc87a48f166dd31b3bc0fd308398752e275b Mon Sep 17 00:00:00 2001
From: Sylvain Rabot <sylvain@abstraction.fr>
Date: Wed, 17 Jul 2024 18:06:14 +0200
Subject: [PATCH 33/58] Only lock fieldmap once during message parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
goos: darwin
goarch: arm64
pkg: github.com/quickfixgo/quickfix
               │     old     │          new-parse-no-lock          │
               │   sec/op    │   sec/op     vs base                │
ParseMessage-8   695.2n ± 1%   591.0n ± 0%  -14.99% (p=0.000 n=20)
```

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
---
 field_map.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---
 message.go   | 25 +++++++++++++++-------
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/field_map.go b/field_map.go
index 18216f81c..4aac64b1d 100644
--- a/field_map.go
+++ b/field_map.go
@@ -115,6 +115,20 @@ func (m FieldMap) GetField(tag Tag, parser FieldValueReader) MessageRejectError
 	return nil
 }
 
+// GetField parses of a field with Tag tag. Returned reject may indicate the field is not present, or the field value is invalid.
+func (m FieldMap) getFieldNoLock(tag Tag, parser FieldValueReader) MessageRejectError {
+	f, ok := m.tagLookup[tag]
+	if !ok {
+		return ConditionallyRequiredFieldMissing(tag)
+	}
+
+	if err := parser.Read(f[0].value); err != nil {
+		return IncorrectDataFormatForValue(tag)
+	}
+
+	return nil
+}
+
 // GetBytes is a zero-copy GetField wrapper for []bytes fields.
 func (m FieldMap) GetBytes(tag Tag) ([]byte, MessageRejectError) {
 	m.rwLock.RLock()
@@ -128,6 +142,16 @@ func (m FieldMap) GetBytes(tag Tag) ([]byte, MessageRejectError) {
 	return f[0].value, nil
 }
 
+// getBytesNoLock is a lock free zero-copy GetField wrapper for []bytes fields.
+func (m FieldMap) getBytesNoLock(tag Tag) ([]byte, MessageRejectError) {
+	f, ok := m.tagLookup[tag]
+	if !ok {
+		return nil, ConditionallyRequiredFieldMissing(tag)
+	}
+
+	return f[0].value, nil
+}
+
 // GetBool is a GetField wrapper for bool fields.
 func (m FieldMap) GetBool(tag Tag) (bool, MessageRejectError) {
 	var val FIXBoolean
@@ -152,6 +176,21 @@ func (m FieldMap) GetInt(tag Tag) (int, MessageRejectError) {
 	return int(val), err
 }
 
+// GetInt is a lock free GetField wrapper for int fields.
+func (m FieldMap) getIntNoLock(tag Tag) (int, MessageRejectError) {
+	bytes, err := m.getBytesNoLock(tag)
+	if err != nil {
+		return 0, err
+	}
+
+	var val FIXInt
+	if val.Read(bytes) != nil {
+		err = IncorrectDataFormatForValue(tag)
+	}
+
+	return int(val), err
+}
+
 // GetTime is a GetField wrapper for utc timestamp fields.
 func (m FieldMap) GetTime(tag Tag) (t time.Time, err MessageRejectError) {
 	m.rwLock.RLock()
@@ -179,6 +218,15 @@ func (m FieldMap) GetString(tag Tag) (string, MessageRejectError) {
 	return string(val), nil
 }
 
+// GetString is a GetField wrapper for string fields.
+func (m FieldMap) getStringNoLock(tag Tag) (string, MessageRejectError) {
+	var val FIXString
+	if err := m.getFieldNoLock(tag, &val); err != nil {
+		return "", err
+	}
+	return string(val), nil
+}
+
 // GetGroup is a Get function specific to Group Fields.
 func (m FieldMap) GetGroup(parser FieldGroupReader) MessageRejectError {
 	m.rwLock.RLock()
@@ -246,6 +294,13 @@ func (m *FieldMap) Clear() {
 	}
 }
 
+func (m *FieldMap) clearNoLock() {
+	m.tags = m.tags[0:0]
+	for k := range m.tagLookup {
+		delete(m.tagLookup, k)
+	}
+}
+
 // CopyInto overwrites the given FieldMap with this one.
 func (m *FieldMap) CopyInto(to *FieldMap) {
 	m.rwLock.RLock()
@@ -263,9 +318,6 @@ func (m *FieldMap) CopyInto(to *FieldMap) {
 }
 
 func (m *FieldMap) add(f field) {
-	m.rwLock.Lock()
-	defer m.rwLock.Unlock()
-
 	t := fieldTag(f)
 	if _, ok := m.tagLookup[t]; !ok {
 		m.tags = append(m.tags, t)
diff --git a/message.go b/message.go
index 11afd7669..54bf0d473 100644
--- a/message.go
+++ b/message.go
@@ -181,10 +181,17 @@ func ParseMessageWithDataDictionary(
 
 // doParsing executes the message parsing process.
 func doParsing(mp *msgParser) (err error) {
+	mp.msg.Header.rwLock.Lock()
+	defer mp.msg.Header.rwLock.Unlock()
+	mp.msg.Body.rwLock.Lock()
+	defer mp.msg.Body.rwLock.Unlock()
+	mp.msg.Trailer.rwLock.Lock()
+	defer mp.msg.Trailer.rwLock.Unlock()
+
 	// Initialize for parsing.
-	mp.msg.Header.Clear()
-	mp.msg.Body.Clear()
-	mp.msg.Trailer.Clear()
+	mp.msg.Header.clearNoLock()
+	mp.msg.Body.clearNoLock()
+	mp.msg.Trailer.clearNoLock()
 
 	// Allocate expected message fields in one chunk.
 	fieldCount := 0
@@ -267,7 +274,7 @@ func doParsing(mp *msgParser) (err error) {
 		}
 
 		if mp.parsedFieldBytes.tag == tagXMLDataLen {
-			xmlDataLen, _ = mp.msg.Header.GetInt(tagXMLDataLen)
+			xmlDataLen, _ = mp.msg.Header.getIntNoLock(tagXMLDataLen)
 		}
 		mp.fieldIndex++
 	}
@@ -292,7 +299,7 @@ func doParsing(mp *msgParser) (err error) {
 		}
 	}
 
-	bodyLength, err := mp.msg.Header.GetInt(tagBodyLength)
+	bodyLength, err := mp.msg.Header.getIntNoLock(tagBodyLength)
 	if err != nil {
 		err = parseError{OrigError: err.Error()}
 	} else if length != bodyLength && !xmlDataMsg {
@@ -373,7 +380,7 @@ func parseGroup(mp *msgParser, tags []Tag) {
 // tags slice will contain multiple tags if the tag in question is found while processing a group already.
 func isNumInGroupField(msg *Message, tags []Tag, appDataDictionary *datadictionary.DataDictionary) bool {
 	if appDataDictionary != nil {
-		msgt, err := msg.MsgType()
+		msgt, err := msg.msgTypeNoLock()
 		if err != nil {
 			return false
 		}
@@ -406,7 +413,7 @@ func isNumInGroupField(msg *Message, tags []Tag, appDataDictionary *datadictiona
 // tags slice will contain multiple tags if the tag in question is found while processing a group already.
 func getGroupFields(msg *Message, tags []Tag, appDataDictionary *datadictionary.DataDictionary) (fields []*datadictionary.FieldDef) {
 	if appDataDictionary != nil {
-		msgt, err := msg.MsgType()
+		msgt, err := msg.msgTypeNoLock()
 		if err != nil {
 			return
 		}
@@ -476,6 +483,10 @@ func (m *Message) MsgType() (string, MessageRejectError) {
 	return m.Header.GetString(tagMsgType)
 }
 
+func (m *Message) msgTypeNoLock() (string, MessageRejectError) {
+	return m.Header.getStringNoLock(tagMsgType)
+}
+
 // IsMsgTypeOf returns true if the Header contains MsgType (tag 35) field and its value is the specified one.
 func (m *Message) IsMsgTypeOf(msgType string) bool {
 	if v, err := m.MsgType(); err == nil {

From 39392681c4a42ade314172f9063c0027048defba Mon Sep 17 00:00:00 2001
From: Alexandre Beslic <ab21c8b9f7@abronan.com>
Date: Thu, 18 Jul 2024 20:06:01 +0100
Subject: [PATCH 34/58] Fix stuck call to Dial when calling Stop on the
 initiator

This commit fixes an issue when calling Start() and then
Stop() on the initiator while the connection is likely
to fail and timeout. Calling initiator.Stop() will block since
Dial will attempt to connect until it times out and returns
on the 'waitForReconnectInterval' call.

We mitigate this problem by using a proxy.ContextDialer and
allowing to pass a context with cancellation method to the
dialer.DialContext method on 'handleConnection'.

We need to start a routine listening for the stopChan in
order to call cancel() explicitly and thus exit the DialContext
method.

Note: there are scenarios where cancel() will be called twice,
this choice was made in order to avoid a larger refactor of the
reconnect logic, but since the call to cancel() is idempotent,
this doesn't lead to any adverse effect.

fixes quickfixgo#653

Signed-off-by: Alexandre Beslic <ab21c8b9f7@abronan.com>
---
 dialer.go    | 18 ++++++++++++++++--
 initiator.go | 26 +++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/dialer.go b/dialer.go
index a8e4c1893..de4419ff8 100644
--- a/dialer.go
+++ b/dialer.go
@@ -25,7 +25,7 @@ import (
 	"github.com/quickfixgo/quickfix/config"
 )
 
-func loadDialerConfig(settings *SessionSettings) (dialer proxy.Dialer, err error) {
+func loadDialerConfig(settings *SessionSettings) (dialer proxy.ContextDialer, err error) {
 	stdDialer := &net.Dialer{}
 	if settings.HasSetting(config.SocketTimeout) {
 		timeout, err := settings.DurationSetting(config.SocketTimeout)
@@ -73,9 +73,23 @@ func loadDialerConfig(settings *SessionSettings) (dialer proxy.Dialer, err error
 			}
 		}
 
-		dialer, err = proxy.SOCKS5("tcp", fmt.Sprintf("%s:%d", proxyHost, proxyPort), proxyAuth, dialer)
+		var proxyDialer proxy.Dialer
+
+		proxyDialer, err = proxy.SOCKS5("tcp", fmt.Sprintf("%s:%d", proxyHost, proxyPort), proxyAuth, stdDialer)
+		if err != nil {
+			return
+		}
+
+		if contextDialer, ok := proxyDialer.(proxy.ContextDialer); ok {
+			dialer = contextDialer
+		} else {
+			err = fmt.Errorf("proxy does not support context dialer")
+			return
+		}
+
 	default:
 		err = fmt.Errorf("unsupported proxy type %s", proxyType)
 	}
+
 	return
 }
diff --git a/initiator.go b/initiator.go
index 8f7a76200..18451477e 100644
--- a/initiator.go
+++ b/initiator.go
@@ -17,6 +17,7 @@ package quickfix
 
 import (
 	"bufio"
+	"context"
 	"crypto/tls"
 	"strings"
 	"sync"
@@ -50,7 +51,7 @@ func (i *Initiator) Start() (err error) {
 			return
 		}
 
-		var dialer proxy.Dialer
+		var dialer proxy.ContextDialer
 		if dialer, err = loadDialerConfig(settings); err != nil {
 			return
 		}
@@ -142,7 +143,7 @@ func (i *Initiator) waitForReconnectInterval(reconnectInterval time.Duration) bo
 	return true
 }
 
-func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, dialer proxy.Dialer) {
+func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, dialer proxy.ContextDialer) {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
@@ -162,6 +163,19 @@ func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, di
 			return
 		}
 
+		ctx, cancel := context.WithCancel(context.Background())
+
+		// We start a goroutine in order to be able to cancel the dialer mid-connection
+		// on receiving a stop signal to stop the initiator.
+		go func() {
+			select {
+			case <-i.stopChan:
+				cancel()
+			case <-ctx.Done():
+				return
+			}
+		}()
+
 		var disconnected chan interface{}
 		var msgIn chan fixIn
 		var msgOut chan []byte
@@ -169,7 +183,7 @@ func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, di
 		address := session.SocketConnectAddress[connectionAttempt%len(session.SocketConnectAddress)]
 		session.log.OnEventf("Connecting to: %v", address)
 
-		netConn, err := dialer.Dial("tcp", address)
+		netConn, err := dialer.DialContext(ctx, "tcp", address)
 		if err != nil {
 			session.log.OnEventf("Failed to connect: %v", err)
 			goto reconnect
@@ -208,6 +222,10 @@ func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, di
 			close(disconnected)
 		}()
 
+		// This ensures we properly cleanup the goroutine and context used for
+		// dial cancelation after successful connection.
+		cancel()
+
 		select {
 		case <-disconnected:
 		case <-i.stopChan:
@@ -215,6 +233,8 @@ func (i *Initiator) handleConnection(session *session, tlsConfig *tls.Config, di
 		}
 
 	reconnect:
+		cancel()
+
 		connectionAttempt++
 		session.log.OnEventf("Reconnecting in %v", session.ReconnectInterval)
 		if !i.waitForReconnectInterval(session.ReconnectInterval) {

From ad74d03b5ab5ae16f94dfcb17bc1d44331247623 Mon Sep 17 00:00:00 2001
From: Michael Wilner <mwilner@connamara.tech>
Date: Wed, 31 Jul 2024 07:17:37 -0500
Subject: [PATCH 35/58] Introduce message iterator to avoid loading all
 messages into memory at once upon resend request

---
 in_session.go                     | 28 ++++++++++------------
 internal/testsuite/store_suite.go | 40 +++++++++++++++++++++----------
 memorystore.go                    | 18 ++++++++++----
 store.go                          |  1 +
 store/file/filestore.go           | 20 ++++++++++++----
 store/mongo/mongostore.go         | 26 +++++++++++++-------
 store/sql/sqlstore.go             | 27 ++++++++++++---------
 7 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/in_session.go b/in_session.go
index 816b4b240..6edbb8409 100644
--- a/in_session.go
+++ b/in_session.go
@@ -225,38 +225,31 @@ func (state inSession) handleResendRequest(session *session, msg *Message) (next
 	return state
 }
 
-func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int, inReplyTo Message) (err error) {
+func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int, inReplyTo Message) error {
 	if session.DisableMessagePersist {
-		err = state.generateSequenceReset(session, beginSeqNo, endSeqNo+1, inReplyTo)
-		return
-	}
-
-	msgs, err := session.store.GetMessages(beginSeqNo, endSeqNo)
-	if err != nil {
-		session.log.OnEventf("error retrieving messages from store: %s", err.Error())
-		return
+		return state.generateSequenceReset(session, beginSeqNo, endSeqNo+1, inReplyTo)
 	}
 
 	seqNum := beginSeqNo
 	nextSeqNum := seqNum
 	msg := NewMessage()
-	for _, msgBytes := range msgs {
-		err = ParseMessageWithDataDictionary(msg, bytes.NewBuffer(msgBytes), session.transportDataDictionary, session.appDataDictionary)
+	err := session.store.IterateMessages(beginSeqNo, endSeqNo, func(msgBytes []byte) error {
+		err := ParseMessageWithDataDictionary(msg, bytes.NewBuffer(msgBytes), session.transportDataDictionary, session.appDataDictionary)
 		if err != nil {
 			session.log.OnEventf("Resend Msg Parse Error: %v, %v", err.Error(), bytes.NewBuffer(msgBytes).String())
-			return // We cant continue with a message that cant be parsed correctly.
+			return err // We cant continue with a message that cant be parsed correctly.
 		}
 		msgType, _ := msg.Header.GetBytes(tagMsgType)
 		sentMessageSeqNum, _ := msg.Header.GetInt(tagMsgSeqNum)
 
 		if isAdminMessageType(msgType) {
 			nextSeqNum = sentMessageSeqNum + 1
-			continue
+			return nil
 		}
 
 		if !session.resend(msg) {
 			nextSeqNum = sentMessageSeqNum + 1
-			continue
+			return nil
 		}
 
 		if seqNum != sentMessageSeqNum {
@@ -271,6 +264,11 @@ func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int
 
 		seqNum = sentMessageSeqNum + 1
 		nextSeqNum = seqNum
+		return nil
+	})
+	if err != nil {
+		session.log.OnEventf("error retrieving messages from store: %s", err.Error())
+		return err
 	}
 
 	if seqNum != nextSeqNum { // gapfill for catch-up
@@ -279,7 +277,7 @@ func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int
 		}
 	}
 
-	return
+	return nil
 }
 
 func (state inSession) processReject(session *session, msg *Message, rej MessageRejectError) sessionState {
diff --git a/internal/testsuite/store_suite.go b/internal/testsuite/store_suite.go
index 0563a5861..49b76b05a 100644
--- a/internal/testsuite/store_suite.go
+++ b/internal/testsuite/store_suite.go
@@ -77,6 +77,28 @@ func (s *StoreTestSuite) TestMessageStoreReset() {
 	s.Equal(1, s.MsgStore.NextTargetMsgSeqNum())
 }
 
+func (s *StoreTestSuite) fetchMessages(beginSeqNum, endSeqNum int) (msgs [][]byte) {
+	s.T().Helper()
+
+	// Fetch messages from the new iterator
+	err := s.MsgStore.IterateMessages(beginSeqNum, endSeqNum, func(msg []byte) error {
+		msgs = append(msgs, msg)
+		return nil
+	})
+	s.Require().Nil(err)
+
+	// Fetch messages from the old getter
+	oldMsgs, err := s.MsgStore.GetMessages(beginSeqNum, endSeqNum)
+	s.Require().Nil(err)
+
+	// Ensure the output is the same
+	s.Require().Len(msgs, len(oldMsgs))
+	for idx, msg := range msgs {
+		s.Require().EqualValues(msg, oldMsgs[idx])
+	}
+	return
+}
+
 func (s *StoreTestSuite) TestMessageStoreSaveMessageGetMessage() {
 	// Given the following saved messages
 	expectedMsgsBySeqNum := map[int]string{
@@ -89,8 +111,7 @@ func (s *StoreTestSuite) TestMessageStoreSaveMessageGetMessage() {
 	}
 
 	// When the messages are retrieved from the MessageStore
-	actualMsgs, err := s.MsgStore.GetMessages(1, 3)
-	s.Require().Nil(err)
+	actualMsgs := s.fetchMessages(1, 3)
 
 	// Then the messages should be
 	s.Require().Len(actualMsgs, 3)
@@ -102,8 +123,7 @@ func (s *StoreTestSuite) TestMessageStoreSaveMessageGetMessage() {
 	s.Require().Nil(s.MsgStore.Refresh())
 
 	// And the messages are retrieved from the MessageStore
-	actualMsgs, err = s.MsgStore.GetMessages(1, 3)
-	s.Require().Nil(err)
+	actualMsgs = s.fetchMessages(1, 3)
 
 	// Then the messages should still be
 	s.Require().Len(actualMsgs, 3)
@@ -127,8 +147,7 @@ func (s *StoreTestSuite) TestMessageStoreSaveMessageAndIncrementGetMessage() {
 	s.Equal(423, s.MsgStore.NextSenderMsgSeqNum())
 
 	// When the messages are retrieved from the MessageStore
-	actualMsgs, err := s.MsgStore.GetMessages(1, 3)
-	s.Require().Nil(err)
+	actualMsgs := s.fetchMessages(1, 3)
 
 	// Then the messages should be
 	s.Require().Len(actualMsgs, 3)
@@ -140,8 +159,7 @@ func (s *StoreTestSuite) TestMessageStoreSaveMessageAndIncrementGetMessage() {
 	s.Require().Nil(s.MsgStore.Refresh())
 
 	// And the messages are retrieved from the MessageStore
-	actualMsgs, err = s.MsgStore.GetMessages(1, 3)
-	s.Require().Nil(err)
+	actualMsgs = s.fetchMessages(1, 3)
 
 	s.Equal(423, s.MsgStore.NextSenderMsgSeqNum())
 
@@ -154,8 +172,7 @@ func (s *StoreTestSuite) TestMessageStoreSaveMessageAndIncrementGetMessage() {
 
 func (s *StoreTestSuite) TestMessageStoreGetMessagesEmptyStore() {
 	// When messages are retrieved from an empty store
-	messages, err := s.MsgStore.GetMessages(1, 2)
-	require.Nil(s.T(), err)
+	messages := s.fetchMessages(1, 2)
 
 	// Then no messages should be returned
 	require.Empty(s.T(), messages, "Did not expect messages from empty store")
@@ -187,8 +204,7 @@ func (s *StoreTestSuite) TestMessageStoreGetMessagesVariousRanges() {
 
 	// Then the returned messages should be
 	for _, tc := range testCases {
-		actualMsgs, err := s.MsgStore.GetMessages(tc.beginSeqNo, tc.endSeqNo)
-		require.Nil(t, err)
+		actualMsgs := s.fetchMessages(tc.beginSeqNo, tc.endSeqNo)
 		require.Len(t, actualMsgs, len(tc.expectedBytes))
 		for i, expectedMsg := range tc.expectedBytes {
 			assert.Equal(t, string(expectedMsg), string(actualMsgs[i]))
diff --git a/memorystore.go b/memorystore.go
index 2379016e2..7c57ca783 100644
--- a/memorystore.go
+++ b/memorystore.go
@@ -97,14 +97,24 @@ func (store *memoryStore) SaveMessageAndIncrNextSenderMsgSeqNum(seqNum int, msg
 	return store.IncrNextSenderMsgSeqNum()
 }
 
-func (store *memoryStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
-	var msgs [][]byte
+func (store *memoryStore) IterateMessages(beginSeqNum, endSeqNum int, cb func([]byte) error) error {
 	for seqNum := beginSeqNum; seqNum <= endSeqNum; seqNum++ {
 		if m, ok := store.messageMap[seqNum]; ok {
-			msgs = append(msgs, m)
+			if err := cb(m); err != nil {
+				return err
+			}
 		}
 	}
-	return msgs, nil
+	return nil
+}
+
+func (store *memoryStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
+	var msgs [][]byte
+	err := store.IterateMessages(beginSeqNum, endSeqNum, func(m []byte) error {
+		msgs = append(msgs, m)
+		return nil
+	})
+	return msgs, err
 }
 
 type memoryStoreFactory struct{}
diff --git a/store.go b/store.go
index 34e2570e4..6689297ba 100644
--- a/store.go
+++ b/store.go
@@ -36,6 +36,7 @@ type MessageStore interface {
 	SaveMessage(seqNum int, msg []byte) error
 	SaveMessageAndIncrNextSenderMsgSeqNum(seqNum int, msg []byte) error
 	GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error)
+	IterateMessages(beginSeqNum, endSeqNum int, cb func([]byte) error) error
 
 	Refresh() error
 	Reset() error
diff --git a/store/file/filestore.go b/store/file/filestore.go
index 0cc1e3c33..ae44540b1 100644
--- a/store/file/filestore.go
+++ b/store/file/filestore.go
@@ -378,18 +378,28 @@ func (store *fileStore) getMessage(seqNum int) (msg []byte, found bool, err erro
 	return msg, true, nil
 }
 
-func (store *fileStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
-	var msgs [][]byte
+func (store *fileStore) IterateMessages(beginSeqNum, endSeqNum int, cb func([]byte) error) error {
 	for seqNum := beginSeqNum; seqNum <= endSeqNum; seqNum++ {
 		m, found, err := store.getMessage(seqNum)
 		if err != nil {
-			return nil, err
+			return err
 		}
 		if found {
-			msgs = append(msgs, m)
+			if err = cb(m); err != nil {
+				return err
+			}
 		}
 	}
-	return msgs, nil
+	return nil
+}
+
+func (store *fileStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
+	var msgs [][]byte
+	err := store.IterateMessages(beginSeqNum, endSeqNum, func(msg []byte) error {
+		msgs = append(msgs, msg)
+		return nil
+	})
+	return msgs, err
 }
 
 // Close closes the store's files.
diff --git a/store/mongo/mongostore.go b/store/mongo/mongostore.go
index 5af278e10..42696388e 100644
--- a/store/mongo/mongostore.go
+++ b/store/mongo/mongostore.go
@@ -338,17 +338,17 @@ func (store *mongoStore) SaveMessageAndIncrNextSenderMsgSeqNum(seqNum int, msg [
 	return store.cache.SetNextSenderMsgSeqNum(next)
 }
 
-func (store *mongoStore) GetMessages(beginSeqNum, endSeqNum int) (msgs [][]byte, err error) {
+func (store *mongoStore) IterateMessages(beginSeqNum, endSeqNum int, cb func([]byte) error) error {
 	msgFilter := generateMessageFilter(&store.sessionID)
 	// Marshal into database form.
 	msgFilterBytes, err := bson.Marshal(msgFilter)
 	if err != nil {
-		return
+		return err
 	}
 	seqFilter := bson.M{}
 	err = bson.Unmarshal(msgFilterBytes, &seqFilter)
 	if err != nil {
-		return
+		return err
 	}
 	// Modify the query to use a range for the sequence filter.
 	seqFilter["msgseq"] = bson.M{
@@ -358,18 +358,26 @@ func (store *mongoStore) GetMessages(beginSeqNum, endSeqNum int) (msgs [][]byte,
 	sortOpt := options.Find().SetSort(bson.D{{Key: "msgseq", Value: 1}})
 	cursor, err := store.db.Database(store.mongoDatabase).Collection(store.messagesCollection).Find(context.Background(), seqFilter, sortOpt)
 	if err != nil {
-		return
+		return err
 	}
-
+	defer func() { _ = cursor.Close(context.Background()) }()
 	for cursor.Next(context.Background()) {
 		if err = cursor.Decode(&msgFilter); err != nil {
-			return
+			return err
+		} else if err = cb(msgFilter.Message); err != nil {
+			return err
 		}
-		msgs = append(msgs, msgFilter.Message)
 	}
+	return nil
+}
 
-	err = cursor.Close(context.Background())
-	return
+func (store *mongoStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
+	var msgs [][]byte
+	err := store.IterateMessages(beginSeqNum, endSeqNum, func(msg []byte) error {
+		msgs = append(msgs, msg)
+		return nil
+	})
+	return msgs, err
 }
 
 // Close closes the store's database connection.
diff --git a/store/sql/sqlstore.go b/store/sql/sqlstore.go
index 7550e3012..aeaeb6eb3 100644
--- a/store/sql/sqlstore.go
+++ b/store/sql/sqlstore.go
@@ -352,9 +352,8 @@ func (store *sqlStore) SaveMessageAndIncrNextSenderMsgSeqNum(seqNum int, msg []b
 	return store.cache.SetNextSenderMsgSeqNum(next)
 }
 
-func (store *sqlStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
+func (store *sqlStore) IterateMessages(beginSeqNum, endSeqNum int, cb func([]byte) error) error {
 	s := store.sessionID
-	var msgs [][]byte
 	rows, err := store.db.Query(sqlString(`SELECT message FROM messages
 		WHERE beginstring=? AND session_qualifier=?
 		AND sendercompid=? AND sendersubid=? AND senderlocid=?
@@ -366,23 +365,29 @@ func (store *sqlStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error)
 		s.TargetCompID, s.TargetSubID, s.TargetLocationID,
 		beginSeqNum, endSeqNum)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	for rows.Next() {
 		var message string
-		if err := rows.Scan(&message); err != nil {
-			return nil, err
+		if err = rows.Scan(&message); err != nil {
+			return err
+		} else if err = cb([]byte(message)); err != nil {
+			return err
 		}
-		msgs = append(msgs, []byte(message))
 	}
 
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
+	return rows.Err()
+}
 
-	return msgs, nil
+func (store *sqlStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, error) {
+	var msgs [][]byte
+	err := store.IterateMessages(beginSeqNum, endSeqNum, func(msg []byte) error {
+		msgs = append(msgs, msg)
+		return nil
+	})
+	return msgs, err
 }
 
 // Close closes the store's database connection.

From 1289a474d5ebcefd94269a447a7aab28b935e2a0 Mon Sep 17 00:00:00 2001
From: Sam Mulube <sam.mulube@appital.io>
Date: Tue, 6 Aug 2024 10:53:15 +0100
Subject: [PATCH 36/58] Use the Go generated file convention.

This commit updates the template to include the recommended convention
for generated files, specifically a string that matches the regex:

```
^// Code generated .* DO NOT EDIT\.$
```

This change should make easier certain housekeeping tasks, specifically
allowing things like linting tools to ignore these files. See
https://pkg.go.dev/cmd/go#hdr-Generate_Go_files_by_processing_source for
a canonical source for this recommendation.
---
 cmd/generate-fix/internal/templates.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmd/generate-fix/internal/templates.go b/cmd/generate-fix/internal/templates.go
index 680a422f4..00b9e5936 100644
--- a/cmd/generate-fix/internal/templates.go
+++ b/cmd/generate-fix/internal/templates.go
@@ -171,6 +171,7 @@ func ({{ template "receiver" }} {{ .Name}}RepeatingGroup) Get(i int) {{ .Name }}
 
 	HeaderTemplate = template.Must(template.Must(baseTemplate.Clone()).Parse(`
 {{ define "receiver" }}h{{ end }}
+// Code generated by quickfix. DO NOT EDIT.
 package {{ .Package }}
 
 import (
@@ -212,6 +213,7 @@ func NewHeader(header *quickfix.Header) (h Header) {
 
 	TrailerTemplate = template.Must(template.Must(baseTemplate.Clone()).Parse(`
 {{ define "receiver" }}t{{ end }}
+// Code generated by quickfix. DO NOT EDIT.
 package {{ .Package }}
 
 import (
@@ -246,6 +248,7 @@ type Trailer struct {
 
 	MessageTemplate = template.Must(baseTemplate.Parse(`
 {{ define "receiver" }}m{{ end }}
+// Code generated by quickfix. DO NOT EDIT.
 package {{ .Package }}
 
 import (
@@ -325,6 +328,7 @@ func Route(router RouteOut) (string, string, quickfix.MessageRoute) {
 	`))
 
 	TagTemplate = template.Must(template.New("Tag").Parse(`
+// Code generated by quickfix. DO NOT EDIT.
 package tag
 import "github.com/quickfixgo/quickfix"
 
@@ -336,6 +340,7 @@ const (
 	`))
 
 	FieldTemplate = template.Must(template.New("Field").Funcs(tmplFuncs).Parse(`
+// Code generated by quickfix. DO NOT EDIT.
 package field
 import (
 	{{ if checkIfTimeImportRequiredForFields . }}"time"{{ end }}
@@ -415,6 +420,7 @@ func (f {{ .Name }}Field) Value() ({{ quickfixValueType $base_type }}) {
 `))
 
 	EnumTemplate = template.Must(template.New("Enum").Parse(`
+// Code generated by quickfix. DO NOT EDIT.
 package enum
 {{ range $ft := . }}
 {{ if $ft.Enums }}

From d3b4f98e6f8f2f49e9e47fe5fb5a58dac5c620f5 Mon Sep 17 00:00:00 2001
From: Sam Mulube <sam.mulube@appital.io>
Date: Mon, 17 Jun 2024 12:31:17 +0100
Subject: [PATCH 37/58] Support TLS configuration as raw bytes

This change is intended to allow users to configure TLS settings in the
form of raw byte slices. This is particularly useful for situations
where the FIX application is running in a cloud environment (e.g. k8s)
and session configuration is loaded from a database (rather than a
static file). In this scenario it is much more convenient to be able to
load TLS key pairs from the DB in the form of byte slices, than to have
to ensure files with the correct names exist on some persistent volume
such that the FIX app can load them from disk correctly.

To support this we changed the basic type stored within SessionSettings
to be a byte slice which means we are able to still support the existing
settings model, but also handle raw byte slices we can use for TLS
setup. The existing API exposed by SessionSettings remains unchanged
meaning users should not have to update their codee, but we have added a
new `SetRaw` and `RawSetting` accessors to directly read/write byte
slice values.
---
 config/configuration.go  |  41 ++++++++++++++
 session_factory.go       |   6 +--
 session_settings.go      |  73 +++++++++++++++----------
 session_settings_test.go |  65 ++++++++++++++++++++++-
 tls.go                   |  86 +++++++++++++++++++++---------
 tls_test.go              | 112 ++++++++++++++++++++++++++++++++++++++-
 6 files changed, 324 insertions(+), 59 deletions(-)

diff --git a/config/configuration.go b/config/configuration.go
index f524f5005..754f587b1 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -739,6 +739,47 @@ const (
 	//  - A filepath to a file with read access.
 	SocketCAFile string = "SocketCAFile"
 
+	// SocketPrivateKeyBytes is an optional value containing raw bytes of a PEM
+	// encoded private key to use for secure TLS communications.
+	// Must be used with SocketCertificateBytes.
+	// Must contain PEM encoded data.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Raw bytes containing a valid PEM encoded private key.
+	SocketPrivateKeyBytes string = "SocketPrivateKeyBytes"
+
+	// SocketCertificateBytes is an optional value containing raw bytes of a PEM
+	// encoded certificate to use for secure TLS communications.
+	// Must be used with SocketPrivateKeyBytes.
+	// Must contain PEM encoded data.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Raw bytes containing a valid PEM encoded certificate.
+	SocketCertificateBytes string = "SocketCertificateBytes"
+
+	// SocketCABytes is an optional value containing raw bytes of a PEM encoded
+	// root CA to use for secure TLS communications. For acceptors, client
+	// certificates will be verified against this CA. For initiators, clients
+	// will use the CA to verify the server certificate. If not configured,
+	// initiators will verify the server certificates using the host's root CA
+	// set.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - Raw bytes containing a valid PEM encoded CA.
+	SocketCABytes string = "SocketCABytes"
+
 	// SocketInsecureSkipVerify controls whether a client verifies the server's certificate chain and host name.
 	// If SocketInsecureSkipVerify is set to Y, crypto/tls accepts any certificate presented by the server and any host name in that certificate.
 	// In this mode, TLS is susceptible to machine-in-the-middle attacks unless custom verification is used.
diff --git a/session_factory.go b/session_factory.go
index 37818deb9..d875762de 100644
--- a/session_factory.go
+++ b/session_factory.go
@@ -284,7 +284,7 @@ func (f sessionFactory) newSession(
 				for _, dayStr := range dayStrs {
 					day, ok := dayLookup[dayStr]
 					if !ok {
-						err = IncorrectFormatForSetting{Setting: config.Weekdays, Value: weekdaysStr}
+						err = IncorrectFormatForSetting{Setting: config.Weekdays, Value: []byte(weekdaysStr)}
 						return
 					}
 					weekdays = append(weekdays, day)
@@ -315,7 +315,7 @@ func (f sessionFactory) newSession(
 			parseDay := func(setting, dayStr string) (day time.Weekday, err error) {
 				day, ok := dayLookup[dayStr]
 				if !ok {
-					return day, IncorrectFormatForSetting{Setting: setting, Value: dayStr}
+					return day, IncorrectFormatForSetting{Setting: setting, Value: []byte(dayStr)}
 				}
 				return
 			}
@@ -355,7 +355,7 @@ func (f sessionFactory) newSession(
 			s.timestampPrecision = Nanos
 
 		default:
-			err = IncorrectFormatForSetting{Setting: config.TimeStampPrecision, Value: precisionStr}
+			err = IncorrectFormatForSetting{Setting: config.TimeStampPrecision, Value: []byte(precisionStr)}
 			return
 		}
 	}
diff --git a/session_settings.go b/session_settings.go
index 323ac6234..74d6cdd27 100644
--- a/session_settings.go
+++ b/session_settings.go
@@ -23,7 +23,7 @@ import (
 
 // SessionSettings maps session settings to values with typed accessors.
 type SessionSettings struct {
-	settings map[string]string
+	settings map[string][]byte
 }
 
 // ConditionallyRequiredSetting indicates a missing setting.
@@ -37,8 +37,9 @@ func (e ConditionallyRequiredSetting) Error() string {
 
 // IncorrectFormatForSetting indicates a setting that is incorrectly formatted.
 type IncorrectFormatForSetting struct {
-	Setting, Value string
-	Err            error
+	Setting string
+	Value   []byte
+	Err     error
 }
 
 func (e IncorrectFormatForSetting) Error() string {
@@ -47,7 +48,7 @@ func (e IncorrectFormatForSetting) Error() string {
 
 // Init initializes or resets SessionSettings.
 func (s *SessionSettings) Init() {
-	s.settings = make(map[string]string)
+	s.settings = make(map[string][]byte)
 }
 
 // NewSessionSettings returns a newly initialized SessionSettings instance.
@@ -58,8 +59,8 @@ func NewSessionSettings() *SessionSettings {
 	return s
 }
 
-// Set assigns a value to a setting on SessionSettings.
-func (s *SessionSettings) Set(setting string, val string) {
+// SetRaw assigns a value to a setting on SessionSettings.
+func (s *SessionSettings) SetRaw(setting string, val []byte) {
 	// Lazy init.
 	if s.settings == nil {
 		s.Init()
@@ -68,69 +69,87 @@ func (s *SessionSettings) Set(setting string, val string) {
 	s.settings[setting] = val
 }
 
+// Set assigns a string value to a setting on SessionSettings.
+func (s *SessionSettings) Set(setting string, val string) {
+	// Lazy init
+	if s.settings == nil {
+		s.Init()
+	}
+
+	s.settings[setting] = []byte(val)
+}
+
 // HasSetting returns true if a setting is set, false if not.
 func (s *SessionSettings) HasSetting(setting string) bool {
 	_, ok := s.settings[setting]
 	return ok
 }
 
-// Setting is a settings string accessor. Returns an error if the setting is missing.
-func (s *SessionSettings) Setting(setting string) (string, error) {
+// RawSetting is a settings accessor that returns the raw byte slice value of
+// the setting. Returns an error if the setting is missing.
+func (s *SessionSettings) RawSetting(setting string) ([]byte, error) {
 	val, ok := s.settings[setting]
 	if !ok {
-		return val, ConditionallyRequiredSetting{setting}
+		return nil, ConditionallyRequiredSetting{Setting: setting}
 	}
 
 	return val, nil
 }
 
-// IntSetting returns the requested setting parsed as an int.  Returns an errror if the setting is not set or cannot be parsed as an int.
-func (s *SessionSettings) IntSetting(setting string) (val int, err error) {
-	stringVal, err := s.Setting(setting)
+// Setting is a settings string accessor. Returns an error if the setting is missing.
+func (s *SessionSettings) Setting(setting string) (string, error) {
+	val, err := s.RawSetting(setting)
+	if err != nil {
+		return "", err
+	}
 
+	return string(val), nil
+}
+
+// IntSetting returns the requested setting parsed as an int.  Returns an errror if the setting is not set or cannot be parsed as an int.
+func (s *SessionSettings) IntSetting(setting string) (int, error) {
+	rawVal, err := s.RawSetting(setting)
 	if err != nil {
-		return
+		return 0, err
 	}
 
-	if val, err = strconv.Atoi(stringVal); err != nil {
-		return val, IncorrectFormatForSetting{Setting: setting, Value: stringVal, Err: err}
+	if val, err := strconv.Atoi(string(rawVal)); err == nil {
+		return val, nil
 	}
 
-	return
+	return 0, IncorrectFormatForSetting{Setting: setting, Value: rawVal, Err: err}
 }
 
 // DurationSetting returns the requested setting parsed as a time.Duration.
 // Returns an error if the setting is not set or cannot be parsed as a time.Duration.
-func (s *SessionSettings) DurationSetting(setting string) (val time.Duration, err error) {
-	stringVal, err := s.Setting(setting)
-
+func (s *SessionSettings) DurationSetting(setting string) (time.Duration, error) {
+	rawVal, err := s.RawSetting(setting)
 	if err != nil {
-		return
+		return 0, err
 	}
 
-	if val, err = time.ParseDuration(stringVal); err != nil {
-		return val, IncorrectFormatForSetting{Setting: setting, Value: stringVal, Err: err}
+	if val, err := time.ParseDuration(string(rawVal)); err == nil {
+		return val, nil
 	}
 
-	return
+	return 0, IncorrectFormatForSetting{Setting: setting, Value: rawVal, Err: err}
 }
 
 // BoolSetting returns the requested setting parsed as a boolean.  Returns an error if the setting is not set or cannot be parsed as a bool.
 func (s SessionSettings) BoolSetting(setting string) (bool, error) {
-	stringVal, err := s.Setting(setting)
-
+	rawVal, err := s.RawSetting(setting)
 	if err != nil {
 		return false, err
 	}
 
-	switch stringVal {
+	switch string(rawVal) {
 	case "Y", "y":
 		return true, nil
 	case "N", "n":
 		return false, nil
 	}
 
-	return false, IncorrectFormatForSetting{Setting: setting, Value: stringVal}
+	return false, IncorrectFormatForSetting{Setting: setting, Value: rawVal}
 }
 
 func (s *SessionSettings) overlay(overlay *SessionSettings) {
diff --git a/session_settings_test.go b/session_settings_test.go
index 7fa9a94ad..d413f6866 100644
--- a/session_settings_test.go
+++ b/session_settings_test.go
@@ -16,7 +16,9 @@
 package quickfix
 
 import (
+	"bytes"
 	"testing"
+	"time"
 
 	"github.com/quickfixgo/quickfix/config"
 )
@@ -55,10 +57,15 @@ func TestSessionSettings_IntSettings(t *testing.T) {
 	}
 
 	s.Set(config.SocketAcceptPort, "notanint")
-	if _, err := s.IntSetting(config.SocketAcceptPort); err == nil {
+	_, err := s.IntSetting(config.SocketAcceptPort)
+	if err == nil {
 		t.Error("Expected error for unparsable value")
 	}
 
+	if err.Error() != `"notanint" is invalid for SocketAcceptPort` {
+		t.Errorf("Expected %s, got %s", `"notanint" is invalid for SocketAcceptPort`, err)
+	}
+
 	s.Set(config.SocketAcceptPort, "1005")
 	val, err := s.IntSetting(config.SocketAcceptPort)
 	if err != nil {
@@ -77,10 +84,15 @@ func TestSessionSettings_BoolSettings(t *testing.T) {
 	}
 
 	s.Set(config.ResetOnLogon, "notabool")
-	if _, err := s.BoolSetting(config.ResetOnLogon); err == nil {
+	_, err := s.BoolSetting(config.ResetOnLogon)
+	if err == nil {
 		t.Error("Expected error for unparsable value")
 	}
 
+	if err.Error() != `"notabool" is invalid for ResetOnLogon` {
+		t.Errorf("Expected %s, got %s", `"notabool" is invalid for ResetOnLogon`, err)
+	}
+
 	var boolTests = []struct {
 		input    string
 		expected bool
@@ -105,6 +117,55 @@ func TestSessionSettings_BoolSettings(t *testing.T) {
 	}
 }
 
+func TestSessionSettings_DurationSettings(t *testing.T) {
+	s := NewSessionSettings()
+	if _, err := s.BoolSetting(config.ReconnectInterval); err == nil {
+		t.Error("Expected error for unknown setting")
+	}
+
+	s.Set(config.ReconnectInterval, "not duration")
+
+	_, err := s.DurationSetting(config.ReconnectInterval)
+	if err == nil {
+		t.Error("Expected error for unparsable value")
+	}
+
+	if err.Error() != `"not duration" is invalid for ReconnectInterval` {
+		t.Errorf("Expected %s, got %s", `"not duration" is invalid for ReconnectInterval`, err)
+	}
+
+	s.Set(config.ReconnectInterval, "10s")
+
+	got, err := s.DurationSetting(config.ReconnectInterval)
+	if err != nil {
+		t.Error("Unexpected err", err)
+	}
+
+	expected, _ := time.ParseDuration("10s")
+
+	if got != expected {
+		t.Errorf("Expected %v, got %v", expected, got)
+	}
+}
+
+func TestSessionSettings_ByteSettings(t *testing.T) {
+	s := NewSessionSettings()
+	if _, err := s.RawSetting(config.SocketPrivateKeyBytes); err == nil {
+		t.Error("Expected error for unknown setting")
+	}
+
+	s.SetRaw(config.SocketPrivateKeyBytes, []byte("pembytes"))
+
+	got, err := s.RawSetting(config.SocketPrivateKeyBytes)
+	if err != nil {
+		t.Error("Unexpected err", err)
+	}
+
+	if !bytes.Equal([]byte("pembytes"), got) {
+		t.Errorf("Expected %v, got %v", []byte("pembytes"), got)
+	}
+}
+
 func TestSessionSettings_Clone(t *testing.T) {
 	s := NewSessionSettings()
 
diff --git a/tls.go b/tls.go
index b9978a727..335d8e5d7 100644
--- a/tls.go
+++ b/tls.go
@@ -18,18 +18,20 @@ package quickfix
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"os"
 
 	"github.com/quickfixgo/quickfix/config"
 )
 
-func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error) {
+func loadTLSConfig(settings *SessionSettings) (*tls.Config, error) {
+	var err error
 	allowSkipClientCerts := false
 	if settings.HasSetting(config.SocketUseSSL) {
 		allowSkipClientCerts, err = settings.BoolSetting(config.SocketUseSSL)
 		if err != nil {
-			return
+			return nil, err
 		}
 	}
 
@@ -37,7 +39,7 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
 	if settings.HasSetting(config.SocketServerName) {
 		serverName, err = settings.Setting(config.SocketServerName)
 		if err != nil {
-			return
+			return nil, err
 		}
 	}
 
@@ -45,17 +47,20 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
 	if settings.HasSetting(config.SocketInsecureSkipVerify) {
 		insecureSkipVerify, err = settings.BoolSetting(config.SocketInsecureSkipVerify)
 		if err != nil {
-			return
+			return nil, err
 		}
 	}
 
-	if !settings.HasSetting(config.SocketPrivateKeyFile) && !settings.HasSetting(config.SocketCertificateFile) {
+	if !settings.HasSetting(config.SocketPrivateKeyFile) &&
+		!settings.HasSetting(config.SocketCertificateFile) &&
+		!settings.HasSetting(config.SocketPrivateKeyBytes) &&
+		!settings.HasSetting(config.SocketCertificateBytes) {
 		if !allowSkipClientCerts {
-			return
+			return nil, nil
 		}
 	}
 
-	tlsConfig = defaultTLSConfig()
+	tlsConfig := defaultTLSConfig()
 	tlsConfig.ServerName = serverName
 	tlsConfig.InsecureSkipVerify = insecureSkipVerify
 	setMinVersionExplicit(settings, tlsConfig)
@@ -67,49 +72,80 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
 
 		privateKeyFile, err = settings.Setting(config.SocketPrivateKeyFile)
 		if err != nil {
-			return
+			return nil, err
 		}
 
 		certificateFile, err = settings.Setting(config.SocketCertificateFile)
 		if err != nil {
-			return
+			return nil, err
 		}
 
 		tlsConfig.Certificates = make([]tls.Certificate, 1)
 
 		if tlsConfig.Certificates[0], err = tls.LoadX509KeyPair(certificateFile, privateKeyFile); err != nil {
-			return
+			return nil, fmt.Errorf("failed to load key pair: %w", err)
+		}
+	} else if settings.HasSetting(config.SocketPrivateKeyBytes) || settings.HasSetting(config.SocketCertificateBytes) {
+		privateKeyBytes, err := settings.RawSetting(config.SocketPrivateKeyBytes)
+		if err != nil {
+			return nil, err
+		}
+
+		certificateBytes, err := settings.RawSetting(config.SocketCertificateBytes)
+		if err != nil {
+			return nil, err
 		}
+
+		tlsConfig.Certificates = make([]tls.Certificate, 1)
+
+		certificate, err := tls.X509KeyPair(certificateBytes, privateKeyBytes)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse key pair: %w", err)
+		}
+
+		tlsConfig.Certificates[0] = certificate
 	}
 
 	if !allowSkipClientCerts {
 		tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
 	}
 
-	if !settings.HasSetting(config.SocketCAFile) {
-		return
+	if !settings.HasSetting(config.SocketCAFile) && !settings.HasSetting(config.SocketCABytes) {
+		return tlsConfig, nil
 	}
 
-	caFile, err := settings.Setting(config.SocketCAFile)
-	if err != nil {
-		return
-	}
+	certPool := x509.NewCertPool()
+	if settings.HasSetting(config.SocketCAFile) {
+		caFile, err := settings.Setting(config.SocketCAFile)
+		if err != nil {
+			return nil, err
+		}
 
-	pem, err := os.ReadFile(caFile)
-	if err != nil {
-		return
-	}
+		pem, err := os.ReadFile(caFile)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read CA bundle: %w", err)
+		}
 
-	certPool := x509.NewCertPool()
-	if !certPool.AppendCertsFromPEM(pem) {
-		err = fmt.Errorf("Failed to parse %v", caFile)
-		return
+		if !certPool.AppendCertsFromPEM(pem) {
+			err = fmt.Errorf("failed to parse %v", caFile)
+			return nil, err
+		}
+	} else {
+		caBytes, err := settings.RawSetting(config.SocketCABytes)
+		if err != nil {
+			return nil, err
+		}
+
+		if !certPool.AppendCertsFromPEM(caBytes) {
+			err = errors.New("failed to parse CA bundle from raw bytes")
+			return nil, err
+		}
 	}
 
 	tlsConfig.RootCAs = certPool
 	tlsConfig.ClientCAs = certPool
 
-	return
+	return tlsConfig, nil
 }
 
 // defaultTLSConfig brought to you by https://github.com/gtank/cryptopasta/
diff --git a/tls_test.go b/tls_test.go
index 0bae6cd54..ea9ea93a6 100644
--- a/tls_test.go
+++ b/tls_test.go
@@ -17,6 +17,7 @@ package quickfix
 
 import (
 	"crypto/tls"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -26,8 +27,9 @@ import (
 
 type TLSTestSuite struct {
 	suite.Suite
-	settings                                *Settings
-	PrivateKeyFile, CertificateFile, CAFile string
+	settings                                   *Settings
+	PrivateKeyFile, CertificateFile, CAFile    string
+	PrivateKeyBytes, CertificateBytes, CABytes []byte
 }
 
 func TestTLSTestSuite(t *testing.T) {
@@ -39,6 +41,18 @@ func (s *TLSTestSuite) SetupTest() {
 	s.PrivateKeyFile = "_test_data/localhost.key"
 	s.CertificateFile = "_test_data/localhost.crt"
 	s.CAFile = "_test_data/ca.crt"
+
+	privateKeyBytes, err := os.ReadFile(s.PrivateKeyFile)
+	s.Require().NoError(err)
+	s.PrivateKeyBytes = privateKeyBytes
+
+	certificateBytes, err := os.ReadFile(s.CertificateFile)
+	s.Require().NoError(err)
+	s.CertificateBytes = certificateBytes
+
+	caBytes, err := os.ReadFile(s.CAFile)
+	s.Require().NoError(err)
+	s.CABytes = caBytes
 }
 
 func (s *TLSTestSuite) TestLoadTLSNoSettings() {
@@ -51,11 +65,13 @@ func (s *TLSTestSuite) TestLoadTLSMissingKeyOrCert() {
 	s.settings.GlobalSettings().Set(config.SocketPrivateKeyFile, s.PrivateKeyFile)
 	_, err := loadTLSConfig(s.settings.GlobalSettings())
 	s.NotNil(err)
+	s.EqualError(err, "Conditionally Required Setting: SocketCertificateFile")
 
 	s.SetupTest()
 	s.settings.GlobalSettings().Set(config.SocketCertificateFile, s.CertificateFile)
 	_, err = loadTLSConfig(s.settings.GlobalSettings())
 	s.NotNil(err)
+	s.EqualError(err, "Conditionally Required Setting: SocketPrivateKeyFile")
 }
 
 func (s *TLSTestSuite) TestLoadTLSInvalidKeyOrCert() {
@@ -63,6 +79,7 @@ func (s *TLSTestSuite) TestLoadTLSInvalidKeyOrCert() {
 	s.settings.GlobalSettings().Set(config.SocketCertificateFile, "foo")
 	_, err := loadTLSConfig(s.settings.GlobalSettings())
 	s.NotNil(err)
+	s.EqualError(err, "failed to load key pair: open foo: no such file or directory")
 }
 
 func (s *TLSTestSuite) TestLoadTLSNoCA() {
@@ -86,6 +103,7 @@ func (s *TLSTestSuite) TestLoadTLSWithBadCA() {
 
 	_, err := loadTLSConfig(s.settings.GlobalSettings())
 	s.NotNil(err)
+	s.EqualError(err, "failed to read CA bundle: open bar: no such file or directory")
 }
 
 func (s *TLSTestSuite) TestLoadTLSWithCA() {
@@ -223,3 +241,93 @@ func (s *TLSTestSuite) TestMinimumTLSVersion() {
 	s.NotNil(tlsConfig)
 	s.Equal(tlsConfig.MinVersion, uint16(tls.VersionTLS12))
 }
+
+func (s *TLSTestSuite) TestLoadTLSBytesMissingKeyOrCert() {
+	s.settings.GlobalSettings().SetRaw(config.SocketPrivateKeyBytes, s.PrivateKeyBytes)
+	_, err := loadTLSConfig(s.settings.GlobalSettings())
+	s.NotNil(err)
+	s.EqualError(err, "Conditionally Required Setting: SocketCertificateBytes")
+
+	s.SetupTest()
+	s.settings.GlobalSettings().SetRaw(config.SocketCertificateBytes, s.CertificateBytes)
+	_, err = loadTLSConfig(s.settings.GlobalSettings())
+	s.NotNil(err)
+	s.EqualError(err, "Conditionally Required Setting: SocketPrivateKeyBytes")
+}
+
+func (s *TLSTestSuite) TestLoadTLSBytesInvalidKeyOrCert() {
+	s.settings.GlobalSettings().SetRaw(config.SocketPrivateKeyBytes, s.PrivateKeyBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketCertificateBytes, []byte("not a cert"))
+	_, err := loadTLSConfig(s.settings.GlobalSettings())
+	s.NotNil(err)
+	s.EqualError(err, "failed to parse key pair: tls: failed to find any PEM data in certificate input")
+
+	s.SetupTest()
+	s.settings.GlobalSettings().SetRaw(config.SocketCertificateBytes, s.CertificateBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketPrivateKeyBytes, []byte("not a key"))
+	_, err = loadTLSConfig(s.settings.GlobalSettings())
+	s.NotNil(err)
+	s.EqualError(err, "failed to parse key pair: tls: failed to find any PEM data in key input")
+}
+
+func (s *TLSTestSuite) TestLoadTLSBytesNoCA() {
+	s.settings.GlobalSettings().SetRaw(config.SocketPrivateKeyBytes, s.PrivateKeyBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketCertificateBytes, s.CertificateBytes)
+
+	tlsConfig, err := loadTLSConfig(s.settings.GlobalSettings())
+	s.NoError(err)
+	s.NotNil(tlsConfig)
+
+	s.Len(tlsConfig.Certificates, 1)
+	s.Nil(tlsConfig.RootCAs)
+	s.Nil(tlsConfig.ClientCAs)
+	s.Equal(tls.RequireAndVerifyClientCert, tlsConfig.ClientAuth)
+}
+
+func (s *TLSTestSuite) TestLoadTLSBytesWithBadCA() {
+	s.settings.GlobalSettings().SetRaw(config.SocketPrivateKeyBytes, s.PrivateKeyBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketCertificateBytes, s.CertificateBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketCABytes, []byte("bar"))
+
+	_, err := loadTLSConfig(s.settings.GlobalSettings())
+	s.NotNil(err)
+	s.EqualError(err, "failed to parse CA bundle from raw bytes")
+}
+
+func (s *TLSTestSuite) TestLoadTLSBytesWithCA() {
+	s.settings.GlobalSettings().SetRaw(config.SocketPrivateKeyBytes, s.PrivateKeyBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketCertificateBytes, s.CertificateBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketCABytes, s.CABytes)
+
+	tlsConfig, err := loadTLSConfig(s.settings.GlobalSettings())
+	s.Nil(err)
+	s.NotNil(tlsConfig)
+
+	s.Len(tlsConfig.Certificates, 1)
+	s.NotNil(tlsConfig.RootCAs)
+	s.NotNil(tlsConfig.ClientCAs)
+	s.Equal(tls.RequireAndVerifyClientCert, tlsConfig.ClientAuth)
+}
+
+func (s *TLSTestSuite) TestLoadTLSBytesWithOnlyCA() {
+	s.settings.GlobalSettings().Set(config.SocketUseSSL, "Y")
+	s.settings.GlobalSettings().SetRaw(config.SocketCABytes, s.CABytes)
+
+	tlsConfig, err := loadTLSConfig(s.settings.GlobalSettings())
+	s.Nil(err)
+	s.NotNil(tlsConfig)
+
+	s.NotNil(tlsConfig.RootCAs)
+	s.NotNil(tlsConfig.ClientCAs)
+}
+
+func (s *TLSTestSuite) TestServerNameWithCertsFromBytes() {
+	s.settings.GlobalSettings().SetRaw(config.SocketPrivateKeyBytes, s.PrivateKeyBytes)
+	s.settings.GlobalSettings().SetRaw(config.SocketCertificateBytes, s.CertificateBytes)
+	s.settings.GlobalSettings().Set(config.SocketServerName, "DummyServerNameWithCerts")
+
+	tlsConfig, err := loadTLSConfig(s.settings.GlobalSettings())
+	s.Nil(err)
+	s.NotNil(tlsConfig)
+	s.Equal("DummyServerNameWithCerts", tlsConfig.ServerName)
+}

From 2e60bad3ad1c7b2047ef8745f90d900b229a7647 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Wed, 14 Aug 2024 12:56:25 -0500
Subject: [PATCH 38/58] v0.9.5 release notes

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 258e21aff..6c6f3b16d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 0.9.5 (August 14, 2024)
+
+### ENHANCEMENTS
+* Introduce message iterator to avoid loading all messages into memory at once upon resend request https://github.com/quickfixgo/quickfix/pull/659
+* Only lock fieldmap once during message parsing https://github.com/quickfixgo/quickfix/pull/658
+* Optimize tag value parsing https://github.com/quickfixgo/quickfix/pull/657
+* Use bytes.Count to count the number of message fields https://github.com/quickfixgo/quickfix/pull/655
+* Port config documentation into proper go doc format https://github.com/quickfixgo/quickfix/pull/649
+* Support TLS configuration as raw bytes https://github.com/quickfixgo/quickfix/pull/647
+
+### BUG FIXES
+* Use the Go generated file convention https://github.com/quickfixgo/quickfix/pull/660
+* Fix stuck call to Dial when calling Stop on the Initiator https://github.com/quickfixgo/quickfix/pull/654
+* Do not increment NextTargetMsgSeqNum for out of sequence Logout and Test Requests https://github.com/quickfixgo/quickfix/pull/645
+
 ## 0.9.4 (May 29, 2024)
 
 ### ENHANCEMENTS

From 26dc5024e323647a9280772b5e0c115eb0ed34f9 Mon Sep 17 00:00:00 2001
From: Endre Kovacs <endre@alpaca.markets>
Date: Thu, 29 Aug 2024 10:48:36 +0200
Subject: [PATCH 39/58] allow the clients of acceptor to specify their own
 tls.Config

---
 accepter_test.go | 43 +++++++++++++++++++++++++++++++++++++++++++
 acceptor.go      | 25 ++++++++++++++++++++-----
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/accepter_test.go b/accepter_test.go
index 54bfff845..413bf9e21 100644
--- a/accepter_test.go
+++ b/accepter_test.go
@@ -16,6 +16,7 @@
 package quickfix
 
 import (
+	"crypto/tls"
 	"net"
 	"testing"
 
@@ -23,6 +24,7 @@ import (
 
 	proxyproto "github.com/pires/go-proxyproto"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestAcceptor_Start(t *testing.T) {
@@ -83,3 +85,44 @@ func TestAcceptor_Start(t *testing.T) {
 		})
 	}
 }
+
+func TestAcceptor_SetTLSConfig(t *testing.T) {
+	sessionSettings := NewSessionSettings()
+	sessionSettings.Set(config.BeginString, BeginStringFIX42)
+	sessionSettings.Set(config.SenderCompID, "sender")
+	sessionSettings.Set(config.TargetCompID, "target")
+
+	genericSettings := NewSettings()
+
+	genericSettings.GlobalSettings().Set("SocketAcceptPort", "5001")
+	_, err := genericSettings.AddSession(sessionSettings)
+	require.NoError(t, err)
+
+	logger, err := NewScreenLogFactory().Create()
+	require.NoError(t, err)
+	acceptor := &Acceptor{settings: genericSettings, globalLog: logger}
+	defer acceptor.Stop()
+	// example of a customized tls.Config that loads the certificates dynamically by the `GetCertificate` function
+	// as opposed to the Certificates slice, that is static in nature, and is only populated once and needs application restart to reload the certs.
+	customizedTLSConfig := tls.Config{
+		Certificates: []tls.Certificate{},
+		GetCertificate: func(chi *tls.ClientHelloInfo) (*tls.Certificate, error) {
+			cert, err := tls.LoadX509KeyPair("_test_data/localhost.crt", "_test_data/localhost.key")
+			if err != nil {
+				return nil, err
+			}
+			return &cert, nil
+		},
+	}
+
+	acceptor.SetTLSConfig(&customizedTLSConfig)
+	assert.NoError(t, acceptor.Start())
+	assert.Len(t, acceptor.listeners, 1)
+
+	conn, err := tls.Dial("tcp", "localhost:5001", &tls.Config{
+		InsecureSkipVerify: true,
+	})
+	require.NoError(t, err)
+	assert.NotNil(t, conn)
+	defer conn.Close()
+}
diff --git a/acceptor.go b/acceptor.go
index f5b9b281c..6bea76bdc 100644
--- a/acceptor.go
+++ b/acceptor.go
@@ -19,6 +19,7 @@ import (
 	"bufio"
 	"bytes"
 	"crypto/tls"
+	"fmt"
 	"io"
 	"net"
 	"runtime/debug"
@@ -48,6 +49,7 @@ type Acceptor struct {
 	sessionHostPort       map[SessionID]int
 	listeners             map[string]net.Listener
 	connectionValidator   ConnectionValidator
+	tlsConfig             *tls.Config
 	sessionFactory
 }
 
@@ -81,9 +83,12 @@ func (a *Acceptor) Start() (err error) {
 		a.listeners[address] = nil
 	}
 
-	var tlsConfig *tls.Config
-	if tlsConfig, err = loadTLSConfig(a.settings.GlobalSettings()); err != nil {
-		return
+	if a.tlsConfig == nil {
+		var tlsConfig *tls.Config
+		if tlsConfig, err = loadTLSConfig(a.settings.GlobalSettings()); err != nil {
+			return
+		}
+		a.tlsConfig = tlsConfig
 	}
 
 	var useTCPProxy bool
@@ -94,8 +99,8 @@ func (a *Acceptor) Start() (err error) {
 	}
 
 	for address := range a.listeners {
-		if tlsConfig != nil {
-			if a.listeners[address], err = tls.Listen("tcp", address, tlsConfig); err != nil {
+		if a.tlsConfig != nil {
+			if a.listeners[address], err = tls.Listen("tcp", address, a.tlsConfig); err != nil {
 				return
 			}
 		} else if a.listeners[address], err = net.Listen("tcp", address); err != nil {
@@ -228,6 +233,7 @@ func (a *Acceptor) invalidMessage(msg *bytes.Buffer, err error) {
 func (a *Acceptor) handleConnection(netConn net.Conn) {
 	defer func() {
 		if err := recover(); err != nil {
+			fmt.Println("asdqwe", a.globalLog)
 			a.globalLog.OnEventf("Connection Terminated with Panic: %s", debug.Stack())
 		}
 
@@ -421,3 +427,12 @@ LOOP:
 func (a *Acceptor) SetConnectionValidator(validator ConnectionValidator) {
 	a.connectionValidator = validator
 }
+
+// SetTLSConfig allows the creator of the Acceptor to specify a fully customizable tls.Config.
+
+// When the caller explicitly provides a tls.Config with this function,
+// it takes precendent over TLS settings specified in the acceptor's settings.GlobalSettings(),
+// meaning that the setting object is not inspected or used for the creation of the tls.Config.
+func (a *Acceptor) SetTLSConfig(tlsConfig *tls.Config) {
+	a.tlsConfig = tlsConfig
+}

From aa3199175a62f75ca869b6ac2c90173debcfff74 Mon Sep 17 00:00:00 2001
From: Endre Kovacs <endre@alpaca.markets>
Date: Thu, 29 Aug 2024 11:24:03 +0200
Subject: [PATCH 40/58] lint fix

---
 accepter_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accepter_test.go b/accepter_test.go
index 413bf9e21..5cf888a8c 100644
--- a/accepter_test.go
+++ b/accepter_test.go
@@ -106,7 +106,7 @@ func TestAcceptor_SetTLSConfig(t *testing.T) {
 	// as opposed to the Certificates slice, that is static in nature, and is only populated once and needs application restart to reload the certs.
 	customizedTLSConfig := tls.Config{
 		Certificates: []tls.Certificate{},
-		GetCertificate: func(chi *tls.ClientHelloInfo) (*tls.Certificate, error) {
+		GetCertificate: func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
 			cert, err := tls.LoadX509KeyPair("_test_data/localhost.crt", "_test_data/localhost.key")
 			if err != nil {
 				return nil, err

From 6e397eeff979c9f5973e7c476c6cd4d5b1133b6d Mon Sep 17 00:00:00 2001
From: Endre Kovacs <endre@alpaca.markets>
Date: Thu, 29 Aug 2024 13:54:58 +0200
Subject: [PATCH 41/58] cleanup

---
 acceptor.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/acceptor.go b/acceptor.go
index 6bea76bdc..c391b62af 100644
--- a/acceptor.go
+++ b/acceptor.go
@@ -19,7 +19,6 @@ import (
 	"bufio"
 	"bytes"
 	"crypto/tls"
-	"fmt"
 	"io"
 	"net"
 	"runtime/debug"
@@ -233,7 +232,6 @@ func (a *Acceptor) invalidMessage(msg *bytes.Buffer, err error) {
 func (a *Acceptor) handleConnection(netConn net.Conn) {
 	defer func() {
 		if err := recover(); err != nil {
-			fmt.Println("asdqwe", a.globalLog)
 			a.globalLog.OnEventf("Connection Terminated with Panic: %s", debug.Stack())
 		}
 

From f4d6fe9276e8081ac8dc27764e427db58c4c670d Mon Sep 17 00:00:00 2001
From: Endre Kovacs <endre@alpaca.markets>
Date: Thu, 29 Aug 2024 14:11:18 +0200
Subject: [PATCH 42/58] adjust comments

---
 acceptor.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/acceptor.go b/acceptor.go
index c391b62af..2f9f6c48b 100644
--- a/acceptor.go
+++ b/acceptor.go
@@ -426,11 +426,12 @@ func (a *Acceptor) SetConnectionValidator(validator ConnectionValidator) {
 	a.connectionValidator = validator
 }
 
-// SetTLSConfig allows the creator of the Acceptor to specify a fully customizable tls.Config.
-
-// When the caller explicitly provides a tls.Config with this function,
+// SetTLSConfig allows the creator of the Acceptor to specify a fully customizable tls.Config of their choice,
+// which will be used in the Start() method.
+//
+// Note: when the caller explicitly provides a tls.Config with this function,
 // it takes precendent over TLS settings specified in the acceptor's settings.GlobalSettings(),
-// meaning that the setting object is not inspected or used for the creation of the tls.Config.
+// meaning that the `settings.GlobalSettings()` object is not inspected or used for the creation of the tls.Config.
 func (a *Acceptor) SetTLSConfig(tlsConfig *tls.Config) {
 	a.tlsConfig = tlsConfig
 }

From aa15928b56c5b7a0db74acf0d4a7f8ca368aba49 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Thu, 29 Aug 2024 19:01:54 -0500
Subject: [PATCH 43/58] Adds nextexpectedseqnum test defs and refactors test
 server to support new syntax

---
 .github/workflows/ci.yaml                     | 58 +++++++--------
 _test/Reflector.rb                            |  2 +
 _test/ReflectorClient.rb                      |  8 +++
 _test/cfg/nextexpectedseqnum/fix44.cfg        | 10 +++
 _test/cfg/nextexpectedseqnum/fix50.cfg        | 12 ++++
 _test/cfg/nextexpectedseqnum/fix50sp1.cfg     | 12 ++++
 _test/cfg/nextexpectedseqnum/fix50sp2.cfg     | 12 ++++
 .../fix44/2a_NextExpectedMsgSeqNumCorrect.def | 16 +++++
 .../fix44/2b_NextExpectedMsgSeqNumTooHigh.def | 10 +++
 .../fix44/2c_NextExpectedMsgSeqNumTooLow.def  | 14 ++++
 ...esetSeqNumFlagAndNextExpectedMsgSeqNum.def | 14 ++++
 .../fix50/2a_NextExpectedMsgSeqNumCorrect.def | 16 +++++
 .../fix50/2b_NextExpectedMsgSeqNumTooHigh.def |  9 +++
 .../fix50/2c_NextExpectedMsgSeqNumTooLow.def  | 14 ++++
 ...esetSeqNumFlagAndNextExpectedMsgSeqNum.def | 14 ++++
 .../2a_NextExpectedMsgSeqNumCorrect.def       | 16 +++++
 .../2b_NextExpectedMsgSeqNumTooHigh.def       |  9 +++
 .../2c_NextExpectedMsgSeqNumTooLow.def        | 14 ++++
 ...esetSeqNumFlagAndNextExpectedMsgSeqNum.def | 14 ++++
 .../2a_NextExpectedMsgSeqNumCorrect.def       | 16 +++++
 .../2b_NextExpectedMsgSeqNumTooHigh.def       |  9 +++
 .../2c_NextExpectedMsgSeqNumTooLow.def        | 14 ++++
 ...esetSeqNumFlagAndNextExpectedMsgSeqNum.def | 14 ++++
 _test/test-server/main.go                     | 71 ++++++++++++++++++-
 config/configuration.go                       | 13 ++++
 internal/session_settings.go                  |  1 +
 registry.go                                   | 36 ++++++++++
 session.go                                    | 65 +++++++++++++++++
 session_factory.go                            |  6 ++
 tag.go                                        |  1 +
 30 files changed, 490 insertions(+), 30 deletions(-)
 create mode 100644 _test/cfg/nextexpectedseqnum/fix44.cfg
 create mode 100644 _test/cfg/nextexpectedseqnum/fix50.cfg
 create mode 100644 _test/cfg/nextexpectedseqnum/fix50sp1.cfg
 create mode 100644 _test/cfg/nextexpectedseqnum/fix50sp2.cfg
 create mode 100644 _test/definitions/nextexpectedseqnum/fix44/2a_NextExpectedMsgSeqNumCorrect.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix44/2b_NextExpectedMsgSeqNumTooHigh.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix44/2c_NextExpectedMsgSeqNumTooLow.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix44/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50/2a_NextExpectedMsgSeqNumCorrect.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50/2b_NextExpectedMsgSeqNumTooHigh.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50/2c_NextExpectedMsgSeqNumTooLow.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp1/2a_NextExpectedMsgSeqNumCorrect.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp1/2b_NextExpectedMsgSeqNumTooHigh.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp1/2c_NextExpectedMsgSeqNumTooLow.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp1/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp2/2a_NextExpectedMsgSeqNumCorrect.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp2/2b_NextExpectedMsgSeqNumTooHigh.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp2/2c_NextExpectedMsgSeqNumTooLow.def
 create mode 100644 _test/definitions/nextexpectedseqnum/fix50sp2/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a1ff334be..2c13221db 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -241,32 +241,32 @@ jobs:
           ACCEPTANCE_SET: lastseqnumprocessed
         run: make generate-ci && make build && make $FIX_TEST
 
-  # nextexpectedseqnum:
-  #   name: NextExpectedSeqNum Suite
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     matrix:
-  #       go: [1.21]
-  #       fix-version:
-  #         - fix44
-  #         - fix50
-  #         - fix50sp1
-  #         - fix50sp2
-  #   steps:
-  #     - name: Setup
-  #       uses: actions/setup-go@v2
-  #       with:
-  #         go-version: ${{ matrix.go }}
-  #     - name: Check out source
-  #       uses: actions/checkout@v2
-  #     - name: Install ruby
-  #       uses: ruby/setup-ruby@v1
-  #       with:
-  #         ruby-version: '3.0'
-  #     - name: Acceptance test
-  #       env:
-  #         GO111MODULE: on
-  #         FIX_TEST: ${{ matrix.fix-version }}
-  #         STORE_TYPE: memory
-  #         ACCEPTANCE_SET: nextexpectedseqnum
-  #       run: make generate-ci && make build && make $FIX_TEST
\ No newline at end of file
+  nextexpectedseqnum:
+    name: NextExpectedSeqNum Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [1.21]
+        fix-version:
+          - fix44
+          - fix50
+          - fix50sp1
+          - fix50sp2
+    steps:
+      - name: Setup
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Check out source
+        uses: actions/checkout@v2
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+      - name: Acceptance test
+        env:
+          GO111MODULE: on
+          FIX_TEST: ${{ matrix.fix-version }}
+          STORE_TYPE: memory
+          ACCEPTANCE_SET: nextexpectedseqnum
+        run: make generate-ci && make build && make $FIX_TEST
\ No newline at end of file
diff --git a/_test/Reflector.rb b/_test/Reflector.rb
index fe9535f39..3e86af7a1 100644
--- a/_test/Reflector.rb
+++ b/_test/Reflector.rb
@@ -61,6 +61,8 @@ def processLine(lineNum, line, body, cid)
         connectAction(cid)
       elsif body == "DISCONNECT"
         disconnectAction(cid)
+      elsif body.index("SET_SESSION") == 0
+        setSeqnum(body)
       else
         raise "Syntax error: " + body
       end
diff --git a/_test/ReflectorClient.rb b/_test/ReflectorClient.rb
index acc8acc72..148867b40 100644
--- a/_test/ReflectorClient.rb
+++ b/_test/ReflectorClient.rb
@@ -19,6 +19,8 @@
 require 'Reflector'
 require 'FixParser'
 require "socket"
+require 'uri'
+require 'net/http'
 
 class ReflectorClient
 
@@ -62,6 +64,12 @@ def @reflector.disconnectAction(cid)
       @sockets.delete(cid)
       @parsers.delete(cid)
     end
+    
+    def @reflector.setSeqnum(body)
+      left_array = body.split(" ")
+      uri = URI('http://localhost:8095/seqnum?SESSION='+left_array[1]+'&'+left_array[2])
+      Net::HTTP.get_response(uri)
+    end
 
     def @reflector.waitConnectAction(cid)
     end
diff --git a/_test/cfg/nextexpectedseqnum/fix44.cfg b/_test/cfg/nextexpectedseqnum/fix44.cfg
new file mode 100644
index 000000000..b31219439
--- /dev/null
+++ b/_test/cfg/nextexpectedseqnum/fix44.cfg
@@ -0,0 +1,10 @@
+[DEFAULT]
+SocketAcceptPort=5005
+SenderCompID=ISLD
+TargetCompID=TW
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIX.4.4
+DataDictionary=../spec/FIX44.xml
+EnableNextExpectedMsgSeqNum=Y
diff --git a/_test/cfg/nextexpectedseqnum/fix50.cfg b/_test/cfg/nextexpectedseqnum/fix50.cfg
new file mode 100644
index 000000000..c60f608e2
--- /dev/null
+++ b/_test/cfg/nextexpectedseqnum/fix50.cfg
@@ -0,0 +1,12 @@
+[DEFAULT]
+SocketAcceptPort=5006
+SenderCompID=ISLD
+TargetCompID=TW
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+DefaultApplVerID=FIX.5.0
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50.xml
+EnableNextExpectedMsgSeqNum=Y
diff --git a/_test/cfg/nextexpectedseqnum/fix50sp1.cfg b/_test/cfg/nextexpectedseqnum/fix50sp1.cfg
new file mode 100644
index 000000000..f1ec2103b
--- /dev/null
+++ b/_test/cfg/nextexpectedseqnum/fix50sp1.cfg
@@ -0,0 +1,12 @@
+[DEFAULT]
+SocketAcceptPort=5007
+SenderCompID=ISLD
+TargetCompID=TW
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+DefaultApplVerID=FIX.5.0SP1
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50SP1.xml
+EnableNextExpectedMsgSeqNum=Y
diff --git a/_test/cfg/nextexpectedseqnum/fix50sp2.cfg b/_test/cfg/nextexpectedseqnum/fix50sp2.cfg
new file mode 100644
index 000000000..4a1db4eef
--- /dev/null
+++ b/_test/cfg/nextexpectedseqnum/fix50sp2.cfg
@@ -0,0 +1,12 @@
+[DEFAULT]
+SocketAcceptPort=5008
+SenderCompID=ISLD
+TargetCompID=TW
+FileLogPath=tmp
+
+[SESSION]
+BeginString=FIXT.1.1
+DefaultApplVerID=FIX.5.0SP2
+TransportDataDictionary=../spec/FIXT11.xml
+AppDataDictionary=../spec/FIX50SP2.xml
+EnableNextExpectedMsgSeqNum=Y
diff --git a/_test/definitions/nextexpectedseqnum/fix44/2a_NextExpectedMsgSeqNumCorrect.def b/_test/definitions/nextexpectedseqnum/fix44/2a_NextExpectedMsgSeqNumCorrect.def
new file mode 100644
index 000000000..3cadb8ca2
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix44/2a_NextExpectedMsgSeqNumCorrect.def
@@ -0,0 +1,16 @@
+iCONNECT
+
+#------------------------
+# logon message and response
+# send logon with sequence number equals to 1
+# expect for a logon response with NextExpectedMsgSeqNum field equals to 2 
+#------------------------
+
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
108=2

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

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix44/2b_NextExpectedMsgSeqNumTooHigh.def b/_test/definitions/nextexpectedseqnum/fix44/2b_NextExpectedMsgSeqNumTooHigh.def
new file mode 100644
index 000000000..dea8ea56b
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix44/2b_NextExpectedMsgSeqNumTooHigh.def
@@ -0,0 +1,10 @@
+# If message NextExpectedMsgSeqNum field is too high, we must disconnect
+
+iCONNECT
+iSET_SESSION FIX.4.4:ISLD->TW NEXTSENDERSEQNUM=1
+iSET_SESSION FIX.4.4:ISLD->TW NEXTTARGETSEQNUM=1
+
+I8=FIX.4.4
35=A
34=1000
49=TW
52=<TIME>
56=ISLD
98=0
789=1200
108=30

+
+E8=FIX.4.4
9=135
35=5
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
58=Tag 789 (NextExpectedMsgSeqNum) is higher than expected. Expected 1, Received 1200
10=0

+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix44/2c_NextExpectedMsgSeqNumTooLow.def b/_test/definitions/nextexpectedseqnum/fix44/2c_NextExpectedMsgSeqNumTooLow.def
new file mode 100644
index 000000000..85b7a5e19
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix44/2c_NextExpectedMsgSeqNumTooLow.def
@@ -0,0 +1,14 @@
+iCONNECT
+iSET_SESSION FIX.4.4:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIX.4.4:ISLD->TW NEXTTARGETSEQNUM=1
+
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
108=30

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

+E8=FIX.4.4
9=94
35=4
34=1
43=Y
49=ISLD
52=<TIME>
56=TW
122=<TIME>
36=2001
123=Y

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix44/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def b/_test/definitions/nextexpectedseqnum/fix44/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
new file mode 100644
index 000000000..f8a24d30f
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix44/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
@@ -0,0 +1,14 @@
+# FIX Logon using tag 141/ResetSeqNumFlag and tag 789/NextExpectedSeqMsgNum
+
+iCONNECT
+iSET_SESSION FIX.4.4:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIX.4.4:ISLD->TW NEXTTARGETSEQNUM=2000
+
+I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
141=Y
108=30

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

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

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50/2a_NextExpectedMsgSeqNumCorrect.def b/_test/definitions/nextexpectedseqnum/fix50/2a_NextExpectedMsgSeqNumCorrect.def
new file mode 100644
index 000000000..72ee93f93
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50/2a_NextExpectedMsgSeqNumCorrect.def
@@ -0,0 +1,16 @@
+iCONNECT
+
+#------------------------
+# logon message and response
+# send logon with sequence number equals to 1
+# expect for a logon response with NextExpectedMsgSeqNum field equals to 2 
+#------------------------
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
1137=7
108=2

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

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50/2b_NextExpectedMsgSeqNumTooHigh.def b/_test/definitions/nextexpectedseqnum/fix50/2b_NextExpectedMsgSeqNumTooHigh.def
new file mode 100644
index 000000000..776b243a2
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50/2b_NextExpectedMsgSeqNumTooHigh.def
@@ -0,0 +1,9 @@
+# If message NextExpectedMsgSeqNum field is too high, we must disconnect
+
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=1
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=1
+I8=FIXT.1.1
35=A
34=1000
49=TW
52=<TIME>
56=ISLD
98=0
789=1200
1137=7
108=30

+
+E8=FIXT.1.1
9=135
35=5
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
58=Tag 789 (NextExpectedMsgSeqNum) is higher than expected. Expected 1, Received 1200
10=0

+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50/2c_NextExpectedMsgSeqNumTooLow.def b/_test/definitions/nextexpectedseqnum/fix50/2c_NextExpectedMsgSeqNumTooLow.def
new file mode 100644
index 000000000..e3d1e3bb1
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50/2c_NextExpectedMsgSeqNumTooLow.def
@@ -0,0 +1,14 @@
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=1
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
1137=7
108=30

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

+E8=FIXT.1.1
9=94
35=4
34=1
43=Y
49=ISLD
52=<TIME>
56=TW
122=<TIME>
36=2001
123=Y

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def b/_test/definitions/nextexpectedseqnum/fix50/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
new file mode 100644
index 000000000..3a738b90d
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
@@ -0,0 +1,14 @@
+# FIX Logon using tag 141/ResetSeqNumFlag and tag 789/NextExpectedSeqMsgNum
+
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=2000
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
141=Y
1137=7
108=30

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

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp1/2a_NextExpectedMsgSeqNumCorrect.def b/_test/definitions/nextexpectedseqnum/fix50sp1/2a_NextExpectedMsgSeqNumCorrect.def
new file mode 100644
index 000000000..0441f335c
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp1/2a_NextExpectedMsgSeqNumCorrect.def
@@ -0,0 +1,16 @@
+iCONNECT
+
+#------------------------
+# logon message and response
+# send logon with sequence number equals to 1
+# expect for a logon response with NextExpectedMsgSeqNum field equals to 2 
+#------------------------
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
1137=8
108=2

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

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp1/2b_NextExpectedMsgSeqNumTooHigh.def b/_test/definitions/nextexpectedseqnum/fix50sp1/2b_NextExpectedMsgSeqNumTooHigh.def
new file mode 100644
index 000000000..a29496672
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp1/2b_NextExpectedMsgSeqNumTooHigh.def
@@ -0,0 +1,9 @@
+# If message NextExpectedMsgSeqNum field is too high, we must disconnect
+
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=1
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=1
+I8=FIXT.1.1
35=A
34=1000
49=TW
52=<TIME>
56=ISLD
98=0
789=1200
1137=8
108=30

+
+E8=FIXT.1.1
9=135
35=5
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
58=Tag 789 (NextExpectedMsgSeqNum) is higher than expected. Expected 1, Received 1200
10=0

+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp1/2c_NextExpectedMsgSeqNumTooLow.def b/_test/definitions/nextexpectedseqnum/fix50sp1/2c_NextExpectedMsgSeqNumTooLow.def
new file mode 100644
index 000000000..4de8b8094
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp1/2c_NextExpectedMsgSeqNumTooLow.def
@@ -0,0 +1,14 @@
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=1
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
1137=10
108=30

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

+E8=FIXT.1.1
9=94
35=4
34=1
43=Y
49=ISLD
52=<TIME>
56=TW
122=<TIME>
36=2001
123=Y

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp1/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def b/_test/definitions/nextexpectedseqnum/fix50sp1/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
new file mode 100644
index 000000000..2fc6d76af
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp1/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
@@ -0,0 +1,14 @@
+# FIX Logon using tag 141/ResetSeqNumFlag and tag 789/NextExpectedSeqMsgNum
+
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=2000
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
141=Y
1137=8
108=30

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

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp2/2a_NextExpectedMsgSeqNumCorrect.def b/_test/definitions/nextexpectedseqnum/fix50sp2/2a_NextExpectedMsgSeqNumCorrect.def
new file mode 100644
index 000000000..d106d7108
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp2/2a_NextExpectedMsgSeqNumCorrect.def
@@ -0,0 +1,16 @@
+iCONNECT
+
+#------------------------
+# logon message and response
+# send logon with sequence number equals to 1
+# expect for a logon response with NextExpectedMsgSeqNum field equals to 2 
+#------------------------
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
1137=9
108=2

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

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp2/2b_NextExpectedMsgSeqNumTooHigh.def b/_test/definitions/nextexpectedseqnum/fix50sp2/2b_NextExpectedMsgSeqNumTooHigh.def
new file mode 100644
index 000000000..f702d38ee
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp2/2b_NextExpectedMsgSeqNumTooHigh.def
@@ -0,0 +1,9 @@
+# If message NextExpectedMsgSeqNum field is too high, we must disconnect
+
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=1
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=1
+I8=FIXT.1.1
35=A
34=1000
49=TW
52=<TIME>
56=ISLD
98=0
789=1200
1137=9
108=30

+
+E8=FIXT.1.1
9=135
35=5
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
58=Tag 789 (NextExpectedMsgSeqNum) is higher than expected. Expected 1, Received 1200
10=0

+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp2/2c_NextExpectedMsgSeqNumTooLow.def b/_test/definitions/nextexpectedseqnum/fix50sp2/2c_NextExpectedMsgSeqNumTooLow.def
new file mode 100644
index 000000000..4a941eb53
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp2/2c_NextExpectedMsgSeqNumTooLow.def
@@ -0,0 +1,14 @@
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=1
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
1137=9
108=30

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

+E8=FIXT.1.1
9=94
35=4
34=1
43=Y
49=ISLD
52=<TIME>
56=TW
122=<TIME>
36=2001
123=Y

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/definitions/nextexpectedseqnum/fix50sp2/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def b/_test/definitions/nextexpectedseqnum/fix50sp2/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
new file mode 100644
index 000000000..c9c03b272
--- /dev/null
+++ b/_test/definitions/nextexpectedseqnum/fix50sp2/ResetSeqNumFlagAndNextExpectedMsgSeqNum.def
@@ -0,0 +1,14 @@
+# FIX Logon using tag 141/ResetSeqNumFlag and tag 789/NextExpectedSeqMsgNum
+
+iCONNECT
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTSENDERSEQNUM=2000
+iSET_SESSION FIXT.1.1:ISLD->TW NEXTTARGETSEQNUM=2000
+
+I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
789=1
141=Y
1137=9
108=30

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

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=2
49=TW
52=<TIME>
56=ISLD

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

+
+eDISCONNECT
\ No newline at end of file
diff --git a/_test/test-server/main.go b/_test/test-server/main.go
index b80bd4d6c..2679e889d 100644
--- a/_test/test-server/main.go
+++ b/_test/test-server/main.go
@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"os/signal"
 	"path"
+	"strconv"
 	"strings"
 	"time"
 
@@ -131,11 +133,15 @@ func main() {
 	}
 
 	fileLogFactory, err := quickfix.NewFileLogFactory(appSettings)
-
 	if err != nil {
 		fmt.Println("Error creating file log factory:", err)
 		return
 	}
+	//fileLogFactory := quickfix.NewScreenLogFactory()
+	// if err != nil {
+	// 	fmt.Println("Error creating file log factory:", err)
+	// 	return
+	// }
 
 	storeType := os.Args[2]
 
@@ -175,6 +181,69 @@ func main() {
 		return
 	}
 
+	// http handler for seqnum resets for specific test defs. not applicable for most tests.
+	http.HandleFunc("/seqnum", func(w http.ResponseWriter, r *http.Request) {
+		defer w.WriteHeader(http.StatusOK)
+		queryParams := r.URL.Query()
+		sessionStr, ok :=  queryParams["SESSION"]
+		if !ok {
+			fmt.Println("cannot find session")
+			os.Exit(1)
+		}
+		splts := strings.Split(sessionStr[0], ":")
+		parties := strings.Split(splts[1], "->")
+		sessionID := quickfix.SessionID{
+			BeginString: splts[0],
+			SenderCompID: parties[0],
+			TargetCompID: parties[1],
+		}
+		num, ok :=  queryParams["NEXTTARGETSEQNUM"]
+		if ok {
+			seqnumInt, cErr := strconv.Atoi(num[0])
+			if cErr != nil {
+				fmt.Println("cannot find seqnum")
+				os.Exit(1)
+			}
+			setErr := quickfix.SetNextTargetMsgSeqNum(sessionID, seqnumInt)
+			if setErr != nil {
+				fmt.Println("err setting target seqnum: " + setErr.Error())
+				return
+			}
+			fmt.Println("set target seqnum to: " + num[0])
+			return
+		}
+
+		num, ok =  queryParams["NEXTSENDERSEQNUM"]
+		if ok {
+			seqnumInt, cErr := strconv.Atoi(num[0])
+			if cErr != nil {
+				fmt.Println("cannot find seqnum")
+				os.Exit(1)
+			}
+			setErr := quickfix.SetNextSenderMsgSeqNum(sessionID, seqnumInt)
+			if setErr != nil {
+				fmt.Println("err setting sender seqnum: " + setErr.Error())
+				return
+			}
+			fmt.Println("set sender seqnum to: "+num[0])
+			return
+		}
+		
+		fmt.Println("never found seqnum")
+		os.Exit(1)
+	})
+	websrvr := http.Server{Addr: ":8095"}
+	defer func() {
+		if err := websrvr.Close(); err != nil {
+			fmt.Println("unable to stop srver: ", err)
+		}
+	}()
+	go func() {
+		if err := websrvr.ListenAndServe(); err != http.ErrServerClosed {
+			fmt.Println("websrvr err: ", err)
+		}
+	}()
+
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 	<-c
diff --git a/config/configuration.go b/config/configuration.go
index 754f587b1..d76a6dd0c 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -1019,4 +1019,17 @@ const (
 	//  - Y
 	//  - N
 	EnableLastMsgSeqNumProcessed string = "EnableLastMsgSeqNumProcessed"
+
+	// EnableNextExpectedMsgSeqNum tells the FIX engine to add tag NextExpectedMsgSeqNum (optional tag 789) on the 
+	// sent Logon message and use value of tag 789 on received Logon message to synchronize session. 
+	// This should not be enabled for FIX versions less than FIX.4.4.
+	//
+	// Required: No
+	//
+	// Default: N
+	//
+	// Valid Values:
+	//  - Y
+	//  - N
+	EnableNextExpectedMsgSeqNum  string = "EnableNextExpectedMsgSeqNum"
 )
diff --git a/internal/session_settings.go b/internal/session_settings.go
index e003f54e4..5cbdcfb06 100644
--- a/internal/session_settings.go
+++ b/internal/session_settings.go
@@ -14,6 +14,7 @@ type SessionSettings struct {
 	InitiateLogon                bool
 	ResendRequestChunkSize       int
 	EnableLastMsgSeqNumProcessed bool
+	EnableNextExpectedMsgSeqNum  bool
 	SkipCheckLatency             bool
 	MaxLatency                   time.Duration
 	DisableMessagePersist        bool
diff --git a/registry.go b/registry.go
index 236c795b6..145c710c3 100644
--- a/registry.go
+++ b/registry.go
@@ -93,6 +93,42 @@ func UnregisterSession(sessionID SessionID) error {
 	return errUnknownSession
 }
 
+// SetNextTargetMsgSeqNum set the next expected target message sequence number for the session matching the session id.
+func SetNextTargetMsgSeqNum(sessionID SessionID, seqNum int) error {
+	session, ok := lookupSession(sessionID)
+	if !ok {
+		return errUnknownSession
+	}
+	return session.store.SetNextTargetMsgSeqNum(seqNum)
+}
+
+// SetNextSenderMsgSeqNum sets the next outgoing message sequence number for the session matching the session id.
+func SetNextSenderMsgSeqNum(sessionID SessionID, seqNum int) error {
+	session, ok := lookupSession(sessionID)
+	if !ok {
+		return errUnknownSession
+	}
+	return session.store.SetNextSenderMsgSeqNum(seqNum)
+}
+
+// GetExpectedSenderNum retrieves the expected sender sequence number for the session matching the session id.
+func GetExpectedSenderNum(sessionID SessionID) (int, error) {
+	session, ok := lookupSession(sessionID)
+	if !ok {
+		return 0, errUnknownSession
+	}
+	return session.store.NextSenderMsgSeqNum(), nil
+}
+
+// GetExpectedTargetNum retrieves the next target sequence number for the session matching the session id.
+func GetExpectedTargetNum(sessionID SessionID) (int, error) {
+	session, ok := lookupSession(sessionID)
+	if !ok {
+		return 0, errUnknownSession
+	}
+	return session.store.NextTargetMsgSeqNum(), nil
+}
+
 func registerSession(s *session) error {
 	sessionsLock.Lock()
 	defer sessionsLock.Unlock()
diff --git a/session.go b/session.go
index 29d0b89e9..8cc840e47 100644
--- a/session.go
+++ b/session.go
@@ -181,6 +181,27 @@ func (s *session) sendLogonInReplyTo(setResetSeqNum bool, inReplyTo *Message) er
 		logon.Body.SetField(tagDefaultApplVerID, FIXString(s.DefaultApplVerID))
 	}
 
+	// Evaluate tag 789.
+	if s.EnableNextExpectedMsgSeqNum {
+		if inReplyTo != nil {
+			targetWantsNextSeqNumToBe, getErr := inReplyTo.Body.GetInt(tagNextExpectedMsgSeqNum)
+			if getErr == nil {
+				actualNextNum := s.store.NextSenderMsgSeqNum()
+				// // Is the 789 we received too high ??
+				if targetWantsNextSeqNumToBe > actualNextNum {
+					// we can't resend what we never sent! something unrecoverable has happened.
+					return RejectLogon{fmt.Sprintf("Tag 789 (NextExpectedMsgSeqNum) is higher than expected. Expected %d, Received %d", actualNextNum, targetWantsNextSeqNumToBe)}
+				}
+				nextSeqNum := s.store.NextTargetMsgSeqNum()
+				logon.Body.SetField(tagNextExpectedMsgSeqNum, FIXInt(nextSeqNum+1))
+			}
+		} else {
+			// We are sending a logon.
+			nextseqnum := s.store.NextTargetMsgSeqNum()
+			logon.Body.SetField(tagNextExpectedMsgSeqNum, FIXInt(nextseqnum+1))
+		}
+	}
+
 	if err := s.dropAndSendInReplyTo(logon, inReplyTo); err != nil {
 		return err
 	}
@@ -188,6 +209,31 @@ func (s *session) sendLogonInReplyTo(setResetSeqNum bool, inReplyTo *Message) er
 	return nil
 }
 
+func (session *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inReplyTo Message) (err error) {
+	sequenceReset := NewMessage()
+	session.fillDefaultHeader(sequenceReset, &inReplyTo)
+
+	sequenceReset.Header.SetField(tagMsgType, FIXString("4"))
+	sequenceReset.Header.SetField(tagMsgSeqNum, FIXInt(beginSeqNo))
+	sequenceReset.Header.SetField(tagPossDupFlag, FIXBoolean(true))
+	sequenceReset.Body.SetField(tagNewSeqNo, FIXInt(endSeqNo))
+	sequenceReset.Body.SetField(tagGapFillFlag, FIXBoolean(true))
+
+	var origSendingTime FIXString
+	if err := sequenceReset.Header.GetField(tagSendingTime, &origSendingTime); err == nil {
+		sequenceReset.Header.SetField(tagOrigSendingTime, origSendingTime)
+	}
+
+	session.application.ToAdmin(sequenceReset, session.sessionID)
+
+	msgBytes := sequenceReset.build()
+
+	session.EnqueueBytesAndSend(msgBytes)
+	session.log.OnEventf("Sent SequenceReset TO: %v", endSeqNo)
+
+	return
+}
+
 func (s *session) buildLogout(reason string) *Message {
 	logout := NewMessage()
 	logout.Header.SetField(tagMsgType, FIXString("5"))
@@ -471,6 +517,8 @@ func (s *session) handleLogon(msg *Message) error {
 		}
 	}
 
+	nextSenderMsgNumAtLogonReceived := s.store.NextSenderMsgSeqNum()
+
 	if resetStore {
 		if err := s.store.Reset(); err != nil {
 			return err
@@ -499,6 +547,23 @@ func (s *session) handleLogon(msg *Message) error {
 	s.peerTimer.Reset(time.Duration(float64(1.2) * float64(s.HeartBtInt)))
 	s.application.OnLogon(s.sessionID)
 
+	// Evaluate tag 789 to see if we end up with an implied gapfill/resend.
+	if s.EnableNextExpectedMsgSeqNum && !msg.Body.Has(tagResetSeqNumFlag) {
+			targetWantsNextSeqNumToBe, getErr := msg.Body.GetInt(tagNextExpectedMsgSeqNum)
+			if getErr == nil {
+					if targetWantsNextSeqNumToBe != nextSenderMsgNumAtLogonReceived {
+						if !s.DisableMessagePersist {
+							seqResetErr := s.generateSequenceReset(targetWantsNextSeqNumToBe, nextSenderMsgNumAtLogonReceived+1, *msg)
+							if seqResetErr != nil {
+								return seqResetErr
+							}
+						} else {
+							return targetTooHigh{ReceivedTarget: targetWantsNextSeqNumToBe, ExpectedTarget: nextSenderMsgNumAtLogonReceived}
+						}
+					}
+			}
+	}
+
 	if err := s.checkTargetTooHigh(msg); err != nil {
 		return err
 	}
diff --git a/session_factory.go b/session_factory.go
index d875762de..effe6ed35 100644
--- a/session_factory.go
+++ b/session_factory.go
@@ -196,6 +196,12 @@ func (f sessionFactory) newSession(
 		}
 	}
 
+	if settings.HasSetting(config.EnableNextExpectedMsgSeqNum) {
+		if s.EnableNextExpectedMsgSeqNum, err = settings.BoolSetting(config.EnableNextExpectedMsgSeqNum); err != nil {
+			return
+		}
+	}
+
 	if settings.HasSetting(config.CheckLatency) {
 		var doCheckLatency bool
 		if doCheckLatency, err = settings.BoolSetting(config.CheckLatency); err != nil {
diff --git a/tag.go b/tag.go
index 01b28356f..909f8e5d0 100644
--- a/tag.go
+++ b/tag.go
@@ -44,6 +44,7 @@ const (
 	tagXMLData                Tag = 213
 	tagMessageEncoding        Tag = 347
 	tagLastMsgSeqNumProcessed Tag = 369
+	tagNextExpectedMsgSeqNum  Tag = 789
 	tagOnBehalfOfSendingTime  Tag = 370
 	tagApplVerID              Tag = 1128
 	tagCstmApplVerID          Tag = 1129

From fdcb6a12cf57e576abe30494d794add89d32281d Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Fri, 30 Aug 2024 17:15:29 -0500
Subject: [PATCH 44/58] Satisfies linter

---
 _test/test-server/main.go | 12 ++++++------
 config/configuration.go   |  6 +++---
 session.go                | 32 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/_test/test-server/main.go b/_test/test-server/main.go
index 2679e889d..470cd7c22 100644
--- a/_test/test-server/main.go
+++ b/_test/test-server/main.go
@@ -185,7 +185,7 @@ func main() {
 	http.HandleFunc("/seqnum", func(w http.ResponseWriter, r *http.Request) {
 		defer w.WriteHeader(http.StatusOK)
 		queryParams := r.URL.Query()
-		sessionStr, ok :=  queryParams["SESSION"]
+		sessionStr, ok := queryParams["SESSION"]
 		if !ok {
 			fmt.Println("cannot find session")
 			os.Exit(1)
@@ -193,11 +193,11 @@ func main() {
 		splts := strings.Split(sessionStr[0], ":")
 		parties := strings.Split(splts[1], "->")
 		sessionID := quickfix.SessionID{
-			BeginString: splts[0],
+			BeginString:  splts[0],
 			SenderCompID: parties[0],
 			TargetCompID: parties[1],
 		}
-		num, ok :=  queryParams["NEXTTARGETSEQNUM"]
+		num, ok := queryParams["NEXTTARGETSEQNUM"]
 		if ok {
 			seqnumInt, cErr := strconv.Atoi(num[0])
 			if cErr != nil {
@@ -213,7 +213,7 @@ func main() {
 			return
 		}
 
-		num, ok =  queryParams["NEXTSENDERSEQNUM"]
+		num, ok = queryParams["NEXTSENDERSEQNUM"]
 		if ok {
 			seqnumInt, cErr := strconv.Atoi(num[0])
 			if cErr != nil {
@@ -225,10 +225,10 @@ func main() {
 				fmt.Println("err setting sender seqnum: " + setErr.Error())
 				return
 			}
-			fmt.Println("set sender seqnum to: "+num[0])
+			fmt.Println("set sender seqnum to: " + num[0])
 			return
 		}
-		
+
 		fmt.Println("never found seqnum")
 		os.Exit(1)
 	})
diff --git a/config/configuration.go b/config/configuration.go
index d76a6dd0c..f4f6fed97 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -1020,8 +1020,8 @@ const (
 	//  - N
 	EnableLastMsgSeqNumProcessed string = "EnableLastMsgSeqNumProcessed"
 
-	// EnableNextExpectedMsgSeqNum tells the FIX engine to add tag NextExpectedMsgSeqNum (optional tag 789) on the 
-	// sent Logon message and use value of tag 789 on received Logon message to synchronize session. 
+	// EnableNextExpectedMsgSeqNum tells the FIX engine to add tag NextExpectedMsgSeqNum (optional tag 789) on the
+	// sent Logon message and use value of tag 789 on received Logon message to synchronize session.
 	// This should not be enabled for FIX versions less than FIX.4.4.
 	//
 	// Required: No
@@ -1031,5 +1031,5 @@ const (
 	// Valid Values:
 	//  - Y
 	//  - N
-	EnableNextExpectedMsgSeqNum  string = "EnableNextExpectedMsgSeqNum"
+	EnableNextExpectedMsgSeqNum string = "EnableNextExpectedMsgSeqNum"
 )
diff --git a/session.go b/session.go
index 8cc840e47..ac329e288 100644
--- a/session.go
+++ b/session.go
@@ -209,9 +209,9 @@ func (s *session) sendLogonInReplyTo(setResetSeqNum bool, inReplyTo *Message) er
 	return nil
 }
 
-func (session *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inReplyTo Message) (err error) {
+func (s *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inReplyTo Message) (err error) {
 	sequenceReset := NewMessage()
-	session.fillDefaultHeader(sequenceReset, &inReplyTo)
+	s.fillDefaultHeader(sequenceReset, &inReplyTo)
 
 	sequenceReset.Header.SetField(tagMsgType, FIXString("4"))
 	sequenceReset.Header.SetField(tagMsgSeqNum, FIXInt(beginSeqNo))
@@ -224,12 +224,12 @@ func (session *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inRe
 		sequenceReset.Header.SetField(tagOrigSendingTime, origSendingTime)
 	}
 
-	session.application.ToAdmin(sequenceReset, session.sessionID)
+	s.application.ToAdmin(sequenceReset, s.sessionID)
 
 	msgBytes := sequenceReset.build()
 
-	session.EnqueueBytesAndSend(msgBytes)
-	session.log.OnEventf("Sent SequenceReset TO: %v", endSeqNo)
+	s.EnqueueBytesAndSend(msgBytes)
+	s.log.OnEventf("Sent SequenceReset TO: %v", endSeqNo)
 
 	return
 }
@@ -549,19 +549,19 @@ func (s *session) handleLogon(msg *Message) error {
 
 	// Evaluate tag 789 to see if we end up with an implied gapfill/resend.
 	if s.EnableNextExpectedMsgSeqNum && !msg.Body.Has(tagResetSeqNumFlag) {
-			targetWantsNextSeqNumToBe, getErr := msg.Body.GetInt(tagNextExpectedMsgSeqNum)
-			if getErr == nil {
-					if targetWantsNextSeqNumToBe != nextSenderMsgNumAtLogonReceived {
-						if !s.DisableMessagePersist {
-							seqResetErr := s.generateSequenceReset(targetWantsNextSeqNumToBe, nextSenderMsgNumAtLogonReceived+1, *msg)
-							if seqResetErr != nil {
-								return seqResetErr
-							}
-						} else {
-							return targetTooHigh{ReceivedTarget: targetWantsNextSeqNumToBe, ExpectedTarget: nextSenderMsgNumAtLogonReceived}
-						}
+		targetWantsNextSeqNumToBe, getErr := msg.Body.GetInt(tagNextExpectedMsgSeqNum)
+		if getErr == nil {
+			if targetWantsNextSeqNumToBe != nextSenderMsgNumAtLogonReceived {
+				if !s.DisableMessagePersist {
+					seqResetErr := s.generateSequenceReset(targetWantsNextSeqNumToBe, nextSenderMsgNumAtLogonReceived+1, *msg)
+					if seqResetErr != nil {
+						return seqResetErr
 					}
+				} else {
+					return targetTooHigh{ReceivedTarget: targetWantsNextSeqNumToBe, ExpectedTarget: nextSenderMsgNumAtLogonReceived}
+				}
 			}
+		}
 	}
 
 	if err := s.checkTargetTooHigh(msg); err != nil {

From 87eef54ce3c280d78759edd079778ea756e95e53 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Thu, 5 Sep 2024 17:00:38 -0500
Subject: [PATCH 45/58] Reinit stop sync to prevent deadlock on sequential
 start/stops

---
 session.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/session.go b/session.go
index ac329e288..5320f49b9 100644
--- a/session.go
+++ b/session.go
@@ -848,6 +848,7 @@ func (s *session) onAdmin(msg interface{}) {
 }
 
 func (s *session) run() {
+	s.stopOnce = sync.Once{}
 	s.Start(s)
 	var stopChan = make(chan struct{})
 	s.stateTimer = internal.NewEventTimer(func() {

From 7194eee457dfbf38dea54649457340d16540d9d6 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Fri, 6 Sep 2024 17:13:45 -0500
Subject: [PATCH 46/58] Check logon auth before resetting store

---
 session.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/session.go b/session.go
index 5320f49b9..476ae551a 100644
--- a/session.go
+++ b/session.go
@@ -507,6 +507,12 @@ func (s *session) handleLogon(msg *Message) error {
 		}
 	}
 
+	nextSenderMsgNumAtLogonReceived := s.store.NextSenderMsgSeqNum()
+
+	if err := s.verifyIgnoreSeqNumTooHigh(msg); err != nil {
+		return err
+	}
+
 	var resetSeqNumFlag FIXBoolean
 	if err := msg.Body.GetField(tagResetSeqNumFlag, &resetSeqNumFlag); err == nil {
 		if resetSeqNumFlag {
@@ -517,18 +523,12 @@ func (s *session) handleLogon(msg *Message) error {
 		}
 	}
 
-	nextSenderMsgNumAtLogonReceived := s.store.NextSenderMsgSeqNum()
-
 	if resetStore {
 		if err := s.store.Reset(); err != nil {
 			return err
 		}
 	}
 
-	if err := s.verifyIgnoreSeqNumTooHigh(msg); err != nil {
-		return err
-	}
-
 	if !s.InitiateLogon {
 		if !s.HeartBtIntOverride {
 			var heartBtInt FIXInt

From 2e7e0777f9ab8a46dc61f84cc1ee987ba53f3e0a Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Mon, 9 Sep 2024 17:30:14 -0500
Subject: [PATCH 47/58] Modify msg verify checks

---
 session.go | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/session.go b/session.go
index 476ae551a..933b982b3 100644
--- a/session.go
+++ b/session.go
@@ -509,7 +509,8 @@ func (s *session) handleLogon(msg *Message) error {
 
 	nextSenderMsgNumAtLogonReceived := s.store.NextSenderMsgSeqNum()
 
-	if err := s.verifyIgnoreSeqNumTooHigh(msg); err != nil {
+	// Make sure this is a valid session before resetting the store.
+	if err := s.verifyMsgAgainstAppImpl(msg); err != nil {
 		return err
 	}
 
@@ -529,6 +530,12 @@ func (s *session) handleLogon(msg *Message) error {
 		}
 	}
 
+	// Verify seq num too high but dont check against app implementation since we just did that. 
+	// Don't need to double check.
+	if err := s.verifySelect(msg, false, true, false); err != nil {
+		return err
+	}
+
 	if !s.InitiateLogon {
 		if !s.HeartBtIntOverride {
 			var heartBtInt FIXInt
@@ -586,18 +593,18 @@ func (s *session) initiateLogoutInReplyTo(reason string, inReplyTo *Message) (er
 }
 
 func (s *session) verify(msg *Message) MessageRejectError {
-	return s.verifySelect(msg, true, true)
+	return s.verifySelect(msg, true, true, true)
 }
 
 func (s *session) verifyIgnoreSeqNumTooHigh(msg *Message) MessageRejectError {
-	return s.verifySelect(msg, false, true)
+	return s.verifySelect(msg, false, true, true)
 }
 
 func (s *session) verifyIgnoreSeqNumTooHighOrLow(msg *Message) MessageRejectError {
-	return s.verifySelect(msg, false, false)
+	return s.verifySelect(msg, false, false, true)
 }
 
-func (s *session) verifySelect(msg *Message, checkTooHigh bool, checkTooLow bool) MessageRejectError {
+func (s *session) verifySelect(msg *Message, checkTooHigh bool, checkTooLow bool, checkAppImpl bool) MessageRejectError {
 	if reject := s.checkBeginString(msg); reject != nil {
 		return reject
 	}
@@ -626,6 +633,14 @@ func (s *session) verifySelect(msg *Message, checkTooHigh bool, checkTooLow bool
 		}
 	}
 
+	if checkAppImpl {
+		return s.verifyMsgAgainstAppImpl(msg)
+	}
+
+	return nil
+}
+
+func (s *session) verifyMsgAgainstAppImpl(msg *Message) MessageRejectError {
 	if s.Validator != nil {
 		if reject := s.Validator.Validate(msg); reject != nil {
 			return reject

From dc7a7bfc7000c45117638252fa6e7614c3b3d339 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Mon, 9 Sep 2024 20:22:03 -0500
Subject: [PATCH 48/58] Resolve failing unit test

---
 in_session.go       | 4 ++--
 logon_state_test.go | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/in_session.go b/in_session.go
index 6edbb8409..5445967cd 100644
--- a/in_session.go
+++ b/in_session.go
@@ -87,7 +87,7 @@ func (state inSession) Timeout(session *session, event internal.Event) (nextStat
 }
 
 func (state inSession) handleLogout(session *session, msg *Message) (nextState sessionState) {
-	if err := session.verifySelect(msg, false, false); err != nil {
+	if err := session.verifySelect(msg, false, false, true); err != nil {
 		return state.processReject(session, msg, err)
 	}
 
@@ -154,7 +154,7 @@ func (state inSession) handleSequenceReset(session *session, msg *Message) (next
 		}
 	}
 
-	if err := session.verifySelect(msg, bool(gapFillFlag), bool(gapFillFlag)); err != nil {
+	if err := session.verifySelect(msg, bool(gapFillFlag), bool(gapFillFlag), true); err != nil {
 		return state.processReject(session, msg, err)
 	}
 
diff --git a/logon_state_test.go b/logon_state_test.go
index ee47a2be6..4fe952743 100644
--- a/logon_state_test.go
+++ b/logon_state_test.go
@@ -358,6 +358,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonSeqNumTooLow() {
 	logon.Body.SetField(tagHeartBtInt, FIXInt(32))
 	logon.Header.SetInt(tagMsgSeqNum, 1)
 
+	s.MockApp.On("FromAdmin").Return(nil)
 	s.MockApp.On("ToAdmin")
 	s.NextTargetMsgSeqNum(2)
 	s.fixMsgIn(s.session, logon)

From fad0176e627de4c56e4eac3e6bc71d1638bf2a56 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Mon, 9 Sep 2024 20:29:42 -0500
Subject: [PATCH 49/58] Linter

---
 session.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/session.go b/session.go
index 933b982b3..d9bbfba65 100644
--- a/session.go
+++ b/session.go
@@ -530,7 +530,7 @@ func (s *session) handleLogon(msg *Message) error {
 		}
 	}
 
-	// Verify seq num too high but dont check against app implementation since we just did that. 
+	// Verify seq num too high but dont check against app implementation since we just did that.
 	// Don't need to double check.
 	if err := s.verifySelect(msg, false, true, false); err != nil {
 		return err

From f1f8c0efa5992022ce60ae7c63bc589e9e0826e2 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Mon, 9 Sep 2024 20:33:41 -0500
Subject: [PATCH 50/58] Linter fix

---
 session.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/session.go b/session.go
index d9bbfba65..cdcb8603d 100644
--- a/session.go
+++ b/session.go
@@ -532,7 +532,7 @@ func (s *session) handleLogon(msg *Message) error {
 
 	// Verify seq num too high but dont check against app implementation since we just did that.
 	// Don't need to double check.
-	if err := s.verifySelect(msg, false, true, false); err != nil {
+	if err := s.verifyIgnoreSeqNumTooHigh(msg); err != nil {
 		return err
 	}
 
@@ -597,7 +597,7 @@ func (s *session) verify(msg *Message) MessageRejectError {
 }
 
 func (s *session) verifyIgnoreSeqNumTooHigh(msg *Message) MessageRejectError {
-	return s.verifySelect(msg, false, true, true)
+	return s.verifySelect(msg, false, true, false)
 }
 
 func (s *session) verifyIgnoreSeqNumTooHighOrLow(msg *Message) MessageRejectError {

From bb3e854d79346a9c77ea5592753e7833926625c0 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Tue, 10 Sep 2024 15:58:21 -0500
Subject: [PATCH 51/58] Adds unit test

---
 logon_state_test.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/logon_state_test.go b/logon_state_test.go
index 4fe952743..f5c871ea6 100644
--- a/logon_state_test.go
+++ b/logon_state_test.go
@@ -226,6 +226,27 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonInitiateLogonExpectResetSeqNum()
 	s.NextSenderMsgSeqNum(2)
 }
 
+func (s *LogonStateTestSuite) TestFixMsgInLogonInitiateLogonRejectedSeqNumNotReset() {
+	s.session.InitiateLogon = true
+	s.session.sentReset = true
+	s.Require().Nil(s.store.IncrNextSenderMsgSeqNum())
+
+	logon := s.Logon()
+	logon.Body.SetField(tagHeartBtInt, FIXInt(32))
+	logon.Body.SetField(tagResetSeqNumFlag, FIXBoolean(true))
+
+	s.MockApp.On("FromAdmin").Return(RejectLogon{"reject message"})
+	s.MockApp.On("OnLogout")
+	s.MockApp.On("ToAdmin")
+	s.fixMsgIn(s.session, logon)
+
+	s.MockApp.AssertExpectations(s.T())
+	s.State(latentState{})
+
+	s.NextTargetMsgSeqNum(2)
+	s.NextSenderMsgSeqNum(3)
+}
+
 func (s *LogonStateTestSuite) TestFixMsgInLogonInitiateLogonUnExpectedResetSeqNum() {
 	s.session.InitiateLogon = true
 	s.session.sentReset = false

From 393a748fdfe2083e45c261301566e51501216155 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Fri, 20 Sep 2024 15:30:43 -0500
Subject: [PATCH 52/58] Reverts toadmin call sequencing

---
 session.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/session.go b/session.go
index cdcb8603d..49b1b467b 100644
--- a/session.go
+++ b/session.go
@@ -356,6 +356,7 @@ func (s *session) prepMessageForSend(msg *Message, inReplyTo *Message) (msgBytes
 	}
 
 	if isAdminMessageType(msgType) {
+		s.application.ToAdmin(msg, s.sessionID)
 		if bytes.Equal(msgType, msgTypeLogon) {
 			var resetSeqNumFlag FIXBoolean
 			if msg.Body.Has(tagResetSeqNumFlag) {
@@ -374,7 +375,6 @@ func (s *session) prepMessageForSend(msg *Message, inReplyTo *Message) (msgBytes
 				msg.Header.SetField(tagMsgSeqNum, FIXInt(seqNum))
 			}
 		}
-		s.application.ToAdmin(msg, s.sessionID)
 	} else {
 		if err = s.application.ToApp(msg, s.sessionID); err != nil {
 			return

From b7d706f73352d24c8b8c723a94967094e42af2d9 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Fri, 20 Sep 2024 16:39:24 -0500
Subject: [PATCH 53/58] Adds v0.9.6 release notes

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c6f3b16d..ee1a6c217 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 0.9.6 (September 20, 2024)
+
+### ENHANCEMENTS
+* Allow the clients of acceptor to specify their own tls.Config https://github.com/quickfixgo/quickfix/pull/667
+* Adds NextExpectedSeqNum setting https://github.com/quickfixgo/quickfix/pull/668
+
+### BUG FIXES
+* Reinit stop sync to prevent deadlock on sequential start/stops https://github.com/quickfixgo/quickfix/pull/669
+* Check logon auth before resetting store https://github.com/quickfixgo/quickfix/pull/670
+* Reverts ToAdmin call sequencing https://github.com/quickfixgo/quickfix/pull/674
+
 ## 0.9.5 (August 14, 2024)
 
 ### ENHANCEMENTS

From 9c5d08c440ca6e911ae012697e5c55b0cf2a916a Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Wed, 11 Sep 2024 21:36:13 -0500
Subject: [PATCH 54/58] Adds new log impls and renames files for consistency

---
 _test/test-server/main.go                     |   3 +-
 accepter_test.go => acceptor_test.go          |   2 +-
 config/configuration.go                       | 104 +++++++-
 file_log.go => log/file/file_log.go           |  15 +-
 file_log_test.go => log/file/file_log_test.go |  12 +-
 fileutil.go => log/file/file_util.go          |   6 +-
 .../file/file_util_test.go                    |   7 +-
 log/mongo/mongo_log.go                        | 222 +++++++++++++++++
 log/mongo/mongo_log_test.go                   |  99 ++++++++
 screen_log.go => log/screen/screen_log.go     |  12 +-
 log/sql/sql_log.go                            | 226 ++++++++++++++++++
 log/sql/sql_log_test.go                       | 110 +++++++++
 memorystore.go => memory_store.go             |   0
 store/file/{filestore.go => file_store.go}    |   0
 .../{filestore_test.go => file_store_test.go} |   0
 ...morystore_test.go => memory_store_test.go} |   0
 store/mongo/{mongostore.go => mongo_store.go} |   0
 ...mongostore_test.go => mongo_store_test.go} |   0
 store/sql/{sqlstore.go => sql_store.go}       |   0
 .../{sqlstore_test.go => sql_store_test.go}   |   0
 20 files changed, 789 insertions(+), 29 deletions(-)
 rename accepter_test.go => acceptor_test.go (98%)
 rename file_log.go => log/file/file_log.go (84%)
 rename file_log_test.go => log/file/file_log_test.go (93%)
 rename fileutil.go => log/file/file_util.go (93%)
 rename fileutil_test.go => log/file/file_util_test.go (91%)
 create mode 100644 log/mongo/mongo_log.go
 create mode 100644 log/mongo/mongo_log_test.go
 rename screen_log.go => log/screen/screen_log.go (79%)
 create mode 100644 log/sql/sql_log.go
 create mode 100644 log/sql/sql_log_test.go
 rename memorystore.go => memory_store.go (100%)
 rename store/file/{filestore.go => file_store.go} (100%)
 rename store/file/{filestore_test.go => file_store_test.go} (100%)
 rename store/memory/{memorystore_test.go => memory_store_test.go} (100%)
 rename store/mongo/{mongostore.go => mongo_store.go} (100%)
 rename store/mongo/{mongostore_test.go => mongo_store_test.go} (100%)
 rename store/sql/{sqlstore.go => sql_store.go} (100%)
 rename store/sql/{sqlstore_test.go => sql_store_test.go} (100%)

diff --git a/_test/test-server/main.go b/_test/test-server/main.go
index 470cd7c22..d3e680d9b 100644
--- a/_test/test-server/main.go
+++ b/_test/test-server/main.go
@@ -17,6 +17,7 @@ import (
 	"github.com/quickfixgo/quickfix/config"
 	field "github.com/quickfixgo/quickfix/gen/field"
 	tag "github.com/quickfixgo/quickfix/gen/tag"
+	filelog "github.com/quickfixgo/quickfix/log/file"
 	"github.com/quickfixgo/quickfix/store/file"
 	"github.com/quickfixgo/quickfix/store/mongo"
 )
@@ -132,7 +133,7 @@ func main() {
 		return
 	}
 
-	fileLogFactory, err := quickfix.NewFileLogFactory(appSettings)
+	fileLogFactory, err := filelog.NewLogFactory(appSettings)
 	if err != nil {
 		fmt.Println("Error creating file log factory:", err)
 		return
diff --git a/accepter_test.go b/acceptor_test.go
similarity index 98%
rename from accepter_test.go
rename to acceptor_test.go
index 5cf888a8c..059c42715 100644
--- a/accepter_test.go
+++ b/acceptor_test.go
@@ -98,7 +98,7 @@ func TestAcceptor_SetTLSConfig(t *testing.T) {
 	_, err := genericSettings.AddSession(sessionSettings)
 	require.NoError(t, err)
 
-	logger, err := NewScreenLogFactory().Create()
+	logger, err := NewNullLogFactory().Create()
 	require.NoError(t, err)
 	acceptor := &Acceptor{settings: genericSettings, globalLog: logger}
 	defer acceptor.Stop()
diff --git a/config/configuration.go b/config/configuration.go
index f4f6fed97..a0223f9fc 100644
--- a/config/configuration.go
+++ b/config/configuration.go
@@ -849,6 +849,100 @@ const (
 	// Valid Values:
 	//  - A valid path
 	FileLogPath string = "FileLogPath"
+
+	// SQLLogDriver sets the name of the database driver to use for application logs (see https://go.dev/wiki/SQLDrivers for the list of available drivers).
+	// SQLLogDriver is only relevant if also using sql.NewLogFactory(..) in code
+	// when creating your LogFactory for your initiator or acceptor.
+	//
+	// Required: Only if using a sql db as your Log
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - See https://go.dev/wiki/SQLDrivers
+	SQLLogDriver string = "SQLLogDriver"
+
+	// SQLLogDataSourceName sets the driver-specific data source name of the database to use for application logs.
+	// This usually consists of at least a database name and connection information.
+	// SQLLogDataSourceName is only relevant if also using sql.NewLogFactory(..) in code
+	// when creating your LogFactory for your initiator or acceptor.
+	//
+	// See https://pkg.go.dev/database/sql#Open for more information.
+	//
+	// Required: Only if using a sql db as your Log.
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string correspondinng to a datasource
+	SQLLogDataSourceName string = "SQLLogDataSourceName"
+
+	// SQLLogConnMaxLifetime sets the maximum duration of time that a database connection may be reused.
+	// See https://pkg.go.dev/database/sql#DB.SetConnMaxLifetime for more information.
+	//
+	// If your database server has a config option to close inactive connections after some duration (e.g. MySQL "wait_timeout"),
+	// set SQLLogConnMaxLifetime to a value less than that duration.
+	//
+	// Example Values:
+	//  - SQLLogConnMaxLifetime=14400s # 14400 seconds
+	//  - SQLLogConnMaxLifetime=2h45m  # 2 hours and 45 minutes
+	//
+	// SQLLogConnMaxLifetime is only relevant if also using sql.NewLogFactory(..) in code
+	// when creating your LogFactory for your initiator or acceptor.
+	//
+	// Required: No
+	//
+	// Default: 0 (forever)
+	//
+	// Valid Values:
+	//  - A valid go time.Duration
+	SQLLogConnMaxLifetime string = "SQLLogConnMaxLifetime"
+
+	// MongoLogConnection sets the MongoDB connection URL to use for application logs.
+	//
+	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
+	//
+	// MongoLogConnection is only relevant if also using mongo.NewLogFactory(..) in code
+	// when creating your LogFactory for your initiator or acceptor.
+	//
+	// Required: Only if using MongoDB as your Log.
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string representing a MongoDB connection
+	MongoLogConnection string = "MongoLogConnection"
+
+	// MongoLogDatabase sets the MongoDB-specific name of the database to use for application logs.
+	//
+	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
+	//
+	// MongoLogDatabase is only relevant if also using mongo.NewLogFactory(..) in code
+	// when creating your LogFactory for your initiator or acceptor.
+	//
+	// Required: Only if using MongoDB as your Log.
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string corresponding to a MongoDB database
+	MongoLogDatabase string = "MongoLogDatabase"
+
+	// MongoLogReplicaSet sets the MongoDB replica set to use for application logs.
+	// This is optional.
+	//
+	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
+	//
+	// MongoLogReplicaSet is only relevant if also using mongo.NewLogFactory(..) in code
+	// when creating your LogFactory for your initiator or acceptor.
+	//
+	// Required: No
+	//
+	// Default: N/A
+	//
+	// Valid Values:
+	//  - A string corresponding to a MongoDB replica set
+	MongoLogReplicaSet string = "MongoLogReplicaSet"
 )
 
 const (
@@ -895,7 +989,7 @@ const (
 	//  - N
 	FileStoreSync string = "FileStoreSync"
 
-	// SQLStoreDriver sets the name of the database driver to use (see https://go.dev/wiki/SQLDrivers for the list of available drivers).
+	// SQLStoreDriver sets the name of the database driver to use for message storage (see https://go.dev/wiki/SQLDrivers for the list of available drivers).
 	// SQLStoreDriver is only relevant if also using sql.NewStoreFactory(..) in code
 	// when creating your MessageStoreFactory for your initiator or acceptor.
 	//
@@ -907,7 +1001,7 @@ const (
 	//  - See https://go.dev/wiki/SQLDrivers
 	SQLStoreDriver string = "SQLStoreDriver"
 
-	// SQLStoreDataSourceName sets the driver-specific data source name of the database to use.
+	// SQLStoreDataSourceName sets the driver-specific data source name of the database to use for messagge storage.
 	// This usually consists of at least a database name and connection information.
 	// SQLStoreDataSourceName is only relevant if also using sql.NewStoreFactory(..) in code
 	// when creating your MessageStoreFactory for your initiator or acceptor.
@@ -943,7 +1037,7 @@ const (
 	//  - A valid go time.Duration
 	SQLStoreConnMaxLifetime string = "SQLStoreConnMaxLifetime"
 
-	// MongoStoreConnection sets the MongoDB connection URL to use.
+	// MongoStoreConnection sets the MongoDB connection URL to use for message storage.
 	//
 	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
 	//
@@ -958,7 +1052,7 @@ const (
 	//  - A string representing a MongoDB connection
 	MongoStoreConnection string = "MongoStoreConnection"
 
-	// MongoStoreDatabase sets the MongoDB-specific name of the database to use.
+	// MongoStoreDatabase sets the MongoDB-specific name of the database to use for message storage.
 	//
 	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
 	//
@@ -973,7 +1067,7 @@ const (
 	//  - A string corresponding to a MongoDB database
 	MongoStoreDatabase string = "MongoStoreDatabase"
 
-	// MongoStoreReplicaSet sets the MongoDB replica set to use.
+	// MongoStoreReplicaSet sets the MongoDB replica set to use for message storage.
 	// This is optional.
 	//
 	// See https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect for more information.
diff --git a/file_log.go b/log/file/file_log.go
similarity index 84%
rename from file_log.go
rename to log/file/file_log.go
index 85eefab1d..9fd36a851 100644
--- a/file_log.go
+++ b/log/file/file_log.go
@@ -13,7 +13,7 @@
 // Contact ask@quickfixengine.org if any conditions of this licensing
 // are not clear to you.
 
-package quickfix
+package file
 
 import (
 	"fmt"
@@ -21,6 +21,7 @@ import (
 	"os"
 	"path"
 
+	"github.com/quickfixgo/quickfix"
 	"github.com/quickfixgo/quickfix/config"
 )
 
@@ -47,12 +48,12 @@ func (l fileLog) OnEventf(format string, v ...interface{}) {
 
 type fileLogFactory struct {
 	globalLogPath   string
-	sessionLogPaths map[SessionID]string
+	sessionLogPaths map[quickfix.SessionID]string
 }
 
-// NewFileLogFactory creates an instance of LogFactory that writes messages and events to file.
+// NewLogFactory creates an instance of LogFactory that writes messages and events to file.
 // The location of global and session log files is configured via FileLogPath.
-func NewFileLogFactory(settings *Settings) (LogFactory, error) {
+func NewLogFactory(settings *quickfix.Settings) (quickfix.LogFactory, error) {
 	logFactory := fileLogFactory{}
 
 	var err error
@@ -60,7 +61,7 @@ func NewFileLogFactory(settings *Settings) (LogFactory, error) {
 		return logFactory, err
 	}
 
-	logFactory.sessionLogPaths = make(map[SessionID]string)
+	logFactory.sessionLogPaths = make(map[quickfix.SessionID]string)
 
 	for sid, sessionSettings := range settings.SessionSettings() {
 		logPath, err := sessionSettings.Setting(config.FileLogPath)
@@ -101,11 +102,11 @@ func newFileLog(prefix string, logPath string) (fileLog, error) {
 	return l, nil
 }
 
-func (f fileLogFactory) Create() (Log, error) {
+func (f fileLogFactory) Create() (quickfix.Log, error) {
 	return newFileLog("GLOBAL", f.globalLogPath)
 }
 
-func (f fileLogFactory) CreateSessionLog(sessionID SessionID) (Log, error) {
+func (f fileLogFactory) CreateSessionLog(sessionID quickfix.SessionID) (quickfix.Log, error) {
 	logPath, ok := f.sessionLogPaths[sessionID]
 
 	if !ok {
diff --git a/file_log_test.go b/log/file/file_log_test.go
similarity index 93%
rename from file_log_test.go
rename to log/file/file_log_test.go
index b303ec290..cf25e8474 100644
--- a/file_log_test.go
+++ b/log/file/file_log_test.go
@@ -13,7 +13,7 @@
 // Contact ask@quickfixengine.org if any conditions of this licensing
 // are not clear to you.
 
-package quickfix
+package file
 
 import (
 	"bufio"
@@ -22,11 +22,13 @@ import (
 	"path"
 	"strings"
 	"testing"
+
+	"github.com/quickfixgo/quickfix"
 )
 
 func TestFileLog_NewFileLogFactory(t *testing.T) {
 
-	_, err := NewFileLogFactory(NewSettings())
+	_, err := NewLogFactory(quickfix.NewSettings())
 
 	if err == nil {
 		t.Error("Should expect error when settings have no file log path")
@@ -52,9 +54,9 @@ TargetCompID=ARCA
 SessionQualifier=BS
 `
 	stringReader := strings.NewReader(cfg)
-	settings, _ := ParseSettings(stringReader)
+	settings, _ := quickfix.ParseSettings(stringReader)
 
-	factory, err := NewFileLogFactory(settings)
+	factory, err := NewLogFactory(settings)
 
 	if err != nil {
 		t.Error("Did not expect error", err)
@@ -68,7 +70,7 @@ SessionQualifier=BS
 type fileLogHelper struct {
 	LogPath string
 	Prefix  string
-	Log     Log
+	Log     quickfix.Log
 }
 
 func newFileLogHelper(t *testing.T) *fileLogHelper {
diff --git a/fileutil.go b/log/file/file_util.go
similarity index 93%
rename from fileutil.go
rename to log/file/file_util.go
index 73bc4a6b2..34e999a43 100644
--- a/fileutil.go
+++ b/log/file/file_util.go
@@ -13,15 +13,17 @@
 // Contact ask@quickfixengine.org if any conditions of this licensing
 // are not clear to you.
 
-package quickfix
+package file
 
 import (
 	"fmt"
 	"os"
 	"strings"
+
+	"github.com/quickfixgo/quickfix"
 )
 
-func sessionIDFilenamePrefix(s SessionID) string {
+func sessionIDFilenamePrefix(s quickfix.SessionID) string {
 	sender := []string{s.SenderCompID}
 	if s.SenderSubID != "" {
 		sender = append(sender, s.SenderSubID)
diff --git a/fileutil_test.go b/log/file/file_util_test.go
similarity index 91%
rename from fileutil_test.go
rename to log/file/file_util_test.go
index 0f9095364..77a95b6ab 100644
--- a/fileutil_test.go
+++ b/log/file/file_util_test.go
@@ -13,7 +13,7 @@
 // Contact ask@quickfixengine.org if any conditions of this licensing
 // are not clear to you.
 
-package quickfix
+package file
 
 import (
 	"fmt"
@@ -21,6 +21,7 @@ import (
 	"path"
 	"testing"
 
+	"github.com/quickfixgo/quickfix"
 	"github.com/stretchr/testify/require"
 )
 
@@ -37,7 +38,7 @@ func requireFileExists(t *testing.T, fname string) {
 
 func TestSessionIDFilename_MinimallyQualifiedSessionID(t *testing.T) {
 	// When the session ID is
-	sessionID := SessionID{BeginString: "FIX.4.4", SenderCompID: "SENDER", TargetCompID: "TARGET"}
+	sessionID := quickfix.SessionID{BeginString: "FIX.4.4", SenderCompID: "SENDER", TargetCompID: "TARGET"}
 
 	// Then the filename should be
 	require.Equal(t, "FIX.4.4-SENDER-TARGET", sessionIDFilenamePrefix(sessionID))
@@ -45,7 +46,7 @@ func TestSessionIDFilename_MinimallyQualifiedSessionID(t *testing.T) {
 
 func TestSessionIDFilename_FullyQualifiedSessionID(t *testing.T) {
 	// When the session ID is
-	sessionID := SessionID{
+	sessionID := quickfix.SessionID{
 		BeginString:      "FIX.4.4",
 		SenderCompID:     "A",
 		SenderSubID:      "B",
diff --git a/log/mongo/mongo_log.go b/log/mongo/mongo_log.go
new file mode 100644
index 000000000..253e6bdb9
--- /dev/null
+++ b/log/mongo/mongo_log.go
@@ -0,0 +1,222 @@
+// Copyright (c) quickfixengine.org  All rights reserved.
+//
+// This file may be distributed under the terms of the quickfixengine.org
+// license as defined by quickfixengine.org and appearing in the file
+// LICENSE included in the packaging of this file.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+// THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE.
+//
+// See http://www.quickfixengine.org/LICENSE for licensing information.
+//
+// Contact ask@quickfixengine.org if any conditions of this licensing
+// are not clear to you.
+
+package mongo
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/pkg/errors"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+
+	"github.com/quickfixgo/quickfix"
+	"github.com/quickfixgo/quickfix/config"
+)
+
+type mongoLogFactory struct {
+	settings              *quickfix.Settings
+	messagesLogCollection string
+	eventLogCollection    string
+}
+
+type mongoLog struct {
+	sessionID             quickfix.SessionID
+	mongoURL              string
+	mongoDatabase         string
+	db                    *mongo.Client
+	messagesLogCollection string
+	eventLogCollection    string
+	allowTransactions     bool
+}
+
+// NewLogFactory returns a mongo-based implementation of LogFactory.
+func NewLogFactory(settings *quickfix.Settings) quickfix.LogFactory {
+	return NewLogFactoryPrefixed(settings, "")
+}
+
+// NewLogFactoryPrefixed returns a mongo-based implementation of LogFactory, with prefix on collections.
+func NewLogFactoryPrefixed(settings *quickfix.Settings, collectionsPrefix string) quickfix.LogFactory {
+	return mongoLogFactory{
+		settings:              settings,
+		messagesLogCollection: collectionsPrefix + "messages_log",
+		eventLogCollection:    collectionsPrefix + "event_log",
+	}
+}
+
+// Create creates a new mongo implementation of the Log interface.
+func (f mongoLogFactory) Create() (l quickfix.Log, err error) {
+	globalSettings := f.settings.GlobalSettings()
+
+	mongoConnectionURL, err := globalSettings.Setting(config.MongoLogConnection)
+	if err != nil {
+		return nil, err
+	}
+	mongoDatabase, err := globalSettings.Setting(config.MongoLogDatabase)
+	if err != nil {
+		return nil, err
+	}
+
+	// Optional.
+	mongoReplicaSet, _ := globalSettings.Setting(config.MongoLogReplicaSet)
+
+	return newmongoLog(quickfix.SessionID{}, mongoConnectionURL, mongoDatabase, mongoReplicaSet, f.messagesLogCollection, f.eventLogCollection)
+}
+
+// CreateSessionLog creates a new mongo implementation of the Log interface.
+func (f mongoLogFactory) CreateSessionLog(sessionID quickfix.SessionID) (l quickfix.Log, err error) {
+	globalSettings := f.settings.GlobalSettings()
+	dynamicSessions, _ := globalSettings.BoolSetting(config.DynamicSessions)
+
+	sessionSettings, ok := f.settings.SessionSettings()[sessionID]
+	if !ok {
+		if dynamicSessions {
+			sessionSettings = globalSettings
+		} else {
+			return nil, fmt.Errorf("unknown session: %v", sessionID)
+		}
+	}
+	mongoConnectionURL, err := sessionSettings.Setting(config.MongoLogConnection)
+	if err != nil {
+		return nil, err
+	}
+	mongoDatabase, err := sessionSettings.Setting(config.MongoLogDatabase)
+	if err != nil {
+		return nil, err
+	}
+
+	// Optional.
+	mongoReplicaSet, _ := sessionSettings.Setting(config.MongoLogReplicaSet)
+
+	return newmongoLog(sessionID, mongoConnectionURL, mongoDatabase, mongoReplicaSet, f.messagesLogCollection, f.eventLogCollection)
+}
+
+func newmongoLog(sessionID quickfix.SessionID, mongoURL, mongoDatabase, mongoReplicaSet, messagesLogCollection, eventLogCollection string) (l *mongoLog, err error) {
+
+	allowTransactions := len(mongoReplicaSet) > 0
+	l = &mongoLog{
+		sessionID:             sessionID,
+		mongoURL:              mongoURL,
+		mongoDatabase:         mongoDatabase,
+		messagesLogCollection: messagesLogCollection,
+		eventLogCollection:    eventLogCollection,
+		allowTransactions:     allowTransactions,
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	l.db, err = mongo.Connect(ctx, options.Client().ApplyURI(mongoURL).SetDirect(len(mongoReplicaSet) == 0).SetReplicaSet(mongoReplicaSet))
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+func (l mongoLog) OnIncoming(msg []byte) {
+	l.insert(l.messagesLogCollection, msg)
+}
+
+func (l mongoLog) OnOutgoing(msg []byte) {
+	l.insert(l.messagesLogCollection, msg)
+}
+
+func (l mongoLog) OnEvent(msg string) {
+	l.insert(l.eventLogCollection, []byte(msg))
+}
+
+func (l mongoLog) OnEventf(format string, v ...interface{}) {
+	l.insert(l.eventLogCollection, []byte(fmt.Sprintf(format, v...)))
+}
+
+func generateEntry(s *quickfix.SessionID) (entry *entryData) {
+	entry = &entryData{
+		BeginString:      s.BeginString,
+		SessionQualifier: s.Qualifier,
+		SenderCompID:     s.SenderCompID,
+		SenderSubID:      s.SenderSubID,
+		SenderLocID:      s.SenderLocationID,
+		TargetCompID:     s.TargetCompID,
+		TargetSubID:      s.TargetSubID,
+		TargetLocID:      s.TargetLocationID,
+	}
+	return
+}
+
+type entryData struct {
+	Time             time.Time `bson:"time,omitempty"`
+	BeginString      string    `bson:"begin_string"`
+	SenderCompID     string    `bson:"sender_comp_id"`
+	SenderSubID      string    `bson:"sender_sub_id"`
+	SenderLocID      string    `bson:"sender_loc_id"`
+	TargetCompID     string    `bson:"target_comp_id"`
+	TargetSubID      string    `bson:"target_sub_id"`
+	TargetLocID      string    `bson:"target_loc_id"`
+	SessionQualifier string    `bson:"session_qualifier"`
+	Text             []byte    `bson:"text,omitempty"`
+}
+
+func (l *mongoLog) insert(collection string, text []byte) {
+	entry := generateEntry(&l.sessionID)
+	entry.Text = text
+	entry.Time = time.Now()
+	_, err := l.db.Database(l.mongoDatabase).Collection(collection).InsertOne(context.Background(), entry)
+	if err != nil {
+		log.Println(err)
+	}
+}
+
+func (l *mongoLog) iterate(coll string, cb func(string) error) error {
+	entry := generateEntry(&l.sessionID)
+
+	cursor, err := l.db.Database(l.mongoDatabase).Collection(coll).Find(context.Background(), bson.D{}, nil)
+	if err != nil {
+		return err
+	}
+	defer func() { _ = cursor.Close(context.Background()) }()
+	for cursor.Next(context.Background()) {
+		if err = cursor.Decode(&entry); err != nil {
+			return err
+		} else if err = cb(string(entry.Text)); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (l *mongoLog) getEntries(coll string) ([]string, error) {
+	var txts []string
+	err := l.iterate(coll, func(text string) error {
+		txts = append(txts, text)
+		return nil
+	})
+	return txts, err
+}
+
+// close closes the l's database connection.
+func (l *mongoLog) close() error {
+	if l.db != nil {
+		err := l.db.Disconnect(context.Background())
+		if err != nil {
+			return errors.Wrap(err, "error disconnecting from database")
+		}
+		l.db = nil
+	}
+	return nil
+}
diff --git a/log/mongo/mongo_log_test.go b/log/mongo/mongo_log_test.go
new file mode 100644
index 000000000..771db953c
--- /dev/null
+++ b/log/mongo/mongo_log_test.go
@@ -0,0 +1,99 @@
+// Copyright (c) quickfixengine.org  All rights reserved.
+//
+// This file may be distributed under the terms of the quickfixengine.org
+// license as defined by quickfixengine.org and appearing in the file
+// LICENSE included in the packaging of this file.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+// THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE.
+//
+// See http://www.quickfixengine.org/LICENSE for licensing information.
+//
+// Contact ask@quickfixengine.org if any conditions of this licensing
+// are not clear to you.
+
+package mongo
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/quickfixgo/quickfix"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+)
+
+// MongoLogTestSuite runs tests for the MongoLog impl of Log.
+type MongoLogTestSuite struct {
+	suite.Suite
+	log *mongoLog
+}
+
+func (suite *MongoLogTestSuite) SetupTest() {
+	mongoDbCxn := os.Getenv("MONGODB_TEST_CXN")
+	if len(mongoDbCxn) <= 0 {
+		log.Println("MONGODB_TEST_CXN environment arg is not provided, skipping...")
+		suite.T().SkipNow()
+	}
+	mongoDatabase := "automated_testing_database"
+	mongoReplicaSet := "replicaset"
+
+	// create settings
+	sessionID := quickfix.SessionID{BeginString: "FIX.4.4", SenderCompID: "SENDER", TargetCompID: "TARGET"}
+	settings, err := quickfix.ParseSettings(strings.NewReader(fmt.Sprintf(`
+[DEFAULT]
+MongoLogConnection=%s
+MongoLogDatabase=%s
+MongoLogReplicaSet=%s
+
+[SESSION]
+BeginString=%s
+SenderCompID=%s
+TargetCompID=%s`, mongoDbCxn, mongoDatabase, mongoReplicaSet, sessionID.BeginString, sessionID.SenderCompID, sessionID.TargetCompID)))
+	require.Nil(suite.T(), err)
+
+	// create log
+	log, err := NewLogFactory(settings).CreateSessionLog(sessionID)
+	require.Nil(suite.T(), err)
+	suite.log = log.(*mongoLog)
+}
+
+func (suite *MongoLogTestSuite) TestMongoLog() {
+	suite.log.OnIncoming([]byte("Cool1"))
+	suite.log.OnOutgoing([]byte("Cool2"))
+	entries, err := suite.log.getEntries("messages_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool1", entries[0])
+	require.Equal(suite.T(), "Cool2", entries[1])
+
+	suite.log.OnEvent("Cool3")
+	suite.log.OnEvent("Cool4")
+	entries, err = suite.log.getEntries("event_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool3", entries[0])
+	require.Equal(suite.T(), "Cool4", entries[1])
+}
+
+func (suite *MongoLogTestSuite) TearDownTest() {
+	entry := generateEntry(&suite.log.sessionID)
+	_, err := suite.log.db.Database(suite.log.mongoDatabase).Collection(suite.log.messagesLogCollection).DeleteMany(context.Background(), entry)
+	require.Nil(suite.T(), err)
+
+	entry2 := generateEntry(&suite.log.sessionID)
+	_, err = suite.log.db.Database(suite.log.mongoDatabase).Collection(suite.log.eventLogCollection).DeleteMany(context.Background(), entry2)
+	require.Nil(suite.T(), err)
+
+	err = suite.log.close()
+	require.Nil(suite.T(), err)
+}
+
+func TestMongoLogTestSuite(t *testing.T) {
+	suite.Run(t, new(MongoLogTestSuite))
+}
diff --git a/screen_log.go b/log/screen/screen_log.go
similarity index 79%
rename from screen_log.go
rename to log/screen/screen_log.go
index c17d67ecb..91e3f95aa 100644
--- a/screen_log.go
+++ b/log/screen/screen_log.go
@@ -13,11 +13,13 @@
 // Contact ask@quickfixengine.org if any conditions of this licensing
 // are not clear to you.
 
-package quickfix
+package screen
 
 import (
 	"fmt"
 	"time"
+
+	"github.com/quickfixgo/quickfix"
 )
 
 type screenLog struct {
@@ -45,17 +47,17 @@ func (l screenLog) OnEventf(format string, a ...interface{}) {
 
 type screenLogFactory struct{}
 
-func (screenLogFactory) Create() (Log, error) {
+func (screenLogFactory) Create() (quickfix.Log, error) {
 	log := screenLog{"GLOBAL"}
 	return log, nil
 }
 
-func (screenLogFactory) CreateSessionLog(sessionID SessionID) (Log, error) {
+func (screenLogFactory) CreateSessionLog(sessionID quickfix.SessionID) (quickfix.Log, error) {
 	log := screenLog{sessionID.String()}
 	return log, nil
 }
 
-// NewScreenLogFactory creates an instance of LogFactory that writes messages and events to stdout.
-func NewScreenLogFactory() LogFactory {
+// NewLogFactory creates an instance of LogFactory that writes messages and events to stdout.
+func NewLogFactory() quickfix.LogFactory {
 	return screenLogFactory{}
 }
diff --git a/log/sql/sql_log.go b/log/sql/sql_log.go
new file mode 100644
index 000000000..10858bdf7
--- /dev/null
+++ b/log/sql/sql_log.go
@@ -0,0 +1,226 @@
+// Copyright (c) quickfixengine.org  All rights reserved.
+//
+// This file may be distributed under the terms of the quickfixengine.org
+// license as defined by quickfixengine.org and appearing in the file
+// LICENSE included in the packaging of this file.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+// THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE.
+//
+// See http://www.quickfixengine.org/LICENSE for licensing information.
+//
+// Contact ask@quickfixengine.org if any conditions of this licensing
+// are not clear to you.
+
+package sql
+
+import (
+	"database/sql"
+	"fmt"
+	"log"
+	"regexp"
+	"time"
+
+	"github.com/quickfixgo/quickfix"
+	"github.com/quickfixgo/quickfix/config"
+)
+
+type sqlLogFactory struct {
+	settings *quickfix.Settings
+}
+
+type sqlLog struct {
+	sessionID          quickfix.SessionID
+	sqlDriver          string
+	sqlDataSourceName  string
+	sqlConnMaxLifetime time.Duration
+	db                 *sql.DB
+	placeholder        placeholderFunc
+}
+
+type placeholderFunc func(int) string
+
+var rePlaceholder = regexp.MustCompile(`\?`)
+
+func sqlString(raw string, placeholder placeholderFunc) string {
+	if placeholder == nil {
+		return raw
+	}
+	idx := 0
+	return rePlaceholder.ReplaceAllStringFunc(raw, func(_ string) string {
+		p := placeholder(idx)
+		idx++
+		return p
+	})
+}
+
+func postgresPlaceholder(i int) string {
+	return fmt.Sprintf("$%d", i+1)
+}
+
+// NewLogFactory returns a sql-based implementation of LogFactory.
+func NewLogFactory(settings *quickfix.Settings) quickfix.LogFactory {
+	return sqlLogFactory{settings: settings}
+}
+
+// Create creates a new SQLLog implementation of the Log interface.
+func (f sqlLogFactory) Create() (log quickfix.Log, err error) {
+	globalSettings := f.settings.GlobalSettings()
+
+	sqlDriver, err := globalSettings.Setting(config.SQLLogDriver)
+	if err != nil {
+		return nil, err
+	}
+	sqlDataSourceName, err := globalSettings.Setting(config.SQLLogDataSourceName)
+	if err != nil {
+		return nil, err
+	}
+	sqlConnMaxLifetime := 0 * time.Second
+	if globalSettings.HasSetting(config.SQLLogConnMaxLifetime) {
+		sqlConnMaxLifetime, err = globalSettings.DurationSetting(config.SQLLogConnMaxLifetime)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return newSQLLog(quickfix.SessionID{}, sqlDriver, sqlDataSourceName, sqlConnMaxLifetime)
+}
+
+// CreateSessionLog creates a new SQLLog implementation of the Log interface.
+func (f sqlLogFactory) CreateSessionLog(sessionID quickfix.SessionID) (log quickfix.Log, err error) {
+	globalSettings := f.settings.GlobalSettings()
+	dynamicSessions, _ := globalSettings.BoolSetting(config.DynamicSessions)
+
+	sessionSettings, ok := f.settings.SessionSettings()[sessionID]
+	if !ok {
+		if dynamicSessions {
+			sessionSettings = globalSettings
+		} else {
+			return nil, fmt.Errorf("unknown session: %v", sessionID)
+		}
+	}
+
+	sqlDriver, err := sessionSettings.Setting(config.SQLLogDriver)
+	if err != nil {
+		return nil, err
+	}
+	sqlDataSourceName, err := sessionSettings.Setting(config.SQLLogDataSourceName)
+	if err != nil {
+		return nil, err
+	}
+	sqlConnMaxLifetime := 0 * time.Second
+	if sessionSettings.HasSetting(config.SQLLogConnMaxLifetime) {
+		sqlConnMaxLifetime, err = sessionSettings.DurationSetting(config.SQLLogConnMaxLifetime)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return newSQLLog(sessionID, sqlDriver, sqlDataSourceName, sqlConnMaxLifetime)
+}
+
+func newSQLLog(sessionID quickfix.SessionID, driver string, dataSourceName string, connMaxLifetime time.Duration) (l *sqlLog, err error) {
+	l = &sqlLog{
+		sessionID:          sessionID,
+		sqlDriver:          driver,
+		sqlDataSourceName:  dataSourceName,
+		sqlConnMaxLifetime: connMaxLifetime,
+	}
+
+	if l.sqlDriver == "postgres" || l.sqlDriver == "pgx" {
+		l.placeholder = postgresPlaceholder
+	}
+
+	if l.db, err = sql.Open(l.sqlDriver, l.sqlDataSourceName); err != nil {
+		return nil, err
+	}
+	l.db.SetConnMaxLifetime(l.sqlConnMaxLifetime)
+
+	if err = l.db.Ping(); err != nil { // ensure immediate connection
+		return nil, err
+	}
+
+	return l, nil
+}
+
+func (l sqlLog) OnIncoming(msg []byte) {
+	l.insert("messages_log", string(msg))
+}
+
+func (l sqlLog) OnOutgoing(msg []byte) {
+	l.insert("messages_log", string(msg))
+}
+
+func (l sqlLog) OnEvent(msg string) {
+	l.insert("event_log", msg)
+}
+
+func (l sqlLog) OnEventf(format string, v ...interface{}) {
+	l.insert("event_log", fmt.Sprintf(format, v...))
+}
+
+func (l sqlLog) insert(table string, value string) {
+	s := l.sessionID
+
+	_, err := l.db.Exec(sqlString(`INSERT INTO `+table+` (
+			time,
+			beginstring, session_qualifier,
+			sendercompid, sendersubid, senderlocid,
+			targetcompid, targetsubid, targetlocid, 
+			text)
+			VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, l.placeholder),
+		time.Now(),
+		s.BeginString, s.Qualifier,
+		s.SenderCompID, s.SenderSubID, s.SenderLocationID,
+		s.TargetCompID, s.TargetSubID, s.TargetLocationID,
+		value,
+	)
+	if err != nil {
+		log.Println(err)
+	}
+}
+
+func (l *sqlLog) iterate(table string, cb func(string) error) error {
+	s := l.sessionID
+	rows, err := l.db.Query(sqlString(`SELECT text FROM `+table+`
+		WHERE beginstring=? AND session_qualifier=?
+		AND sendercompid=? AND sendersubid=? AND senderlocid=?
+		AND targetcompid=? AND targetsubid=? AND targetlocid=?`,
+		l.placeholder),
+		s.BeginString, s.Qualifier,
+		s.SenderCompID, s.SenderSubID, s.SenderLocationID,
+		s.TargetCompID, s.TargetSubID, s.TargetLocationID)
+	if err != nil {
+		return err
+	}
+	defer func() { _ = rows.Close() }()
+
+	for rows.Next() {
+		var txt string
+		if err = rows.Scan(&txt); err != nil {
+			return err
+		} else if err = cb(txt); err != nil {
+			return err
+		}
+	}
+
+	return rows.Err()
+}
+
+func (l *sqlLog) getEntries(table string) ([]string, error) {
+	var msgs []string
+	err := l.iterate(table, func(msg string) error {
+		msgs = append(msgs, msg)
+		return nil
+	})
+	return msgs, err
+}
+
+// Close closes the log's database connection.
+func (l *sqlLog) close() error {
+	if l.db != nil {
+		l.db.Close()
+		l.db = nil
+	}
+	return nil
+}
diff --git a/log/sql/sql_log_test.go b/log/sql/sql_log_test.go
new file mode 100644
index 000000000..513371da4
--- /dev/null
+++ b/log/sql/sql_log_test.go
@@ -0,0 +1,110 @@
+// Copyright (c) quickfixengine.org  All rights reserved.
+//
+// This file may be distributed under the terms of the quickfixengine.org
+// license as defined by quickfixengine.org and appearing in the file
+// LICENSE included in the packaging of this file.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+// THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE.
+//
+// See http://www.quickfixengine.org/LICENSE for licensing information.
+//
+// Contact ask@quickfixengine.org if any conditions of this licensing
+// are not clear to you.
+
+package sql
+
+import (
+	"database/sql"
+	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	_ "github.com/mattn/go-sqlite3"
+	"github.com/quickfixgo/quickfix"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+)
+
+// SQLLogTestSuite runs tests for the SQLLog impl of Log.
+type SQLLogTestSuite struct {
+	suite.Suite
+	sqlLogRootPath string
+	log            *sqlLog
+}
+
+func (suite *SQLLogTestSuite) SetupTest() {
+	suite.sqlLogRootPath = path.Join(os.TempDir(), fmt.Sprintf("SQLLogTestSuite-%d", os.Getpid()))
+	err := os.MkdirAll(suite.sqlLogRootPath, os.ModePerm)
+	require.Nil(suite.T(), err)
+	sqlDriver := "sqlite3"
+	sqlDsn := path.Join(suite.sqlLogRootPath, fmt.Sprintf("%d.db", time.Now().UnixNano()))
+
+	// create tables
+	db, err := sql.Open(sqlDriver, sqlDsn)
+	require.Nil(suite.T(), err)
+	ddlFnames, err := filepath.Glob(fmt.Sprintf("../../_sql/%s/*.sql", sqlDriver))
+	require.Nil(suite.T(), err)
+	for _, fname := range ddlFnames {
+		sqlBytes, err := os.ReadFile(fname)
+		require.Nil(suite.T(), err)
+		_, err = db.Exec(string(sqlBytes))
+		require.Nil(suite.T(), err)
+	}
+
+	// create settings
+	sessionID := quickfix.SessionID{BeginString: "FIX.4.4", SenderCompID: "SENDER", TargetCompID: "TARGET"}
+	settings, err := quickfix.ParseSettings(strings.NewReader(fmt.Sprintf(`
+[DEFAULT]
+SQLLogDriver=%s
+SQLLogDataSourceName=%s
+SQLLogConnMaxLifetime=14400s
+
+[SESSION]
+BeginString=%s
+SenderCompID=%s
+TargetCompID=%s`, sqlDriver, sqlDsn, sessionID.BeginString, sessionID.SenderCompID, sessionID.TargetCompID)))
+	require.Nil(suite.T(), err)
+
+	// create log
+	log, err := NewLogFactory(settings).CreateSessionLog(sessionID)
+	require.Nil(suite.T(), err)
+	suite.log = log.(*sqlLog)
+}
+
+func (suite *SQLLogTestSuite) TestSQLLog() {
+	suite.log.OnIncoming([]byte("Cool1"))
+	suite.log.OnOutgoing([]byte("Cool2"))
+	entries, err := suite.log.getEntries("messages_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool1", entries[0])
+	require.Equal(suite.T(), "Cool2", entries[1])
+
+	suite.log.OnEvent("Cool3")
+	suite.log.OnEvent("Cool4")
+	entries, err = suite.log.getEntries("event_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool3", entries[0])
+	require.Equal(suite.T(), "Cool4", entries[1])
+}
+
+func (suite *SQLLogTestSuite) TestSqlPlaceholderReplacement() {
+	got := sqlString("A ? B ? C ?", postgresPlaceholder)
+	suite.Equal("A $1 B $2 C $3", got)
+}
+
+func (suite *SQLLogTestSuite) TearDownTest() {
+	suite.log.close()
+	os.RemoveAll(suite.sqlLogRootPath)
+}
+
+func TestSQLLogTestSuite(t *testing.T) {
+	suite.Run(t, new(SQLLogTestSuite))
+}
diff --git a/memorystore.go b/memory_store.go
similarity index 100%
rename from memorystore.go
rename to memory_store.go
diff --git a/store/file/filestore.go b/store/file/file_store.go
similarity index 100%
rename from store/file/filestore.go
rename to store/file/file_store.go
diff --git a/store/file/filestore_test.go b/store/file/file_store_test.go
similarity index 100%
rename from store/file/filestore_test.go
rename to store/file/file_store_test.go
diff --git a/store/memory/memorystore_test.go b/store/memory/memory_store_test.go
similarity index 100%
rename from store/memory/memorystore_test.go
rename to store/memory/memory_store_test.go
diff --git a/store/mongo/mongostore.go b/store/mongo/mongo_store.go
similarity index 100%
rename from store/mongo/mongostore.go
rename to store/mongo/mongo_store.go
diff --git a/store/mongo/mongostore_test.go b/store/mongo/mongo_store_test.go
similarity index 100%
rename from store/mongo/mongostore_test.go
rename to store/mongo/mongo_store_test.go
diff --git a/store/sql/sqlstore.go b/store/sql/sql_store.go
similarity index 100%
rename from store/sql/sqlstore.go
rename to store/sql/sql_store.go
diff --git a/store/sql/sqlstore_test.go b/store/sql/sql_store_test.go
similarity index 100%
rename from store/sql/sqlstore_test.go
rename to store/sql/sql_store_test.go

From f01e28e2391b07f7198d5d71cdb5a154fb3b1542 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Thu, 12 Sep 2024 17:07:33 -0500
Subject: [PATCH 55/58] Adds more tests

---
 log/mongo/mongo_log_test.go | 32 ++++++++++++++++++++++++++++++--
 log/sql/sql_log_test.go     | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/log/mongo/mongo_log_test.go b/log/mongo/mongo_log_test.go
index 771db953c..720955709 100644
--- a/log/mongo/mongo_log_test.go
+++ b/log/mongo/mongo_log_test.go
@@ -31,7 +31,9 @@ import (
 // MongoLogTestSuite runs tests for the MongoLog impl of Log.
 type MongoLogTestSuite struct {
 	suite.Suite
-	log *mongoLog
+	log       *mongoLog
+	settings  *quickfix.Settings
+	sessionID quickfix.SessionID
 }
 
 func (suite *MongoLogTestSuite) SetupTest() {
@@ -57,13 +59,39 @@ SenderCompID=%s
 TargetCompID=%s`, mongoDbCxn, mongoDatabase, mongoReplicaSet, sessionID.BeginString, sessionID.SenderCompID, sessionID.TargetCompID)))
 	require.Nil(suite.T(), err)
 
+	suite.sessionID = sessionID
+	suite.settings = settings
+}
+
+func (suite *MongoLogTestSuite) TestMongoLogNoSession() {
 	// create log
-	log, err := NewLogFactory(settings).CreateSessionLog(sessionID)
+	log, err := NewLogFactory(suite.settings).Create()
 	require.Nil(suite.T(), err)
 	suite.log = log.(*mongoLog)
+
+	suite.log.OnIncoming([]byte("Cool1"))
+	suite.log.OnOutgoing([]byte("Cool2"))
+	entries, err := suite.log.getEntries("messages_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool1", entries[0])
+	require.Equal(suite.T(), "Cool2", entries[1])
+
+	suite.log.OnEvent("Cool3")
+	suite.log.OnEvent("Cool4")
+	entries, err = suite.log.getEntries("event_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool3", entries[0])
+	require.Equal(suite.T(), "Cool4", entries[1])
 }
 
 func (suite *MongoLogTestSuite) TestMongoLog() {
+	// create log
+	log, err := NewLogFactory(suite.settings).CreateSessionLog(suite.sessionID)
+	require.Nil(suite.T(), err)
+	suite.log = log.(*mongoLog)
+
 	suite.log.OnIncoming([]byte("Cool1"))
 	suite.log.OnOutgoing([]byte("Cool2"))
 	entries, err := suite.log.getEntries("messages_log")
diff --git a/log/sql/sql_log_test.go b/log/sql/sql_log_test.go
index 513371da4..c15fb3090 100644
--- a/log/sql/sql_log_test.go
+++ b/log/sql/sql_log_test.go
@@ -36,6 +36,9 @@ type SQLLogTestSuite struct {
 	suite.Suite
 	sqlLogRootPath string
 	log            *sqlLog
+
+	settings  *quickfix.Settings
+	sessionID quickfix.SessionID
 }
 
 func (suite *SQLLogTestSuite) SetupTest() {
@@ -71,13 +74,39 @@ SenderCompID=%s
 TargetCompID=%s`, sqlDriver, sqlDsn, sessionID.BeginString, sessionID.SenderCompID, sessionID.TargetCompID)))
 	require.Nil(suite.T(), err)
 
+	suite.sessionID = sessionID
+	suite.settings = settings
+}
+
+func (suite *SQLLogTestSuite) TestSQLLogNoSession() {
 	// create log
-	log, err := NewLogFactory(settings).CreateSessionLog(sessionID)
+	log, err := NewLogFactory(suite.settings).Create()
 	require.Nil(suite.T(), err)
 	suite.log = log.(*sqlLog)
+
+	suite.log.OnIncoming([]byte("Cool1"))
+	suite.log.OnOutgoing([]byte("Cool2"))
+	entries, err := suite.log.getEntries("messages_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool1", entries[0])
+	require.Equal(suite.T(), "Cool2", entries[1])
+
+	suite.log.OnEvent("Cool3")
+	suite.log.OnEvent("Cool4")
+	entries, err = suite.log.getEntries("event_log")
+	require.Nil(suite.T(), err)
+	require.Len(suite.T(), entries, 2)
+	require.Equal(suite.T(), "Cool3", entries[0])
+	require.Equal(suite.T(), "Cool4", entries[1])
 }
 
 func (suite *SQLLogTestSuite) TestSQLLog() {
+	// create log
+	log, err := NewLogFactory(suite.settings).CreateSessionLog(suite.sessionID)
+	require.Nil(suite.T(), err)
+	suite.log = log.(*sqlLog)
+
 	suite.log.OnIncoming([]byte("Cool1"))
 	suite.log.OnOutgoing([]byte("Cool2"))
 	entries, err := suite.log.getEntries("messages_log")

From b781a85b495d595516506f3c57853104c1a0de26 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Tue, 24 Sep 2024 15:03:07 -0500
Subject: [PATCH 56/58] Adds composite log

---
 log/composite/composite_log.go      |  81 +++++++++++++++++++++
 log/composite/composite_log_test.go | 109 ++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)
 create mode 100644 log/composite/composite_log.go
 create mode 100644 log/composite/composite_log_test.go

diff --git a/log/composite/composite_log.go b/log/composite/composite_log.go
new file mode 100644
index 000000000..8de3b85e2
--- /dev/null
+++ b/log/composite/composite_log.go
@@ -0,0 +1,81 @@
+// Copyright (c) quickfixengine.org  All rights reserved.
+//
+// This file may be distributed under the terms of the quickfixengine.org
+// license as defined by quickfixengine.org and appearing in the file
+// LICENSE included in the packaging of this file.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+// THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE.
+//
+// See http://www.quickfixengine.org/LICENSE for licensing information.
+//
+// Contact ask@quickfixengine.org if any conditions of this licensing
+// are not clear to you.
+
+package composite
+
+import (
+	"github.com/quickfixgo/quickfix"
+)
+
+type compositeLog struct {
+	logs []quickfix.Log
+}
+
+func (l compositeLog) OnIncoming(s []byte) {
+	for _, log := range l.logs {
+		log.OnIncoming(s)
+	}
+}
+
+func (l compositeLog) OnOutgoing(s []byte) {
+	for _, log := range l.logs {
+		log.OnOutgoing(s)
+	}
+}
+
+func (l compositeLog) OnEvent(s string) {
+	for _, log := range l.logs {
+		log.OnEvent(s)
+	}
+}
+
+func (l compositeLog) OnEventf(format string, a ...interface{}) {
+	for _, log := range l.logs {
+		log.OnEventf(format, a)
+	}
+}
+
+type compositeLogFactory struct {
+	logFactories []quickfix.LogFactory
+}
+
+func (clf compositeLogFactory) Create() (quickfix.Log, error) {
+	logs := []quickfix.Log{}
+	for _, lf := range clf.logFactories {
+		log, err := lf.Create()
+		if err != nil {
+			return nil, err
+		}
+		logs = append(logs, log)
+	}
+	return compositeLog{logs}, nil
+}
+
+func (clf compositeLogFactory) CreateSessionLog(sessionID quickfix.SessionID) (quickfix.Log, error) {
+	logs := []quickfix.Log{}
+	for _, lf := range clf.logFactories {
+		log, err := lf.CreateSessionLog(sessionID)
+		if err != nil {
+			return nil, err
+		}
+		logs = append(logs, log)
+	}
+	return compositeLog{logs}, nil
+}
+
+// NewLogFactory creates an instance of LogFactory that writes messages and events to stdout.
+func NewLogFactory(logfactories []quickfix.LogFactory) quickfix.LogFactory {
+	return compositeLogFactory{logfactories}
+}
diff --git a/log/composite/composite_log_test.go b/log/composite/composite_log_test.go
new file mode 100644
index 000000000..690b10a44
--- /dev/null
+++ b/log/composite/composite_log_test.go
@@ -0,0 +1,109 @@
+// Copyright (c) quickfixengine.org  All rights reserved.
+//
+// This file may be distributed under the terms of the quickfixengine.org
+// license as defined by quickfixengine.org and appearing in the file
+// LICENSE included in the packaging of this file.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+// THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE.
+//
+// See http://www.quickfixengine.org/LICENSE for licensing information.
+//
+// Contact ask@quickfixengine.org if any conditions of this licensing
+// are not clear to you.
+
+package composite
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path"
+	"strings"
+	"testing"
+	"time"
+
+	_ "github.com/mattn/go-sqlite3"
+	"github.com/quickfixgo/quickfix"
+	"github.com/quickfixgo/quickfix/log/file"
+	"github.com/quickfixgo/quickfix/log/mongo"
+	"github.com/quickfixgo/quickfix/log/screen"
+	"github.com/quickfixgo/quickfix/log/sql"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+)
+
+// CompositeLogTestSuite runs tests for the MongoLog impl of Log.
+type CompositeLogTestSuite struct {
+	suite.Suite
+	sqlLogRootPath string
+	settings       *quickfix.Settings
+	sessionID      quickfix.SessionID
+}
+
+func (suite *CompositeLogTestSuite) SetupTest() {
+	mongoDbCxn := os.Getenv("MONGODB_TEST_CXN")
+	if len(mongoDbCxn) <= 0 {
+		log.Println("MONGODB_TEST_CXN environment arg is not provided, skipping...")
+		suite.T().SkipNow()
+	}
+	mongoDatabase := "automated_testing_database"
+	mongoReplicaSet := "replicaset"
+
+	// create settings
+	sessionID := quickfix.SessionID{BeginString: "FIX.4.4", SenderCompID: "SENDER", TargetCompID: "TARGET"}
+	logPath := path.Join(os.TempDir(), fmt.Sprintf("TestLogStore-%d", os.Getpid()))
+	suite.sqlLogRootPath = path.Join(os.TempDir(), fmt.Sprintf("SQLLogTestSuite-%d", os.Getpid()))
+	err := os.MkdirAll(suite.sqlLogRootPath, os.ModePerm)
+	require.Nil(suite.T(), err)
+	sqlDriver := "sqlite3"
+	sqlDsn := path.Join(suite.sqlLogRootPath, fmt.Sprintf("%d.db", time.Now().UnixNano()))
+
+	settings, err := quickfix.ParseSettings(strings.NewReader(fmt.Sprintf(`
+[DEFAULT]
+MongoLogConnection=%s
+MongoLogDatabase=%s
+MongoLogReplicaSet=%s
+FileLogPath=%s
+SQLLogDriver=%s
+SQLLogDataSourceName=%s
+SQLLogConnMaxLifetime=14400s
+
+[SESSION]
+BeginString=%s
+SenderCompID=%s
+TargetCompID=%s`, mongoDbCxn, mongoDatabase, mongoReplicaSet, logPath, sqlDriver, sqlDsn, sessionID.BeginString, sessionID.SenderCompID, sessionID.TargetCompID)))
+	require.Nil(suite.T(), err)
+
+	suite.sessionID = sessionID
+	suite.settings = settings
+}
+
+func (suite *CompositeLogTestSuite) TestCreateLogNoSession() {
+
+	mngoLogFactory := mongo.NewLogFactory(suite.settings)
+	sqlLogFactory := sql.NewLogFactory(suite.settings)
+	// create log
+	_, err := NewLogFactory([]quickfix.LogFactory{mngoLogFactory, sqlLogFactory}).Create()
+	require.Nil(suite.T(), err)
+}
+
+func (suite *CompositeLogTestSuite) TestCreateLogSession() {
+
+	screenLogFactory := screen.NewLogFactory()
+	fileLogFactory, err := file.NewLogFactory(suite.settings)
+	require.Nil(suite.T(), err)
+
+	// create log
+	_, err = NewLogFactory([]quickfix.LogFactory{screenLogFactory, fileLogFactory}).CreateSessionLog(suite.sessionID)
+	require.Nil(suite.T(), err)
+}
+
+func (suite *CompositeLogTestSuite) TearDownTest() {
+	os.RemoveAll(suite.sqlLogRootPath)
+}
+
+func TestCompositeLogTestSuite(t *testing.T) {
+	suite.Run(t, new(CompositeLogTestSuite))
+}

From 90867a2b7bd05f7d6196ece7a11bf19a4dd20894 Mon Sep 17 00:00:00 2001
From: Michael Ackley <mackley@connamara.com>
Date: Wed, 25 Sep 2024 11:16:40 -0500
Subject: [PATCH 57/58] Adds convenience getters for session log and store

---
 registry.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/registry.go b/registry.go
index 145c710c3..5f8e69fc2 100644
--- a/registry.go
+++ b/registry.go
@@ -129,6 +129,24 @@ func GetExpectedTargetNum(sessionID SessionID) (int, error) {
 	return session.store.NextTargetMsgSeqNum(), nil
 }
 
+// GetMessageStore returns the MessageStore interface for session matching the session id.
+func GetMessageStore(sessionID SessionID) (MessageStore, error) {
+	session, ok := lookupSession(sessionID)
+	if !ok {
+		return nil, errUnknownSession
+	}
+	return session.store, nil
+}
+
+// GetLog returns the Log interface for session matching the session id.
+func GetLog(sessionID SessionID) (Log, error) {
+	session, ok := lookupSession(sessionID)
+	if !ok {
+		return nil, errUnknownSession
+	}
+	return session.log, nil
+}
+
 func registerSession(s *session) error {
 	sessionsLock.Lock()
 	defer sessionsLock.Unlock()

From 1a64a6c5108ab8b7345ac6b08ad05f49c8085fff Mon Sep 17 00:00:00 2001
From: Sylvain Rabot <sylvain@abstraction.fr>
Date: Tue, 5 Nov 2024 13:18:13 +0100
Subject: [PATCH 58/58] Fix mongodb store tests in CI

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
---
 .github/workflows/ci.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5dc0f1694..064a94661 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -191,9 +191,14 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.11.0
+        with:
+          mongodb-replica-set: replicaset
       - name: Acceptance test
         env:
           GO111MODULE: on
+          MONGODB_TEST_CXN: mongodb://localhost:27017
           FIX_TEST: ${{ matrix.fix-version }}
           STORE_TYPE: mongo
           ACCEPTANCE_SET: server