Changeset 1723 for pjproject/branches/users/nanang/pjsip/include/pjsua-lib/pjsua.h

Timestamp:

Jan 21, 2008 9:20:58 PM (16 years ago)

Author:

nanang

Message:

Ticket #452:

• Applied preprocessor PJMEDIA_HAS_SRTP in PJMEDIA & PJSUA.
• Applied preprocessor PJSUA_DEFAULT_USE_SRTP and PJSUA_DEFAULT_SRTP_SECURE_SIGNALING in PJSUA

File:

• pjproject/branches/users/nanang/pjsip/include/pjsua-lib/pjsua.h (modified) (7 diffs)

pjproject/branches/users/nanang/pjsip/include/pjsua-lib/pjsua.h

@@ -404 +404 @@
 #endif
 
-
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+
+/**
+ * Default value of SRTP mode usage. Valid values are PJMEDIA_SRTP_DISABLED, 
+ * PJMEDIA_SRTP_OPTIONAL, and PJMEDIA_SRTP_MANDATORY.
+ */
+#ifndef PJSUA_DEFAULT_USE_SRTP
+    #define PJSUA_DEFAULT_USE_SRTP  PJMEDIA_SRTP_DISABLED
+#endif
+
+/**
+ * Default value of secure signaling requirement for SRTP.
+ * Valid values are:
+ *      0: SRTP does not require secure signaling
+ *      1: SRTP requires secure transport such as TLS
+ *      2: SRTP requires secure end-to-end transport (SIPS)
+ */
+#ifndef PJSUA_DEFAULT_SRTP_SECURE_SIGNALING
+    #define PJSUA_DEFAULT_SRTP_SECURE_SIGNALING 0
+#endif
+
+#endif
 
 /**
@@ -1035 +1056 @@
     pj_str_t        user_agent;
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /**
      * Specify default value of secure media transport usage. 
@@ -1043 +1065 @@
      * configuration (#pjsua_acc_config).
      *
-     * Default:
-     *  PJMEDIA_SRTP_DISABLED
+     * Default: #PJSUA_DEFAULT_USE_SRTP
      */
     pjmedia_srtp_use    use_srtp;
@@ -1060 +1081 @@
      * configuration (#pjsua_acc_config).
      *
-     * Default: 0
+     * Default: #PJSUA_DEFAULT_SRTP_SECURE_SIGNALING
      */
     int              srtp_secure_signaling;
+#endif
 
 } pjsua_config;
@@ -2001 +2023 @@
     pj_str_t         ka_data;
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /**
      * Specify whether secure media transport should be used for this account.
@@ -2006 +2029 @@
      * PJMEDIA_SRTP_MANDATORY.
      *
-     * Default:
-     *  PJMEDIA_SRTP_DISABLED
+     * Default: #PJSUA_DEFAULT_USE_SRTP
      */
     pjmedia_srtp_use    use_srtp;
@@ -2020 +2042 @@
      *  2: SRTP requires secure end-to-end transport (SIPS)
      *
-     * Default: 0
+     * Default: #PJSUA_DEFAULT_SRTP_SECURE_SIGNALING
      */
     int              srtp_secure_signaling;
+#endif
 
 } pjsua_acc_config;