Changeset 3832

Timestamp:

Oct 20, 2011 4:01:26 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1319: When sips scheme is used, TLS must be used even when transport=tcp is specified in the URI (thanks Iñaki Baz Castillo for the report)

File:

• pjproject/branches/1.x/pjsip/src/pjsip/sip_util.c (modified) (2 diffs)

pjproject/branches/1.x/pjsip/src/pjsip/sip_util.c

@@ -814 +814 @@
         pjsip_uri *uri = (pjsip_uri*) target_uri;
         const pjsip_sip_uri *url=(const pjsip_sip_uri*)pjsip_uri_get_uri(uri);
+        unsigned flag;
+
         dest_info->flag |= (PJSIP_TRANSPORT_SECURE | PJSIP_TRANSPORT_RELIABLE);
         if (url->maddr_param.slen)
@@ -822 +824 @@
         dest_info->type = 
             pjsip_transport_get_type_from_name(&url->transport_param);
+        /* Double-check that the transport parameter match.
+         * Sample case:     sips:host;transport=tcp
+         * See https://trac.pjsip.org/repos/ticket/1319
+         */
+        flag = pjsip_transport_get_flag_from_type(dest_info->type);
+        if ((flag & dest_info->flag) != dest_info->flag) {
+            pjsip_transport_type_e t;
+
+            t = pjsip_transport_get_type_from_flag(dest_info->flag);
+            if (t != PJSIP_TRANSPORT_UNSPECIFIED)
+                dest_info->type = t;
+        }
 
     } else if (PJSIP_URI_SCHEME_IS_SIP(target_uri)) {