Changeset 4441 for pjproject/trunk

Timestamp:

Mar 19, 2013 3:51:10 AM (12 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.

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -112 +112 @@
         pj_bool_t disable_tcp_switch;
 
+        /**
+         * Enable call media session to always be updated to the latest
+         * received early media SDP when receiving forked early media
+         * (multiple 183 responses with different To tag).
+         *
+         * Default is PJSIP_FOLLOW_EARLY_MEDIA_FORK.
+         */
+        pj_bool_t follow_early_media_fork;
+
     } endpt;
 
@@ -293 +302 @@
 
 /**
+ * Specify whether the call media session should be updated to the latest
+ * received early media SDP when receiving forked early media (multiple 183
+ * responses with different To tag).
+ *
+ * This option can also be controlled at run-time by the
+ * \a follow_early_media_fork setting in pjsip_cfg_t.
+ *
+ * Default is PJ_TRUE.
+ */
+#ifndef PJSIP_FOLLOW_EARLY_MEDIA_FORK
+#   define PJSIP_FOLLOW_EARLY_MEDIA_FORK            PJ_TRUE
+#endif
+
+
+/**
  * Accept call replace in early state when invite is not initiated
  * by the user agent. RFC 3891 Section 3 disallows this, however,

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

pjproject/trunk/pjsip/src/pjsip/sip_config.c

@@ -30 +30 @@
        0,
        0,
-       PJSIP_DONT_SWITCH_TO_TCP
+       PJSIP_DONT_SWITCH_TO_TCP,
+       PJSIP_FOLLOW_EARLY_MEDIA_FORK
     },