akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

server: prevent panic when open channel by peerID fails

Browse Source 
Fixes #147.
This commit is contained in:
Olaoluwa Osuntokun 2017-02-20 16:33:14 -08:00
parent 73cc28d5fb
commit 98ef563f40
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server.go
View File

@ -769,15 +769,15 @@ func (s *server) handleConnectPeer(msg *connectPeerMsg) {
// workflow. // workflow.
func (s *server) handleOpenChanReq(req *openChanReq) { func (s *server) handleOpenChanReq(req *openChanReq) {
var ( var (
targetPeer *peer targetPeer *peer
pubStr string pubKeyBytes []byte
) )
// If the user is targeting the peer by public key, then we'll need to // If the user is targeting the peer by public key, then we'll need to
// convert that into a string for our map. Otherwise, we expect them to // convert that into a string for our map. Otherwise, we expect them to
// target by peer ID instead. // target by peer ID instead.
if req.targetPubkey != nil { if req.targetPubkey != nil {
pubStr = string(req.targetPubkey.SerializeCompressed()) pubKeyBytes = req.targetPubkey.SerializeCompressed()
} }
// First attempt to locate the target peer to open a channel with, if // First attempt to locate the target peer to open a channel with, if
@ -785,15 +785,14 @@ func (s *server) handleOpenChanReq(req *openChanReq) {
s.peersMtx.RLock() s.peersMtx.RLock()
if peer, ok := s.peersByID[req.targetPeerID]; ok { if peer, ok := s.peersByID[req.targetPeerID]; ok {
targetPeer = peer targetPeer = peer
} else if peer, ok := s.peersByPub[pubStr]; ok { } else if peer, ok := s.peersByPub[string(pubKeyBytes)]; ok {
targetPeer = peer targetPeer = peer
} }
s.peersMtx.RUnlock() s.peersMtx.RUnlock()
if targetPeer == nil { if targetPeer == nil {
req.err <- fmt.Errorf("unable to find peer nodeID(%x), "+ req.err <- fmt.Errorf("unable to find peer nodeID(%x), "+
"peerID(%v)", req.targetPubkey.SerializeCompressed(), "peerID(%v)", pubKeyBytes, req.targetPeerID)
req.targetPeerID)
return return
} }