Changeset 3943 for pjproject/branches/1.x

Timestamp:

Jan 17, 2012 7:02:14 AM (12 years ago)

Author:

nanang

Message:

Close #1448: removed server name setting from TLS transport config.

Location:

pjproject/branches/1.x

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (2 diffs)
• pjsip/include/pjsip/sip_transport_tls.h (modified) (1 diff)

pjproject/branches/1.x/pjsip-apps/src/pjsua/pjsua_app.c

@@ -535 +535 @@
            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,
@@ -643 +643 @@
         { "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
@@ -1346 +1345 @@
             break;
 
-        case OPT_TLS_SRV_NAME:
-            cfg->udp_cfg.tls_setting.server_name = pj_str(pj_optarg);
-            break;
         case OPT_TLS_CIPHER:
             {
@@ -1827 +1823 @@
                         (int)config->udp_cfg.tls_setting.password.slen, 
                         config->udp_cfg.tls_setting.password.ptr);
-        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);
     }

pjproject/branches/1.x/pjsip-apps/src/symbian_ua/ua.cpp

@@ -59 +59 @@
 #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
@@ -491 +488 @@
         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) {

pjproject/branches/1.x/pjsip/include/pjsip/sip_transport_tls.h

@@ -121 +121 @@
      */
     pj_ssl_cipher *ciphers;
-
-    /**
-     * Optionally specify the server name instance to be contacted when
-     * making outgoing TLS connection. This setting is useful when the
-     * server is hosting multiple domains for the same TLS listening
-     * socket.
-     *
-     * Default: empty.
-     */
-    pj_str_t    server_name;
 
     /**