Changeset 1723 for pjproject/branches/users/nanang/pjsip-apps/src/pjsua/pjsua_app.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-apps/src/pjsua/pjsua_app.c (modified) (7 diffs)

pjproject/branches/users/nanang/pjsip-apps/src/pjsua/pjsua_app.c

@@ -121 +121 @@
     puts  ("SIP Account options:");
     puts  ("  --use-ims           Enable 3GPP/IMS related settings on this account");
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     puts  ("  --use-srtp=N        Use SRTP N= 0: disabled, 1: optional, 2: mandatory");
+#endif
     puts  ("  --registrar=url     Set the URL of registrar server");
     puts  ("  --id=url            Set the URL of local ID (used in From header)");
@@ -443 +445 @@
         { "rtp-port",   1, 0, OPT_RTP_PORT},
         { "use-ice",    0, 0, OPT_USE_ICE},
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
         { "use-srtp",   1, 0, OPT_USE_SRTP},
+#endif
         { "add-codec",  1, 0, OPT_ADD_CODEC},
         { "dis-codec",  1, 0, OPT_DIS_CODEC},
@@ -474 +478 @@
     pjsua_acc_config *cur_acc;
     char *config_file = NULL;
-    int use_srtp = -1;
     unsigned i;
 
@@ -800 +803 @@
             break;
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
         case OPT_USE_SRTP:
-            use_srtp = my_atoi(pj_optarg);
-            if (!pj_isdigit(*pj_optarg) || use_srtp > 2) {
+            app_config.cfg.use_srtp = my_atoi(pj_optarg);
+            if (!pj_isdigit(*pj_optarg) || app_config.cfg.use_srtp > 2) {
                 PJ_LOG(1,(THIS_FILE, "Invalid value for --use-srtp option"));
                 return -1;
             }
-            app_config.cfg.use_srtp = use_srtp;
-            break;
+            break;
+#endif
 
         case OPT_RTP_PORT:
@@ -1039 +1043 @@
     for (i=0; i<cfg->acc_cnt; ++i) {
         pjsua_acc_config *acfg = &cfg->acc_cfg[i];
-
-        acfg->use_srtp = (pjmedia_srtp_use) use_srtp;
 
         if (acfg->cred_info[acfg->cred_count].username.slen)
@@ -1126 +1128 @@
     }
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /* SRTP */
     if (acc_cfg->use_srtp) {
@@ -1132 +1135 @@
         pj_strcat2(result, line);
     }
+#endif
 
     /* Proxy */