Changeset 1140 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

Apr 3, 2007 6:01:27 PM (16 years ago)

Author:

bennylp

Message:

Fixed misc bugs with ICE: (1) moved STUN session from candidate to component since it causes STUN response to wrong session, and (2) keep-alive transaction timed-out when ICE is active

File:

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

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

@@ -24 +24 @@
 #include <pj/log.h>
 #include <pj/pool.h>
+#include <pj/rand.h>
 #include <pj/string.h>
+
+
+#if 0
+#  define TRACE_PKT(expr)           PJ_LOG(5,expr)
+#else
+#  define TRACE_PKT(expr)
+#endif
 
 
@@ -31 +39 @@
 static void        on_ice_complete(pj_ice_sess *ice, pj_status_t status);
 static pj_status_t ice_tx_pkt(pj_ice_sess *ice, 
-                              unsigned comp_id, unsigned cand_id,
+                              unsigned comp_id,
                               const void *pkt, pj_size_t size,
                               const pj_sockaddr_t *dst_addr,
@@ -85 +93 @@
 
     if (name == NULL)
-        name = "icest%p";
+        name = "icstr%p";
 
     pool = pj_pool_create(stun_cfg->pf, name, 4000, 4000, NULL);
@@ -243 +251 @@
     pj_ice_strans_comp *comp;
     int retry, addr_len;
+    struct {
+        pj_uint32_t a1, a2, a3;
+    } tsx_id;
     pj_status_t status;
 
@@ -251 +262 @@
     comp->sock = PJ_INVALID_SOCKET;
     comp->last_status = PJ_SUCCESS;
+
+    /* Create transaction ID for STUN keep alives */
+    tsx_id.a1 = 0;
+    tsx_id.a2 = comp_id;
+    tsx_id.a3 = (pj_uint32_t) ice_st;
+    pj_memcpy(comp->ka_tsx_id, &tsx_id, sizeof(comp->ka_tsx_id));
 
     /* Create socket */
@@ -438 +455 @@
          * The process below is just a workaround.
          */
-        if (ice_st->ice) {
-            PJ_TODO(DISTINGUISH_BETWEEN_LOCAL_AND_RELAY);
-            status = pj_ice_sess_on_rx_pkt(ice_st->ice, comp->comp_id, 
-                                      comp->cand_list[0].ice_cand_id,
-                                      comp->pkt, bytes_read,
-                                      &comp->src_addr, comp->src_addr_len);
-        } else if (comp->stun_sess) {
-            status = pj_stun_msg_check(comp->pkt, bytes_read, 
-                                       PJ_STUN_IS_DATAGRAM);
-            if (status == PJ_SUCCESS) {
+        status = pj_stun_msg_check(comp->pkt, bytes_read, 
+                                   PJ_STUN_IS_DATAGRAM);
+
+        if (status == PJ_SUCCESS) {
+            if (ice_st->ice==NULL ||
+                pj_memcmp(comp->pkt+8, comp->ka_tsx_id, 12) == 0) 
+            {
                 status = pj_stun_session_on_rx_pkt(comp->stun_sess, comp->pkt,
                                                    bytes_read, 
@@ -454 +468 @@
                                                    comp->src_addr_len);
             } else {
-                (*ice_st->cb.on_rx_data)(ice_st, comp->comp_id, 
-                                         comp->pkt, bytes_read, 
-                                         &comp->src_addr, comp->src_addr_len);
-
+                PJ_TODO(DISTINGUISH_BETWEEN_LOCAL_AND_RELAY);
+
+                TRACE_PKT((comp->ice_st->obj_name, 
+                          "Component %d RX packet from %s:%d",
+                          comp->comp_id,
+                          pj_inet_ntoa(comp->src_addr.ipv4.sin_addr),
+                          (int)pj_ntohs(comp->src_addr.ipv4.sin_port)));
+
+                status = pj_ice_sess_on_rx_pkt(ice_st->ice, comp->comp_id, 
+                                               comp->pkt, bytes_read,
+                                               &comp->src_addr, 
+                                               comp->src_addr_len);
             }
         } else {
@@ -528 +550 @@
         /* Create STUN binding request */
         status = pj_stun_session_create_req(comp->stun_sess,
-                                            PJ_STUN_BINDING_REQUEST, &tdata);
+                                            PJ_STUN_BINDING_REQUEST, 
+                                            comp->ka_tsx_id, &tdata);
         if (status != PJ_SUCCESS)
             continue;
@@ -555 +578 @@
         return;
 
-    delay.sec = 20;
-    delay.msec = 0;
+    delay.sec = PJ_ICE_ST_KEEP_ALIVE_MIN;
+    delay.msec = pj_rand() % (PJ_ICE_ST_KEEP_ALIVE_MAX_RAND * 1000);
+    pj_time_val_normalize(&delay);
 
     ice_st->ka_timer.cb = &ka_timer_cb;
@@ -617 +641 @@
     /* Create STUN binding request */
     status = pj_stun_session_create_req(comp->stun_sess, 
-                                        PJ_STUN_BINDING_REQUEST, &tdata);
+                                        PJ_STUN_BINDING_REQUEST, 
+                                        comp->ka_tsx_id, 
+                                        &tdata);
     if (status != PJ_SUCCESS)
         return status;
@@ -945 +971 @@
  */
 static pj_status_t ice_tx_pkt(pj_ice_sess *ice, 
-                              unsigned comp_id, unsigned cand_id,
+                              unsigned comp_id, 
                               const void *pkt, pj_size_t size,
                               const pj_sockaddr_t *dst_addr,
@@ -959 +985 @@
     PJ_ASSERT_RETURN(comp_id && comp_id <= ice_st->comp_cnt, PJ_EINVAL);
     comp = ice_st->comp[comp_id-1];
+
+    TRACE_PKT((comp->ice_st->obj_name, 
+              "Component %d TX packet to %s:%d",
+              comp_id,
+              pj_inet_ntoa(((pj_sockaddr_in*)dst_addr)->sin_addr),
+              (int)pj_ntohs(((pj_sockaddr_in*)dst_addr)->sin_port)));
 
     pkt_size = size;
@@ -1027 +1059 @@
     if (cand == NULL) {
         /* This is keep-alive */
+        if (status != PJ_SUCCESS) {
+            ice_st_perror(comp->ice_st, "STUN keep-alive request failed",
+                          status);
+        }
         return;
     }