From ece0e38fb61e4bde53879f07e79892128e2b6fac Mon Sep 17 00:00:00 2001 From: kbalt Date: Fri, 10 Jan 2025 19:37:11 +0100 Subject: [PATCH] fix(sip-core): fix build failure after stun-types changes --- crates/sip-core/src/transport/parse.rs | 2 +- crates/sip-core/src/transport/resolver.rs | 2 +- crates/sip-core/src/transport/stun_user.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/sip-core/src/transport/parse.rs b/crates/sip-core/src/transport/parse.rs index 4f35e64..cfafb1e 100644 --- a/crates/sip-core/src/transport/parse.rs +++ b/crates/sip-core/src/transport/parse.rs @@ -41,7 +41,7 @@ pub fn parse_complete(parser: Parser, bytes: &[u8]) -> Result Result { - let msg = match Message::parse(bytes.into()) { + let msg = match Message::parse(bytes) { Ok(msg) => msg, Err(e) => { log::warn!("failed to parse complete stun message, {}", e); diff --git a/crates/sip-core/src/transport/resolver.rs b/crates/sip-core/src/transport/resolver.rs index d68cb1e..e40b1a6 100644 --- a/crates/sip-core/src/transport/resolver.rs +++ b/crates/sip-core/src/transport/resolver.rs @@ -275,7 +275,7 @@ async fn resolve_a_records( fn filter_no_records(e: Result) -> Result, ResolveError> { match e { Ok(t) => Ok(Some(t)), - Err(e) if e.proto().map_or(false, |p| p.is_no_records_found()) => Ok(None), + Err(e) if e.proto().is_some_and(|p| p.is_no_records_found()) => Ok(None), Err(e) => Err(e), } } diff --git a/crates/sip-core/src/transport/stun_user.rs b/crates/sip-core/src/transport/stun_user.rs index e757ef0..95149b0 100644 --- a/crates/sip-core/src/transport/stun_user.rs +++ b/crates/sip-core/src/transport/stun_user.rs @@ -4,7 +4,7 @@ use std::io; use std::net::SocketAddr; use stun::{IncomingMessage, StunEndpointUser}; use stun_types::attributes::{MappedAddress, Software, XorMappedAddress}; -use stun_types::{transaction_id, Class, MessageBuilder, Method}; +use stun_types::{Class, MessageBuilder, Method, TransactionId}; pub struct StunUser; @@ -42,7 +42,7 @@ impl Transports { return Ok(transport.sent_by()); } - let tsx_id = transaction_id(); + let tsx_id = TransactionId::random(); let mut msg = MessageBuilder::new(Class::Request, Method::Binding, tsx_id); msg.add_attr(&Software::new("ezk")).unwrap();