From ede50142b238a62b4c2fa34209a6c3158315c0b4 Mon Sep 17 00:00:00 2001 From: zee276 Date: Thu, 14 Apr 2022 12:47:49 +0200 Subject: [PATCH 1/4] add session reset --- registry.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/registry.go b/registry.go index 3c1fb2af8..759b3115f 100644 --- a/registry.go +++ b/registry.go @@ -50,6 +50,21 @@ func SendToTarget(m Messagable, sessionID SessionID) error { return session.queueForSend(msg) } +//ResetSession resets session's sequence numbers +func ResetSession(sessionID SessionID) error { + session, ok := lookupSession(sessionID) + if !ok { + return errUnknownSession + } + session.log.OnEvent("Session reset") + session.State.ShutdownNow(session) + if err := session.dropAndReset(); err != nil { + session.logError(err) + } + + return nil +} + //UnregisterSession removes a session from the set of known sessions func UnregisterSession(sessionID SessionID) error { sessionsLock.Lock() From e6c717d4f5a329fb4a53f2020328aeb9961f4b57 Mon Sep 17 00:00:00 2001 From: zee276 Date: Thu, 14 Apr 2022 12:53:17 +0200 Subject: [PATCH 2/4] add session reset --- registry.go | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.go b/registry.go index 759b3115f..dd1c7b26f 100644 --- a/registry.go +++ b/registry.go @@ -60,6 +60,7 @@ func ResetSession(sessionID SessionID) error { session.State.ShutdownNow(session) if err := session.dropAndReset(); err != nil { session.logError(err) + return err } return nil From 0884a57b5c13fb22702a5a09b11748ca802502e8 Mon Sep 17 00:00:00 2001 From: Michael Ackley Date: Sun, 29 Oct 2023 21:58:06 -0500 Subject: [PATCH 3/4] Resolve bad merge conflict --- registry.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/registry.go b/registry.go index b9ddd2d36..6f4695d27 100644 --- a/registry.go +++ b/registry.go @@ -85,10 +85,7 @@ func UnregisterSession(sessionID SessionID) error { sessionsLock.Lock() defer sessionsLock.Unlock() - if _, ok : - - - sessions[sessionID]; ok { + if _, ok := sessions[sessionID]; ok { delete(sessions, sessionID) return nil } From a8a6a15ae37ded610d98c0bf47df2cb5539e1f6a Mon Sep 17 00:00:00 2001 From: Michael Ackley Date: Sun, 29 Oct 2023 21:59:35 -0500 Subject: [PATCH 4/4] Adds period --- registry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry.go b/registry.go index 6f4695d27..236c795b6 100644 --- a/registry.go +++ b/registry.go @@ -64,7 +64,7 @@ func SendToTarget(m Messagable, sessionID SessionID) error { return session.queueForSend(msg) } -// ResetSession resets session's sequence numbers +// ResetSession resets session's sequence numbers. func ResetSession(sessionID SessionID) error { session, ok := lookupSession(sessionID) if !ok {