Changeset 1904 for pjproject/trunk

Timestamp:

Apr 1, 2008 6:23:56 PM (16 years ago)

Author:

bennylp

Message:

More work on ticket #485: bug when TURN UDP relay is not destroyed if Allocate request fails

Location:

pjproject/trunk/pjnath/src

Files:

• pjnath/turn_udp.c (modified) (2 diffs)
• pjturn-client/client_main.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_udp.c

@@ -156 +156 @@
     sess_cb.on_rx_data = &turn_on_rx_data;
     sess_cb.on_state = &turn_on_state;
-    status = pj_turn_session_create(cfg, pool->obj_name, af, PJ_TURN_TP_UDP,
+    status = pj_turn_session_create(cfg, "turn%p", af, PJ_TURN_TP_UDP,
                                     &sess_cb, udp_rel, 0, &udp_rel->sess);
     if (status != PJ_SUCCESS) {
@@ -476 +476 @@
 
     if (new_state >= PJ_TURN_STATE_DESTROYING && udp_rel->sess) {
-        if (udp_rel->destroy_request) {
+
+        udp_rel->sess = NULL;
+        // Always destroy the session regardless whether application
+        // has called pj_turn_udp_destroy() or not. This is to handle
+        // the case when Allocate request fails.
+        //if (udp_rel->destroy_request) {
+        if (1) {
             pj_time_val delay = {0, 0};
 
-            pj_turn_session_set_user_data(udp_rel->sess, NULL);
+            pj_turn_session_set_user_data(sess, NULL);
+
+            if (udp_rel->timer.id != TIMER_NONE) {
+                pj_timer_heap_cancel(udp_rel->timer_heap, &udp_rel->timer);
+            }
 
             udp_rel->timer.id = TIMER_DESTROY;
             pj_timer_heap_schedule(udp_rel->timer_heap, &udp_rel->timer, 
                                    &delay);
-        } else {
-            udp_rel->sess = NULL;
         }
     }

pjproject/trunk/pjnath/src/pjturn-client/client_main.c

@@ -358 +358 @@
           peer1_addr);
     puts("+-----------------------------------+                                |");
-    puts("| q  Quit                           | 1  Send data to relay adderss  |");
+    puts("| q  Quit        d  Dump            | 1  Send data to relay adderss  |");
     puts("+-----------------------------------+--------------------------------+");
     printf(">>> ");
@@ -380 +380 @@
         case 'a':
             create_relay();
+            break;
+        case 'd':
+            pj_pool_factory_dump(&g.cp.factory, PJ_TRUE);
             break;
         case 's':