bump version to 0.2.68 and update InviteOption initialization to use default values

Author: shenjinti

Cargo.toml

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

examples/client/main.rs

@@ -249,12 +249,9 @@ async fn main() -> rsipstack::Result<()> {
                 let invite_option = InviteOption {
                     callee: callee.try_into().expect("callee"),
                     caller: contact.clone(),
-                    content_type: None,
-                    offer: None,
                     contact: contact.clone(),
                     credential: Some(credential.clone()),
-                    headers: None,
-                    destination: None,
+                    ..Default::default()
                 };
 
                 match make_call(dialog_layer, invite_option, opt, state_sender).await {

src/dialog/authenticate.rs

@@ -70,12 +70,11 @@ use rsip::{Header, Param, Response};
 /// let invite_option = InviteOption {
 ///     caller: rsip::Uri::try_from("sip:alice@example.com")?,
 ///     callee: rsip::Uri::try_from("sip:bob@example.com")?,
-///     destination: None,
 ///     content_type: Some("application/sdp".to_string()),
 ///     offer: Some(sdp_bytes),
 ///     contact: rsip::Uri::try_from("sip:alice@192.168.1.100:5060")?,
 ///     credential: Some(credential),
-///     headers: None,
+///     ..Default::default()
 /// };
 /// # Ok(())
 /// # }

src/dialog/invitation.rs

@@ -47,11 +47,9 @@ use tracing::{debug, info, warn};
 ///     caller: "sip:alice@example.com".try_into()?,
 ///     callee: "sip:bob@example.com".try_into()?,
 ///     content_type: Some("application/sdp".to_string()),
-///     destination: None,
 ///     offer: Some(sdp_offer_bytes),
 ///     contact: "sip:alice@192.168.1.100:5060".try_into()?,
-///     credential: None,
-///     headers: None,
+///     ..Default::default()
 /// };
 /// # Ok(())
 /// # }
@@ -85,11 +83,11 @@ use tracing::{debug, info, warn};
 ///     caller: "sip:alice@example.com".try_into()?,
 ///     callee: "sip:bob@example.com".try_into()?,
 ///     content_type: Some("application/sdp".to_string()),
-///     destination: None,
 ///     offer: Some(sdp_bytes),
 ///     contact: "sip:alice@192.168.1.100:5060".try_into()?,
 ///     credential: Some(auth_credential),
 ///     headers: Some(custom_headers),
+///     ..Default::default()
 /// };
 /// # Ok(())
 /// # }
@@ -111,18 +109,18 @@ use tracing::{debug, info, warn};
 /// let invite_option = InviteOption {
 ///     caller: "sip:alice@example.com".try_into()?,
 ///     callee: "sip:bob@example.com".try_into()?,
-///     content_type: None, // Will default to "application/sdp"
-///     destination: None,
 ///     offer: Some(sdp_bytes),
 ///     contact: "sip:alice@192.168.1.100:5060".try_into()?,
 ///     credential: Some(credential),
-///     headers: None,
+///     ..Default::default()
 /// };
 /// # Ok(())
 /// # }
 /// ```
 #[derive(Default, Clone)]
 pub struct InviteOption {
+    pub caller_display_name: Option<String>,
+    pub caller_params: Vec<rsip::uri::Param>,
     pub caller: rsip::Uri,
     pub callee: rsip::Uri,
     pub destination: Option<SipAddr>,
@@ -248,9 +246,9 @@ impl DialogLayer {
         let recipient = to.uri.clone();
 
         let from = rsip::typed::From {
-            display_name: None,
+            display_name: opt.caller_display_name.clone(),
             uri: opt.caller.clone(),
-            params: vec![],
+            params: opt.caller_params.clone(),
         }
         .with_tag(make_tag());
 

src/lib.rs

@@ -88,10 +88,8 @@
 //!     callee: rsip::Uri::try_from("sip:bob@example.com")?,
 //!     contact: rsip::Uri::try_from("sip:alice@myhost.com:5060")?,
 //!     content_type: Some("application/sdp".to_string()),
-//!     destination: None,
 //!     offer: Some(sdp_body),
-//!     credential: None,
-//!     headers: None,
+//!     ..Default::default()
 //! };
 //!
 //! let (dialog, response) = dialog_layer.do_invite(invite_option, state_sender).await?;

src/transport/transport_layer.rs

@@ -328,6 +328,7 @@ impl TransportLayerInner {
                 }
             }
             info!(addr=%transport.get_addr(), "transport serve_loop exited");
+            transport.close().await.ok();
             sender_clone.send(TransportEvent::Closed(transport)).ok();
         });
     }