Changeset 2707 for pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_strans.c

Timestamp:

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

Author:

bennylp

Message:

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

File:

• pjproject/branches/projects/sipit24/pjnath/src/pjnath/ice_strans.c (modified) (6 diffs)

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