implement re-INVITE handling in ServerInviteDialog

Author: shenjinti

Cargo.toml

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

src/dialog/server_dialog.rs

@@ -566,7 +566,7 @@ impl ServerInviteDialog {
                     tx.reply(rsip::StatusCode::OK).await?;
                     return Ok(());
                 }
-                rsip::Method::Invite | rsip::Method::Ack => {
+                rsip::Method::Ack => {
                     info!(id=%self.id(),
                         "invalid request received {} {}",
                         tx.original.method, tx.original.uri
@@ -577,6 +577,7 @@ impl ServerInviteDialog {
                         rsip::StatusCode::MethodNotAllowed,
                     ));
                 }
+                rsip::Method::Invite => return self.handle_reinvite(tx).await,
                 rsip::Method::Bye => return self.handle_bye(tx).await,
                 rsip::Method::PRack => return self.handle_prack(tx).await,
                 rsip::Method::Info => return self.handle_info(tx).await,
@@ -652,6 +653,34 @@ impl ServerInviteDialog {
         Ok(())
     }
 
+    async fn handle_reinvite(&mut self, tx: &mut Transaction) -> Result<()> {
+        info!(id = %self.id(), "received re-invite {}", tx.original.uri);
+        self.inner
+            .transition(DialogState::Updated(self.id(), tx.original.clone()))?;
+
+        if let Err(e) = tx.reply(rsip::StatusCode::OK).await {
+            warn!(id = %self.id(), "failed to send 200 OK for re-invite: {}", e);
+        }
+
+        while let Some(msg) = tx.receive().await {
+            match msg {
+                SipMessage::Request(req) => match req.method {
+                    rsip::Method::Ack => {
+                        info!(id = %self.id(),"received ack for re-invite {}", req.uri);
+                        self.inner.transition(DialogState::Confirmed(
+                            self.id(),
+                            tx.last_response.clone().unwrap_or_default(),
+                        ))?;
+                        break;
+                    }
+                    _ => {}
+                },
+                _ => {}
+            }
+        }
+        Ok(())
+    }
+
     async fn handle_invite(&mut self, tx: &mut Transaction) -> Result<()> {
         let handle_loop = async {
             if !self.inner.is_confirmed() && matches!(tx.original.method, rsip::Method::Invite) {