Changeset 4924

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.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• src/pjsip-ua/sip_inv.c (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -1209 +1209 @@
 #endif
 
+/** 
+ * Specify whether to accept INVITE/re-INVITE with unknown content type,
+ * by default the stack will reject this type of message as specified in 
+ * RFC3261 section 8.2.3.
+ * Application that wishes to process the body could set this to PJ_TRUE,
+ * be informed that SDP offer/answer will still be present.
+ *
+ * Default: PJ_FALSE
+ */
+#ifndef PJSIP_INV_ACCEPT_UNKNOWN_BODY
+#   define PJSIP_INV_ACCEPT_UNKNOWN_BODY    PJ_FALSE
+#endif
 
 PJ_END_DECL

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;
             }
 

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

@@ -1200 +1200 @@
 
         status = sdp_info->sdp_err;
-        if (status==PJ_SUCCESS && sdp_info->sdp==NULL)
-            status = PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE);
+        if (status==PJ_SUCCESS && sdp_info->sdp==NULL && 
+            !PJSIP_INV_ACCEPT_UNKNOWN_BODY)
+        {
+            if (sdp_info->body.ptr == NULL) {
+                status = PJSIP_ERRNO_FROM_SIP_STATUS(
+                                               PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+            } else {
+                status = PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE);
+            }
+        }
 
         if (status != PJ_SUCCESS) {
-            const pj_str_t reason = pj_str("Bad SDP");
             pjsip_hdr hdr_list;
-            pjsip_warning_hdr *w;
-
-            pjsua_perror(THIS_FILE, "Bad SDP in incoming INVITE",
-                         status);
-
-            w = pjsip_warning_hdr_create_from_status(rdata->tp_info.pool,
-                                             pjsip_endpt_name(pjsua_var.endpt),
-                                             status);
-            pj_list_init(&hdr_list);
-            pj_list_push_back(&hdr_list, w);
-
-            pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 400,
-                                &reason, &hdr_list, NULL, NULL);
+
+            /* Check if body really contains SDP. */
+            if (sdp_info->body.ptr == NULL) {
+                /* Couldn't find "application/sdp" */
+                pjsip_accept_hdr *acc;          
+
+                pjsua_perror(THIS_FILE, "Unknown Content-Type in incoming "\
+                             "INVITE", status);
+
+                /* Add Accept header to response */
+                acc = pjsip_accept_hdr_create(rdata->tp_info.pool);
+                PJ_ASSERT_RETURN(acc, PJ_ENOMEM);
+                acc->values[acc->count++] = pj_str("application/sdp");
+                pj_list_init(&hdr_list);
+                pj_list_push_back(&hdr_list, acc);
+
+                pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 
+                                    PJSIP_SC_UNSUPPORTED_MEDIA_TYPE,
+                                    NULL, &hdr_list, NULL, NULL);
+            } else {
+                const pj_str_t reason = pj_str("Bad SDP");
+                pjsip_warning_hdr *w;
+
+                pjsua_perror(THIS_FILE, "Bad SDP in incoming INVITE",
+                             status);
+
+                w = pjsip_warning_hdr_create_from_status(rdata->tp_info.pool,
+                                              pjsip_endpt_name(pjsua_var.endpt),
+                                              status);
+                pj_list_init(&hdr_list);
+                pj_list_push_back(&hdr_list, w);
+
+                pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 400,
+                                    &reason, &hdr_list, NULL, NULL);
+            }
             goto on_return;
         }
@@ -1225 +1254 @@
          * checks will be done in pjsip_inv_verify_request2() below.
          */
-        if (offer->media_count==0) {
+        if ((offer) && (offer->media_count==0)) {
             const pj_str_t reason = pj_str("Missing media in SDP");
             pjsip_endpt_respond(pjsua_var.endpt, NULL, rdata, 400, &reason,