From 1fc31123b88f478cb271e1f1ce010bae5459bd09 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 7 Jan 2016 11:15:24 +0100 Subject: [PATCH] =?UTF-8?q?add=20lp-auto-answer=20to=20make=20build?= =?UTF-8?q?=E2=80=99s=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coreapi/offeranswer.c | 4 +++- tester/flexisip_tester.c | 6 +++--- tools/CMakeLists.txt | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c index d9d9d655d..7616b3499 100644 --- a/coreapi/offeranswer.c +++ b/coreapi/offeranswer.c @@ -476,8 +476,10 @@ static void initiate_incoming(const SalStreamDescription *local_cap, if (sal_stream_description_has_srtp(result) == TRUE) { /* select crypto algo */ memset(result->crypto, 0, sizeof(result->crypto)); - if (!match_crypto_algo(local_cap->crypto, remote_offer->crypto, &result->crypto[0], &result->crypto_local_tag, TRUE)) + if (!match_crypto_algo(local_cap->crypto, remote_offer->crypto, &result->crypto[0], &result->crypto_local_tag, TRUE)) { result->rtp_port = 0; + ms_message("No matching crypto algo for remote stream's offer [%p]",remote_offer); + } } strcpy(result->ice_pwd, local_cap->ice_pwd); diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c index 80d21483f..9ec983a2c 100644 --- a/tester/flexisip_tester.c +++ b/tester/flexisip_tester.c @@ -978,7 +978,7 @@ static void test_publish_unpublish(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneProxyConfig* proxy; - linphone_core_get_default_proxy(marie->lc,&proxy); + proxy = linphone_core_get_default_proxy_config(marie->lc); linphone_proxy_config_edit(proxy); linphone_proxy_config_enable_publish(proxy,TRUE); linphone_proxy_config_done(proxy); @@ -1040,14 +1040,14 @@ static void test_list_subscribe (void) { BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,1,5000)); /*dummy wait to avoid derred notify*/ wait_for_list(lcs,&dummy,1,2000); - linphone_core_get_default_proxy(pauline->lc,&proxy_config); + proxy_config = linphone_core_get_default_proxy_config(pauline->lc); linphone_proxy_config_edit(proxy_config); linphone_proxy_config_enable_publish(proxy_config,TRUE); linphone_proxy_config_done(proxy_config); BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_NotifyReceived,2,5000)); - linphone_core_get_default_proxy(laure->lc,&proxy_config); + proxy_config = linphone_core_get_default_proxy_config(laure->lc); linphone_proxy_config_edit(proxy_config); linphone_proxy_config_enable_publish(proxy_config,TRUE); linphone_proxy_config_done(proxy_config); diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 104f2346c..545ac16b8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -54,3 +54,24 @@ install(TARGETS lp-gen-wrappers ARCHIVE DESTINATION lib PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) + +set(LP_AUTO_ANSWER_SOURCE_FILES + auto_answer.c +) + +add_definitions( + -DIN_LINPHONE +) + +apply_compile_flags(LP_AUTO_ANSWER_SOURCE_FILES "CPP" "C") +add_executable(lp-auto-answer ${LP_AUTO_ANSWER_SOURCE_FILES}) +target_link_libraries(lp-auto-answer linphone) + + +install(TARGETS lp-auto-answer + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +) +