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

Merge pull request #1339 from cfromknecht/switch-htlc-satisfies-deadlock

Browse Source 
htlcswitch/link: remove deadlock in htlc validation
This commit is contained in:
Olaoluwa Osuntokun 2018-06-06 18:31:10 -07:00 committed by GitHub
commit e3d1fb0d4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htlcswitch/link.go
View File

@ -1714,14 +1714,15 @@ func (l *channelLink) HtlcSatifiesPolicy(payHash [32]byte,
incomingHtlcAmt, amtToForward lnwire.MilliSatoshi) lnwire.FailureMessage { incomingHtlcAmt, amtToForward lnwire.MilliSatoshi) lnwire.FailureMessage {
l.RLock() l.RLock()
defer l.RUnlock() policy := l.cfg.FwrdingPolicy
l.RUnlock()
// As our first sanity check, we'll ensure that the passed HTLC isn't // As our first sanity check, we'll ensure that the passed HTLC isn't
// too small for the next hop. If so, then we'll cancel the HTLC // too small for the next hop. If so, then we'll cancel the HTLC
// directly. // directly.
if amtToForward < l.cfg.FwrdingPolicy.MinHTLC { if amtToForward < policy.MinHTLC {
l.errorf("outgoing htlc(%x) is too small: min_htlc=%v, "+ l.errorf("outgoing htlc(%x) is too small: min_htlc=%v, "+
"htlc_value=%v", payHash[:], l.cfg.FwrdingPolicy.MinHTLC, "htlc_value=%v", payHash[:], policy.MinHTLC,
amtToForward) amtToForward)
// As part of the returned error, we'll send our latest routing // As part of the returned error, we'll send our latest routing
@ -1742,7 +1743,7 @@ func (l *channelLink) HtlcSatifiesPolicy(payHash [32]byte,
// Next, using the amount of the incoming HTLC, we'll calculate the // Next, using the amount of the incoming HTLC, we'll calculate the
// expected fee this incoming HTLC must carry in order to satisfy the // expected fee this incoming HTLC must carry in order to satisfy the
// constraints of the outgoing link. // constraints of the outgoing link.
expectedFee := ExpectedFee(l.cfg.FwrdingPolicy, amtToForward) expectedFee := ExpectedFee(policy, amtToForward)
// If the actual fee is less than our expected fee, then we'll reject // If the actual fee is less than our expected fee, then we'll reject
// this HTLC as it didn't provide a sufficient amount of fees, or the // this HTLC as it didn't provide a sufficient amount of fees, or the