diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-01-17 07:02:14 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-01-17 07:02:14 +0000 |
| commit | d1348cdca78f05eb595d8674410090ba86e0811a (patch) | |
| tree | f9ffa6581d355d44510b5f3e7292cc6e20bbd7e1 /pjsip-apps | |
| parent | 06d3f22a5f024613b692b6113eec1ca3122a2592 (diff) | |
Close #1448: removed server name setting from TLS transport config.
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3943 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 13 | ||||
| -rw-r--r-- | pjsip-apps/src/symbian_ua/ua.cpp | 4 |
2 files changed, 1 insertions, 16 deletions
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index 0c3d3eb6..83d470d7 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -534,7 +534,7 @@ static pj_status_t parse_args(int argc, char *argv[], OPT_NOREFERSUB, OPT_ACCEPT_REDIRECT, OPT_USE_TLS, OPT_TLS_CA_FILE, OPT_TLS_CERT_FILE, OPT_TLS_PRIV_FILE, OPT_TLS_PASSWORD, OPT_TLS_VERIFY_SERVER, OPT_TLS_VERIFY_CLIENT, - OPT_TLS_NEG_TIMEOUT, OPT_TLS_SRV_NAME, OPT_TLS_CIPHER, + OPT_TLS_NEG_TIMEOUT, OPT_TLS_CIPHER, OPT_CAPTURE_DEV, OPT_PLAYBACK_DEV, OPT_CAPTURE_LAT, OPT_PLAYBACK_LAT, OPT_NO_TONES, OPT_JB_MAX_SIZE, OPT_STDOUT_REFRESH, OPT_STDOUT_REFRESH_TEXT, OPT_IPV6, OPT_QOS, @@ -642,7 +642,6 @@ static pj_status_t parse_args(int argc, char *argv[], { "tls-verify-server", 0, 0, OPT_TLS_VERIFY_SERVER}, { "tls-verify-client", 0, 0, OPT_TLS_VERIFY_CLIENT}, { "tls-neg-timeout", 1, 0, OPT_TLS_NEG_TIMEOUT}, - { "tls-srv-name", 1, 0, OPT_TLS_SRV_NAME}, { "tls-cipher", 1, 0, OPT_TLS_CIPHER}, #endif { "capture-dev", 1, 0, OPT_CAPTURE_DEV}, @@ -1345,9 +1344,6 @@ static pj_status_t parse_args(int argc, char *argv[], cfg->udp_cfg.tls_setting.timeout.sec = atoi(pj_optarg); break; - case OPT_TLS_SRV_NAME: - cfg->udp_cfg.tls_setting.server_name = pj_str(pj_optarg); - break; case OPT_TLS_CIPHER: { pj_ssl_cipher cipher; @@ -1829,13 +1825,6 @@ static int write_settings(const struct app_config *config, pj_strcat2(&cfg, line); } - if (config->udp_cfg.tls_setting.server_name.slen) { - pj_ansi_sprintf(line, "--tls-srv-name %.*s\n", - (int)config->udp_cfg.tls_setting.server_name.slen, - config->udp_cfg.tls_setting.server_name.ptr); - pj_strcat2(&cfg, line); - } - if (config->udp_cfg.tls_setting.verify_server) pj_strcat2(&cfg, "--tls-verify-server\n"); diff --git a/pjsip-apps/src/symbian_ua/ua.cpp b/pjsip-apps/src/symbian_ua/ua.cpp index 139ac47c..4f7eb357 100644 --- a/pjsip-apps/src/symbian_ua/ua.cpp +++ b/pjsip-apps/src/symbian_ua/ua.cpp @@ -58,9 +58,6 @@ #define ENABLE_SIP_TCP 0 // experimental #define ENABLE_SIP_TLS 0 // experimental -#define TLS_SRV_NAME "pjsip.org" // TLS servername (required for - // TLS transport) - // // Configure nameserver if DNS SRV is to be used with both SIP // or STUN (for STUN see other settings below) @@ -490,7 +487,6 @@ static pj_status_t app_startup() tcfg.qos_params.dscp_val = SIP_QOS_DSCP; tcfg.tls_setting.qos_params = tcfg.qos_params; } - tcfg.tls_setting.server_name = pj_str(TLS_SRV_NAME); status = pjsua_transport_create(PJSIP_TRANSPORT_TLS, &tcfg, &tid); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Error creating TLS transport", status); |