Skip to content

Commit 4e061bf

Browse files
cbusbeycbusbey
committed
Merge pull request #61 from cbusbey/private_session
remove session from public api
2 parents 7067795 + d832f50 commit 4e061bf

11 files changed

+67
-67
lines changed

‎in_session.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
type inSession struct {
99
}
1010

11-
func (state inSession) FixMsgIn(session *Session, msg Message) (nextState sessionState) {
11+
func (state inSession) FixMsgIn(session *session, msg Message) (nextState sessionState) {
1212
var msgType FIXString
1313
if err := msg.Header.GetField(tagMsgType, &msgType); err == nil {
1414
switch string(msgType) {
@@ -39,7 +39,7 @@ func (state inSession) FixMsgIn(session *Session, msg Message) (nextState sessio
3939
return state
4040
}
4141

42-
func (state inSession) Timeout(session *Session, event event) (nextState sessionState) {
42+
func (state inSession) Timeout(session *session, event event) (nextState sessionState) {
4343
switch event {
4444
case needHeartbeat:
4545
heartBt := NewMessage()
@@ -56,23 +56,23 @@ func (state inSession) Timeout(session *Session, event event) (nextState session
5656
return state
5757
}
5858

59-
func (state inSession) handleLogon(session *Session, msg Message) (nextState sessionState) {
59+
func (state inSession) handleLogon(session *session, msg Message) (nextState sessionState) {
6060
if err := session.handleLogon(msg); err != nil {
6161
return state.initiateLogout(session, "")
6262
}
6363

6464
return state
6565
}
6666

67-
func (state inSession) handleLogout(session *Session, msg Message) (nextState sessionState) {
67+
func (state inSession) handleLogout(session *session, msg Message) (nextState sessionState) {
6868
session.log.OnEvent("Received logout request")
6969
state.generateLogout(session)
7070
session.application.OnLogout(session.sessionID)
7171

7272
return latentState{}
7373
}
7474

75-
func (state inSession) handleSequenceReset(session *Session, msg Message) (nextState sessionState) {
75+
func (state inSession) handleSequenceReset(session *session, msg Message) (nextState sessionState) {
7676
var gapFillFlag FIXBoolean
7777
msg.Body.GetField(tagGapFillFlag, &gapFillFlag)
7878

@@ -97,7 +97,7 @@ func (state inSession) handleSequenceReset(session *Session, msg Message) (nextS
9797
return state
9898
}
9999

100-
func (state inSession) handleResendRequest(session *Session, msg Message) (nextState sessionState) {
100+
func (state inSession) handleResendRequest(session *session, msg Message) (nextState sessionState) {
101101
if err := session.verifyIgnoreSeqNumTooHighOrLow(msg); err != nil {
102102
return state.processReject(session, msg, err)
103103
}
@@ -131,7 +131,7 @@ func (state inSession) handleResendRequest(session *Session, msg Message) (nextS
131131
return state
132132
}
133133

134-
func (state inSession) resendMessages(session *Session, beginSeqNo, endSeqNo int) {
134+
func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int) {
135135
msgs := session.store.GetMessages(beginSeqNo, endSeqNo)
136136

137137
seqNum := beginSeqNo
@@ -172,7 +172,7 @@ func (state inSession) resendMessages(session *Session, beginSeqNo, endSeqNo int
172172
}
173173
}
174174

175-
func (state inSession) handleTestRequest(session *Session, msg Message) (nextState sessionState) {
175+
func (state inSession) handleTestRequest(session *session, msg Message) (nextState sessionState) {
176176
if err := session.verify(msg); err != nil {
177177
return state.processReject(session, msg, err)
178178
}
@@ -192,7 +192,7 @@ func (state inSession) handleTestRequest(session *Session, msg Message) (nextSta
192192
return state
193193
}
194194

195-
func (state inSession) processReject(session *Session, msg Message, rej MessageRejectError) (nextState sessionState) {
195+
func (state inSession) processReject(session *session, msg Message, rej MessageRejectError) (nextState sessionState) {
196196
switch TypedError := rej.(type) {
197197
case targetTooHigh:
198198

@@ -222,7 +222,7 @@ func (state inSession) processReject(session *Session, msg Message, rej MessageR
222222
}
223223
}
224224

225-
func (state inSession) doTargetTooLow(session *Session, msg Message, rej targetTooLow) (nextState sessionState) {
225+
func (state inSession) doTargetTooLow(session *session, msg Message, rej targetTooLow) (nextState sessionState) {
226226
var posDupFlag FIXBoolean
227227
if err := msg.Header.GetField(tagPossDupFlag, &posDupFlag); err == nil && posDupFlag {
228228

@@ -251,14 +251,14 @@ func (state inSession) doTargetTooLow(session *Session, msg Message, rej targetT
251251
return state
252252
}
253253

254-
func (state *inSession) initiateLogout(session *Session, reason string) (nextState logoutState) {
254+
func (state *inSession) initiateLogout(session *session, reason string) (nextState logoutState) {
255255
state.generateLogoutWithReason(session, reason)
256256
time.AfterFunc(time.Duration(2)*time.Second, func() { session.sessionEvent <- logoutTimeout })
257257

258258
return
259259
}
260260

261-
func (state *inSession) generateSequenceReset(session *Session, beginSeqNo int, endSeqNo int) {
261+
func (state *inSession) generateSequenceReset(session *session, beginSeqNo int, endSeqNo int) {
262262
sequenceReset := NewMessage()
263263
session.fillDefaultHeader(sequenceReset)
264264

@@ -278,11 +278,11 @@ func (state *inSession) generateSequenceReset(session *Session, beginSeqNo int,
278278
session.sendBytes(msgBytes)
279279
}
280280

281-
func (state *inSession) generateLogout(session *Session) {
281+
func (state *inSession) generateLogout(session *session) {
282282
state.generateLogoutWithReason(session, "")
283283
}
284284

285-
func (state *inSession) generateLogoutWithReason(session *Session, reason string) {
285+
func (state *inSession) generateLogoutWithReason(session *session, reason string) {
286286
reply := NewMessage()
287287
reply.Header.SetField(tagMsgType, FIXString("5"))
288288
reply.Header.SetField(tagBeginString, FIXString(session.sessionID.BeginString))

‎latent_state.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package quickfix
22

33
type latentState struct{}
44

5-
func (state latentState) FixMsgIn(session *Session, msg Message) (nextState sessionState) {
5+
func (state latentState) FixMsgIn(session *session, msg Message) (nextState sessionState) {
66
session.log.OnEventf("Invalid Session State: Unexpected Msg %v while in Latent state", msg)
77
return state
88
}
99

10-
func (state latentState) Timeout(*Session, event) (nextState sessionState) {
10+
func (state latentState) Timeout(*session, event) (nextState sessionState) {
1111
return state
1212
}

‎logon_state.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package quickfix
22

33
type logonState struct{}
44

5-
func (s logonState) FixMsgIn(session *Session, msg Message) (nextState sessionState) {
5+
func (s logonState) FixMsgIn(session *session, msg Message) (nextState sessionState) {
66
var msgType FIXString
77
if err := msg.Header.GetField(tagMsgType, &msgType); err == nil && string(msgType) == "A" {
88
if err := session.handleLogon(msg); err != nil {
@@ -17,7 +17,7 @@ func (s logonState) FixMsgIn(session *Session, msg Message) (nextState sessionSt
1717
return latentState{}
1818
}
1919

20-
func (s logonState) Timeout(session *Session, e event) (nextState sessionState) {
20+
func (s logonState) Timeout(session *session, e event) (nextState sessionState) {
2121
if e == logonTimeout {
2222
session.log.OnEvent("Timed out waiting for logon response")
2323
return latentState{}

‎logout_state.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package quickfix
33
type logoutState struct {
44
}
55

6-
func (state logoutState) FixMsgIn(session *Session, msg Message) (nextState sessionState) {
6+
func (state logoutState) FixMsgIn(session *session, msg Message) (nextState sessionState) {
77
return state
88
}
99

10-
func (state logoutState) Timeout(session *Session, event event) (nextState sessionState) {
10+
func (state logoutState) Timeout(session *session, event event) (nextState sessionState) {
1111
switch event {
1212
case logoutTimeout:
1313
session.log.OnEvent("Timed out waiting for Logout response")

‎message_router.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (c MessageRouter) tryRoute(beginString FIXString, msgType FIXString, msg Me
4747
if string(beginString) == enum.BeginStringFIXT11 && !isAdminMessageType(string(msgType)) {
4848
var applVerID FIXString
4949
if err := msg.Header.GetField(tagApplVerID, &applVerID); err != nil {
50-
session, _ := LookupSession(sessionID)
50+
session, _ := lookupSession(sessionID)
5151
applVerID = FIXString(session.TargetDefaultApplicationVersionID())
5252
}
5353

‎pending_timeout.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ type pendingTimeout struct {
44
inSession
55
}
66

7-
func (currentState pendingTimeout) Timeout(session *Session, event event) (nextState sessionState) {
7+
func (currentState pendingTimeout) Timeout(session *session, event event) (nextState sessionState) {
88
switch event {
99
case peerTimeout:
1010
session.log.OnEvent("Session Timeout")

‎registry.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func Send(m Marshaler) (err error) {
3636
//SendToTarget sends a message based on the sessionID. Convenient for use in FromApp since it provides a session ID for incoming messages
3737
func SendToTarget(m Marshaler, sessionID SessionID) error {
3838
msg := m.Marshal()
39-
session, err := LookupSession(sessionID)
39+
session, err := lookupSession(sessionID)
4040
if err != nil {
4141
return err
4242
}
@@ -48,16 +48,16 @@ func SendToTarget(m Marshaler, sessionID SessionID) error {
4848

4949
type sessionActivate struct {
5050
SessionID
51-
reply chan *Session
51+
reply chan *session
5252
}
5353

5454
type sessionResource struct {
55-
session *Session
55+
session *session
5656
active bool
5757
}
5858

5959
type sessionLookupResponse struct {
60-
session *Session
60+
session *session
6161
err error
6262
}
6363

@@ -67,7 +67,7 @@ type sessionLookup struct {
6767
}
6868

6969
type registry struct {
70-
newSession chan *Session
70+
newSession chan *session
7171
activate chan sessionActivate
7272
deactivate chan SessionID
7373
lookup chan sessionLookup
@@ -77,16 +77,16 @@ var sessions *registry
7777

7878
func init() {
7979
sessions = new(registry)
80-
sessions.newSession = make(chan *Session)
80+
sessions.newSession = make(chan *session)
8181
sessions.activate = make(chan sessionActivate)
8282
sessions.deactivate = make(chan SessionID)
8383
sessions.lookup = make(chan sessionLookup)
8484

8585
go sessions.sessionResourceServerLoop()
8686
}
8787

88-
func activate(sessionID SessionID) *Session {
89-
response := make(chan *Session)
88+
func activate(sessionID SessionID) *session {
89+
response := make(chan *session)
9090
sessions.activate <- sessionActivate{sessionID, response}
9191
return <-response
9292
}
@@ -95,8 +95,8 @@ func deactivate(sessionID SessionID) {
9595
sessions.deactivate <- sessionID
9696
}
9797

98-
//LookupSession returns the Session associated with the sessionID.
99-
func LookupSession(sessionID SessionID) (*Session, error) {
98+
//lookupSession returns the Session associated with the sessionID.
99+
func lookupSession(sessionID SessionID) (*session, error) {
100100
responseChannel := make(chan sessionLookupResponse)
101101
sessions.lookup <- sessionLookup{sessionID, responseChannel}
102102

‎resend_state.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ type resendState struct {
44
inSession
55
}
66

7-
func (state resendState) FixMsgIn(session *Session, msg Message) (nextState sessionState) {
7+
func (state resendState) FixMsgIn(session *session, msg Message) (nextState sessionState) {
88
for ok := true; ok; {
99
nextState = state.inSession.FixMsgIn(session, msg)
1010

0 commit comments

Comments
 (0)