Commit 5baaa9fc authored by Sylvain Berfini's avatar Sylvain Berfini 🎩
Browse files

Fix merge + compil wp

parent 5c30c2a3
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
<ClCompile Include="..\..\..\tester\message_tester.c" /> <ClCompile Include="..\..\..\tester\message_tester.c" />
<ClCompile Include="..\..\..\tester\presence_tester.c" /> <ClCompile Include="..\..\..\tester\presence_tester.c" />
<ClCompile Include="..\..\..\tester\register_tester.c" /> <ClCompile Include="..\..\..\tester\register_tester.c" />
<ClCompile Include="..\..\..\tester\setup_tester.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\tester\liblinphone_tester.h" /> <ClInclude Include="..\..\..\tester\liblinphone_tester.h" />
...@@ -152,6 +153,11 @@ ...@@ -152,6 +153,11 @@
<Project>{08dd0d38-d9b5-4626-b60d-b4d76b571142}</Project> <Project>{08dd0d38-d9b5-4626-b60d-b4d76b571142}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="..\..\..\tester\laure_rc" />
<None Include="..\..\..\tester\marie_rc" />
<None Include="..\..\..\tester\pauline_rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" Condition="'$(Platform)'=='ARM'" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" Condition="'$(Platform)'=='ARM'" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
......
...@@ -12,8 +12,20 @@ ...@@ -12,8 +12,20 @@
<ClCompile Include="..\..\..\tester\message_tester.c" /> <ClCompile Include="..\..\..\tester\message_tester.c" />
<ClCompile Include="..\..\..\tester\presence_tester.c" /> <ClCompile Include="..\..\..\tester\presence_tester.c" />
<ClCompile Include="..\..\..\tester\register_tester.c" /> <ClCompile Include="..\..\..\tester\register_tester.c" />
<ClCompile Include="..\..\..\tester\setup_tester.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\tester\liblinphone_tester.h" /> <ClInclude Include="..\..\..\tester\liblinphone_tester.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="..\..\..\tester\laure_rc">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\..\tester\marie_rc">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\..\tester\pauline_rc">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -526,6 +526,6 @@ LINPHONE_PUBLIC void sal_set_recv_error(Sal *sal,int value); ...@@ -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); void sal_nat_helper_enable(Sal *sal,bool_t enable);
bool_t sal_nat_helper_enabled(Sal *sal); 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); int sal_get_dns_timeout(const Sal* sal);
#endif #endif
...@@ -475,9 +475,7 @@ static void simple_call_transfer(void) { ...@@ -475,9 +475,7 @@ static void simple_call_transfer(void) {
LinphoneCoreManager* pauline = linphone_core_manager_new("./tester/pauline_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new("./tester/pauline_rc");
LinphoneCoreManager* laure = linphone_core_manager_new("./tester/laure_rc"); LinphoneCoreManager* laure = linphone_core_manager_new("./tester/laure_rc");
LinphoneCall* pauline_called_by_marie; LinphoneCall* pauline_called_by_marie;
LinphoneCall* marie_call_pauline; LinphoneCall* marie_call_pauline;
LinphoneCall* pauline_called_by_marie;
char* laure_identity=linphone_address_as_string(laure->identity); char* laure_identity=linphone_address_as_string(laure->identity);
MSList* lcs=ms_list_append(NULL,marie->lc); MSList* lcs=ms_list_append(NULL,marie->lc);
...@@ -610,7 +608,9 @@ test_t call_tests[] = { ...@@ -610,7 +608,9 @@ test_t call_tests[] = {
{ "Call paused resumed", call_paused_resumed }, { "Call paused resumed", call_paused_resumed },
{ "Call paused resumed from callee", call_paused_resumed_from_callee }, { "Call paused resumed from callee", call_paused_resumed_from_callee },
{ "SRTP call", srtp_call }, { "SRTP call", srtp_call },
#ifdef VIDEO_ENABLED
{ "Call with video added", call_with_video_added }, { "Call with video added", call_with_video_added },
#endif
{ "Simple conference", simple_conference }, { "Simple conference", simple_conference },
{ "Simple call transfer", simple_call_transfer }, { "Simple call transfer", simple_call_transfer },
{ "Call transfer existing call outgoing call", call_transfer_existing_call_outgoing_call } { "Call transfer existing call outgoing call", call_transfer_existing_call_outgoing_call }
......
...@@ -53,12 +53,14 @@ LinphoneAddress * create_linphone_address(const char * domain) { ...@@ -53,12 +53,14 @@ LinphoneAddress * create_linphone_address(const char * domain) {
} }
void auth_info_requested(LinphoneCore *lc, const char *realm, const char *username) { 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" ms_message("Auth info requested for user id [%s] at realm [%s]\n"
,username ,username
,realm); ,realm);
stats* counters = (stats*)linphone_core_get_user_data(lc); counters = (stats*)linphone_core_get_user_data(lc);
counters->number_of_auth_info_requested++; 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*/ linphone_core_add_auth_info(lc,info); /*add authentication info to LinphoneCore*/
} }
...@@ -83,9 +85,10 @@ void reset_counters( stats* counters) { ...@@ -83,9 +85,10 @@ void reset_counters( stats* counters) {
LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* file,int proxy_count) { LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* file,int proxy_count) {
LinphoneCore* lc; LinphoneCore* lc;
int retry=0; int retry=0;
stats* counters;
lc = linphone_core_new(v_table,NULL,file,NULL); lc = linphone_core_new(v_table,NULL,file,NULL);
linphone_core_set_user_data(lc,&global_stat); 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_ring(lc,"./share/rings/oldphone.wav");
linphone_core_set_ringback(lc,"./share/ringback.wav"); linphone_core_set_ringback(lc,"./share/ringback.wav");
...@@ -102,9 +105,9 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* file,in ...@@ -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) { bool_t wait_for(LinphoneCore* lc_1, LinphoneCore* lc_2,int* counter,int value) {
MSList* lcs=NULL; MSList* lcs=NULL;
bool_t result;
if (lc_1) if (lc_1)
lcs=ms_list_append(lcs,lc_1); lcs=ms_list_append(lcs,lc_1);
bool_t result;
if (lc_2) if (lc_2)
lcs=ms_list_append(lcs,lc_2); lcs=ms_list_append(lcs,lc_2);
result=wait_for_list(lcs,counter,value,2000); 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) { ...@@ -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) { static void enable_codec(LinphoneCore* lc,const char* type,int rate) {
MSList* codecs=ms_list_copy(linphone_core_get_audio_codecs(lc)); MSList* codecs=ms_list_copy(linphone_core_get_audio_codecs(lc));
MSList* codecs_it; MSList* codecs_it;
PayloadType* pt;
for (codecs_it=codecs;codecs_it!=NULL;codecs_it=codecs_it->next) { for (codecs_it=codecs;codecs_it!=NULL;codecs_it=codecs_it->next) {
linphone_core_enable_payload_type(lc,(PayloadType*)codecs_it->data,0); linphone_core_enable_payload_type(lc,(PayloadType*)codecs_it->data,0);
} }
PayloadType* pt;
if((pt = linphone_core_find_payload_type(lc,type,rate,1))) { if((pt = linphone_core_find_payload_type(lc,type,rate,1))) {
linphone_core_enable_payload_type(lc,pt, 1); linphone_core_enable_payload_type(lc,pt, 1);
} }
......
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
static void core_init_test(void) { static void core_init_test(void) {
LinphoneCoreVTable v_table; LinphoneCoreVTable v_table;
LinphoneCore* lc;
memset (&v_table,0,sizeof(v_table)); 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); CU_ASSERT_PTR_NOT_NULL_FATAL(lc);
linphone_core_destroy(lc); linphone_core_destroy(lc);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment