Changeset 4350 for pjproject/trunk

Timestamp:

Feb 15, 2013 3:57:31 AM (11 years ago)

Author:

nanang

Message:

Re #1242: Fixed ICE nego completion check as it always returns FALSE when peer doesn't support ICE.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/transport_ice.h (modified) (1 diff)
• pjmedia/src/pjmedia/transport_ice.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/transport_ice.h

@@ -69 +69 @@
 typedef struct pjmedia_ice_transport_info
 {
+    /**
+     * Specifies whether ICE is used, i.e. SDP offer and answer indicates
+     * that both parties support ICE and ICE should be used for the session.
+     */
+    pj_bool_t active;
+
     /**
      * ICE sesion state.

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

@@ -1544 +1544 @@
         pj_bzero(ii, sizeof(*ii));
 
+        ii->active = tp_ice->use_ice;
+
         if (pj_ice_strans_has_sess(tp_ice->ice_st))
             ii->role = pj_ice_strans_get_role(tp_ice->ice_st);

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

@@ -3077 +3077 @@
                    pjmedia_transport_info_get_spc_info(
                                         &tpinfo, PJMEDIA_TRANSPORT_TYPE_ICE);
-        if (!ice_info)
+
+        /* Check if ICE is active */
+        if (!ice_info || !ice_info->active)
             continue;
 
         /* Check if ICE setup not completed yet */
-        if (ice_info->sess_state < PJ_ICE_STRANS_STATE_RUNNING) {
+        if (ice_info->sess_state < PJ_ICE_STRANS_STATE_RUNNING) {
             ice_complete = PJ_FALSE;
             break;