fix: update version to 0.2.37 and enhance SIP connection handling

Author: shenjinti

Cargo.toml

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

src/dialog/server_dialog.rs

@@ -176,10 +176,14 @@ impl ServerInviteDialog {
             body,
         );
         let via = self.inner.initial_request.via_header()?;
-        let via_received = SipConnection::parse_target_from_via(via)?;
+        let (via_transport, via_received) = SipConnection::parse_target_from_via(via)?;
+        let mut params = vec![];
+        if via_transport != rsip::transport::Transport::Udp {
+            params.push(rsip::param::Param::Transport(via_transport));
+        }
         let contact = rsip::Uri {
             host_with_port: via_received,
-            params: vec![rsip::Param::Transport(via.trasnport()?)],
+            params,
             ..Default::default()
         };
         debug!(id = %self.id(), "accepting dialog with contact: {}", contact);

src/rsip_ext.rs

@@ -31,7 +31,9 @@ impl RsipResponseExt for rsip::Response {
     /// and returns it as a HostWithPort struct.
     fn via_received(&self) -> Option<rsip::HostWithPort> {
         let via = self.via_header().ok()?;
-        SipConnection::parse_target_from_via(via).ok()
+        SipConnection::parse_target_from_via(via)
+            .map(|(_, host_with_port)| host_with_port)
+            .ok()
     }
     fn content_type(&self) -> Option<rsip::headers::ContentType> {
         let headers = self.headers();

src/transport/connection.rs

@@ -336,11 +336,17 @@ impl SipConnection {
         typed_via.params.retain(|param| {
             if let Param::Other(key, _) = param {
                 !key.value().eq_ignore_ascii_case("rport")
+            } else if let Param::Transport(_) = param {
+                false
             } else {
                 true
             }
         });
 
+        if transport != rsip::transport::Transport::Udp && typed_via.transport != transport {
+            typed_via.params.push(Param::Transport(transport));
+        }
+
         *via = typed_via
             .with_param(Param::Received(rsip::param::Received::new(
                 received.host.to_string(),
@@ -353,8 +359,11 @@ impl SipConnection {
         Ok(())
     }
 
-    pub fn parse_target_from_via(via: &rsip::headers::untyped::Via) -> Result<rsip::HostWithPort> {
+    pub fn parse_target_from_via(
+        via: &rsip::headers::untyped::Via,
+    ) -> Result<(rsip::Transport, rsip::HostWithPort)> {
         let mut host_with_port = via.uri()?.host_with_port;
+        let mut transport = via.trasnport().unwrap_or(rsip::Transport::Udp);
         if let Ok(params) = via.params().as_ref() {
             for param in params {
                 match param {
@@ -363,6 +372,9 @@ impl SipConnection {
                             host_with_port.host = addr.into();
                         }
                     }
+                    Param::Transport(t) => {
+                        transport = t.clone();
+                    }
                     Param::Other(key, Some(value)) if key.value().eq_ignore_ascii_case("rport") => {
                         if let Ok(port) = value.value().try_into() {
                             host_with_port.port = Some(port);
@@ -372,13 +384,13 @@ impl SipConnection {
                 }
             }
         }
-        Ok(host_with_port)
+        Ok((transport, host_with_port))
     }
 
     pub fn get_destination(msg: &rsip::SipMessage) -> Result<SocketAddr> {
         let host_with_port = match msg {
             rsip::SipMessage::Request(req) => req.uri().host_with_port.clone(),
-            rsip::SipMessage::Response(res) => Self::parse_target_from_via(res.via_header()?)?,
+            rsip::SipMessage::Response(res) => Self::parse_target_from_via(res.via_header()?)?.1,
         };
         host_with_port.try_into().map_err(Into::into)
     }

src/transport/tests/test_sipaddr.rs

@@ -18,7 +18,7 @@ fn test_via_received() {
         body: Default::default(),
     };
 
-    let parse_addr =
+    let (_, parse_addr) =
         SipConnection::parse_target_from_via(&register_req.via_header().expect("via_header"))
             .expect("get_target_socketaddr");
 
@@ -38,7 +38,7 @@ fn test_via_received() {
 
     match msg {
         SipMessage::Request(req) => {
-            let parse_addr =
+            let (_, parse_addr) =
                 SipConnection::parse_target_from_via(&req.via_header().expect("via_header"))
                     .expect("get_target_socketaddr");
             assert_eq!(parse_addr, addr.into());