Changeset 4956 for pjproject/trunk

Timestamp:

Oct 31, 2014 12:14:28 PM (10 years ago)

Author:

riza

Message:

Fixed #1797: Clean up provisional media is executed when there is an ongoing SDP negotiation.
Scenario:

1. re-invite got 491, state tsx changed to completed
2. cleanup prov med executed
3. re-invite again with video
4. timer tsx to shift tsx no 1, from completed -> terminated trigger provisional cleanup
5. provisional video transport in no 3 got cleanup

File:

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

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -4694 +4694 @@
                pjsip_method_cmp(&tsx->method, &pjsip_invite_method)==0 &&
                tsx->state >= PJSIP_TSX_STATE_COMPLETED &&
+               e->body.tsx_state.prev_state < PJSIP_TSX_STATE_COMPLETED &&
                (tsx->status_code!=401 && tsx->status_code!=407))
     {
@@ -4727 +4728 @@
                pjsip_method_cmp(&tsx->method, &pjsip_update_method)==0 &&
                tsx->state >= PJSIP_TSX_STATE_COMPLETED &&
+               e->body.tsx_state.prev_state < PJSIP_TSX_STATE_COMPLETED &&
                (tsx->status_code!=401 && tsx->status_code!=407))
     {