Changeset 3217 for pjproject/trunk

Timestamp:

Jun 23, 2010 12:21:20 PM (14 years ago)

Author:

bennylp

Message:

Another unterminated SDP offer/answer negotiation fix (Re: #1045):

• fixed unterminated negotiation if our media transport rejects incoming offer (e.g. due to mismatch SRTP transport) with 488.
• to fix the above, modified the SDP negotiator (sdp_neg.[hc])'s pjmedia_sdp_neg_cancel_offer() to also be able to cancel in remote offer state
• also fixed the bug introduced previous Session Timer fix (Re: #1047), which cause SDP negotiator's state to be cleared after failed UAC UPDATE transaction is terminated, which means UPDATE can only be sent 5 seconds after the last UPDATE if the last UPDATE failed.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/sdp_neg.h (modified) (1 diff)
• pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/sdp_neg.h

@@ -623 +623 @@
 
 /**
- * Cancel previously sent offer, and move negotiator state back to
- * previous stable state (PJMEDIA_SDP_NEG_STATE_DONE). The negotiator
- * must be in PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER state.
+ * Cancel any pending offer, whether the offer is initiated by local or
+ * remote, and move negotiator state back to previous stable state
+ * (PJMEDIA_SDP_NEG_STATE_DONE). The negotiator must be in
+ * PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER or PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER
+ * state.
  *
  * @param neg           The negotiator.

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -1391 +1391 @@
 
     /* Must be in LOCAL_OFFER state. */
-    PJ_ASSERT_RETURN(neg->state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER,
+    PJ_ASSERT_RETURN(neg->state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER ||
+                     neg->state == PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER,
                      PJMEDIA_SDPNEG_EINSTATE);
 

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -2790 +2790 @@
             (status=inv_negotiate_sdp(inv)) != PJ_SUCCESS)
         {
-            /* Negotiation has failed */
+            /* Negotiation has failed. If negotiator is still
+             * stuck at non-DONE state, cancel any ongoing offer.
+             */
+            neg_state = pjmedia_sdp_neg_get_state(inv->neg);
+            if (neg_state != PJMEDIA_SDP_NEG_STATE_DONE) {
+                pjmedia_sdp_neg_cancel_offer(inv->neg);
+            }
+
             status = pjsip_dlg_create_response(inv->dlg, rdata, 
                                                PJSIP_SC_NOT_ACCEPTABLE_HERE,
@@ -2902 +2909 @@
     }
 
-    /* Otherwise if we don't get successful response, cancel
-     * our negotiator.
-     */
-    if (status != PJ_SUCCESS &&
-        pjmedia_sdp_neg_get_state(inv->neg)==PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER &&
+    /* Cancel the negotiation if we don't get successful negotiation by now */
+    if (pjmedia_sdp_neg_get_state(inv->neg) ==
+                PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER &&
         tsx_inv_data && tsx_inv_data->sdp_done == PJ_FALSE) 
     {