Changeset 2707 for pjproject

Timestamp:

May 18, 2009 5:49:37 AM (16 years ago)

Author:

bennylp

Message:

More ticket #851: propagated ICE regular nomination option up to pjsua

Location:

pjproject/branches/projects/sipit24

Files:

• pjnath/include/pjnath/ice_strans.h (modified) (1 diff)
• pjnath/src/pjnath/ice_session.c (modified) (3 diffs)
• pjnath/src/pjnath/ice_strans.c (modified) (6 diffs)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)
• pjsip-apps/src/samples/debug.c (modified) (1 diff)
• pjsip-apps/src/samples/icedemo.c (modified) (3 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/branches/projects/sipit24/pjnath/include/pjnath/ice_strans.h

@@ -198 +198 @@
 
     /**
+     * This contains various STUN session options. Once the ICE stream
+     * transport is created, application may also change the options
+     * with #pj_ice_strans_set_options().
+     */
+    pj_ice_sess_options  opt;
+
+    /**
      * STUN and local transport settings. This specifies the 
      * settings for local UDP socket, which will be resolved

pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_session.c

@@ -438 +438 @@
     PJ_ASSERT_RETURN(ice && opt, PJ_EINVAL);
     pj_memcpy(&ice->opt, opt, sizeof(*opt));
+    LOG5((ice->obj_name, "ICE nomination type set to %s",
+          (ice->opt.aggressive ? "aggressive" : "regular")));
     return PJ_SUCCESS;
 }
@@ -1410 +1412 @@
              * flag set.
              */
-            LOG5((ice->obj_name, 
+            LOG4((ice->obj_name, 
                   "All checks have completed, starting nominated checks now"));
             start_nominated_check(ice);
@@ -1440 +1442 @@
         }
 
-        LOG5((ice->obj_name, 
+        LOG4((ice->obj_name, 
               "Scheduling nominated check in %d ms",
               ice->opt.nominated_check_delay));

pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_strans.c

@@ -159 +159 @@
     pj_ice_strans_cb         cb;        /**< Application callback.      */
     pj_lock_t               *init_lock; /**< Initialization mutex.      */
-    pj_ice_sess_options      opt;       /**< ICE session options        */
 
     pj_ice_sess             *ice;       /**< ICE session.               */
@@ -198 +197 @@
     pj_stun_sock_cfg_default(&cfg->stun.cfg);
     pj_turn_alloc_param_default(&cfg->turn.alloc_param);
+
+    pj_ice_sess_options_default(&cfg->opt);
 
     cfg->af = pj_AF_INET();
@@ -449 +450 @@
     ice_st->obj_name = pool->obj_name;
     ice_st->user_data = user_data;
-
-    pj_ice_sess_options_default(&ice_st->opt);
 
     PJ_LOG(4,(ice_st->obj_name, 
@@ -661 +660 @@
 {
     PJ_ASSERT_RETURN(ice_st && opt, PJ_EINVAL);
-    pj_memcpy(opt, &ice_st->opt, sizeof(*opt));
+    pj_memcpy(opt, &ice_st->cfg.opt, sizeof(*opt));
     return PJ_SUCCESS;
 }
@@ -672 +671 @@
 {
     PJ_ASSERT_RETURN(ice_st && opt, PJ_EINVAL);
-    pj_memcpy(&ice_st->opt, opt, sizeof(*opt));
+    pj_memcpy(&ice_st->cfg.opt, opt, sizeof(*opt));
     if (ice_st->ice)
-        pj_ice_sess_set_options(ice_st->ice, &ice_st->opt);
+        pj_ice_sess_set_options(ice_st->ice, &ice_st->cfg.opt);
     return PJ_SUCCESS;
 }
@@ -715 +714 @@
 
     /* Set options */
-    pj_ice_sess_set_options(ice_st->ice, &ice_st->opt);
+    pj_ice_sess_set_options(ice_st->ice, &ice_st->cfg.opt);
 
     /* If default candidate for components are SRFLX one, upload a custom

pjproject/branches/projects/sipit24/pjsip-apps/src/pjsua/pjsua_app.c

@@ -265 +265 @@
     puts  ("Media Transport Options:");
     puts  ("  --use-ice           Enable ICE (default:no)");
-    puts  ("  --ice-no-host       Disable ICE host candidates (default: no)");
+    puts  ("  --ice-regular       Use ICE regular nomination (default: aggressive)");
+    puts  ("  --ice-max-hosts=N   Set maximum number of ICE host candidates");
     puts  ("  --ice-no-rtcp       Disable RTCP component in ICE (default: no)");
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
@@ -477 +478 @@
            OPT_AUTO_ANSWER, OPT_AUTO_PLAY, OPT_AUTO_PLAY_HANGUP, OPT_AUTO_LOOP,
            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_ICE_NO_RTCP, OPT_TURN_SRV, 
+           OPT_USE_ICE, OPT_ICE_REGULAR, OPT_USE_SRTP, OPT_SRTP_SECURE,
+           OPT_USE_TURN, OPT_ICE_MAX_HOSTS, 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, 
@@ -554 +555 @@
 
         { "use-ice",    0, 0, OPT_USE_ICE},
+        { "ice-regular",0, 0, OPT_ICE_REGULAR},
         { "use-turn",   0, 0, OPT_USE_TURN},
-        { "ice-no-host",0, 0, OPT_ICE_NO_HOST},
+        { "ice-max-hosts",1, 0, OPT_ICE_MAX_HOSTS},
         { "ice-no-rtcp",0, 0, OPT_ICE_NO_RTCP},
         { "turn-srv",   1, 0, OPT_TURN_SRV},
@@ -993 +995 @@
             break;
 
+        case OPT_ICE_REGULAR:
+            cfg->media_cfg.ice_opt.aggressive = PJ_FALSE;
+            break;
+
         case OPT_USE_TURN:
             cfg->media_cfg.enable_turn = PJ_TRUE;
             break;
 
-        case OPT_ICE_NO_HOST:
-            cfg->media_cfg.ice_no_host_cands = PJ_TRUE;
+        case OPT_ICE_MAX_HOSTS:
+            cfg->media_cfg.ice_max_host_cands = my_atoi(pj_optarg);
             break;
 
@@ -1645 +1651 @@
         pj_strcat2(&cfg, "--use-ice\n");
 
+    if (config->media_cfg.ice_opt.aggressive == PJ_FALSE)
+        pj_strcat2(&cfg, "--ice-regular\n");
+
     if (config->media_cfg.enable_turn)
         pj_strcat2(&cfg, "--use-turn\n");
 
-    if (config->media_cfg.ice_no_host_cands)
-        pj_strcat2(&cfg, "--ice-no-host\n");
+    if (config->media_cfg.ice_max_host_cands >= 0) {
+        pj_ansi_sprintf(line, "--ice_max_host_cands %d\n",
+                        config->media_cfg.ice_max_host_cands);
+        pj_strcat2(&cfg, line);
+    }
 
     if (config->media_cfg.ice_no_rtcp)
@@ -1886 +1898 @@
     }
 
-    if (config->cfg.force_lr) {
+    if (!config->cfg.force_lr) {
         pj_strcat2(&cfg, "--no-force-lr\n");
     }

pjproject/branches/projects/sipit24/pjsip-apps/src/samples/debug.c

@@ -29 +29 @@
  *  #include "playfile.c"
  */
-#include "auddemo.c"
+#include "icedemo.c"
 

pjproject/branches/projects/sipit24/pjsip-apps/src/samples/icedemo.c

@@ -312 +312 @@
         icedemo.ice_cfg.stun.max_host_cands = icedemo.opt.max_host;
 
+    /* Nomination strategy */
+    if (icedemo.opt.regular)
+        icedemo.ice_cfg.opt.aggressive = PJ_FALSE;
+    else
+        icedemo.ice_cfg.opt.aggressive = PJ_TRUE;
+
     /* Configure STUN/srflx candidate resolution */
     if (icedemo.opt.stun_srv.slen) {
@@ -377 +383 @@
 {
     pj_ice_strans_cb icecb;
-    pj_ice_sess_options opt;
     pj_status_t status;
 
@@ -402 +407 @@
     else
         PJ_LOG(3,(THIS_FILE, "ICE instance successfully created"));
-
-    status = pj_ice_strans_get_options(icedemo.icest, &opt);
-    pj_assert(status == PJ_SUCCESS);
-
-    if (icedemo.opt.regular)
-        opt.aggressive = PJ_FALSE;
-    else
-        opt.aggressive = PJ_TRUE;
-
-    status = pj_ice_strans_set_options(icedemo.icest, &opt);
-    pj_assert(status == PJ_SUCCESS);
 }
 

pjproject/branches/projects/sipit24/pjsip/include/pjsua-lib/pjsua.h

@@ -4261 +4261 @@
 
     /**
-     * Disable ICE host candidates.
-     */
-    pj_bool_t           ice_no_host_cands;
+     * Set the maximum number of host candidates.
+     *
+     * Default: -1 (maximum not set)
+     */
+    int                 ice_max_host_cands;
+
+    /**
+     * ICE session options.
+     */
+    pj_ice_sess_options ice_opt;
 
     /**

pjproject/branches/projects/sipit24/pjsip/src/pjsua-lib/pjsua_core.c

@@ -182 +182 @@
     cfg->jb_init = cfg->jb_min_pre = cfg->jb_max_pre = cfg->jb_max = -1;
     cfg->snd_auto_close_time = 1;
+
+    cfg->ice_max_host_cands = -1;
+    pj_ice_sess_options_default(&cfg->ice_opt);
 
     cfg->turn_conn_type = PJ_TURN_TP_UDP;

pjproject/branches/projects/sipit24/pjsip/src/pjsua-lib/pjsua_media.c

@@ -811 +811 @@
         ice_cfg.stun.port = pj_sockaddr_get_port(&pjsua_var.stun_srv);
     }
-    if (pjsua_var.media_cfg.ice_no_host_cands)
-        ice_cfg.stun.max_host_cands = 0;
+    if (pjsua_var.media_cfg.ice_max_host_cands >= 0)
+        ice_cfg.stun.max_host_cands = pjsua_var.media_cfg.ice_max_host_cands;
 
     /* Configure TURN settings */