Changeset 1523 for pjproject/trunk

Timestamp:

Oct 26, 2007 3:59:34 AM (17 years ago)

Author:

bennylp

Message:

More ticket #399: fixed bug that triggers assertion in the timer

File:

• pjproject/trunk/pjnath/src/pjnath/nat_detect.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -79 +79 @@
     pj_timer_heap_t         *timer_heap;
     pj_timer_entry           timer;
+    unsigned                 timer_executed;
 
     void                    *user_data;
@@ -358 +359 @@
     char errmsg[PJ_ERR_MSG_SIZE];
     pj_time_val delay;
+
+    if (sess->timer.id != 0) {
+        pj_timer_heap_cancel(sess->timer_heap, &sess->timer);
+        sess->timer.id = 0;
+    }
 
     pj_bzero(&result, sizeof(result));
@@ -831 +837 @@
     } else if (te->id == TIMER_TEST) {
 
-        int executed;
         pj_bool_t next_timer;
 
         pj_mutex_lock(sess->mutex);
 
-        executed = test_executed(sess);
         next_timer = PJ_FALSE;
 
-        if (executed == ST_TEST_1) {
+        if (sess->timer_executed == 0) {
             send_test(sess, ST_TEST_1, NULL, 0);
             next_timer = PJ_TRUE;
-        } else if (executed == ST_TEST_2) {
+        } else if (sess->timer_executed == 1) {
             send_test(sess, ST_TEST_2, NULL, CHANGE_IP_PORT_FLAG);
             next_timer = PJ_TRUE;
-        } else if (executed == ST_TEST_3) {
+        } else if (sess->timer_executed == 2) {
             send_test(sess, ST_TEST_3, NULL, CHANGE_PORT_FLAG);
         } else {
             pj_assert(!"Shouldn't have timer at this state");
         }
+
+        ++sess->timer_executed;
 
         if (next_timer) {