Changeset 1745 for pjproject/trunk

Timestamp:

Jan 25, 2008 9:02:33 AM (17 years ago)

Author:

bennylp

Message:

More ticket #61: fix bug in secure signaling determination, and added --srtp-secure option in pjsua to control signaling security requirement for SRTP

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

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

@@ -122 +122 @@
     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");
+    puts  ("  --use-srtp=N        Use SRTP?  0:disabled, 1:optional, 2:mandatory (def:0)");
+    puts  ("  --srtp-secure=N     SRTP require secure SIP? 0:no, 1:tls, 1:sips (def:1)");
 #endif
     puts  ("  --registrar=url     Set the URL of registrar server");
@@ -386 +387 @@
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
            OPT_AUTO_ANSWER, OPT_AUTO_HANGUP, OPT_AUTO_PLAY, OPT_AUTO_LOOP,
-           OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_USE_ICE, OPT_USE_SRTP,
+           OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_USE_ICE, OPT_USE_SRTP, 
+           OPT_SRTP_SECURE,
            OPT_PLAY_FILE, OPT_PLAY_TONE, OPT_RTP_PORT, OPT_ADD_CODEC, 
            OPT_ILBC_MODE, OPT_REC_FILE, OPT_AUTO_REC,
@@ -447 +449 @@
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
         { "use-srtp",   1, 0, OPT_USE_SRTP},
+        { "srtp-secure",1, 0, OPT_SRTP_SECURE},
 #endif
         { "add-codec",  1, 0, OPT_ADD_CODEC},
@@ -811 +814 @@
             }
             break;
+        case OPT_SRTP_SECURE:
+            app_config.cfg.srtp_secure_signaling = my_atoi(pj_optarg);
+            if (!pj_isdigit(*pj_optarg) || 
+                app_config.cfg.srtp_secure_signaling > 2) 
+            {
+                PJ_LOG(1,(THIS_FILE, "Invalid value for --srtp-secure option"));
+                return -1;
+            }
+            break;
 #endif
 
@@ -1267 +1279 @@
     }
 
-
     /* TLS */
     if (config->use_tls)
@@ -1310 +1321 @@
 
     pj_strcat2(&cfg, "\n#\n# Media settings:\n#\n");
+
+    /* SRTP */
+    if (app_config.cfg.use_srtp != PJSUA_DEFAULT_USE_SRTP) {
+        pj_ansi_sprintf(line, "--use-srtp %d\n",
+                        app_config.cfg.use_srtp);
+        pj_strcat2(&cfg, line);
+    }
+    if (app_config.cfg.srtp_secure_signaling != 
+        PJSUA_DEFAULT_SRTP_SECURE_SIGNALING) 
+    {
+        pj_ansi_sprintf(line, "--srtp-secure %d\n",
+                        app_config.cfg.srtp_secure_signaling);
+        pj_strcat2(&cfg, line);
+    }
 
 

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

@@ -260 +260 @@
     int i;
 
-    for (i=0; i<(str->slen-substr->slen); ++i) {
+    for (i=0; i<=(str->slen-substr->slen); ++i) {
         pj_str_t s;
         s.ptr = str->ptr+i;