Changeset 2196 for pjproject/trunk

Timestamp:

Aug 7, 2008 9:55:52 AM (16 years ago)

Author:

bennylp

Message:

Ticket #586: Added ICE negotiations test to test the scenario when two agents have different number of components

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)
• pjsip-apps/src/test-pjsua/scripts-call/305_ice_comp_1_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-call/305_ice_comp_2_1.py (added)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -250 +250 @@
     puts  ("Media Transport Options:");
     puts  ("  --use-ice           Enable ICE (default:no)");
-    puts  ("  --ice-no-host       Disable ICE host candidates");
+    puts  ("  --ice-no-host       Disable ICE host candidates (default: no)");
+    puts  ("  --ice-no-rtcp       Disable RTCP component in ICE (default: no)");
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
     puts  ("  --rx-drop-pct=PCT   Drop PCT percent of RX RTP (for pkt lost sim, default: 0)");
@@ -457 +458 @@
            OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_SND_CLOCK_RATE, OPT_STEREO,
            OPT_USE_ICE, OPT_USE_SRTP, OPT_SRTP_SECURE,
-           OPT_USE_TURN, OPT_ICE_NO_HOST, OPT_TURN_SRV, OPT_TURN_TCP,
-           OPT_TURN_USER, OPT_TURN_PASSWD,
+           OPT_USE_TURN, OPT_ICE_NO_HOST, OPT_ICE_NO_RTCP, OPT_TURN_SRV, 
+           OPT_TURN_TCP, OPT_TURN_USER, OPT_TURN_PASSWD,
            OPT_PLAY_FILE, OPT_PLAY_TONE, OPT_RTP_PORT, OPT_ADD_CODEC, 
            OPT_ILBC_MODE, OPT_REC_FILE, OPT_AUTO_REC,
@@ -530 +531 @@
         { "use-turn",   0, 0, OPT_USE_TURN},
         { "ice-no-host",0, 0, OPT_ICE_NO_HOST},
+        { "ice-no-rtcp",0, 0, OPT_ICE_NO_RTCP},
         { "turn-srv",   1, 0, OPT_TURN_SRV},
         { "turn-tcp",   0, 0, OPT_TURN_TCP},
@@ -948 +950 @@
             break;
 
+        case OPT_ICE_NO_RTCP:
+            cfg->media_cfg.ice_no_rtcp = PJ_TRUE;
+            break;
+
         case OPT_TURN_SRV:
             cfg->media_cfg.turn_server = pj_str(pj_optarg);
@@ -1555 +1561 @@
     if (config->media_cfg.ice_no_host_cands)
         pj_strcat2(&cfg, "--ice-no-host\n");
+
+    if (config->media_cfg.ice_no_rtcp)
+        pj_strcat2(&cfg, "--ice-no-rtcp\n");
 
     if (config->media_cfg.turn_server.slen) {

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

@@ -4102 +4102 @@
 
     /**
+     * Disable RTCP component.
+     *
+     * Default: no
+     */
+    pj_bool_t           ice_no_rtcp;
+
+    /**
      * Enable TURN relay candidate in ICE.
      */

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

@@ -759 +759 @@
 
         comp_cnt = 1;
-        if (PJMEDIA_ADVERTISE_RTCP)
+        if (PJMEDIA_ADVERTISE_RTCP && !pjsua_var.media_cfg.ice_no_rtcp)
             ++comp_cnt;