permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 04:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard peer collision checks with snapshot (#810)

Browse Source
This commit is contained in:
jack
2025-10-15 16:12:16 +02:00
committed by GitHub
parent 3d914dcf46
commit b6d42261d0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Services/BLEService.swift
+4 -2
View File
@@ -2652,18 +2652,20 @@ extension BLEService {
var accepted = false var accepted = false
var senderNickname: String = "" var senderNickname: String = ""
// Snapshot peers to avoid concurrent mutation while iterating during nickname collision checks.
let peersSnapshot = collectionsQueue.sync { peers }
// If the packet is from ourselves (e.g., recovered via sync TTL==0), accept immediately // If the packet is from ourselves (e.g., recovered via sync TTL==0), accept immediately
if peerID == myPeerID { if peerID == myPeerID {
accepted = true accepted = true
senderNickname = myNickname senderNickname = myNickname
} }
else if let info = peers[peerID], info.isVerifiedNickname { else if let info = peersSnapshot[peerID], info.isVerifiedNickname {
// Known verified peer path // Known verified peer path
accepted = true accepted = true
senderNickname = info.nickname senderNickname = info.nickname
// Handle nickname collisions // Handle nickname collisions
let hasCollision = peers.values.contains { $0.isConnected && $0.nickname == info.nickname && $0.peerID != peerID } || (myNickname == info.nickname) let hasCollision = peersSnapshot.values.contains { $0.isConnected && $0.nickname == info.nickname && $0.peerID != peerID } || (myNickname == info.nickname)
if hasCollision { if hasCollision {
senderNickname += "#" + String(peerID.id.prefix(4)) senderNickname += "#" + String(peerID.id.prefix(4))
} }