Changeset 3329 for pjproject/trunk/pjsip/src/pjsip/sip_uri.c

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)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_uri.c (modified) (1 diff)

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;