Skip to content

Commit f84bbef

Browse files
committed
f Drop route_size_insane
1 parent 1f0d84f commit f84bbef

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2728,13 +2728,11 @@ where
27282728
let onion_keys = onion_utils::construct_onion_keys(&self.secp_ctx, &path, &session_priv)
27292729
.map_err(|_| APIError::InvalidRoute{err: "Pubkey along hop was maliciously selected".to_owned()})?;
27302730
let (onion_payloads, htlc_msat, htlc_cltv) = onion_utils::build_onion_payloads(path, total_value, recipient_onion, cur_height, keysend_preimage)?;
2731-
if onion_utils::route_size_insane(&onion_payloads) {
2732-
return Err(APIError::InvalidRoute{err: "Route size too large considering onion data".to_owned()});
2733-
}
2731+
27342732
let onion_packet = match onion_utils::construct_onion_packet(onion_payloads, onion_keys, prng_seed, payment_hash) {
27352733
Ok(packet) => packet,
27362734
Err(()) => {
2737-
return Err(APIError::InvalidRoute{err: "Failed to create onion packet".to_owned()});
2735+
return Err(APIError::InvalidRoute { err: "Failed to create onion packet".to_owned()});
27382736
}
27392737
};
27402738

lightning/src/ln/onion_utils.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,6 @@ fn shift_slice_right(arr: &mut [u8], amt: usize) {
208208
}
209209
}
210210

211-
pub(super) fn route_size_insane(payloads: &Vec<msgs::OnionHopData>) -> bool {
212-
let mut len = 0;
213-
for payload in payloads.iter() {
214-
let mut payload_len = LengthCalculatingWriter(0);
215-
payload.write(&mut payload_len).expect("Failed to calculate length");
216-
assert!(payload_len.0 + 32 < ONION_DATA_LEN);
217-
len += payload_len.0 + 32;
218-
if len > ONION_DATA_LEN {
219-
return true;
220-
}
221-
}
222-
false
223-
}
224-
225211
pub(super) fn construct_onion_packet(payloads: Vec<msgs::OnionHopData>, onion_keys: Vec<OnionKeys>, prng_seed: [u8; 32], associated_data: &PaymentHash) -> Result<msgs::OnionPacket, ()> {
226212
let mut packet_data = [0; ONION_DATA_LEN];
227213

0 commit comments

Comments
 (0)