]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rust/bt-dht: convert to nom 8
authorJason Ish <jason.ish@oisf.net>
Tue, 28 Oct 2025 06:24:37 +0000 (00:24 -0600)
committerJason Ish <jason.ish@oisf.net>
Thu, 30 Oct 2025 15:15:41 +0000 (09:15 -0600)
Ticket: #8045

rust/src/bittorrent_dht/parser.rs

index d2a93f30c8b182e2b784c30d50ab3d7df81bdeb5..35b41689ac0e8e614f4f3ba477fa7b8df106aa46 100644 (file)
@@ -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);