Changeset 3172

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.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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);
     }

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -1084 +1084 @@
      */
     int              srtp_secure_signaling;
+
+    /**
+     * Specify whether SRTP in PJMEDIA_SRTP_OPTIONAL mode should compose 
+     * duplicated media in SDP offer, i.e: unsecured and secured version.
+     * Otherwise, the SDP media will be composed as unsecured media but 
+     * with SDP "crypto" attribute.
+     *
+     * Default: PJ_FALSE
+     */
+    pj_bool_t        srtp_optional_dup_offer;
 #endif
 
@@ -2127 +2137 @@
      */
     int              srtp_secure_signaling;
+
+    /**
+     * Specify whether SRTP in PJMEDIA_SRTP_OPTIONAL mode should compose 
+     * duplicated media in SDP offer, i.e: unsecured and secured version.
+     * Otherwise, the SDP media will be composed as unsecured media but 
+     * with SDP "crypto" attribute.
+     *
+     * Default: PJ_FALSE
+     */
+    pj_bool_t        srtp_optional_dup_offer;
 #endif
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -752 +752 @@
     acc->cfg.use_srtp = cfg->use_srtp;
     acc->cfg.srtp_secure_signaling = cfg->srtp_secure_signaling;
+    acc->cfg.srtp_optional_dup_offer = cfg->srtp_optional_dup_offer;    
 #endif
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -176 +176 @@
     cfg->use_srtp = pjsua_var.ua_cfg.use_srtp;
     cfg->srtp_secure_signaling = pjsua_var.ua_cfg.srtp_secure_signaling;
+    cfg->srtp_optional_dup_offer = pjsua_var.ua_cfg.srtp_optional_dup_offer;
 #endif
     cfg->reg_retry_interval = PJSUA_REG_RETRY_INTERVAL;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1369 +1369 @@
         return status;
     }
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    /* Check if SRTP is in optional mode and configured to use duplicated
+     * media, i.e: secured and unsecured version, in the SDP offer.
+     */
+    if (!rem_sdp &&
+        pjsua_var.acc[call->acc_id].cfg.use_srtp == PJMEDIA_SRTP_OPTIONAL &&
+        pjsua_var.acc[call->acc_id].cfg.srtp_optional_dup_offer)
+    {
+        unsigned i;
+
+        for (i = 0; i < sdp->media_count; ++i) {
+            pjmedia_sdp_media *m = sdp->media[i];
+
+            /* Check if this media is unsecured but has SDP "crypto" 
+             * attribute.
+             */
+            if (pj_stricmp2(&m->desc.transport, "RTP/AVP") == 0 &&
+                pjmedia_sdp_media_find_attr2(m, "crypto", NULL) != NULL)
+            {
+                pjmedia_sdp_media *new_m;
+
+                /* Duplicate this media and apply secured transport */
+                new_m = pjmedia_sdp_media_clone(pool, m);
+                pj_strdup2(pool, &new_m->desc.transport, "RTP/SAVP");
+
+                /* Remove the "crypto" attribute in the unsecured media */
+                pjmedia_sdp_media_remove_all_attr(m, "crypto");
+
+                /* Insert the new media before the unsecured media */
+                if (sdp->media_count < PJMEDIA_MAX_SDP_MEDIA) {
+                    pj_array_insert(sdp->media, sizeof(new_m), 
+                                    sdp->media_count, i, &new_m);
+                    ++sdp->media_count;
+                    ++i;
+                }
+            }
+        }
+    }
+#endif
 
     /* Update currently advertised RTP source address */