From 183ebd1f7285ac6cdf4ba1d3dc602ca47a092444 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Tue, 15 Mar 2022 20:12:14 +0000
Subject: [PATCH] New WIP
---
network/message/handler.go | 36 +++++++-----------------------------
1 file changed, 7 insertions(+), 29 deletions(-)
diff --git a/network/message/handler.go b/network/message/handler.go
index 0e999a3a4..5f72f8641 100644
--- a/network/message/handler.go
+++ b/network/message/handler.go
@@ -234,38 +234,16 @@ func (m *Manager) handleMessage2(ecrMsg format.Message, bundle Bundle) {
ephID ephemeral.Id
}
- fpLock := m.getFPLock(fingerprint) {
- m.superLock.Lock()
- defer m.superLock.Unlock()
- fpLock, ok := m.fpLocks[fingerprint]
- if !ok {
- m.fpLocks[fingerprint] = &sync.Mutex{}
- return m.fpLocks[fingerprint]
- }
- }
- fpLock.Lock()
-
// If we have a fingerprint, process it.
- messageProc, exists := m.fingerprints.Lookup(fingerprint)// {
- // // note scope here is all broken, fix...
- // m.fingers.Lock()
- // defer m.fingersUnlock()
- // mp, ok := m.fingers[fingerprint]
- // if ok {
- // mp.MarkFingerprintUsed(fingerprint)
- // delete(m.fingers, fingerprint)
- // return mp, true
- // }
- // return nil, false
- // }
+ //Lock
+ messageProc, fpLock, exists := m.fingerprints[fingerprint]
+ // Unlock
if exists {
- // in progress is a future project.
- // m.inprogress.Add({fingerprint, ecrMsg, newID, round})
- m.fingerprints.Delete(fingerprint)
+ fpLock.Lock()
+ defer fpLock.Unlock()
+ messageProc.MarkFingerprintUsed(fingerprint)
messageProc.Process(ecrMsg, newID, round)
- messageProc.MarkUsed(fingerprint)
- fpLock.Unlock()
- // delete from fpLocks as well.
+ delete(m.fingerprints, fingerprint)
return
}
--
GitLab