Changeset 2795 for pjproject

Timestamp:

Jun 24, 2009 6:52:57 PM (15 years ago)

Author:

bennylp

Message:

Ticket #795: merged changes from ticket #794

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (5 diffs)

pjproject/branches/1.0/pjmedia/src/pjmedia/sdp_neg.c

@@ -423 +423 @@
     neg->state = PJMEDIA_SDP_NEG_STATE_WAIT_NEGO;
     if (local) {
-        if (!neg->initial_sdp) {
+        neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
+        if (neg->initial_sdp) {
+            /* I don't think there is anything in RFC 3264 that mandates
+             * answerer to place the same origin (and increment version)
+             * in the answer, but probably it won't hurt either.
+             * Note that the version will be incremented in 
+             * pjmedia_sdp_neg_negotiate()
+             */
+            neg->neg_local_sdp->origin.id = neg->initial_sdp->origin.id;
+        } else {
             neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
         }
-        neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
     } else {
         PJ_ASSERT_RETURN(neg->initial_sdp, PJMEDIA_SDPNEG_ENOINITIAL);

pjproject/branches/1.0/pjsip/src/pjsip-ua/sip_inv.c

@@ -2247 +2247 @@
     }
 
+    /* Notify negotiator about the new offer. This will fix the offer
+     * with correct SDP origin.
+     */
     status = pjmedia_sdp_neg_modify_local_offer(inv->pool,inv->neg,
                                                 offer);
@@ -2252 +2255 @@
         goto on_error;
 
+    /* Retrieve the "fixed" offer from negotiator */
+    pjmedia_sdp_neg_get_neg_local(inv->neg, &offer);
 
     /* Update Contact if required */
@@ -3618 +3623 @@
                     (*mod_inv.cb.on_create_offer)(inv, &sdp);
                     if (sdp) {
+                        /* Notify negotiator about the new offer. This will
+                         * fix the offer with correct SDP origin.
+                         */
                         status = pjmedia_sdp_neg_modify_local_offer(dlg->pool,
                                                                     inv->neg,
                                                                     sdp);
+
+                        /* Retrieve the "fixed" offer from negotiator */
+                        if (status==PJ_SUCCESS) {
+                            const pjmedia_sdp_session *lsdp = NULL;
+                            pjmedia_sdp_neg_get_neg_local(inv->neg, &lsdp);
+                            sdp = (pjmedia_sdp_session*)lsdp;
+                        }
                     }
                 } 

pjproject/branches/1.0/pjsip/src/pjsua-lib/pjsua_call.c

@@ -78 +78 @@
 static pj_status_t create_sdp_of_call_hold(pjsua_call *call,
                                            pjmedia_sdp_session **p_answer);
-
-/* Update SDP version in the offer */
-static void update_sdp_version(pjsua_call *call,
-                               pjmedia_sdp_session *sdp)
-{
-    const pjmedia_sdp_session *old_sdp = NULL;
-    pj_status_t status;
-
-    status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &old_sdp);
-    if (status != PJ_SUCCESS || old_sdp == NULL)
-        return;
-
-    sdp->origin.version = old_sdp->origin.version + 1;
-}
-
 
 /*
@@ -1508 +1493 @@
     }
 
-    update_sdp_version(call, sdp);
-
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
@@ -1580 +1563 @@
     }
 
-    update_sdp_version(call, sdp);
-
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
@@ -1638 +1619 @@
         return status;
     }
-
-    update_sdp_version(call, sdp);
 
     /* Create UPDATE with new offer */
@@ -3310 +3289 @@
     }
 
-    update_sdp_version(call, *offer);
-
     PJSUA_UNLOCK();
 }