vacp2p/nim-libp2p
1
0
Fork 0
mirror of https://github.com/vacp2p/nim-libp2p.git synced 2025-03-04 01:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle empty msgs correctly

Browse Source
This commit is contained in:
Diego 2024-02-09 14:25:18 +01:00
parent 14d1787de8
commit a1f3940c06
No known key found for this signature in database
GPG Key ID: C9DAC9BF68D1F806
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libp2p/protocols/pubsub/gossipsub.nim
View File

@ -281,12 +281,28 @@ proc handleControl(g: GossipSub, peer: PubSubPeer, control: ControlMessage) =
respControl.prune.add(g.handleGraft(peer, control.graft)) respControl.prune.add(g.handleGraft(peer, control.graft))
let messages = g.handleIWant(peer, control.iwant) let messages = g.handleIWant(peer, control.iwant)
if let
respControl.prune.len > 0 or isPruneNotEmpty = respControl.prune.len > 0
respControl.iwant.len > 0 or isIWantNotEmpty = respControl.iwant.len > 0
messages.len > 0:
# iwant and prunes from here, also messages
if isPruneNotEmpty or isIWantNotEmpty:
if isIWantNotEmpty:
libp2p_pubsub_broadcast_iwant.inc(respControl.iwant.len.int64)
if isPruneNotEmpty:
for prune in respControl.prune:
if g.knownTopics.contains(prune.topicId):
libp2p_pubsub_broadcast_prune.inc(labelValues = [prune.topicId])
else:
libp2p_pubsub_broadcast_prune.inc(labelValues = ["generic"])
trace "sending control message", msg = shortLog(respControl), peer
g.send(
peer,
RPCMsg(control: some(respControl)), true)
if messages.len > 0:
for smsg in messages: for smsg in messages:
for topic in smsg.topicIds: for topic in smsg.topicIds:
if g.knownTopics.contains(topic): if g.knownTopics.contains(topic):
@ -294,19 +310,8 @@ proc handleControl(g: GossipSub, peer: PubSubPeer, control: ControlMessage) =
else: else:
libp2p_pubsub_broadcast_messages.inc(labelValues = ["generic"]) libp2p_pubsub_broadcast_messages.inc(labelValues = ["generic"])
libp2p_pubsub_broadcast_iwant.inc(respControl.iwant.len.int64)
for prune in respControl.prune:
if g.knownTopics.contains(prune.topicId):
libp2p_pubsub_broadcast_prune.inc(labelValues = [prune.topicId])
else:
libp2p_pubsub_broadcast_prune.inc(labelValues = ["generic"])
trace "sending control message", msg = shortLog(respControl), peer
g.send(
peer,
RPCMsg(control: some(respControl)), true)
# iwant replies have lower priority # iwant replies have lower priority
trace "sending iwant reply messages", peer
g.send( g.send(
peer, peer,
RPCMsg(messages: messages), false) RPCMsg(messages: messages), false)