Major TLS work (ticket #3): asynchronous socket, rather complete TLS options, and pjsua integration. The TLS support should work in both client and server mode.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@861 74dad513-b988-da41-8d7b-12977e46ad98

1 files changed, 3 insertions, 12 deletions

diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
index a964c49f..eda850a5 100644
--- a/pjsip/include/pjsua-lib/pjsua.h
+++ b/pjsip/include/pjsua-lib/pjsua.h
@@ -841,19 +841,9 @@ typedef struct pjsua_transport_config
     pjsua_stun_config	stun_config;
 
     /**
-     * TLS root CA file path (only used for TLS transport).
+     * TLS settings.
      */
-    pj_str_t		tls_ca_file;
-
-    /**
-     * TLS client key path (only used for TLS transport).
-     */
-    pj_str_t		tls_key_file;
-
-    /**
-     * TLS password (only used for TLS transport).
-     */
-    pj_str_t		tls_password;
+    pjsip_tls_setting	tls_setting;
 
 } pjsua_transport_config;
 
@@ -866,6 +856,7 @@ typedef struct pjsua_transport_config
 PJ_INLINE(void) pjsua_transport_config_default(pjsua_transport_config *cfg)
 {
     pj_bzero(cfg, sizeof(*cfg));
+    pjsip_tls_setting_default(&cfg->tls_setting);
 }