Changeset 1837 for pjproject/trunk

Timestamp:

Mar 2, 2008 10:37:41 AM (17 years ago)

Author:

bennylp

Message:

Ticket #498: Option in client registration to ignore Contact address in REGISTER response

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -24 +24 @@
  * @brief Compile time configuration.
  */
-#include <pj/config.h>
+#include <pj/types.h>
 
 /**
@@ -104 +104 @@
     /* Dialog layer settings .. TODO */
 
+    /** Client registration settings. */
+    struct {
+        /**
+         * Specify whether client registration should check for its 
+         * registered contact in Contact header of successful REGISTE 
+         * response to determine whether registration has been successful. 
+         * This setting may be disabled if non-compliant registrar is unable
+         * to return correct Contact header.
+         *
+         * Default is PJSIP_REGISTER_CLIENT_CHECK_CONTACT
+         */
+        pj_bool_t   check_contact;
+
+    } regc;
+
 } pjsip_cfg_t;
 
@@ -700 +715 @@
 
 /**
+ * Specify whether client registration should check for its registered
+ * contact in Contact header of successful REGISTE response to determine
+ * whether registration has been successful. This setting may be disabled
+ * if non-compliant registrar is unable to return correct Contact header.
+ *
+ * This setting can be changed in run-time with using pjsip_cfg().
+ *
+ * Default is 1
+ */
+#ifndef PJSIP_REGISTER_CLIENT_CHECK_CONTACT
+#   define PJSIP_REGISTER_CLIENT_CHECK_CONTACT  1
+#endif
+
+
+/**
  * @}
  */

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

@@ -724 +724 @@
             /* Enumerate all Contact headers found in the response and
              * find the Contact(s) that we register.
+             *
+             * Note: 
+             *  by default we require that the exact same URI that we
+             *  register is returned in the 200/OK response (by exact,
+             *  meaning all URI components including transport param),
+             *  otherwise if we don't detect that our URI is there, we
+             *  treat registration as failed.
+             *
+             *  If your registrar server couldn't do this, you can
+             *  disable this exact URI checking. See the compile time
+             *  setting PJSIP_REGISTER_CLIENT_CHECK_CONTACT or the
+             *  corresponding run-time setting in pjsip_cfg().
              */
-            for (i=0; i<contact_cnt; ++i) {
+            for (i=0; i<contact_cnt && pjsip_cfg()->regc.check_contact; ++i) {
                 pjsip_contact_hdr *our_contact;
 
@@ -761 +773 @@
              * means we have been unregistered.
              */
-            if (!has_our_contact)
+            if (pjsip_cfg()->regc.check_contact && !has_our_contact)
                 expiration = 0;
 

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

@@ -30 +30 @@
        PJSIP_T4_TIMEOUT,
        PJSIP_TD_TIMEOUT
+    },
+
+    /* Client registration client */
+    {
+        PJSIP_REGISTER_CLIENT_CHECK_CONTACT
     }
 };