Changeset 2043

Timestamp:

Jun 21, 2008 2:13:24 PM (16 years ago)

Author:

bennylp

Message:

Fixed bug in ICE: packet is not sent when ICE is not running (remote has no ice) and TURN is set as default candidate

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (6 diffs)

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

@@ -122 +122 @@
     pj_stun_sock        *stun_sock;     /**< STUN transport.            */
     pj_turn_sock        *turn_sock;     /**< TURN relay transport.      */
+    pj_bool_t            turn_log_off;  /**< TURN loggin off?           */
 
     unsigned             cand_cnt;      /**< # of candidates/aliaes.    */
@@ -663 +664 @@
                       "component %d", i+1));
             pj_turn_sock_set_log(comp->turn_sock, 0xFFFF);
+            comp->turn_log_off = PJ_FALSE;
         }
 
@@ -909 +911 @@
     pj_ssize_t pkt_size;
     pj_ice_strans_comp *comp;
+    unsigned def_cand;
     pj_status_t status;
 
@@ -916 +919 @@
     comp = ice_st->comp[comp_id-1];
 
-    /* If ICE is available, send data with ICE */
+    /* Check that default candidate for the component exists */
+    def_cand = comp->default_cand;
+    if (def_cand >= comp->cand_cnt)
+        return PJ_EINVALIDOP;
+
+    /* If ICE is available, send data with ICE, otherwise send with the
+     * default candidate selected during initialization.
+     */
     if (ice_st->ice) {
         if (comp->turn_sock) {
@@ -927 +937 @@
         return status;
 
-    } else if (comp->stun_sock) {
-
-        pkt_size = data_len;
-        status = pj_stun_sock_sendto(comp->stun_sock, NULL, data, data_len,
-                                     0, dst_addr, dst_addr_len);
-        return (status==PJ_SUCCESS||status==PJ_EPENDING) ? PJ_SUCCESS : status;
+    } else if (comp->cand_list[def_cand].status == PJ_SUCCESS) {
+
+        if (comp->cand_list[def_cand].type == PJ_ICE_CAND_TYPE_RELAYED) {
+
+            enum {
+                msg_disable_ind = 0xFFFF &
+                                  ~(PJ_STUN_SESS_LOG_TX_IND|
+                                    PJ_STUN_SESS_LOG_RX_IND)
+            };
+
+            if (!comp->turn_log_off) {
+                /* Disable logging for Send/Data indications */
+                PJ_LOG(5,(ice_st->obj_name, 
+                          "Disabling STUN Indication logging for "
+                          "component %d", comp->comp_id));
+                pj_turn_sock_set_log(comp->turn_sock, msg_disable_ind);
+                comp->turn_log_off = PJ_TRUE;
+            }
+
+            status = pj_turn_sock_sendto(comp->turn_sock, data, data_len,
+                                         dst_addr, dst_addr_len);
+            return (status==PJ_SUCCESS||status==PJ_EPENDING) ? 
+                    PJ_SUCCESS : status;
+        } else {
+            pkt_size = data_len;
+            status = pj_stun_sock_sendto(comp->stun_sock, NULL, data, 
+                                         data_len, 0, dst_addr, dst_addr_len);
+            return (status==PJ_SUCCESS||status==PJ_EPENDING) ? 
+                    PJ_SUCCESS : status;
+        }
 
     } else
@@ -993 +1027 @@
                         pj_turn_sock_set_log(ice_st->comp[i]->turn_sock,
                                              msg_disable_ind);
+                        ice_st->comp[i]->turn_log_off = PJ_TRUE;
                     }