Changeset 3943


Ignore:
Timestamp:
Jan 17, 2012 7:02:14 AM (8 years ago)
Author:
nanang
Message:

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

Location:
pjproject/branches/1.x
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x/pjsip-apps/src/pjsua/pjsua_app.c

    r3942 r3943  
    535535           OPT_USE_TLS, OPT_TLS_CA_FILE, OPT_TLS_CERT_FILE, OPT_TLS_PRIV_FILE, 
    536536           OPT_TLS_PASSWORD, OPT_TLS_VERIFY_SERVER, OPT_TLS_VERIFY_CLIENT, 
    537            OPT_TLS_NEG_TIMEOUT, OPT_TLS_SRV_NAME, OPT_TLS_CIPHER, 
     537           OPT_TLS_NEG_TIMEOUT, OPT_TLS_CIPHER, 
    538538           OPT_CAPTURE_DEV, OPT_PLAYBACK_DEV, 
    539539           OPT_CAPTURE_LAT, OPT_PLAYBACK_LAT, OPT_NO_TONES, OPT_JB_MAX_SIZE, 
     
    643643        { "tls-verify-client", 0, 0, OPT_TLS_VERIFY_CLIENT}, 
    644644        { "tls-neg-timeout", 1, 0, OPT_TLS_NEG_TIMEOUT}, 
    645         { "tls-srv-name", 1, 0, OPT_TLS_SRV_NAME}, 
    646645        { "tls-cipher", 1, 0, OPT_TLS_CIPHER}, 
    647646#endif 
     
    13461345            break; 
    13471346 
    1348         case OPT_TLS_SRV_NAME: 
    1349             cfg->udp_cfg.tls_setting.server_name = pj_str(pj_optarg); 
    1350             break; 
    13511347        case OPT_TLS_CIPHER: 
    13521348            { 
     
    18271823                        (int)config->udp_cfg.tls_setting.password.slen,  
    18281824                        config->udp_cfg.tls_setting.password.ptr); 
    1829         pj_strcat2(&cfg, line); 
    1830     } 
    1831  
    1832     if (config->udp_cfg.tls_setting.server_name.slen) { 
    1833         pj_ansi_sprintf(line, "--tls-srv-name %.*s\n", 
    1834                         (int)config->udp_cfg.tls_setting.server_name.slen,  
    1835                         config->udp_cfg.tls_setting.server_name.ptr); 
    18361825        pj_strcat2(&cfg, line); 
    18371826    } 
  • pjproject/branches/1.x/pjsip-apps/src/symbian_ua/ua.cpp

    r3553 r3943  
    5959#define ENABLE_SIP_TLS  0 // experimental 
    6060 
    61 #define TLS_SRV_NAME    "pjsip.org"     // TLS servername (required for 
    62                                         // TLS transport) 
    63  
    6461// 
    6562// Configure nameserver if DNS SRV is to be used with both SIP 
     
    491488        tcfg.tls_setting.qos_params = tcfg.qos_params; 
    492489    } 
    493     tcfg.tls_setting.server_name = pj_str(TLS_SRV_NAME); 
    494490    status = pjsua_transport_create(PJSIP_TRANSPORT_TLS, &tcfg, &tid); 
    495491    if (status != PJ_SUCCESS) { 
  • pjproject/branches/1.x/pjsip/include/pjsip/sip_transport_tls.h

    r3942 r3943  
    121121     */ 
    122122    pj_ssl_cipher *ciphers; 
    123  
    124     /** 
    125      * Optionally specify the server name instance to be contacted when 
    126      * making outgoing TLS connection. This setting is useful when the 
    127      * server is hosting multiple domains for the same TLS listening 
    128      * socket. 
    129      * 
    130      * Default: empty. 
    131      */ 
    132     pj_str_t    server_name; 
    133123 
    134124    /** 
Note: See TracChangeset for help on using the changeset viewer.