Changeset 4770 for pjproject/trunk/pjsip/include/pjsip/sip_config.h

Timestamp:

Feb 27, 2014 6:16:36 AM (10 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.

File:

• pjproject/trunk/pjsip/include/pjsip/sip_config.h (modified) (2 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