Changeset 3172 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

May 13, 2010 5:22:51 AM (14 years ago)

Author:

nanang

Message:

Re #1069:

• Added new approach of SRTP optional mode in pjsua-lib by duplicating SDP media line for secured and unsecured version of media transport.
• Integrated this feature into pjsua app, it is activated via --use-srtp=3 param.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -179 +179 @@
     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?  0:disabled, 1:optional, 2:mandatory (def:0)");
+    puts  ("  --use-srtp=N        Use SRTP?  0:disabled, 1:optional, 2:mandatory,");
+    puts  ("                      3:optional by duplicating media offer (def:0)");
     puts  ("  --srtp-secure=N     SRTP require secure SIP? 0:no, 1:tls, 1:sips (def:1)");
 #endif
@@ -1093 +1094 @@
         case OPT_USE_SRTP:
             app_config.cfg.use_srtp = my_atoi(pj_optarg);
-            if (!pj_isdigit(*pj_optarg) || app_config.cfg.use_srtp > 2) {
+            if (!pj_isdigit(*pj_optarg) || app_config.cfg.use_srtp > 3) {
                 PJ_LOG(1,(THIS_FILE, "Invalid value for --use-srtp option"));
                 return -1;
+            }
+            if ((int)app_config.cfg.use_srtp == 3) {
+                /* SRTP optional mode with duplicated media offer */
+                app_config.cfg.use_srtp = PJMEDIA_SRTP_OPTIONAL;
+                app_config.cfg.srtp_optional_dup_offer = PJ_TRUE;
+                cur_acc->srtp_optional_dup_offer = PJ_TRUE;
             }
             cur_acc->use_srtp = app_config.cfg.use_srtp;
@@ -1504 +1511 @@
     /* SRTP */
     if (acc_cfg->use_srtp) {
-        pj_ansi_sprintf(line, "--use-srtp %i\n",
-                        (int)acc_cfg->use_srtp);
+        int use_srtp = (int)acc_cfg->use_srtp;
+        if (use_srtp == PJMEDIA_SRTP_OPTIONAL && 
+            acc_cfg->srtp_optional_dup_offer)
+        {
+            use_srtp = 3;
+        }
+        pj_ansi_sprintf(line, "--use-srtp %i\n", use_srtp);
+        pj_strcat2(result, line);
+    }
+    if (acc_cfg->srtp_secure_signaling != 
+        PJSUA_DEFAULT_SRTP_SECURE_SIGNALING) 
+    {
+        pj_ansi_sprintf(line, "--srtp-secure %d\n",
+                        acc_cfg->srtp_secure_signaling);
         pj_strcat2(result, line);
     }
@@ -1737 +1756 @@
 #if PJMEDIA_HAS_SRTP
     if (app_config.cfg.use_srtp != PJSUA_DEFAULT_USE_SRTP) {
-        pj_ansi_sprintf(line, "--use-srtp %d\n",
-                        app_config.cfg.use_srtp);
+        int use_srtp = (int)app_config.cfg.use_srtp;
+        if (use_srtp == PJMEDIA_SRTP_OPTIONAL && 
+            app_config.cfg.srtp_optional_dup_offer)
+        {
+            use_srtp = 3;
+        }
+        pj_ansi_sprintf(line, "--use-srtp %d\n", use_srtp);
         pj_strcat2(&cfg, line);
     }