Changeset 2945 for pjproject/trunk/pjnath/src/pjnath/ice_strans.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/pjnath/src/pjnath/ice_strans.c (modified) (8 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -174 +174 @@
     pj_lock_t               *init_lock; /**< Initialization mutex.      */
 
+    pj_ice_strans_state      state;     /**< Session state.             */
     pj_ice_sess             *ice;       /**< ICE session.               */
     pj_time_val              start_time;/**< Time when ICE was started  */
@@ -488 +489 @@
     ice_st->comp = (pj_ice_strans_comp**) 
                    pj_pool_calloc(pool, comp_cnt, sizeof(pj_ice_strans_comp*));
+
+    /* Move state to candidate gathering */
+    ice_st->state = PJ_ICE_STRANS_STATE_INIT;
 
     /* Acquire initialization mutex to prevent callback to be 
@@ -562 +566 @@
 }
 
+/* Get ICE session state. */
+PJ_DEF(pj_ice_strans_state) pj_ice_strans_get_state(pj_ice_strans *ice_st)
+{
+    return ice_st->state;
+}
+
+/* State string */
+PJ_DEF(const char*) pj_ice_strans_state_name(pj_ice_strans_state state)
+{
+    const char *names[] = {
+        "Null",
+        "Candidate Gathering",
+        "Candidate Gathering Complete",
+        "Session Initialized",
+        "Negotiation In Progress",
+        "Negotiation Success",
+        "Negotiation Failed"
+    };
+
+    PJ_ASSERT_RETURN(state <= PJ_ICE_STRANS_STATE_FAILED, "???");
+    return names[state];
+}
+
 /* Notification about failure */
 static void sess_fail(pj_ice_strans *ice_st, pj_ice_strans_op op,
@@ -604 +631 @@
     /* All candidates have been gathered */
     ice_st->cb_called = PJ_TRUE;
+    ice_st->state = PJ_ICE_STRANS_STATE_READY;
     if (ice_st->cb.on_ice_complete)
         (*ice_st->cb.on_ice_complete)(ice_st, PJ_ICE_STRANS_OP_INIT, 
@@ -783 +811 @@
     }
 
+    /* ICE session is ready for negotiation */
+    ice_st->state = PJ_ICE_STRANS_STATE_SESS_READY;
+
     return PJ_SUCCESS;
 
@@ -983 +1014 @@
     }
 
+    ice_st->state = PJ_ICE_STRANS_STATE_NEGO;
     return status;
 }
@@ -1012 +1044 @@
     }
 
+    ice_st->state = PJ_ICE_STRANS_STATE_INIT;
     return PJ_SUCCESS;
 }
@@ -1170 +1203 @@
         }
 
+        ice_st->state = (status==PJ_SUCCESS) ? PJ_ICE_STRANS_STATE_RUNNING :
+                                               PJ_ICE_STRANS_STATE_FAILED;
+
         (*ice_st->cb.on_ice_complete)(ice_st, PJ_ICE_STRANS_OP_NEGOTIATION, 
                                       status);