LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Fixed data races in rpcwebsocket Notify functions

Browse source 
Access to connections map and associated notification maps in rpcServer
need to be protected with s.ws.Lock to prevent race with add/remove new
clients.

This closes #88.
This commit is contained in:
Francis Lam 2014-02-10 10:34:26 -05:00
parent 354cc38d2d
commit 1d60e5dba5
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rpcwebsocket.go
View file

@ -827,6 +827,9 @@ func (s *rpcServer) websocketJSONHandler(r chan *btcjson.Reply, c handlerChans,
// of a new block connected to the main chain. The notification is sent // of a new block connected to the main chain. The notification is sent
// to each connected wallet. // to each connected wallet.
func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) { func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) {
s.ws.Lock()
defer s.ws.Unlock()
hash, err := block.Sha() hash, err := block.Sha()
if err != nil { if err != nil {
rpcsLog.Error("Bad block; connected block notification dropped") rpcsLog.Error("Bad block; connected block notification dropped")
@ -842,7 +845,6 @@ func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) {
} }
// Inform any interested parties about txs mined in this block. // Inform any interested parties about txs mined in this block.
s.ws.Lock()
for _, tx := range block.Transactions() { for _, tx := range block.Transactions() {
if clist, ok := s.ws.minedTxNotifications[*tx.Sha()]; ok { if clist, ok := s.ws.minedTxNotifications[*tx.Sha()]; ok {
var enext *list.Element var enext *list.Element
@ -860,13 +862,15 @@ func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) {
} }
} }
} }
s.ws.Unlock()
} }
// NotifyBlockDisconnected creates and marshals a JSON message to notify // NotifyBlockDisconnected creates and marshals a JSON message to notify
// of a new block disconnected from the main chain. The notification is sent // of a new block disconnected from the main chain. The notification is sent
// to each connected wallet. // to each connected wallet.
func (s *rpcServer) NotifyBlockDisconnected(block *btcutil.Block) { func (s *rpcServer) NotifyBlockDisconnected(block *btcutil.Block) {
s.ws.Lock()
defer s.ws.Unlock()
hash, err := block.Sha() hash, err := block.Sha()
if err != nil { if err != nil {
rpcsLog.Error("Bad block; connected block notification dropped") rpcsLog.Error("Bad block; connected block notification dropped")
@ -910,6 +914,9 @@ func notifySpentData(n ntfnChan, txhash *btcwire.ShaHash, index uint32,
// each transaction input of a new block and perform any checks and // each transaction input of a new block and perform any checks and
// notify listening frontends when necessary. // notify listening frontends when necessary.
func (s *rpcServer) newBlockNotifyCheckTxIn(tx *btcutil.Tx) { func (s *rpcServer) newBlockNotifyCheckTxIn(tx *btcutil.Tx) {
s.ws.Lock()
defer s.ws.Unlock()
for _, txin := range tx.MsgTx().TxIn { for _, txin := range tx.MsgTx().TxIn {
if clist, ok := s.ws.spentNotifications[txin.PreviousOutpoint]; ok { if clist, ok := s.ws.spentNotifications[txin.PreviousOutpoint]; ok {
var enext *list.Element var enext *list.Element
@ -928,6 +935,9 @@ func (s *rpcServer) newBlockNotifyCheckTxIn(tx *btcutil.Tx) {
// necessary notifications for wallets. If a non-nil block is passed, // necessary notifications for wallets. If a non-nil block is passed,
// additional block information is passed with the notifications. // additional block information is passed with the notifications.
func (s *rpcServer) NotifyForTxOuts(tx *btcutil.Tx, block *btcutil.Block) { func (s *rpcServer) NotifyForTxOuts(tx *btcutil.Tx, block *btcutil.Block) {
s.ws.Lock()
defer s.ws.Unlock()
// Nothing to do if nobody is listening for transaction notifications. // Nothing to do if nobody is listening for transaction notifications.
if len(s.ws.txNotifications) == 0 { if len(s.ws.txNotifications) == 0 {
return return
@ -987,6 +997,9 @@ func (s *rpcServer) NotifyForTxOuts(tx *btcutil.Tx, block *btcutil.Block) {
// NotifyForNewTx sends delivers the new tx to any client that has // NotifyForNewTx sends delivers the new tx to any client that has
// registered for all new TX. // registered for all new TX.
func (s *rpcServer) NotifyForNewTx(tx *btcutil.Tx) { func (s *rpcServer) NotifyForNewTx(tx *btcutil.Tx) {
s.ws.Lock()
defer s.ws.Unlock()
txId := tx.Sha().String() txId := tx.Sha().String()
mtx := tx.MsgTx() mtx := tx.MsgTx()