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

Timestamp:

Sep 25, 2006 1:40:12 PM (18 years ago)

Author:

bennylp

Message:

Tests with other user agents revealed some bugs which
have been fixed below:

• some UAs sends "telephone-event/8000/1" instead of "telephone-event/8000", which caused SDP negotiation to fail. Fixed in sdp_neg.c.
• codec name was (incorrectly) compared case-sensitively, causing negotiation to fail. Fixed in sdp_neg.c.
• Also improved error reporting in SDP negotiation by introducing few more error codes.
• Added Warning header in Not Acceptable response sent by pjsip_inv_session when SDP negotiation fails.
• PJSUA-LIB will try to negotiate both SDPs before sending 100 response.
• Fixed bug in iLBC codec when setting the mode to 30.

Also:

• Echo cancellation by default is disabled now since it doesn't seem to work. Further investigation needed.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

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

@@ -615 +615 @@
                 /* Incompatible media */
                 code = PJSIP_SC_NOT_ACCEPTABLE_HERE;
-                status = PJSIP_ERRNO_FROM_SIP_STATUS(code);
 
                 if (p_tdata) {
@@ -2415 +2414 @@
             /* Process SDP in the answer */
             status = process_answer(inv, 200, tdata, NULL);
-            if (status != PJ_SUCCESS)
+
+            if (status != PJ_SUCCESS) {
+                /*
+                 * SDP negotiation has failed.
+                 */
+                pj_status_t rc;
+                pj_str_t reason;
+
+                /* Delete the 2xx answer */
+                pjsip_tx_data_dec_ref(tdata);
+                
+                /* Create 500 response */
+                reason = pj_str("SDP negotiation failed");
+                rc = pjsip_dlg_create_response(dlg, rdata, 500, &reason, 
+                                               &tdata);
+                if (rc == PJ_SUCCESS) {
+                    pjsip_warning_hdr *w;
+                    const pj_str_t *endpt_name;
+
+                    endpt_name = pjsip_endpt_name(dlg->endpt);
+                    w = pjsip_warning_hdr_create_from_status(tdata->pool, 
+                                                             endpt_name,
+                                                             status);
+                    if (w)
+                        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)w);
+
+                    pjsip_inv_send_msg(inv, tdata);
+                }
                 return;
-
+            }
+
+            /* Send 2xx regardless of the status of negotiation */
             status = pjsip_inv_send_msg(inv, tdata);