Changeset 3574


Ignore:
Timestamp:
May 20, 2011 10:29:45 AM (8 years ago)
Author:
nanang
Message:

Fixed #1291:

  • fixed bug in SIP invite module, SDP negotiator state should be reverted back after an SDP re-offer is rejected by application.
  • fixed bug in pjsua_call_on_rx_offer(), evaluating call->audio_index should be done after pjsua_media_channel_create_sdp() is successful.
Location:
pjproject/branches/1.x/pjsip/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c

    r3553 r3574  
    40144014                const pjsip_hdr *accept; 
    40154015 
     4016                /* The incoming SDP is unacceptable. If the SDP negotiator 
     4017                 * state has just been changed, i.e: DONE -> REMOTE_OFFER, 
     4018                 * revert it back. 
     4019                 */ 
     4020                if (pjmedia_sdp_neg_get_state(inv->neg) == 
     4021                    PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER) 
     4022                { 
     4023                    pjmedia_sdp_neg_cancel_offer(inv->neg); 
     4024                } 
     4025 
    40164026                status = pjsip_dlg_create_response(inv->dlg, rdata,  
    40174027                                                   488, NULL, &tdata); 
  • pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_call.c

    r3570 r3574  
    37793779    call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; 
    37803780 
    3781     if (call->audio_idx < (int)offer->media_count) 
    3782         conn = offer->media[call->audio_idx]->conn; 
    3783  
    3784     if (!conn) 
    3785         conn = offer->conn; 
    3786  
    37873781    /* Supply candidate answer */ 
    37883782    PJ_LOG(4,(THIS_FILE, "Call %d: received updated media offer", 
     
    37973791        return; 
    37983792    } 
     3793 
     3794    if (call->audio_idx >= 0 && call->audio_idx < (int)offer->media_count) 
     3795        conn = offer->media[call->audio_idx]->conn; 
     3796 
     3797    if (!conn) 
     3798        conn = offer->conn; 
    37993799 
    38003800    /* Check if offer's conn address is zero */ 
Note: See TracChangeset for help on using the changeset viewer.