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

Timestamp:

Mar 19, 2013 3:51:10 AM (11 years ago)

Author:

nanang

Message:

Re #1644: Added run-time setting 'pjsip_cfg()->follow_early_media_fork' and compile-time setting 'PJSIP_FOLLOW_EARLY_MEDIA_FORK', the default value is PJ_TRUE.

File:

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

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

@@ -1736 +1736 @@
     if (tsx_inv_data->sdp_done) {
         pj_str_t res_tag;
+        int st_code;
 
         res_tag = rdata->msg_info.to->tag;
-
-        /* Allow final response after SDP has been negotiated in early
-         * media, IF this response is a final response with different
+        st_code = rdata->msg_info.msg->line.status.code;
+
+        /* Allow final/early response after SDP has been negotiated in early
+         * media, IF this response is a final/early response with different
          * tag.
          */
         if (tsx->role == PJSIP_ROLE_UAC &&
-            rdata->msg_info.msg->line.status.code/100 == 2 &&
+            (st_code/100 == 2 ||
+             (st_code==183 && pjsip_cfg()->endpt.follow_early_media_fork)) &&
             tsx_inv_data->done_early &&
             pj_stricmp(&tsx_inv_data->done_tag, &res_tag))
@@ -1750 +1753 @@
             const pjmedia_sdp_session *reoffer_sdp = NULL;
 
-            PJ_LOG(4,(inv->obj_name, "Received forked final response "
+            PJ_LOG(4,(inv->obj_name, "Received forked %s response "
                       "after SDP negotiation has been done in early "
-                      "media. Renegotiating SDP.."));
+                      "media. Renegotiating SDP..",
+                      (st_code==183? "early" : "final" )));
 
             /* Retrieve original SDP offer from INVITE request */
@@ -1764 +1768 @@
             if (status != PJ_SUCCESS) {
                 PJ_LOG(1,(inv->obj_name, "Error updating local offer for "
-                          "forked 2xx response (err=%d)", status));
+                          "forked 2xx/183 response (err=%d)", status));
                 return status;
             }