Changeset 3208 for pjproject

Timestamp:

Jun 16, 2010 3:26:18 PM (14 years ago)

Author:

nanang

Message:

Fix #1045:

• Fixed invite module to reset SDP negotiator state after incomplete SDP offer-answer in re-INVITE/UPDATE.
• Added some SIPp test scenarios.

Location:

pjproject/trunk

Files:

• pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)
• tests/pjsua/scripts-sipp/uac-inv-and-ack-without-sdp.xml (added)
• tests/pjsua/scripts-sipp/uas-answer-200-inv-without-sdp.xml (added)
• tests/pjsua/scripts-sipp/uas-answer-200-reinvite-without-sdp.xml (added)
• tests/pjsua/scripts-sipp/uas-answer-200-update-without-sdp.xml (added)
• tests/pjsua/scripts-sipp/uas-reinv-and-ack(same-branch)-without-sdp.xml (added)
• tests/pjsua/scripts-sipp/uas-reinv-and-ack-without-sdp.xml (added)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -459 +459 @@
             if (inv->state < PJSIP_INV_STATE_DISCONNECTED) {
                 inv_check_sdp_in_incoming_msg(inv, inv->invite_tsx, rdata);
+
+                /* Check if local offer got no SDP answer and INVITE session
+                 * is in CONFIRMED state.
+                 */
+                if (pjmedia_sdp_neg_get_state(inv->neg)==
+                    PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER &&
+                    inv->state==PJSIP_INV_STATE_CONFIRMED)
+                {
+                    pjmedia_sdp_neg_cancel_offer(inv->neg);
+                }
             }
 
@@ -3976 +3986 @@
                 inv_check_sdp_in_incoming_msg(inv, tsx,
                                               e->body.tsx_state.src.rdata);
+
+                /* Check if local offer got no SDP answer */
+                if (pjmedia_sdp_neg_get_state(inv->neg)==
+                    PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER)
+                {
+                    pjmedia_sdp_neg_cancel_offer(inv->neg);
+                }
             }
 
@@ -4013 +4030 @@
             inv_check_sdp_in_incoming_msg(inv, tsx, 
                                           e->body.tsx_state.src.rdata);
+
+            /* Check if local offer got no SDP answer */
+            if (pjmedia_sdp_neg_get_state(inv->neg)==
+                PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER)
+            {
+                pjmedia_sdp_neg_cancel_offer(inv->neg);
+            }
 
             /* Send ACK */