Changeset 4583 for pjproject


Ignore:
Timestamp:
Aug 21, 2013 9:32:24 AM (9 years ago)
Author:
ming
Message:

Re #817: Fix replying to re-INVITE after it was cancelled (thanks to Saúl Ibarra Corretgé for the patch)

Location:
pjproject/trunk/pjsip
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

    r4562 r4583  
    172172     * #pjsip_inv_set_sdp_answer() and the re-INVITE will be answered 
    173173     * automatically. 
     174     * 
     175     * Remarks: Application may need to monitor on_tsx_state_changed() 
     176     * callback to check whether the re-INVITE is already answered 
     177     * automatically with 487 due to being cancelled. 
    174178     * 
    175179     * @param inv       The invite session. 
  • pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

    r4565 r4583  
    42724272 
    42734273        /* 
    4274          * Handle strandled incoming CANCEL. 
    4275          */ 
    4276         pjsip_rx_data *rdata = e->body.tsx_state.src.rdata; 
    4277         pjsip_tx_data *tdata; 
    4278         pj_status_t status; 
    4279  
    4280         status = pjsip_dlg_create_response(dlg, rdata, 200, NULL, &tdata); 
    4281         if (status != PJ_SUCCESS) return; 
    4282  
    4283         status = pjsip_dlg_send_response(dlg, tsx, tdata); 
    4284         if (status != PJ_SUCCESS) return; 
    4285  
     4274         * Handle strandled incoming CANCEL or CANCEL for re-INVITE 
     4275         */ 
     4276        inv_respond_incoming_cancel(inv, tsx, e); 
    42864277    } 
    42874278    else if (tsx->method.id == PJSIP_INVITE_METHOD && 
Note: See TracChangeset for help on using the changeset viewer.