Changeset 4791 for pjproject

Timestamp:

Mar 11, 2014 7:45:29 AM (11 years ago)

Author:

nanang

Message:

Fix #1747: Don't process message body in the incoming 200/UPDATE if we don't send offer in the UPDATE. Note this also fixes another issue: session timer should always inspect 200/UPDATE response (for session refresh) regardless availability of message body.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)

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

@@ -3341 +3341 @@
     /* Process 2xx response */
     else if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
-        tsx->status_code/100 == 2 &&
-        e->body.tsx_state.src.rdata->msg_info.msg->body)
-    {
-        status = handle_timer_response(inv, e->body.tsx_state.src.rdata,
-                                       PJ_FALSE);
-        status = inv_check_sdp_in_incoming_msg(inv, tsx, 
-                                             e->body.tsx_state.src.rdata);
+        tsx->status_code/100 == 2)
+    {
+        pjsip_rx_data *rdata = e->body.tsx_state.src.rdata;
+        status = handle_timer_response(inv, rdata, PJ_FALSE);
+
+        if (rdata->msg_info.msg->body) {
+            /* Only process remote SDP if we have sent local offer */
+            if (inv->neg && pjmedia_sdp_neg_get_state(inv->neg) == 
+                                        PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER)
+            {
+                status = inv_check_sdp_in_incoming_msg(inv, tsx, rdata);
+            } else {
+                PJ_LOG(5,(THIS_FILE, "Ignored message body in %s as no local "
+                                     "offer was sent",
+                                     pjsip_rx_data_get_info(rdata)));
+            }
+        }
         handled = PJ_TRUE;
     }