Changeset 4819 for pjproject

Timestamp:

Apr 17, 2014 9:13:01 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1761: Remove "timer" from Supported header if it is disabled

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)

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

@@ -29 +29 @@
 #include <pjmedia/sdp_neg.h>
 #include <pjmedia/errno.h>
+#include <pj/array.h>
 #include <pj/string.h>
 #include <pj/pool.h>
@@ -1673 +1674 @@
     hdr = pjsip_endpt_get_capability(inv->dlg->endpt, PJSIP_H_SUPPORTED, NULL);
     if (hdr) {
-        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
-                          pjsip_hdr_shallow_clone(tdata->pool, hdr));
+        pjsip_supported_hdr *h_sup;
+
+        h_sup = (pjsip_supported_hdr*) pjsip_hdr_clone(tdata->pool, hdr);
+        /* Remove "timer" from Supported header if Session-Timers is
+         * disabled (https://trac.pjsip.org/repos/ticket/1761)
+         */
+        if ((inv->options & PJSIP_INV_SUPPORT_TIMER) == 0) {
+            unsigned i;
+            const pj_str_t STR_TIMER = { "timer", 5 };
+            for (i=0; i<h_sup->count; ++i) {
+                if (pj_stricmp(&h_sup->values[i], &STR_TIMER)==0) {
+                    pj_array_erase(h_sup->values, sizeof(h_sup->values[0]),
+                                   h_sup->count, i);
+                    --h_sup->count;
+                    break;
+                }
+            }
+        }
+
+        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)h_sup);
     }
 
@@ -2846 +2865 @@
     hdr = pjsip_endpt_get_capability(inv->dlg->endpt, PJSIP_H_SUPPORTED, NULL);
     if (hdr) {
-        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
-                          pjsip_hdr_shallow_clone(tdata->pool, hdr));
+        pjsip_supported_hdr *h_sup;
+
+        h_sup = (pjsip_supported_hdr*) pjsip_hdr_clone(tdata->pool, hdr);
+        /* Remove "timer" from Supported header if Session-Timers is
+         * disabled (https://trac.pjsip.org/repos/ticket/1761)
+         */
+        if ((inv->options & PJSIP_INV_SUPPORT_TIMER) == 0) {
+            unsigned i;
+            const pj_str_t STR_TIMER = { "timer", 5 };
+            for (i=0; i<h_sup->count; ++i) {
+                if (pj_stricmp(&h_sup->values[i], &STR_TIMER)==0) {
+                    pj_array_erase(h_sup->values, sizeof(h_sup->values[0]),
+                                   h_sup->count, i);
+                    --h_sup->count;
+                    break;
+                }
+            }
+        }
+
+        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)h_sup);
     }