Changeset 4924 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Sep 17, 2014 12:11:45 PM (10 years ago)

Author:

riza

Message:

Re #1788: Add support to allow INVITE/reINVITE with unknown body.

File:

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

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

@@ -4738 +4738 @@
 
             if (status != PJ_SUCCESS) {
-
-                /* Not Acceptable */
-                const pjsip_hdr *accept;
-
-                /* The incoming SDP is unacceptable. If the SDP negotiator
-                 * state has just been changed, i.e: DONE -> REMOTE_OFFER,
-                 * revert it back.
-                 */
-                if (pjmedia_sdp_neg_get_state(inv->neg) ==
-                    PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER)
+                pj_bool_t reject_message = PJ_TRUE;
+
+                if (status == PJMEDIA_SDP_EINSDP)
                 {
-                    pjmedia_sdp_neg_cancel_offer(inv->neg);
+                    sdp_info = pjsip_rdata_get_sdp_info(rdata);
+                    if (sdp_info->body.ptr == NULL && 
+                        PJSIP_INV_ACCEPT_UNKNOWN_BODY) 
+                    {
+                        /* Message body is not "application/sdp" */
+                        reject_message = PJ_FALSE;
+                    }               
                 }
 
-                status = pjsip_dlg_create_response(inv->dlg, rdata, 
-                                                   488, NULL, &tdata);
-                if (status != PJ_SUCCESS)
+                if (reject_message) {
+                    /* Not Acceptable */
+                    const pjsip_hdr *accept;
+
+                    /* The incoming SDP is unacceptable. If the SDP negotiator
+                     * state has just been changed, i.e: DONE -> REMOTE_OFFER,
+                     * revert it back.
+                     */
+                    if (pjmedia_sdp_neg_get_state(inv->neg) ==
+                        PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER)
+                    {
+                        pjmedia_sdp_neg_cancel_offer(inv->neg);
+                    }
+
+                    status = pjsip_dlg_create_response(inv->dlg, rdata, 
+                                         (status == PJMEDIA_SDP_EINSDP)?415:488,
+                                          NULL, &tdata);
+
+                    if (status != PJ_SUCCESS)
+                        return;
+
+
+                    accept = pjsip_endpt_get_capability(dlg->endpt, 
+                                                        PJSIP_H_ACCEPT,
+                                                        NULL);
+                    if (accept) {
+                        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
+                                          pjsip_hdr_clone(tdata->pool, accept));
+                    }
+
+                    status = pjsip_dlg_send_response(dlg, tsx, tdata);
+
                     return;
-
-
-                accept = pjsip_endpt_get_capability(dlg->endpt, PJSIP_H_ACCEPT,
-                                                    NULL);
-                if (accept) {
-                    pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
-                                      pjsip_hdr_clone(tdata->pool, accept));
                 }
-
-                status = pjsip_dlg_send_response(dlg, tsx, tdata);
-
-                return;
             }