Skip to content

mobile: ConnectServer: use mutex more conservatively #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2022
Merged

mobile: ConnectServer: use mutex more conservatively #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions mobile/mobile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,16 @@ func ConnectServer(nameSpace string, mailboxServer string, isDevServer bool,
return
}

mc.mutex.Lock()
defer mc.mutex.Unlock()

statusChecker, lndConnect, err := core.MailboxRPCConnection(
mailboxServer, pairingPhrase, localPriv, remotePub,
func(key *btcec.PublicKey) error {
mc.mutex.Lock()
defer mc.mutex.Unlock()

mc.remoteKeyReceiveCallback.SendResult(
hex.EncodeToString(key.SerializeCompressed()),
hex.EncodeToString(
key.SerializeCompressed(),
),
)

return nil
Expand All @@ -228,23 +230,34 @@ func ConnectServer(nameSpace string, mailboxServer string, isDevServer bool,
"macaroon: %v", err)
}

mc.mac = mac
mc.mutex.Lock()
defer mc.mutex.Unlock()

mc.mac = mac
mc.authDataCallback.SendResult(string(data))

return nil
},
)
if err != nil {
log.Errorf("Error running wasm client: %v", err)
return
}

mc.mutex.Lock()
mc.statusChecker = statusChecker
mc.lndConn, err = lndConnect()
mc.mutex.Unlock()

lndConn, err := lndConnect()
if err != nil {
log.Errorf("Error running wasm client: %v", err)
return
}

mc.mutex.Lock()
mc.lndConn = lndConn
mc.mutex.Unlock()

log.Debugf("Mobile client connected to RPC")
}()

Expand Down