Changeset 3383 for pjproject

Timestamp:

Dec 2, 2010 10:41:46 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1170 (Assertion when receiving updated SDP offer with all media lines removed):

• pjsua_media.c checks if audio media is present in the offer; if not, do not set any answer
• sip_inv.c checks if app has supplied an answer after on_rx_offer() callback is called, and returnd 488 (Not Acceptable) if not (previously, it will return 200/OK without SDP!)
• added a SIPp scenario file to reproduce this

Location:

pjproject/trunk

Files:

• pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)
• tests/pjsua/scripts-sipp/uas-reinv-no-media.xml (added)

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

@@ -1744 +1744 @@
 
         /* Inform application about remote offer. */
-
         if (mod_inv.cb.on_rx_offer && inv->notify) {
 
             (*mod_inv.cb.on_rx_offer)(inv, sdp_info->sdp);
 
+        }
+
+        /* application must have supplied an answer at this point. */
+        if (pjmedia_sdp_neg_get_state(inv->neg) !=
+                PJMEDIA_SDP_NEG_STATE_WAIT_NEGO)
+        {
+            return PJ_EINVALIDOP;
         }
 

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

@@ -1312 +1312 @@
 
         call->audio_idx = find_audio_index(rem_sdp, srtp_active);
+        if (call->audio_idx == -1) {
+            /* No audio in the offer. We can't accept this */
+            PJ_LOG(4,(THIS_FILE,
+                      "Unable to accept SDP offer without audio for call %d",
+                      call_id));
+            return PJMEDIA_SDP_EINMEDIA;
+        }
     }