Ticket #832: ticket832.patch

pjsip/src/test/msg_test.c

@@ -365 +365 @@
     hdr2 = ref_msg->hdr.next;
 
     while (hdr1 != &parsed_msg->hdr && hdr2 != &ref_msg->hdr) {
-        len = hdr1->vptr->print_on(hdr1, str1.ptr, BUFLEN);
-        if (len < 1) {
+        len = pjsip_hdr_print_on(hdr1, str1.ptr, BUFLEN);
+        if (len < 0) {
             status = -40;
             goto on_return;
         }
         str1.ptr[len] = '\0';
         str1.slen = len;
 
-        len = hdr2->vptr->print_on(hdr2, str2.ptr, BUFLEN);
-        if (len < 1) {
+        len = pjsip_hdr_print_on(hdr2, str2.ptr, BUFLEN);
+        if (len < 0) {
             status = -50;
             goto on_return;
         }
@@ -1937 +1937 @@
         /* Print the parsed header*/
         output = (char*) pj_pool_alloc(pool, 1024);
         len = pjsip_hdr_print_on(parsed_hdr1, output, 1024);
-        if (len < 1 || len >= 1024) {
+        if (len < 0 || len >= 1024) {
             PJ_LOG(3,(THIS_FILE, "    header too long: %s: %s", test->hname, test->hcontent));
             return -530;
         }

pjsip/src/pjsip/sip_msg.c

@@ -456 +456 @@
 
     /* 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;
+        if (len > 0) {
+            p += len;
+            if (p+3 >= end)
+                return -1;
 
-        *p++ = '\r';
-        *p++ = '\n';
+            *p++ = '\r';
+            *p++ = '\n';
+        }
     }
 
     /* Process message body. */
@@ -1601 +1603 @@
     char *startbuf = buf;
     char *endbuf = buf + size;
     const pjsip_parser_const_t *pc = pjsip_parser_const();
+    char *p;
+
     /* Route and Record-Route don't compact forms */
 
     copy_advance(buf, hdr->name);
     *buf++ = ':';
     *buf++ = ' ';
 
+    p = buf;
     printed = pjsip_uri_print(PJSIP_URI_IN_ROUTING_HDR, &hdr->name_addr, buf, 
                               endbuf-buf);
     if (printed < 1)
         return -1;
     buf += printed;
 
+    /* Ticket #832: 
+     *   Check the proprietary param 'hide', don't print this header 
+     *   if it exists in the route URI.
+     */
+    while(1) {
+        const pj_str_t st_hide = {"hide", 4};
+        pj_str_t uri_param;
+        char *p2;
+
+        /* Looking for ';' separator. */
+        while (p < buf && *p != ';') { ++p; }
+        if (p >= buf) 
+            break;
+
+        /* Looking for another ';' separator or end-of-URI. */
+        p2 = ++p;
+        while (p2 < buf && *p2 != ';' && *p2 != '>') { ++p2; }
+
+        pj_strset(&uri_param, p, p2-p);
+        if (pj_stricmp(&uri_param, &st_hide) == 0) {
+            return 0;
+        }
+    }
+
+
     printed = pjsip_param_print_on(&hdr->other_param, buf, endbuf-buf, 
                                    &pc->pjsip_TOKEN_SPEC, 
                                    &pc->pjsip_TOKEN_SPEC, ';');

pjsip/src/pjsip/sip_ua_layer.c

@@ -907 +907 @@
     char userinfo[128];
 
     len = pjsip_hdr_print_on(dlg->remote.info, userinfo, sizeof(userinfo));
-    if (len < 1)
+    if (len < 0)
         pj_ansi_strcpy(userinfo, "<--uri too long-->");
     else
         userinfo[len] = '\0';

pjsip/src/pjsua-lib/pjsua_call.c

@@ -2694 +2694 @@
     /* Dump invite sesion info. */
 
     len = pjsip_hdr_print_on(dlg->remote.info, userinfo, sizeof(userinfo));
-    if (len < 1)
+    if (len < 0)
         pj_ansi_strcpy(userinfo, "<--uri too long-->");
     else
         userinfo[len] = '\0';

pjsip-apps/src/samples/siprtp_report.c

@@ -77 +77 @@
 
     /* Call identification */
     len = pjsip_hdr_print_on(dlg->remote.info, userinfo, sizeof(userinfo));
-    if (len < 1)
+    if (len < 0)
         pj_ansi_strcpy(userinfo, "<--uri too long-->");
     else
         userinfo[len] = '\0';