Changeset 3878 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c
- Timestamp:
- Oct 31, 2011 10:31:23 AM (12 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/1.x merged: 3834,3845-3846,3867-3868,3871,3873
- Property svn:mergeinfo changed
-
pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c
r3841 r3878 456 456 if (method->id == PJSIP_ACK_METHOD && inv) { 457 457 458 /* Ignore if we don't have INVITE in progress */ 459 if (!inv->invite_tsx) { 460 return PJ_TRUE; 461 } 462 458 463 /* Ignore ACK if pending INVITE transaction has not finished. */ 459 if (inv->invite_tsx && 460 inv->invite_tsx->state < PJSIP_TSX_STATE_COMPLETED) 461 { 464 if (inv->invite_tsx->state < PJSIP_TSX_STATE_COMPLETED) { 462 465 return PJ_TRUE; 463 466 } 464 467 468 /* Ignore ACK with different CSeq 469 * https://trac.pjsip.org/repos/ticket/1391 470 */ 471 if (rdata->msg_info.cseq->cseq != inv->invite_tsx->cseq) { 472 return PJ_TRUE; 473 } 474 465 475 /* Terminate INVITE transaction, if it's still present. */ 466 if (inv->invite_tsx && 467 inv->invite_tsx->state <= PJSIP_TSX_STATE_COMPLETED) 468 { 476 if (inv->invite_tsx->state <= PJSIP_TSX_STATE_COMPLETED) { 469 477 /* Before we terminate INVITE transaction, process the SDP 470 478 * in the ACK request, if any.
Note: See TracChangeset
for help on using the changeset viewer.