feat: enhance dialog handling by adding initial destination and refining request cancellation

Author: shenjinti

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsipstack"
-version = "0.2.58"
+version = "0.2.59"
 edition = "2021"
 description = "SIP Stack Rust library for building SIP applications"
 license = "MIT"

src/dialog/client_dialog.rs

@@ -10,6 +10,7 @@ use crate::{
     },
     rsip_ext::extract_uri_from_contact,
 };
+use rsip::prelude::HasHeaders;
 use rsip::{
     headers::Route,
     prelude::{HeadersExt, ToTypedHeader, UntypedHeader},
@@ -199,13 +200,21 @@ impl ClientInviteDialog {
         }
         info!(id=%self.id(),"sending cancel request");
         let mut cancel_request = self.inner.initial_request.clone();
+        cancel_request
+            .headers_mut()
+            .retain(|h| !matches!(h, Header::ContentLength(_) | Header::ContentType(_)));
+
         cancel_request.method = rsip::Method::Cancel;
+
+        let mut to = cancel_request.to_header_mut()?.typed()?;
+        to.params.retain(|p| !matches!(p, rsip::Param::Tag(_)));
+        cancel_request.to_header_mut()?.replace(to);
         cancel_request
             .cseq_header_mut()?
             .mut_seq(self.inner.get_local_seq())?
             .mut_method(rsip::Method::Cancel)?;
         cancel_request.body = vec![];
-        cancel_request.to_header_mut()?.mut_tag("".into())?;
+
         self.inner.do_request(cancel_request).await?;
         Ok(())
     }

src/dialog/dialog.rs

@@ -12,6 +12,7 @@ use crate::{
         make_via_branch,
         transaction::{Transaction, TransactionEventSender},
     },
+    transport::SipAddr,
     Result,
 };
 use rsip::{
@@ -183,6 +184,7 @@ pub struct DialogInner {
     pub(super) state_sender: DialogStateSender,
     pub(super) tu_sender: TransactionEventSender,
     pub(super) initial_request: Request,
+    pub(super) initial_destination: Option<SipAddr>,
 }
 
 pub type DialogStateReceiver = UnboundedReceiver<DialogState>;
@@ -259,6 +261,7 @@ impl DialogInner {
             tu_sender,
             state: Mutex::new(DialogState::Calling(id)),
             initial_request,
+            initial_destination: None,
             local_contact,
             remote_contact: Mutex::new(None),
         })
@@ -456,21 +459,17 @@ impl DialogInner {
 
     pub(super) async fn do_request(&self, request: Request) -> Result<Option<rsip::Response>> {
         let method = request.method().to_owned();
-        let mut destination = request.route_header().and_then(|r| {
-            r.typed()
-                .ok()
-                .and_then(|r| r.uris().first().map(|u| u.uri.clone()))
-        });
-
-        if destination.is_none() {
-            if let Some(contact) = self.remote_contact.lock().unwrap().as_ref() {
-                destination = contact.uri().ok();
-            }
-        }
+        let destination = self
+            .remote_contact
+            .lock()
+            .unwrap()
+            .as_ref()
+            .and_then(|c| c.uri().ok().as_ref()?.try_into().ok())
+            .or_else(|| self.initial_destination.clone());
 
         let key = TransactionKey::from_request(&request, TransactionRole::Client)?;
         let mut tx = Transaction::new_client(key, request, self.endpoint_inner.clone(), None);
-        tx.destination = destination.as_ref().map(|d| d.try_into().ok()).flatten();
+        tx.destination = destination;
 
         match tx.send().await {
             Ok(_) => {
@@ -576,7 +575,7 @@ impl DialogInner {
             }
             _ => {}
         }
-        info!("transitioning state: {} -> {}", old_state, state);
+        debug!("transitioning state: {} -> {}", old_state, state);
         *old_state = state;
         Ok(())
     }

src/dialog/invitation.rs

@@ -376,7 +376,7 @@ impl DialogLayer {
         tx.destination = opt.destination;
 
         let id = DialogId::try_from(&request)?;
-        let dlg_inner = DialogInner::new(
+        let mut dlg_inner = DialogInner::new(
             TransactionRole::Client,
             id.clone(),
             request.clone(),
@@ -386,6 +386,7 @@ impl DialogLayer {
             Some(opt.contact),
             tx.tu_sender.clone(),
         )?;
+        dlg_inner.initial_destination = tx.destination.clone();
 
         let dialog = ClientInviteDialog {
             inner: Arc::new(dlg_inner),