Changeset 3574 for pjproject

Timestamp:

May 20, 2011 10:29:45 AM (14 years ago)

Author:

nanang

Message:

Fixed #1291:

• fixed bug in SIP invite module, SDP negotiator state should be reverted back after an SDP re-offer is rejected by application.
• fixed bug in pjsua_call_on_rx_offer(), evaluating call->audio_index should be done after pjsua_media_channel_create_sdp() is successful.

Location:

pjproject/branches/1.x/pjsip/src

Files:

• pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c

@@ -4014 +4014 @@
                 const pjsip_hdr *accept;
 
+                /* The incoming SDP is unacceptable. If the SDP negotiator
+                 * state has just been changed, i.e: DONE -> REMOTE_OFFER,
+                 * revert it back.
+                 */
+                if (pjmedia_sdp_neg_get_state(inv->neg) ==
+                    PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER)
+                {
+                    pjmedia_sdp_neg_cancel_offer(inv->neg);
+                }
+
                 status = pjsip_dlg_create_response(inv->dlg, rdata, 
                                                    488, NULL, &tdata);

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

@@ -3779 +3779 @@
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
-    if (call->audio_idx < (int)offer->media_count)
-        conn = offer->media[call->audio_idx]->conn;
-
-    if (!conn)
-        conn = offer->conn;
-
     /* Supply candidate answer */
     PJ_LOG(4,(THIS_FILE, "Call %d: received updated media offer",
@@ -3797 +3791 @@
         return;
     }
+
+    if (call->audio_idx >= 0 && call->audio_idx < (int)offer->media_count)
+        conn = offer->media[call->audio_idx]->conn;
+
+    if (!conn)
+        conn = offer->conn;
 
     /* Check if offer's conn address is zero */