Changeset 2945 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

Timestamp:

Oct 14, 2009 1:13:18 PM (15 years ago)

Author:

bennylp

Message:

Ticket #881: send UPDATE or re-INVITE after ICE negotiation, if the default candidate has changed

• done
• added pj_ice_strans_state (to be used for informational purposes for now)
• added pjmedia ICE transport specific info, and display it in call dump output
• misc fixes (changed pjmedia_transport_info.spec_info_cnt from int to unsigned)

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -1474 +1474 @@
     }
 
+    /* Fill up transport specific info */
+    if (info->specific_info_cnt < PJ_ARRAY_SIZE(info->spc_info)) {
+        pjmedia_transport_specific_info *tsi;
+        pjmedia_ice_transport_info *ii;
+        unsigned i;
+
+        pj_assert(sizeof(*ii) <= sizeof(tsi->buffer));
+        tsi = &info->spc_info[info->specific_info_cnt++];
+        tsi->type = PJMEDIA_TRANSPORT_TYPE_ICE;
+        tsi->cbsize = sizeof(*ii);
+
+        ii = (pjmedia_ice_transport_info*) tsi->buffer;
+        pj_bzero(ii, sizeof(*ii));
+
+        if (pj_ice_strans_has_sess(tp_ice->ice_st))
+            ii->role = pj_ice_strans_get_role(tp_ice->ice_st);
+        else
+            ii->role = PJ_ICE_SESS_ROLE_UNKNOWN;
+        ii->sess_state = pj_ice_strans_get_state(tp_ice->ice_st);
+        ii->comp_cnt = pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st);
+        
+        for (i=1; i<=ii->comp_cnt && i<=PJ_ARRAY_SIZE(ii->comp); ++i) {
+            const pj_ice_sess_check *chk;
+
+            chk = pj_ice_strans_get_valid_pair(tp_ice->ice_st, i);
+            if (chk) {
+                ii->comp[i-1].lcand_type = chk->lcand->type;
+                ii->comp[i-1].rcand_type = chk->rcand->type;
+            }
+        }
+    }
+
     return PJ_SUCCESS;
 }