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

Timestamp:

May 17, 2009 5:57:19 PM (15 years ago)

Author:

bennylp

Message:

Ticket #851: initial code to support regular nomination in ICE:

• Added option to change nomination strategy in ICE strans and session. Default is still aggressive.
• Added option to control nomination timer
• Renamed no_host_cand to max_host_cands in ICE config
• Updated icedemo
• Also added timer for controlled agent to wait for nomination from controlling agent

File:

• pjproject/branches/projects/sipit24/pjsip-apps/src/samples/icedemo.c (modified) (11 diffs)

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

@@ -40 +40 @@
         unsigned    comp_cnt;
         pj_str_t    ns;
-        pj_bool_t   no_host;
+        int         max_host;
+        pj_bool_t   regular;
         pj_str_t    stun_srv;
         pj_str_t    turn_srv;
@@ -307 +308 @@
     /* -= Start initializing ICE stream transport config =- */
 
-    /* Disable host candidates? */
-    icedemo.ice_cfg.stun.no_host_cands = icedemo.opt.no_host;
+    /* Maximum number of host candidates */
+    if (icedemo.opt.max_host != -1)
+        icedemo.ice_cfg.stun.max_host_cands = icedemo.opt.max_host;
 
     /* Configure STUN/srflx candidate resolution */
@@ -375 +377 @@
 {
     pj_ice_strans_cb icecb;
+    pj_ice_sess_options opt;
     pj_status_t status;
 
@@ -399 +402 @@
     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);
 }
 
@@ -961 +975 @@
     */
 
-    if (comp_id > pj_ice_strans_get_running_comp_cnt(icedemo.icest)) {
+    if (comp_id<1||comp_id>pj_ice_strans_get_running_comp_cnt(icedemo.icest)) {
         PJ_LOG(1,(THIS_FILE, "Error: invalid component ID"));
         return;
@@ -1138 +1152 @@
     puts(" --nameserver, -n IP       Configure nameserver to activate DNS SRV");
     puts("                           resolution");
-    puts(" --no-host, -H             Disable host candidates");
+    puts(" --max-host, -H N          Set max number of host candidates to N");
+    puts(" --regular, -R             Use regular nomination (default aggressive)");
     puts(" --help, -h                Display this screen.");
     puts("");
@@ -1166 +1181 @@
         { "comp-cnt",           1, 0, 'c'},
         { "nameserver",         1, 0, 'n'},
-        { "no-host",            0, 0, 'H'},
+        { "max-host",           1, 0, 'H'},
         { "help",               0, 0, 'h'},
         { "stun-srv",           1, 0, 's'},
@@ -1173 +1188 @@
         { "turn-username",      1, 0, 'u'},
         { "turn-password",      1, 0, 'p'},
-        { "turn-fingerprint",   0, 0, 'F'}
+        { "turn-fingerprint",   0, 0, 'F'},
+        { "regular",            0, 0, 'R'}
     };
     int c, opt_id;
@@ -1179 +1195 @@
 
     icedemo.opt.comp_cnt = 1;
-
-    while((c=pj_getopt_long(argc,argv, "n:s:t:u:p:HhTF", long_options, &opt_id))!=-1) {
+    icedemo.opt.max_host = -1;
+
+    while((c=pj_getopt_long(argc,argv, "c:n:s:t:u:p:H:hTFR", long_options, &opt_id))!=-1) {
         switch (c) {
         case 'c':
@@ -1193 +1210 @@
             break;
         case 'H':
-            icedemo.opt.no_host = PJ_TRUE;
+            icedemo.opt.max_host = atoi(pj_optarg);
             break;
         case 'h':
@@ -1216 +1233 @@
             icedemo.opt.turn_fingerprint = PJ_TRUE;
             break;
+        case 'R':
+            icedemo.opt.regular = PJ_TRUE;
+            break;
         default:
             printf("Argument \"%s\" is not valid. Use -h to see help",