Changeset 5733

Timestamp:

Jan 25, 2018 7:00:42 AM (7 years ago)

Author:

nanang

Message:

Fix #2085:

• Do not override Via header of a CANCEL request, its values are copied from the original INVITE already.
• Reset account's Via address & transport when SIP TCP/TLS transport is disconnected.

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_util.c (modified) (1 diff)
• pjsua-lib/pjsua_acc.c (modified) (1 diff)

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

@@ -1214 +1214 @@
         }
 
-        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.
+        /* For CANCEL request, do not update the Via header since it needs
+         * to match the original request.
          */
-        if (tdata->via_addr.host.slen > 0 &&
-            (!tdata->via_tp ||
-             tdata->via_tp == (void *)stateless_data->cur_transport ||
-             tdata->msg->line.req.method.id == PJSIP_CANCEL_METHOD))
-        {
-            via->sent_by = tdata->via_addr;
-        } else {
-            via->sent_by = stateless_data->cur_transport->local_name;
-        }
-        via->rport_param = pjsip_cfg()->endpt.disable_rport ? -1 : 0;
-
-        /* Add/remove "alias" param to/from Via header on connection 
-         * oriented/less transport, if configured.
-         */
-        if (pjsip_cfg()->endpt.req_has_via_alias &&
-            tdata->msg->type == PJSIP_REQUEST_MSG)
-        {
-            const pj_str_t ALIAS_STR = {"alias", 5};
-            pjsip_param *alias_param;
-            pj_bool_t is_datagram;
-
-            alias_param = pjsip_param_find(&via->other_param, &ALIAS_STR);
-            is_datagram = (stateless_data->cur_transport->flag & 
-                           PJSIP_TRANSPORT_DATAGRAM);
-            if (!is_datagram && !alias_param) {
-                alias_param = PJ_POOL_ZALLOC_T(tdata->pool, pjsip_param);
-                alias_param->name = ALIAS_STR;
-                pj_list_push_back(&via->other_param, alias_param);
-            } else if (is_datagram && alias_param) {
-                pj_list_erase(alias_param);
+        if (tdata->msg->line.req.method.id != PJSIP_CANCEL_METHOD) {
+            via->transport = pj_str(stateless_data->cur_transport->type_name);
+
+            if (tdata->via_addr.host.slen > 0 &&
+                (!tdata->via_tp ||
+                 tdata->via_tp == (void *)stateless_data->cur_transport))
+            {
+                via->sent_by = tdata->via_addr;
+
+                /* Better also update tdata via_tp, e.g: CANCEL may need to
+                 * refer to original INVITE tdata.
+                 */
+                tdata->via_tp = stateless_data->cur_transport;
+            } else {
+                via->sent_by = stateless_data->cur_transport->local_name;
+
+                /* Better also update tdata via_tp & via_addr, e.g: CANCEL
+                 * may need to refer to original INVITE tdata.
+                 */
+                tdata->via_tp = stateless_data->cur_transport;
+                tdata->via_addr = via->sent_by;
+            }
+            
+            via->rport_param = pjsip_cfg()->endpt.disable_rport ? -1 : 0;
+
+            /* Add/remove "alias" param to/from Via header on connection 
+             * oriented/less transport, if configured.
+             */
+            if (pjsip_cfg()->endpt.req_has_via_alias &&
+                tdata->msg->type == PJSIP_REQUEST_MSG)
+            {
+                const pj_str_t ALIAS_STR = {"alias", 5};
+                pjsip_param *alias_param;
+                pj_bool_t is_datagram;
+
+                alias_param = pjsip_param_find(&via->other_param, &ALIAS_STR);
+                is_datagram = (stateless_data->cur_transport->flag & 
+                               PJSIP_TRANSPORT_DATAGRAM);
+                if (!is_datagram && !alias_param) {
+                    alias_param = PJ_POOL_ZALLOC_T(tdata->pool, pjsip_param);
+                    alias_param->name = ALIAS_STR;
+                    pj_list_push_back(&via->other_param, alias_param);
+                } else if (is_datagram && alias_param) {
+                    pj_list_erase(alias_param);
+                }
             }
         }

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -3833 +3833 @@
             continue;
 
+        /* Reset Account's via transport and via address */
+        if (acc->via_tp == (void*)tp) {
+            pj_bzero(&acc->via_addr, sizeof(acc->via_addr));
+            acc->via_tp = NULL;
+        }
+
         /* Release transport immediately if regc is using it
          * See https://trac.pjsip.org/repos/ticket/1481