Merge pull request #171 from bhaan/peer-timer

Reset peer timer after logon

Author: cbusbey

event_timer.go

@@ -9,14 +9,16 @@ type eventTimer struct {
 	timer *time.Timer
 }
 
-func (t *eventTimer) Reset(timeout time.Duration) (ok bool) {
+func (t *eventTimer) Stop() (ok bool) {
 	if t.timer != nil {
 		ok = t.timer.Stop()
-	} else {
-		ok = true
 	}
+	return
+}
 
-	if t.Task != nil {
+func (t *eventTimer) Reset(timeout time.Duration) (ok bool) {
+	ok = t.Stop()
+	if t.Task != nil && timeout > 0 {
 		t.timer = time.AfterFunc(timeout, t.Task)
 	}
 	return

session.go

@@ -295,6 +295,8 @@ func (s *session) handleLogon(msg Message) error {
 		s.log.OnEvent("Received logon response")
 	}
 
+	s.peerTimer.Reset(time.Duration(int64(1.2 * float64(s.heartBeatTimeout))))
+
 	if err := s.checkTargetTooHigh(msg); err != nil {
 		switch TypedError := err.(type) {
 		case targetTooHigh:
@@ -511,6 +513,8 @@ func (s *session) run(msgIn chan fixIn, msgOut chan []byte, quit chan bool) {
 		close(s.messageOut)
 		close(s.toSend)
 		s.toSend = nil
+		s.stateTimer.Stop()
+		s.peerTimer.Stop()
 		s.onDisconnect()
 	}()