Changeset 3329

Timestamp:

Oct 1, 2010 12:24:23 AM (14 years ago)

Author:

bennylp

Message:

Closed #1141: Compile and run-time setting to allow printing of port number in URI in To and From header (thanks Marcus Froeschl for the suggestion)

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -69 +69 @@
 typedef struct pjsip_cfg_t
 {
+    /** Global settings. */
+    struct {
+        /**
+         * Specify port number should be allowed to appear in To and From
+         * header. Note that RFC 3261 disallow this, see Table 1 in section
+         * 19.1.1 of the RFC. Default is PJSIP_ALLOW_PORT_IN_FROMTO_HDR.
+         */
+        pj_bool_t allow_port_in_fromto_hdr;
+
+    } endpt;
+
     /** Transaction layer settings. */
     struct {
@@ -362 +373 @@
 
 /**
+ * Specify port number should be allowed to appear in To and From
+ * header. Note that RFC 3261 disallow this, see Table 1 in section
+ * 19.1.1 of the RFC. This setting can also be altered at run-time
+ * via pjsip_cfg setting, see pjsip_cfg_t.allow_port_in_fromto_hdr
+ * field.
+ *
+ * Default: 0
+ */
+#ifndef PJSIP_ALLOW_PORT_IN_FROMTO_HDR
+#   define PJSIP_ALLOW_PORT_IN_FROMTO_HDR       0
+#endif
+
+/**
  * This macro controls maximum numbers of ioqueue events to be processed
  * in a single pjsip_endpt_handle_events() poll. When PJSIP detects that

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

@@ -24 +24 @@
 pjsip_cfg_t pjsip_sip_cfg_var =
 {
+    /* Global settings */
+    {
+       PJSIP_ALLOW_PORT_IN_FROMTO_HDR
+    },
+
     /* Transaction settings */
     {

pjproject/trunk/pjsip/src/pjsip/sip_uri.c

@@ -289 +289 @@
 
     /* Only print port if it is explicitly specified. 
-     * Port is not allowed in To and From header.
-     */
-    /* Unfortunately some UA requires us to send back the port
-     * number exactly as it was sent. We don't remember whether an
-     * UA has sent us port, so we'll just send the port indiscrimately
-     */
-    //PJ_TODO(SHOULD_DISALLOW_URI_PORT_IN_FROM_TO_HEADER)
-    if (url->port && context != PJSIP_URI_IN_FROMTO_HDR) {
+     * Port is not allowed in To and From header, see Table 1 in
+     * RFC 3261 Section 19.1.1
+     */
+    /* Note: ticket #1141 adds run-time setting to allow port number to
+     * appear in From/To header. Default is still false.
+     */
+    if (url->port &&
+        (context != PJSIP_URI_IN_FROMTO_HDR ||
+         pjsip_cfg()->endpt.allow_port_in_fromto_hdr))
+    {
         if (endbuf - buf < 10)
             return -1;