Changeset 1879 for pjproject/trunk/pjnath/src/pjnath/turn_session.c

Timestamp:

Mar 20, 2008 4:32:06 PM (16 years ago)

Author:

bennylp

Message:

More ticket #485: client and server self tested

File:

• pjproject/trunk/pjnath/src/pjnath/turn_session.c (modified) (9 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -189 +189 @@
     sess->ka_interval = PJ_TURN_KEEP_ALIVE_SEC;
     sess->user_data = user_data;
+    sess->next_ch = PJ_TURN_CHANNEL_MIN;
 
     /* Copy callback */
@@ -326 +327 @@
         /* Send REFRESH with LIFETIME=0 */
         can_destroy = PJ_FALSE;
-        sess->pending_destroy = PJ_TRUE;
+        send_refresh(sess, 0);
         break;
     case PJ_TURN_STATE_DEALLOCATING:
@@ -779 +780 @@
     pj_stun_msg_add_uint_attr(tdata->pool, tdata->msg,
                               PJ_STUN_ATTR_CHANNEL_NUMBER,
-                              PJ_STUN_SET_CH_NB(sess->next_ch));
+                              PJ_STUN_SET_CH_NB(ch_num));
 
     /* Add PEER-ADDRESS attribute */
@@ -1024 +1025 @@
     
     /* Save relayed address */
-    pj_memcpy(&sess->relay_addr, &raddr_attr->sockaddr, sizeof(pj_sockaddr));
+    if (raddr_attr) {
+        /* If we already have relay address, check if the relay address 
+         * in the response matches our relay address.
+         */
+        if (pj_sockaddr_has_addr(&sess->relay_addr)) {
+            if (pj_sockaddr_cmp(&sess->relay_addr, &raddr_attr->sockaddr)) {
+                on_session_fail(sess, method, PJNATH_EINSTUNMSG,
+                                pj_cstr(&s, "Error: different RELAY-ADDRESS is"
+                                            "returned by server"));
+                return;
+            }
+        } else {
+            /* Otherwise save the relayed address */
+            pj_memcpy(&sess->relay_addr, &raddr_attr->sockaddr, 
+                      sizeof(pj_sockaddr));
+        }
+    }
 
     /* Success */
@@ -1181 +1198 @@
     pj_stun_data_attr *data_attr;
 
+    PJ_UNUSED_ARG(pkt);
+    PJ_UNUSED_ARG(pkt_len);
     PJ_UNUSED_ARG(src_addr);
     PJ_UNUSED_ARG(src_addr_len);
@@ -1210 +1229 @@
     /* Notify application */
     if (sess->cb.on_rx_data) {
-        (*sess->cb.on_rx_data)(sess, pkt, pkt_len, 
+        (*sess->cb.on_rx_data)(sess, data_attr->data, data_attr->length, 
                                &peer_attr->sockaddr,
                                pj_sockaddr_get_len(&peer_attr->sockaddr));
@@ -1299 +1318 @@
 
         if (bind_channel) {
+            pj_uint32_t hval = 0;
             /* Register by channel number */
             pj_assert(peer->ch_id != PJ_TURN_INVALID_CHANNEL && peer->bound);
-            pj_assert(pj_hash_get(sess->peer_table, &peer->ch_id, 
-                                  sizeof(peer->ch_id), NULL)==0);
-
-            pj_hash_set(sess->pool, sess->peer_table, &peer->ch_id,
-                        sizeof(peer->ch_id), 0, peer);
+
+            if (pj_hash_get(sess->peer_table, &peer->ch_id, 
+                            sizeof(peer->ch_id), &hval)==0) {
+                pj_hash_set(sess->pool, sess->peer_table, &peer->ch_id,
+                            sizeof(peer->ch_id), hval, peer);
+            }
         }
     }
@@ -1406 +1427 @@
             delay.msec = 0;
 
+            sess->timer.id = TIMER_KEEP_ALIVE;
             pj_timer_heap_schedule(sess->timer_heap, &sess->timer, &delay);
         }
@@ -1415 +1437 @@
         pj_lock_release(sess->lock);
         do_destroy(sess);
-    }    
-}
-
+    } else {
+        pj_assert(!"Unknown timer event");
+        pj_lock_release(sess->lock);
+    }
+}
+