Changeset 4498

Timestamp:

Apr 24, 2013 9:52:25 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1659: SDP offer version number is not incremented if previous re-INVITE offer was rejected

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)

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

@@ -1350 +1350 @@
                      PJMEDIA_SDPNEG_EINSTATE);
 
-    /* Reset state to done */
-    neg->state = PJMEDIA_SDP_NEG_STATE_DONE;
-
     /* 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) {
+        /* Increment next version number. This happens if for example
+         * the reinvite offer is rejected by 488. If we don't increment
+         * the version here, the next offer will have the same version.
+         */
+        neg->active_local_sdp->origin.version++;
+    }
+
+    /* Reset state to done */
+    neg->state = PJMEDIA_SDP_NEG_STATE_DONE;
 
     return PJ_SUCCESS;