Changeset 2724 for pjproject/trunk/pjsip/src/pjsip/sip_msg.c

Timestamp:

May 29, 2009 1:04:03 PM (15 years ago)

Author:

bennylp

Message:

Integration of Sipit24 branch, many tickets involved:

• #793: AMR encoder should regard 'mode-set' param specified by remote decoder.
• #831: Automatically switch to TCP transport when sending large request
• #832: Support for outbound proxy setting without using Route header
• #849: Modify conference audio switch behavior in connecting ports.
• #850: Remove 'Require=replaces' param in 'Refer-To' header (in call transfer with replaces).
• #851: Support for regular nomination in ICE
• #852: --ip-addr support for IPv6 for media transport in pjsua
• #854: Adding SOFTWARE attribute in all outgoing requests may cause compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)
• #855: Bug in digit map frequencies for DTMF digits (thanks FCCH for the report)
• #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice
• #857: Support for ICE keep-alive with Binding indication
• #858: Do not authenticate STUN 438 response
• #859: AMR-WB format param in the SDP is not negotiated correctly.
• #867: Return error instead of asserting when PJSUA-LIB fails to open log file

File:

• pjproject/trunk/pjsip/src/pjsip/sip_msg.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -457 +457 @@
     /* Print each of the headers. */
     for (hdr=msg->hdr.next; hdr!=&msg->hdr; hdr=hdr->next) {
-        len = (*hdr->vptr->print_on)(hdr, p, end-p);
-        if (len < 1)
+        len = pjsip_hdr_print_on(hdr, p, end-p);
+        if (len < 0)
             return -1;
-        p += len;
-
-        if (p+3 >= end)
-            return -1;
-
-        *p++ = '\r';
-        *p++ = '\n';
+
+        if (len > 0) {
+            p += len;
+            if (p+3 >= end)
+                return -1;
+
+            *p++ = '\r';
+            *p++ = '\n';
+        }
     }
 
@@ -1602 +1604 @@
     char *endbuf = buf + size;
     const pjsip_parser_const_t *pc = pjsip_parser_const();
+    pjsip_sip_uri *sip_uri;
+    pjsip_param *p;
+
+    /* Check the proprietary param 'hide', don't print this header 
+     * if it exists in the route URI.
+     */
+    sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(hdr->name_addr.uri);
+    p = sip_uri->other_param.next;
+    while (p != &sip_uri->other_param) {
+        const pj_str_t st_hide = {"hide", 4};
+
+        if (pj_stricmp(&p->name, &st_hide) == 0) {
+            /* Check if param 'hide' is specified without 'lr'. */
+            pj_assert(sip_uri->lr_param != 0);
+            return 0;
+        }
+        p = p->next;
+    }
+
     /* Route and Record-Route don't compact forms */