Changeset 1723 for pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c

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/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c

@@ -750 +750 @@
 {
     pjsua_call *call = &pjsua_var.calls[call_id];
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     pjsua_acc *acc = &pjsua_var.acc[call->acc_id];
     pjmedia_srtp_setting srtp_opt;
     pjmedia_transport *srtp;
     pj_status_t status;
+#endif
 
     PJ_UNUSED_ARG(role);
@@ -767 +770 @@
     pjmedia_transport_media_stop(call->med_tp);
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /* Check if SRTP requires secure signaling */
     if (acc->cfg.use_srtp != PJMEDIA_SRTP_DISABLED) {
@@ -787 +791 @@
     call->med_orig = call->med_tp;
     call->med_tp = srtp;
+#else
+    call->med_orig = call->med_tp;
+    PJ_UNUSED_ARG(security_level);
+#endif
 
     return PJ_SUCCESS;