status-im/go-libp2p-pubsub
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix data race in ownership of RPC when piggybacking control messages.

Browse Source
This commit is contained in:
vyzo 2018-08-28 21:07:09 +03:00
parent 02d5c50ff0
commit de4adefafb
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
comm.go
View File

@ -122,3 +122,19 @@ func rpcWithControl(msgs []*pb.Message,
}, },
} }
} }
func copyRPC(rpc *RPC) *RPC {
return &RPC{
RPC: pb.RPC{
Subscriptions: rpc.Subscriptions,
Publish: rpc.Publish,
Control: &pb.ControlMessage{
Ihave: rpc.Control.Ihave,
Iwant: rpc.Control.Iwant,
Graft: rpc.Control.Graft,
Prune: rpc.Control.Prune,
},
},
from: rpc.from,
}
}

9
gossipsub.go
View File

@ -308,9 +308,14 @@ func (gs *GossipSubRouter) sendPrune(p peer.ID, topic string) {
} }
func (gs *GossipSubRouter) sendRPC(p peer.ID, out *RPC) { func (gs *GossipSubRouter) sendRPC(p peer.ID, out *RPC) {
// do we own the RPC?
own := false
// piggyback cotrol message retries // piggyback cotrol message retries
ctl, ok := gs.control[p] ctl, ok := gs.control[p]
if ok { if ok {
out = copyRPC(out)
own = true
gs.piggybackControl(p, out, ctl) gs.piggybackControl(p, out, ctl)
delete(gs.control, p) delete(gs.control, p)
} }
@ -318,6 +323,10 @@ func (gs *GossipSubRouter) sendRPC(p peer.ID, out *RPC) {
// piggyback gossip // piggyback gossip
ihave, ok := gs.gossip[p] ihave, ok := gs.gossip[p]
if ok { if ok {
if !own {
out = copyRPC(out)
own = true
}
gs.piggybackGossip(p, out, ihave) gs.piggybackGossip(p, out, ihave)
delete(gs.gossip, p) delete(gs.gossip, p)
} }