Changeset 5129 for pjproject/trunk

Timestamp:

Jul 8, 2015 10:17:26 AM (9 years ago)

Author:

nanang

Message:

Fix #1866: Refactored the management of initial SDP in SDP negotiator considering flip-flop memory pools used by the application/invite sesion.

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (9 diffs)

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

@@ -39 +39 @@
 
     pjmedia_sdp_session *initial_sdp,       /**< Initial local SDP           */
+                        *initial_sdp_tmp,   /**< Temporary initial local SDP */
                         *active_local_sdp,  /**< Currently active local SDP. */
                         *active_remote_sdp, /**< Currently active remote's.  */
@@ -399 +400 @@
 
     /* New_offer fixed */
+    neg->initial_sdp_tmp = neg->initial_sdp;
     neg->initial_sdp = new_offer;
     neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, new_offer);
@@ -424 +426 @@
         PJ_ASSERT_RETURN(neg->active_local_sdp, PJMEDIA_SDPNEG_ENOACTIVE);
 
+        /* Retain initial SDP */
+        if (neg->initial_sdp) {
+            neg->initial_sdp_tmp = neg->initial_sdp;
+            neg->initial_sdp = pjmedia_sdp_session_clone(pool,
+                                                         neg->initial_sdp);
+        }
+
         neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER;
         neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, 
                                                        neg->active_local_sdp);
-        neg->initial_sdp = pjmedia_sdp_session_clone(pool,
-                                                     neg->active_local_sdp);
         *offer = neg->active_local_sdp;
 
@@ -438 +445 @@
     }
 
-    
     return PJ_SUCCESS;
 }
@@ -506 +512 @@
         if (neg->initial_sdp) {
             /* Retain initial_sdp value. */
+            neg->initial_sdp_tmp = neg->initial_sdp;
             neg->initial_sdp = pjmedia_sdp_session_clone(pool,
                                                          neg->initial_sdp);
@@ -521 +528 @@
     } else {
         PJ_ASSERT_RETURN(neg->initial_sdp, PJMEDIA_SDPNEG_ENOINITIAL);
+        neg->initial_sdp_tmp = neg->initial_sdp;
         neg->initial_sdp = pjmedia_sdp_session_clone(pool, neg->initial_sdp);
         neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, neg->initial_sdp);
@@ -1400 +1408 @@
                      PJMEDIA_SDPNEG_EINSTATE);
 
-    /* Clear temporary SDP */
-    neg->neg_local_sdp = neg->neg_remote_sdp = NULL;
-    neg->has_remote_answer = PJ_FALSE;
-
     if (neg->state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER &&
         neg->active_local_sdp) 
@@ -1414 +1418 @@
     }
 
+    /* Revert back initial SDP */
+    if (neg->state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER)
+        neg->initial_sdp = neg->initial_sdp_tmp;
+
+    /* Clear temporary SDP */
+    neg->initial_sdp_tmp = NULL;
+    neg->neg_local_sdp = neg->neg_remote_sdp = NULL;
+    neg->has_remote_answer = PJ_FALSE;
+
     /* Reset state to done */
     neg->state = PJMEDIA_SDP_NEG_STATE_DONE;
@@ -1477 +1490 @@
     neg->answer_was_remote = neg->has_remote_answer;
 
+    /* Revert back initial SDP if nego fails */
+    if (status != PJ_SUCCESS)
+        neg->initial_sdp = neg->initial_sdp_tmp;
+
     /* Clear temporary SDP */
+    neg->initial_sdp_tmp = NULL;
     neg->neg_local_sdp = neg->neg_remote_sdp = NULL;
     neg->has_remote_answer = PJ_FALSE;