Changeset 1988 for pjproject/trunk/pjnath/src/pjnath-test/test.c

Timestamp:

Jun 6, 2008 2:47:10 PM (16 years ago)

Author:

bennylp

Message:

Major major modifications related to ticket #485 (support for TURN-07):

• Added STUN socket transport pj_stun_sock
• Integration of TURN-07 to ICE
• Major refactoring in ICE stream transport to make it simpler
• Major modification (i.e. API change) in almost everywhere else
• Much more elaborate STUN, TURN, and ICE tests in pjnath-test

File:

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

pjproject/trunk/pjnath/src/pjnath-test/test.c

@@ -30 +30 @@
 }
 
+pj_status_t create_stun_config(pj_pool_t *pool, pj_stun_config *stun_cfg)
+{
+    pj_ioqueue_t *ioqueue;
+    pj_timer_heap_t *timer_heap;
+    pj_status_t status;
+
+    status = pj_ioqueue_create(pool, 64, &ioqueue);
+    if (status != PJ_SUCCESS) {
+        app_perror("   pj_ioqueue_create()", status);
+        return status;
+    }
+
+    status = pj_timer_heap_create(pool, 256, &timer_heap);
+    if (status != PJ_SUCCESS) {
+        app_perror("   pj_timer_heap_create()", status);
+        pj_ioqueue_destroy(ioqueue);
+        return status;
+    }
+
+    pj_stun_config_init(stun_cfg, mem, 0, ioqueue, timer_heap);
+
+    return PJ_SUCCESS;
+}
+
+void destroy_stun_config(pj_stun_config *stun_cfg)
+{
+    if (stun_cfg->timer_heap) {
+        pj_timer_heap_destroy(stun_cfg->timer_heap);
+        stun_cfg->timer_heap = NULL;
+    }
+    if (stun_cfg->ioqueue) {
+        pj_ioqueue_destroy(stun_cfg->ioqueue);
+        stun_cfg->ioqueue = NULL;
+    }
+}
+
+void poll_events(pj_stun_config *stun_cfg, unsigned msec,
+                 pj_bool_t first_event_only)
+{
+    pj_time_val stop_time;
+    int count = 0;
+
+    pj_gettimeofday(&stop_time);
+    stop_time.msec += msec;
+    pj_time_val_normalize(&stop_time);
+
+    /* Process all events for the specified duration. */
+    for (;;) {
+        pj_time_val timeout = {0, 1}, now;
+        int c;
+
+        c = pj_timer_heap_poll( stun_cfg->timer_heap, NULL );
+        if (c > 0)
+            count += c;
+
+        //timeout.sec = timeout.msec = 0;
+        c = pj_ioqueue_poll( stun_cfg->ioqueue, &timeout);
+        if (c > 0)
+            count += c;
+
+        pj_gettimeofday(&now);
+        if (PJ_TIME_VAL_GTE(now, stop_time))
+            break;
+
+        if (first_event_only && count >= 0)
+            break;
+    }
+}
+
+void capture_pjlib_state(pj_stun_config *cfg, struct pjlib_state *st)
+{
+    pj_caching_pool *cp;
+
+    st->timer_cnt = pj_timer_heap_count(cfg->timer_heap);
+    
+    cp = (pj_caching_pool*)mem;
+    st->pool_used_cnt = cp->used_count;
+}
+
+int check_pjlib_state(pj_stun_config *cfg, 
+                      const struct pjlib_state *initial_st)
+{
+    struct pjlib_state current_state;
+    int rc = 0;
+
+    capture_pjlib_state(cfg, &current_state);
+
+    if (current_state.timer_cnt > initial_st->timer_cnt) {
+        PJ_LOG(3,("", "    error: possibly leaking timer"));
+        rc |= ERR_TIMER_LEAK;
+    }
+
+    if (current_state.pool_used_cnt > initial_st->pool_used_cnt) {
+        PJ_LOG(3,("", "    error: possibly leaking memory"));
+        PJ_LOG(3,("", "    dumping memory pool:"));
+        pj_pool_factory_dump(mem, PJ_TRUE);
+        rc |= ERR_MEMORY_LEAK;
+    }
+
+    return rc;
+}
+
+
 #define DO_TEST(test)   do { \
                             PJ_LOG(3, ("test", "Running %s...", #test));  \
@@ -65 +168 @@
     pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 0 );
 
+    pjlib_util_init();
     pjnath_init();
 
@@ -74 +178 @@
 #if INCLUDE_ICE_TEST
     DO_TEST(ice_test());
+#endif
+
+#if INCLUDE_STUN_SOCK_TEST
+    DO_TEST(stun_sock_test());
+#endif
+
+#if INCLUDE_TURN_SOCK_TEST
+    DO_TEST(turn_sock_test());
 #endif