X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Foutbound_payment.rs;h=f5396046177fe40dbb02295bd6419b8208f41052;hb=cd5f09b8e34e838041a9dcdc512ddcf37a976634;hp=b449e27983ecd09efdc88a90ff22235d0f7d0f67;hpb=70ea1108646468335d085a862e18bca774632bf3;p=rust-lightning

diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index b449e279..f5396046 100644
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -243,7 +243,7 @@ impl PendingOutboundPayment {
 		if insert_res {
 			if let PendingOutboundPayment::Retryable {
 				ref mut pending_amt_msat, ref mut pending_fee_msat,
-				ref mut remaining_max_total_routing_fee_msat, .. 
+				ref mut remaining_max_total_routing_fee_msat, ..
 			} = self {
 					*pending_amt_msat += path.final_value_msat();
 					let path_fee_msat = path.fee_msat();
@@ -1337,6 +1337,13 @@ impl OutboundPayments {
 					continue 'path_check;
 				}
 			}
+			for (i, hop) in path.hops.iter().enumerate() {
+				// Check for duplicate channel_id in the remaining hops of the path
+				if path.hops.iter().skip(i + 1).any(|other_hop| other_hop.short_channel_id == hop.short_channel_id) {
+					path_errs.push(Err(APIError::InvalidRoute{err: "Path went through the same channel twice".to_owned()}));
+					continue 'path_check;
+				}
+			}
 			total_value += path.final_value_msat();
 			path_errs.push(Ok(()));
 		}