diff options
Diffstat (limited to 'pjsip/src')
-rw-r--r-- | pjsip/src/test-pjsip/test.c | 5 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/transport_test.c | 5 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/tsx_uas_test.c | 6 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/txdata_test.c | 2 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/uri_test.c | 2 |
5 files changed, 12 insertions, 8 deletions
diff --git a/pjsip/src/test-pjsip/test.c b/pjsip/src/test-pjsip/test.c index 2eecf83f..502f049b 100644 --- a/pjsip/src/test-pjsip/test.c +++ b/pjsip/src/test-pjsip/test.c @@ -219,11 +219,14 @@ int test_main(void) pj_status_t rc; pj_caching_pool caching_pool; const char *filename; - unsigned i, tsx_test_cnt=0; + unsigned tsx_test_cnt=0; struct tsx_test_param tsx_test[10]; pj_status_t status; +#if INCLUDE_TSX_TEST + unsigned i; pjsip_transport *tp; pjsip_tpfactory *tpfactory; +#endif int line; pj_log_set_level(log_level); diff --git a/pjsip/src/test-pjsip/transport_test.c b/pjsip/src/test-pjsip/transport_test.c index e5baa040..bb5a627d 100644 --- a/pjsip/src/test-pjsip/transport_test.c +++ b/pjsip/src/test-pjsip/transport_test.c @@ -335,9 +335,6 @@ static pj_str_t rt_call_id; static pj_bool_t rt_on_rx_request(pjsip_rx_data *rdata) { if (!pj_strncmp(&rdata->msg_info.cid->id, &rt_call_id, rt_call_id.slen)) { - char *pos = pj_strchr(&rdata->msg_info.cid->id, '/'); - int thread_id = (*pos - '0'); - pjsip_tx_data *tdata; pjsip_response_addr res_addr; pj_status_t status; @@ -489,7 +486,7 @@ static void rt_tx_timer( pj_timer_heap_t *timer_heap, static int rt_worker_thread(void *arg) { - int i, thread_id = (int)(long)arg; + int i; pj_time_val poll_delay = { 0, 10 }; /* Sleep to allow main threads to run. */ diff --git a/pjsip/src/test-pjsip/tsx_uas_test.c b/pjsip/src/test-pjsip/tsx_uas_test.c index 42cb075f..8124b5af 100644 --- a/pjsip/src/test-pjsip/tsx_uas_test.c +++ b/pjsip/src/test-pjsip/tsx_uas_test.c @@ -106,7 +106,7 @@ static char *TEST9_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAS-Test9"; static char *TEST10_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAS-Test10"; static char *TEST11_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAS-Test11"; static char *TEST12_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAS-Test12"; -static char *TEST13_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAS-Test13"; +//static char *TEST13_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAS-Test13"; #define TEST1_STATUS_CODE 200 #define TEST2_STATUS_CODE 301 @@ -194,7 +194,7 @@ static pj_str_t tsx_key = { key_buf, 0 }; /* General timer entry to be used by tests. */ -static pj_timer_entry timer; +//static pj_timer_entry timer; /* Timer to send response via transaction. */ struct response @@ -313,6 +313,7 @@ static void terminate_our_tsx(int status_code) pj_mutex_unlock(tsx->mutex); } +#if 0 /* Unused for now */ /* Timer callback to terminate transaction. */ static void terminate_tsx_timer( pj_timer_heap_t *timer_heap, struct pj_timer_entry *entry) @@ -338,6 +339,7 @@ static void schedule_terminate_tsx( pjsip_transaction *tsx, timer.cb = &terminate_tsx_timer; pjsip_endpt_schedule_timer(endpt, &timer, &delay); } +#endif /* diff --git a/pjsip/src/test-pjsip/txdata_test.c b/pjsip/src/test-pjsip/txdata_test.c index da90906f..dc132765 100644 --- a/pjsip/src/test-pjsip/txdata_test.c +++ b/pjsip/src/test-pjsip/txdata_test.c @@ -337,6 +337,7 @@ static int core_txdata_test(void) * This test demonstrate the bug as reported in: * http://bugzilla.pjproject.net/show_bug.cgi?id=49 */ +#if INCLUDE_GCC_TEST static int gcc_test() { char msgbuf[512]; @@ -400,6 +401,7 @@ static int gcc_test() pjsip_tx_data_dec_ref(tdata); return 0; } +#endif /* This tests the request creating functions against the following diff --git a/pjsip/src/test-pjsip/uri_test.c b/pjsip/src/test-pjsip/uri_test.c index da3c1833..d7e7917b 100644 --- a/pjsip/src/test-pjsip/uri_test.c +++ b/pjsip/src/test-pjsip/uri_test.c @@ -76,7 +76,7 @@ static pjsip_uri *create_uri31( pj_pool_t *pool ); static pjsip_uri *create_uri32( pj_pool_t *pool ); static pjsip_uri *create_uri33( pj_pool_t *pool ); static pjsip_uri *create_uri34( pj_pool_t *pool ); -static pjsip_uri *create_uri35( pj_pool_t *pool ); +//static pjsip_uri *create_uri35( pj_pool_t *pool ); static pjsip_uri *create_dummy( pj_pool_t *pool ); #define ERR_NOT_EQUAL -1001 |