Changeset 4267 for pjproject/trunk

Timestamp:

Sep 28, 2012 6:17:11 AM (12 years ago)

Author:

nanang

Message:

Close #1587: Added settings to accept call replace when in early state and as UAS: accept_replace_in_early_state in pjsip_cfg_t and PJSIP_ACCEPT_REPLACE_IN_EARLY_STATE macro.

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -77 +77 @@
          */
         pj_bool_t allow_port_in_fromto_hdr;
+
+        /**
+         * Accept call replace in early state when invite is not initiated
+         * by the user agent. RFC 3891 Section 3 disallows this, however,
+         * for better interoperability reason, this might be ignored.
+         *
+         * Default is PJSIP_ACCEPT_REPLACE_IN_EARLY_STATE.
+         */
+        pj_bool_t accept_replace_in_early_state;
 
         /**
@@ -276 +285 @@
 
 /**
+ * Accept call replace in early state when invite is not initiated
+ * by the user agent. RFC 3891 Section 3 disallows this, however,
+ * for better interoperability reason, this might be ignored.
+ *
+ * This option can also be controlled at run-time by the
+ * \a accept_replace_in_early_state setting in pjsip_cfg_t.
+ *
+ * Default is 0 (no).
+ */
+#ifndef PJSIP_ACCEPT_REPLACE_IN_EARLY_STATE
+#   define PJSIP_ACCEPT_REPLACE_IN_EARLY_STATE      0
+#endif
+
+
+/**
  * This setting controls the threshold of the UDP packet, which if it's
  * larger than this value the request will be sent with TCP. This setting

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

@@ -306 +306 @@
      * Exist) response to the new INVITE.
      */
-    if (inv->state <= PJSIP_INV_STATE_EARLY && inv->role != PJSIP_ROLE_UAC) {
+    if (inv->state <= PJSIP_INV_STATE_EARLY && inv->role != PJSIP_ROLE_UAC &&
+        pjsip_cfg()->endpt.accept_replace_in_early_state == PJ_FALSE)
+    {
         code = PJSIP_SC_CALL_TSX_DOES_NOT_EXIST;
         warn_text = "Found early INVITE session but not initiated by this UA";

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

@@ -27 +27 @@
     {
        PJSIP_ALLOW_PORT_IN_FROMTO_HDR,
+       PJSIP_ACCEPT_REPLACE_IN_EARLY_STATE,
        0,
        PJSIP_DONT_SWITCH_TO_TCP