Changeset 3906 for pjproject

Timestamp:

Dec 9, 2011 7:19:25 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1416: Allow application to send data after ICE negotiation fails

Location:

pjproject/branches/1.x

Files:

• pjmedia/src/pjmedia/transport_ice.c (modified) (2 diffs)
• pjnath/src/pjnath/ice_strans.c (modified) (1 diff)

pjproject/branches/1.x/pjmedia/src/pjmedia/transport_ice.c

@@ -403 +403 @@
      * new ufrag/pwd pair.
      */
-    if (!restart_session && pj_ice_strans_sess_is_complete(tp_ice->ice_st)) {
+    if (!restart_session && pj_ice_strans_sess_is_complete(tp_ice->ice_st) &&
+        pj_ice_strans_get_state(tp_ice->ice_st) != PJ_ICE_STRANS_STATE_FAILED)
+    {
         const pj_ice_sess_check *check;
         char *attr_buf;
@@ -533 +535 @@
         }
 
-    } else if (pj_ice_strans_has_sess(tp_ice->ice_st)) {
+    } else if (pj_ice_strans_has_sess(tp_ice->ice_st) &&
+               pj_ice_strans_get_state(tp_ice->ice_st) !=
+                        PJ_ICE_STRANS_STATE_FAILED)
+    {
         /* Encode all candidates to SDP media */
         char *attr_buf;

pjproject/branches/1.x/pjnath/src/pjnath/ice_strans.c

@@ -1164 +1164 @@
     /* If ICE is available, send data with ICE, otherwise send with the
      * default candidate selected during initialization.
+     *
+     * https://trac.pjsip.org/repos/ticket/1416:
+     * Once ICE has failed, also send data with the default candidate.
      */
-    if (ice_st->ice) {
+    if (ice_st->ice && ice_st->state < PJ_ICE_STRANS_STATE_FAILED) {
         if (comp->turn_sock) {
             pj_turn_sock_lock(comp->turn_sock);