Changeset 5555 for pjproject/trunk/pjsip/src/pjsip/sip_util.c

Timestamp:

Feb 20, 2017 1:12:21 AM (7 years ago)

Author:

ming

Message:

Fixed #1996: Via-Header mismatch in CANCEL

Thank you to Marcus Froeschl for the report

File:

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

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

@@ -1215 +1215 @@
 
         via->transport = pj_str(stateless_data->cur_transport->type_name);
+        /* For Cancel request, do not update the Via address with
+         * the new transport since it needs to match the original
+         * request.
+         */
         if (tdata->via_addr.host.slen > 0 &&
-            tdata->via_tp == (void *)stateless_data->cur_transport)
+            (tdata->via_tp == (void *)stateless_data->cur_transport ||
+             tdata->msg->line.req.method.id == PJSIP_CANCEL_METHOD))
         {
             via->sent_by = tdata->via_addr;