Changeset 4133 for pjproject/trunk

Timestamp:

May 21, 2012 2:00:17 PM (12 years ago)

Author:

bennylp

Message:

Fixed #1512: added Option to continue ICE operation even when STUN resolution fails

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/ice_strans.h (modified) (1 diff)
• src/pjnath/ice_strans.c (modified) (5 diffs)

pjproject/trunk/pjnath/include/pjnath/ice_strans.h

@@ -270 +270 @@
         pj_uint16_t          port;
 
+        /**
+         * Ignore STUN resolution error and proceed with just local
+         * addresses.
+         *
+         * The default is PJ_FALSE
+         */
+        pj_bool_t            ignore_stun_error;
+
     } stun;
 

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

@@ -222 +222 @@
 
     cfg->stun.max_host_cands = 64;
+    cfg->stun.ignore_stun_error = PJ_FALSE;
 }
 
@@ -1502 +1503 @@
             if (cand)
                 cand->status = status;
-            sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT, "DNS resolution failed", 
-                      status);
+            if (!ice_st->cfg.stun.ignore_stun_error) {
+                sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT,
+                          "DNS resolution failed", status);
+            } else {
+                PJ_LOG(4,(ice_st->obj_name,
+                          "STUN error is ignored for comp %d",
+                          comp->comp_id));
+            }
         }
         break;
@@ -1540 +1547 @@
                         --comp->default_cand;
                     } else if (comp->default_cand == idx) {
-                        comp->default_cand = 0;
+                        comp->default_cand = !idx;
                     }
 
@@ -1568 +1575 @@
             if (cand)
                 cand->status = status;
-            sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT, 
-                      "STUN binding request failed", status);
+            if (!ice_st->cfg.stun.ignore_stun_error) {
+                sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT,
+                          "STUN binding request failed", status);
+            } else {
+                PJ_LOG(4,(ice_st->obj_name,
+                          "STUN error is ignored for comp %d",
+                          comp->comp_id));
+
+                if (cand) {
+                    unsigned idx = cand - comp->cand_list;
+
+                    /* Update default candidate index */
+                    if (comp->default_cand == idx) {
+                        comp->default_cand = !idx;
+                    }
+                }
+
+                sess_init_update(ice_st);
+            }
         }
         break;
@@ -1576 +1600 @@
             pj_assert(cand != NULL);
             cand->status = status;
-            sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT, 
-                      "STUN keep-alive failed", status);
+            if (!ice_st->cfg.stun.ignore_stun_error) {
+                sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT,
+                          "STUN keep-alive failed", status);
+            } else {
+                PJ_LOG(4,(ice_st->obj_name, "STUN error is ignored"));
+            }
         }
         break;