diff options
author | Benny Prijono <bennylp@teluu.com> | 2009-04-23 11:50:25 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2009-04-23 11:50:25 +0000 |
commit | 998a1fa8fdb03e9922184fb1202d1e4705086030 (patch) | |
tree | 6e82ca2f0629ac5e5ca79a9b92ac3c6d1045ca02 /pjsip/src/pjsua-lib/pjsua_call.c | |
parent | 0b54cf857cd757da2571a62845894c67fb9e8ecf (diff) |
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
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2643 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_call.c')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 2531cd11..746ef0ad 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -78,21 +78,6 @@ static pjsip_redirect_op pjsua_call_on_redirected(pjsip_inv_session *inv, 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; -} - - /* * Callback called by event framework when the xfer subscription state * has changed. @@ -1519,8 +1504,6 @@ PJ_DEF(pj_status_t) pjsua_call_set_hold(pjsua_call_id call_id, return status; } - update_sdp_version(call, sdp); - /* Create re-INVITE with new offer */ status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata); if (status != PJ_SUCCESS) { @@ -1591,8 +1574,6 @@ PJ_DEF(pj_status_t) pjsua_call_reinvite( pjsua_call_id call_id, return status; } - update_sdp_version(call, sdp); - /* Create re-INVITE with new offer */ status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata); if (status != PJ_SUCCESS) { @@ -1650,8 +1631,6 @@ PJ_DEF(pj_status_t) pjsua_call_update( pjsua_call_id call_id, return status; } - update_sdp_version(call, sdp); - /* Create UPDATE with new offer */ status = pjsip_inv_update(call->inv, NULL, sdp, &tdata); if (status != PJ_SUCCESS) { @@ -3321,8 +3300,6 @@ static void pjsua_call_on_create_offer(pjsip_inv_session *inv, return; } - update_sdp_version(call, *offer); - PJSUA_UNLOCK(); } |