More lock improvments and deny tracking

cmd/main.go

@@ -16,7 +16,7 @@ import (
 
 const (
 	appName                 = "cashshuffle"
-	version                 = "0.6.5"
+	version                 = "0.6.6"
 	defaultPort             = 1337
 	defaultWebSocketPort    = 1338
 	defaultTorPort          = 1339

server/banned.go

@@ -45,7 +45,7 @@ func (pi *packetInfo) checkBlameMessage() error {
 			return nil
 		}
 
-		if pi.tracker.bannedByPool(accused) {
+		if pi.tracker.bannedByPool(accused, true) {
 			pi.tracker.increaseBanScore(accused.conn)
 			pi.tracker.decreasePoolVoters(blamer.pool)
 			pi.tracker.addDenyIPMatch(blamer.conn, blamer.pool)

server/broadcast.go

@@ -73,7 +73,7 @@ func (pi *packetInfo) broadcastAll(msgs []*message.Signed) error {
 	}
 
 	for conn, player := range pi.tracker.connections {
-		if (sender.pool != player.pool) || pi.tracker.bannedByPool(player) {
+		if (sender.pool != player.pool) || pi.tracker.bannedByPool(player, false) {
 			continue
 		}
 
@@ -102,7 +102,7 @@ func (pi *packetInfo) broadcastNewRound(lock bool) {
 	}
 
 	for conn, player := range pi.tracker.connections {
-		if sender.pool != player.pool || pi.tracker.bannedByPool(player) {
+		if sender.pool != player.pool || pi.tracker.bannedByPool(player, false) {
 			continue
 		}
 
@@ -138,7 +138,7 @@ func (pi *packetInfo) announceStart() {
 	}
 
 	for conn, player := range pi.tracker.connections {
-		if sender.pool != player.pool || pi.tracker.bannedByPool(player) {
+		if sender.pool != player.pool || pi.tracker.bannedByPool(player, false) {
 			continue
 		}
 

server/tracker.go

@@ -123,9 +123,14 @@ func (t *Tracker) remove(conn net.Conn) {
 }
 
 // bannedByPool returns true if the player has been banned by their pool.
-func (t *Tracker) bannedByPool(p *playerData) bool {
-	t.mutex.RLock()
-	defer t.mutex.RUnlock()
+func (t *Tracker) bannedByPool(p *playerData, lock bool) bool {
+	if lock {
+		t.mutex.RLock()
+		defer t.mutex.RUnlock()
+	}
+
+	p.mutex.RLock()
+	defer p.mutex.RUnlock()
 
 	// the vote is all available voters - 1 for the accused
 	return len(p.blamedBy) >= t.poolVoters[p.pool]-1

server/verification.go

@@ -22,7 +22,7 @@ func (pi *packetInfo) verifyMessage() error {
 			return errors.New("invalid verification key")
 		}
 
-		if pi.tracker.bannedByPool(player) {
+		if pi.tracker.bannedByPool(player, true) {
 			return errors.New("banned player")
 		}