From: Jason Ish Date: Tue, 28 Oct 2025 06:24:37 +0000 (-0600) Subject: rust/bt-dht: convert to nom 8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9eeefd0684b7d2433e6ae4443f53c4613ed703af;p=thirdparty%2Fsuricata.git rust/bt-dht: convert to nom 8 Ticket: #8045 --- diff --git a/rust/src/bittorrent_dht/parser.rs b/rust/src/bittorrent_dht/parser.rs index d2a93f30c8..35b41689ac 100644 --- a/rust/src/bittorrent_dht/parser.rs +++ b/rust/src/bittorrent_dht/parser.rs @@ -23,9 +23,9 @@ use crate::bittorrent_dht::bittorrent_dht::BitTorrentDHTTransaction; use bendy::decoding::{Decoder, Error, FromBencode, Object, ResultExt}; -use nom7::bytes::complete::take; -use nom7::number::complete::be_u16; -use nom7::IResult; +use nom8::bytes::complete::take; +use nom8::number::complete::be_u16; +use nom8::{IResult, Parser}; #[derive(Debug, Eq, PartialEq)] pub struct BitTorrentDHTRequest { @@ -242,7 +242,7 @@ impl FromBencode for BitTorrentDHTResponse { } (b"nodes", value) => { let (_, decoded_nodes) = - nom7::multi::many0(parse_node)(value.try_into_bytes().context("nodes")?) + nom8::multi::many0(parse_node).parse(value.try_into_bytes().context("nodes")?) .map_err(|_| Error::malformed_content("nodes.node"))?; if !decoded_nodes.is_empty() { nodes = Some(decoded_nodes); @@ -250,7 +250,7 @@ impl FromBencode for BitTorrentDHTResponse { } (b"nodes6", value) => { let (_, decoded_nodes) = - nom7::multi::many0(parse_node6)(value.try_into_bytes().context("nodes6")?) + nom8::multi::many0(parse_node6).parse(value.try_into_bytes().context("nodes6")?) .map_err(|_| Error::malformed_content("nodes6.nodes6"))?; if !decoded_nodes.is_empty() { nodes6 = Some(decoded_nodes);