Changeset 6088 for pjproject

Timestamp:

Oct 8, 2019 8:32:53 AM (5 years ago)

Author:

riza

Message:

Fixed #2241: Update "sent-by" field of Via header on CANCEL request for proxy scenario.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_util.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -1106 +1106 @@
     PJ_UNUSED_ARG(tdata);
     pj_assert(tdata == stateless_data->tdata);
+    pj_status_t need_update_via = PJ_TRUE;
 
     for (;;) {
@@ -1202 +1203 @@
         }
 
+        if (tdata->msg->line.req.method.id == PJSIP_CANCEL_METHOD) {
+            if (via->sent_by.host.slen > 0) {
+                /* Don't update Via header on a CANCEL request if the sent-by
+                 * parameter is already set since it needs to match the 
+                 * original request. */
+                need_update_via = PJ_FALSE;
+            }
+        }
+
         if (via->branch_param.slen == 0) {
             pj_str_t tmp;
@@ -1214 +1224 @@
         }
 
-        /* For CANCEL request, do not update the Via header since it needs
-         * to match the original request.
-         */
-        if (tdata->msg->line.req.method.id != PJSIP_CANCEL_METHOD) {
+        if (need_update_via) {
             via->transport = pj_str(stateless_data->cur_transport->type_name);