Changeset 4750 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Feb 19, 2014 4:11:43 AM (10 years ago)

Author:

bennylp

Message:

Fixed #1738: Infinite loop when re-INVITE is received while adding new media

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -34 +34 @@
  */
 #define LOCK_CODEC_MAX_RETRY         5
-
 
 /*
@@ -2393 +2392 @@
         goto on_return;
 
+    if (pjsua_call_media_is_changing(call)) {
+        PJ_LOG(1,(THIS_FILE, "Unable to reinvite" ERR_MEDIA_CHANGING));
+        status = PJ_EINVALIDOP;
+        goto on_return;
+    }
+
     if (call->inv->state != PJSIP_INV_STATE_CONFIRMED) {
         PJ_LOG(3,(THIS_FILE, "Can not re-INVITE call that is not confirmed"));
@@ -2499 +2504 @@
     if (status != PJ_SUCCESS)
         goto on_return;
+
+    if (pjsua_call_media_is_changing(call)) {
+        PJ_LOG(1,(THIS_FILE, "Unable to send UPDATE" ERR_MEDIA_CHANGING));
+        status = PJ_EINVALIDOP;
+        goto on_return;
+    }
 
     status = apply_call_setting(call, opt, NULL);
@@ -3879 +3890 @@
     PJ_LOG(4,(THIS_FILE, "Call %d: received updated media offer",
               call->index));
+
     pj_log_push_indent();
+
+    if (pjsua_call_media_is_changing(call)) {
+        PJ_LOG(1,(THIS_FILE, "Unable to process offer" ERR_MEDIA_CHANGING));
+        goto on_return;
+    }
 
     if (pjsua_var.ua_cfg.cb.on_call_rx_offer) {
@@ -3970 +3987 @@
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
+    if (pjsua_call_media_is_changing(call)) {
+        *offer = NULL;
+        PJ_LOG(1,(THIS_FILE, "Unable to create offer" ERR_MEDIA_CHANGING));
+        goto on_return;
+    }
 
     /* See if we've put call on hold. */