Changeset 4770

Timestamp:

Feb 27, 2014 6:16:36 AM (9 years ago)

Author:

nanang

Message:

Fixed #1740: TLS will be used whenever request URI uses "sips" scheme regardless the target-URI scheme/transport. This behavior is configurable via 'PJSIP_DONT_SWITCH_TO_TLS' in compile-time, or 'pjsip_cfg()->disable_tls_switch' in run-time.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (2 diffs)
• src/pjsip/sip_config.c (modified) (1 diff)
• src/pjsip/sip_util.c (modified) (5 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -113 +113 @@
 
         /**
+         * Disable automatic switching to TLS if target-URI does not use
+         * "sips" scheme nor TLS transport, even when request-URI uses
+         * "sips" scheme.
+         *
+         * Default is PJSIP_DONT_SWITCH_TO_TLS.
+         */
+        pj_bool_t disable_tls_switch;
+
+        /**
          * Enable call media session to always be updated to the latest
          * received early media SDP when receiving forked early media
@@ -310 +319 @@
 
 /**
+ * As specified RFC 3261 section 8.1.2, when request-URI uses "sips" scheme,
+ * TLS must always be used regardless of the target-URI scheme or transport
+ * type.
+ *
+ * This option will specify whether the behavior of automatic switching to TLS
+ * should be disabled, i.e: regard the target-URI scheme or transport type.
+ *
+ * This option can also be controlled at run-time by the \a disable_tls_switch
+ * setting in pjsip_cfg_t.
+ *
+ * Default is 0 (no).
+ */
+#ifndef PJSIP_DONT_SWITCH_TO_TLS
+#   define PJSIP_DONT_SWITCH_TO_TLS     0
+#endif
+
+
+/**
  * Specify whether the call media session should be updated to the latest
  * received early media SDP when receiving forked early media (multiple 183

pjproject/trunk/pjsip/src/pjsip/sip_config.c

@@ -31 +31 @@
        0,
        PJSIP_DONT_SWITCH_TO_TCP,
+       PJSIP_DONT_SWITCH_TO_TLS,
        PJSIP_FOLLOW_EARLY_MEDIA_FORK,
        PJSIP_REQ_HAS_VIA_ALIAS

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

@@ -803 +803 @@
 /* Fill-up destination information from a target URI */
 static pj_status_t get_dest_info(const pjsip_uri *target_uri, 
+                                 const pjsip_uri *request_uri, 
                                  pj_pool_t *pool,
                                  pjsip_host_info *dest_info)
@@ -811 +812 @@
     pj_bzero(dest_info, sizeof(*dest_info));
 
-    if (PJSIP_URI_SCHEME_IS_SIPS(target_uri)) {
+    /* When request URI uses sips scheme, TLS must always be used regardless
+     * of the target scheme or transport type (see ticket #1740).
+     */
+    if (PJSIP_URI_SCHEME_IS_SIPS(target_uri) || 
+        (pjsip_cfg()->endpt.disable_tls_switch == 0 && request_uri &&
+         PJSIP_URI_SCHEME_IS_SIPS(request_uri)))
+    {
         pjsip_uri *uri = (pjsip_uri*) target_uri;
         const pjsip_sip_uri *url=(const pjsip_sip_uri*)pjsip_uri_get_uri(uri);
         unsigned flag;
+
+        if (!PJSIP_URI_SCHEME_IS_SIPS(target_uri)) {
+            PJ_LOG(4,(THIS_FILE, "Automatic switch to TLS transport as "
+                                 "request-URI uses ""sips"" scheme."));
+        }
 
         dest_info->flag |= (PJSIP_TRANSPORT_SECURE | PJSIP_TRANSPORT_RELIABLE);
@@ -896 +908 @@
     }
 
-    return get_dest_info(target_uri, (pj_pool_t*)tdata->pool, dest_info);
+    return get_dest_info(target_uri, tdata->msg->line.req.uri,
+                         (pj_pool_t*)tdata->pool, dest_info);
 }
 
@@ -999 +1012 @@
 
     /* Fill up the destination host/port from the URI. */
-    status = get_dest_info(target_uri, tdata->pool, dest_info);
+    status = get_dest_info(target_uri, new_request_uri, tdata->pool,
+                           dest_info);
     if (status != PJ_SUCCESS)
         return status;
@@ -1496 +1510 @@
 
     /* Build destination info. */
-    status = get_dest_info(uri, tdata->pool, &dest_info);
+    status = get_dest_info(uri, NULL, tdata->pool, &dest_info);
     if (status != PJ_SUCCESS) {
         pjsip_tx_data_dec_ref(tdata);