bump version to 0.4.5 and enhance Record-Route handling to support comma-separated lists

Author: shenjinti

Cargo.toml

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

src/transaction/message.rs

@@ -260,11 +260,14 @@ impl EndpointInner {
                 }
             }
         }
-        // update route set from Record-Route header
+        // update route set from Record-Route header (support comma-separated lists)
         let mut route_set = Vec::new();
         for header in resp.headers.iter() {
             if let Header::RecordRoute(record_route) = header {
-                route_set.push(Header::Route(Route::from(record_route.value())));
+                let value = record_route.value();
+                for token in value.split(',').map(|t| t.trim()).filter(|t| !t.is_empty()) {
+                    route_set.push(Header::Route(Route::from(token)));
+                }
             }
         }
         route_set.reverse();

src/transaction/tests/test_client.rs

@@ -1,4 +1,4 @@
-use crate::rsip_ext::RsipResponseExt;
+use crate::rsip_ext::{destination_from_request, RsipResponseExt};
 use crate::transaction::key::{TransactionKey, TransactionRole};
 use crate::transaction::transaction::Transaction;
 use crate::transport::udp::UdpConnection;
@@ -167,6 +167,54 @@ Content-Length: 0\r\n\r\n";
     Ok(())
 }
 
+#[tokio::test]
+async fn test_make_ack_accepts_comma_separated_record_route() -> Result<()> {
+    let endpoint = super::create_test_endpoint(None).await?;
+
+    let raw_response = "SIP/2.0 200 OK\r\n\
+Via: SIP/2.0/UDP uac.example.com:5060;branch=z9hG4bK1\r\n\
+Record-Route: <sip:3.4.5.6:24364;r2=on;lr;ftag=Xq5kaQn5;did=9e8.3362>,<sip:3.4.5.6:21827;r2=on;lr;ftag=Xq5kaQn5;did=9e8.3362>,<sip:1.2.40.7:21827;lr;ftag=Xq5kaQn5;did=9e8.ab21>\r\n\
+From: <sip:alice@example.com>;tag=from-tag\r\n\
+To: <sip:bob@example.com>;tag=to-tag\r\n\
+Call-ID: callid@example.com\r\n\
+CSeq: 1 INVITE\r\n\
+Contact: <sip:uas@192.0.2.55:5080;transport=udp>\r\n\
+Content-Length: 0\r\n\r\n";
+
+    let response = Response::try_from(raw_response)?;
+    let request_uri = response.remote_uri(None)?;
+    let ack = endpoint.inner.make_ack(&response, request_uri)?;
+
+    let routes: Vec<String> = ack
+        .headers
+        .iter()
+        .filter_map(|header| match header {
+            Header::Route(route) => Some(route.value().to_string()),
+            _ => None,
+        })
+        .collect();
+
+    assert_eq!(
+        routes,
+        vec![
+            "<sip:1.2.40.7:21827;lr;ftag=Xq5kaQn5;did=9e8.ab21>".to_string(),
+            "<sip:3.4.5.6:21827;r2=on;lr;ftag=Xq5kaQn5;did=9e8.3362>".to_string(),
+            "<sip:3.4.5.6:24364;r2=on;lr;ftag=Xq5kaQn5;did=9e8.3362>".to_string(),
+        ],
+        "ACK Route headers must follow the reversed Record-Route order"
+    );
+
+    let destination =
+        destination_from_request(&ack).expect("route-enabled ACK should resolve to a destination");
+    let expected_destination = Uri::try_from("sip:1.2.40.7:21827;lr;ftag=Xq5kaQn5;did=9e8.ab21")?;
+    assert_eq!(
+        &*destination, &expected_destination,
+        "First Route entry must determine the transport destination",
+    );
+
+    Ok(())
+}
+
 #[tokio::test]
 async fn test_make_ack_uses_contact_with_ob() -> Result<()> {
     let endpoint = super::create_test_endpoint(None).await?;