Changeset 2643 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Apr 23, 2009 11:50:25 AM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #794: Bug with generating SDP version in origin line (thanks Joel Dodson for the report)

• the INVITE session now correctly uses the SDP offer "fixed" by the negotiator, hence it will have the correct origin fields.
• removed update_sdp_version() from PJSUA-LIB
• the negotiator now also fixes the session ID of subsequent answer so that it's identical to the previous SDP

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (5 diffs)

pjproject/trunk/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;
-}
-
 
 /*
@@ -1520 +1505 @@
     }
 
-    update_sdp_version(call, sdp);
-
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
@@ -1592 +1575 @@
     }
 
-    update_sdp_version(call, sdp);
-
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
@@ -1650 +1631 @@
         return status;
     }
-
-    update_sdp_version(call, sdp);
 
     /* Create UPDATE with new offer */
@@ -3322 +3301 @@
     }
 
-    update_sdp_version(call, *offer);
-
     PJSUA_UNLOCK();
 }