Ignore:
Timestamp:
Jan 23, 2008 8:39:07 PM (12 years ago)
Author:
bennylp
Message:

Ticket #61: Implement SRTP support in PJMEDIA and PJSUA-LIB, and updated applications because of the changes. This is a major modification back ported from SRTP branch. See ticket #61 for changelog detail of this commit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

    r1703 r1735  
    404404#endif 
    405405 
    406  
     406#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) 
     407 
     408/** 
     409 * Default value of SRTP mode usage. Valid values are PJMEDIA_SRTP_DISABLED,  
     410 * PJMEDIA_SRTP_OPTIONAL, and PJMEDIA_SRTP_MANDATORY. 
     411 */ 
     412#ifndef PJSUA_DEFAULT_USE_SRTP 
     413    #define PJSUA_DEFAULT_USE_SRTP  PJMEDIA_SRTP_DISABLED 
     414#endif 
     415 
     416/** 
     417 * Default value of secure signaling requirement for SRTP. 
     418 * Valid values are: 
     419 *      0: SRTP does not require secure signaling 
     420 *      1: SRTP requires secure transport such as TLS 
     421 *      2: SRTP requires secure end-to-end transport (SIPS) 
     422 */ 
     423#ifndef PJSUA_DEFAULT_SRTP_SECURE_SIGNALING 
     424    #define PJSUA_DEFAULT_SRTP_SECURE_SIGNALING 1 
     425#endif 
     426 
     427#endif 
    407428 
    408429/** 
     
    10351056    pj_str_t        user_agent; 
    10361057 
     1058#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) 
     1059    /** 
     1060     * Specify default value of secure media transport usage.  
     1061     * Valid values are PJMEDIA_SRTP_DISABLED, PJMEDIA_SRTP_OPTIONAL, and 
     1062     * PJMEDIA_SRTP_MANDATORY. 
     1063     * 
     1064     * Note that this setting can be further customized in account  
     1065     * configuration (#pjsua_acc_config). 
     1066     * 
     1067     * Default: #PJSUA_DEFAULT_USE_SRTP 
     1068     */ 
     1069    pjmedia_srtp_use    use_srtp; 
     1070 
     1071    /** 
     1072     * Specify whether SRTP requires secure signaling to be used. This option 
     1073     * is only used when \a use_srtp option above is non-zero. 
     1074     * 
     1075     * Valid values are: 
     1076     *  0: SRTP does not require secure signaling 
     1077     *  1: SRTP requires secure transport such as TLS 
     1078     *  2: SRTP requires secure end-to-end transport (SIPS) 
     1079     * 
     1080     * Note that this setting can be further customized in account  
     1081     * configuration (#pjsua_acc_config). 
     1082     * 
     1083     * Default: #PJSUA_DEFAULT_SRTP_SECURE_SIGNALING 
     1084     */ 
     1085    int              srtp_secure_signaling; 
     1086#endif 
     1087 
    10371088} pjsua_config; 
    10381089 
     
    19712022     */ 
    19722023    pj_str_t         ka_data; 
     2024 
     2025#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) 
     2026    /** 
     2027     * Specify whether secure media transport should be used for this account. 
     2028     * Valid values are PJMEDIA_SRTP_DISABLED, PJMEDIA_SRTP_OPTIONAL, and 
     2029     * PJMEDIA_SRTP_MANDATORY. 
     2030     * 
     2031     * Default: #PJSUA_DEFAULT_USE_SRTP 
     2032     */ 
     2033    pjmedia_srtp_use    use_srtp; 
     2034 
     2035    /** 
     2036     * Specify whether SRTP requires secure signaling to be used. This option 
     2037     * is only used when \a use_srtp option above is non-zero. 
     2038     * 
     2039     * Valid values are: 
     2040     *  0: SRTP does not require secure signaling 
     2041     *  1: SRTP requires secure transport such as TLS 
     2042     *  2: SRTP requires secure end-to-end transport (SIPS) 
     2043     * 
     2044     * Default: #PJSUA_DEFAULT_SRTP_SECURE_SIGNALING 
     2045     */ 
     2046    int              srtp_secure_signaling; 
     2047#endif 
    19732048 
    19742049} pjsua_acc_config; 
Note: See TracChangeset for help on using the changeset viewer.