Changeset 1390

Timestamp:

Jun 26, 2007 8:23:18 AM (17 years ago)

Author:

bennylp

Message:

Ticket #342: added configuration to control whether Allow header should be included in outgoing INVITE requests

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -159 +159 @@
 
 /**
+ * Send Allow header in dialog establishing requests?
+ * RFC 3261 Allow header SHOULD be included in dialog establishing
+ * requests to inform remote agent about which SIP requests are
+ * allowed within dialog.
+ *
+ * Note that there is also an undocumented variable defined in sip_dialog.c
+ * to control whether Allow header should be included. The default value 
+ * of this variable is PJSIP_INCLUDE_ALLOW_HDR_IN_DLG.
+ * To change PJSIP behavior during run-time, application can use the 
+ * following construct:
+ *
+ \verbatim
+   extern pj_bool_t pjsip_include_allow_hdr_in_dlg;
+ 
+   // do not transmit Allow header
+   pjsip_include_allow_hdr_in_dlg = PJ_FALSE;
+ \endverbatim
+ *
+ * Default is 1 (Yes)
+ */
+#ifndef PJSIP_INCLUDE_ALLOW_HDR_IN_DLG
+#   define PJSIP_INCLUDE_ALLOW_HDR_IN_DLG       1
+#endif
+
+
+/**
  * Allow SIP modules removal or insertions during operation?
  * If yes, then locking will be employed when endpoint need to

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

@@ -114 +114 @@
 };
 
+/* Config */
+extern pj_bool_t pjsip_include_allow_hdr_in_dlg;
 
 /*
@@ -1154 +1156 @@
 
     /* Add Allow header. */
-    hdr = pjsip_endpt_get_capability(inv->dlg->endpt, PJSIP_H_ALLOW, NULL);
-    if (hdr) {
-        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
-                          pjsip_hdr_shallow_clone(tdata->pool, hdr));
+    if (pjsip_include_allow_hdr_in_dlg) {
+        hdr = pjsip_endpt_get_capability(inv->dlg->endpt, PJSIP_H_ALLOW, NULL);
+        if (hdr) {
+            pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
+                              pjsip_hdr_shallow_clone(tdata->pool, hdr));
+        }
     }
 

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -40 +40 @@
 long pjsip_dlg_lock_tls_id;
 
+/* Config */
+pj_bool_t pjsip_include_allow_hdr_in_dlg = PJSIP_INCLUDE_ALLOW_HDR_IN_DLG;
+
+
 PJ_DEF(pj_bool_t) pjsip_method_creates_dialog(const pjsip_method *m)
 {
@@ -1197 +1201 @@
 
         /* Add Allow header in 2xx and 405 response. */
-        if ((st_class==2 || st_code==405) &&
+        if (((st_class==2 && pjsip_include_allow_hdr_in_dlg)
+             || st_code==405) &&
             pjsip_msg_find_hdr(tdata->msg, PJSIP_H_ALLOW, NULL)==NULL) 
         {