diff --git a/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj b/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj index 1685afd27..bf77462b5 100644 --- a/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj +++ b/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj @@ -134,6 +134,7 @@ + @@ -152,6 +153,11 @@ {08dd0d38-d9b5-4626-b60d-b4d76b571142} + + + + + diff --git a/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj.filters b/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj.filters index 5e3ead950..e7b5435bd 100644 --- a/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj.filters +++ b/build/vsx/LibLinphoneTester/LibLinphoneTester.vcxproj.filters @@ -12,8 +12,20 @@ + + + + Resource Files + + + Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/include/sal/sal.h b/include/sal/sal.h index 71edb3d1e..80a747fe3 100644 --- a/include/sal/sal.h +++ b/include/sal/sal.h @@ -526,6 +526,6 @@ LINPHONE_PUBLIC void sal_set_recv_error(Sal *sal,int value); void sal_nat_helper_enable(Sal *sal,bool_t enable); bool_t sal_nat_helper_enabled(Sal *sal); -void sal_set_dns_timeout(Sal* sal,int timeout); +LINPHONE_PUBLIC void sal_set_dns_timeout(Sal* sal,int timeout); int sal_get_dns_timeout(const Sal* sal); #endif diff --git a/tester/call_tester.c b/tester/call_tester.c index 16ad764ed..b7ff3465c 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -475,9 +475,7 @@ static void simple_call_transfer(void) { LinphoneCoreManager* pauline = linphone_core_manager_new("./tester/pauline_rc"); LinphoneCoreManager* laure = linphone_core_manager_new("./tester/laure_rc"); LinphoneCall* pauline_called_by_marie; - LinphoneCall* marie_call_pauline; - LinphoneCall* pauline_called_by_marie; char* laure_identity=linphone_address_as_string(laure->identity); MSList* lcs=ms_list_append(NULL,marie->lc); @@ -610,7 +608,9 @@ test_t call_tests[] = { { "Call paused resumed", call_paused_resumed }, { "Call paused resumed from callee", call_paused_resumed_from_callee }, { "SRTP call", srtp_call }, +#ifdef VIDEO_ENABLED { "Call with video added", call_with_video_added }, +#endif { "Simple conference", simple_conference }, { "Simple call transfer", simple_call_transfer }, { "Call transfer existing call outgoing call", call_transfer_existing_call_outgoing_call } diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c index 26c6fbacd..e92037e17 100644 --- a/tester/liblinphone_tester.c +++ b/tester/liblinphone_tester.c @@ -53,12 +53,14 @@ LinphoneAddress * create_linphone_address(const char * domain) { } void auth_info_requested(LinphoneCore *lc, const char *realm, const char *username) { + stats* counters; + LinphoneAuthInfo *info; ms_message("Auth info requested for user id [%s] at realm [%s]\n" ,username ,realm); - stats* counters = (stats*)linphone_core_get_user_data(lc); + counters = (stats*)linphone_core_get_user_data(lc); counters->number_of_auth_info_requested++; - LinphoneAuthInfo *info=linphone_auth_info_new(test_username,NULL,test_password,NULL,auth_domain); /*create authentication structure from identity*/ + info=linphone_auth_info_new(test_username,NULL,test_password,NULL,auth_domain); /*create authentication structure from identity*/ linphone_core_add_auth_info(lc,info); /*add authentication info to LinphoneCore*/ } @@ -83,9 +85,10 @@ void reset_counters( stats* counters) { LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* file,int proxy_count) { LinphoneCore* lc; int retry=0; + stats* counters; lc = linphone_core_new(v_table,NULL,file,NULL); linphone_core_set_user_data(lc,&global_stat); - stats* counters = (stats*)linphone_core_get_user_data(lc); + counters = (stats*)linphone_core_get_user_data(lc); linphone_core_set_ring(lc,"./share/rings/oldphone.wav"); linphone_core_set_ringback(lc,"./share/ringback.wav"); @@ -102,9 +105,9 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* file,in bool_t wait_for(LinphoneCore* lc_1, LinphoneCore* lc_2,int* counter,int value) { MSList* lcs=NULL; + bool_t result; if (lc_1) lcs=ms_list_append(lcs,lc_1); - bool_t result; if (lc_2) lcs=ms_list_append(lcs,lc_2); result=wait_for_list(lcs,counter,value,2000); @@ -128,10 +131,10 @@ bool_t wait_for_list(MSList* lcs,int* counter,int value,int timeout_ms) { static void enable_codec(LinphoneCore* lc,const char* type,int rate) { MSList* codecs=ms_list_copy(linphone_core_get_audio_codecs(lc)); MSList* codecs_it; + PayloadType* pt; for (codecs_it=codecs;codecs_it!=NULL;codecs_it=codecs_it->next) { linphone_core_enable_payload_type(lc,(PayloadType*)codecs_it->data,0); } - PayloadType* pt; if((pt = linphone_core_find_payload_type(lc,type,rate,1))) { linphone_core_enable_payload_type(lc,pt, 1); } diff --git a/tester/setup_tester.c b/tester/setup_tester.c index 4ee2564c5..4fee989e9 100644 --- a/tester/setup_tester.c +++ b/tester/setup_tester.c @@ -26,8 +26,9 @@ static void core_init_test(void) { LinphoneCoreVTable v_table; + LinphoneCore* lc; memset (&v_table,0,sizeof(v_table)); - LinphoneCore* lc = linphone_core_new(&v_table,NULL,NULL,NULL); + lc = linphone_core_new(&v_table,NULL,NULL,NULL); CU_ASSERT_PTR_NOT_NULL_FATAL(lc); linphone_core_destroy(lc); }