mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-02 19:29:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'public/master' into belle-sip

Browse source 
Conflicts:
	coreapi/linphonecore.c
	coreapi/linphonecore.h
This commit is contained in:
Jehan Monnier 2013-07-25 22:11:23 +02:00
commit d9fd0d5634
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README
View file

@ -8,8 +8,7 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
- intltool
- you need at least:
- libosip2>=3.5.0
- libeXosip2>=3.5.0
- belle-sip>=1.0.0
- speex>=1.2.0 (including libspeexdsp part)
+ if you want the gtk/glade interface:

4
coreapi/linphonecore.c
View file

@ -5465,6 +5465,8 @@ LpConfig *linphone_core_get_config(LinphoneCore *lc){
static void linphone_core_uninit(LinphoneCore *lc)
{
linphone_core_free_hooks(lc);
lc->video_conf.show_local = FALSE;
while(lc->calls)
{
LinphoneCall *the_call = lc->calls->data;
@ -5883,7 +5885,7 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc){
return lc->zrtp_secrets_cache;
}
const LinphoneCall* linphone_core_find_call_from_uri(LinphoneCore *lc, const char *uri) {
const LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri) {
MSList *calls;
const LinphoneCall *c;
const LinphoneAddress *address;

2
coreapi/linphonecore.h
View file

@ -1626,7 +1626,7 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc);
* @param uri which should match call remote uri
* @return LinphoneCall or NULL is no match is found
*/
LINPHONE_PUBLIC const LinphoneCall* linphone_core_find_call_from_uri(LinphoneCore *lc, const char *uri);
LINPHONE_PUBLIC const LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri);
LINPHONE_PUBLIC int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call);
LINPHONE_PUBLIC int linphone_core_add_all_to_conference(LinphoneCore *lc);

2
coreapi/linphonecore_jni.cc
View file

@ -2512,7 +2512,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setZrtpSecretsCache(JNIE
extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_findCallFromUri(JNIEnv *env,jobject thiz,jlong pCore, jstring jUri) {
const char* cUri=env->GetStringUTFChars(jUri, NULL);
LinphoneCall *call= (LinphoneCall *) linphone_core_find_call_from_uri((LinphoneCore *) pCore,cUri);
LinphoneCall *call=linphone_core_find_call_from_uri((LinphoneCore *) pCore,cUri);
env->ReleaseStringUTFChars(jUri, cUri);
LinphoneCoreData *lcdata=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)pCore);
return (jobject) lcdata->getCall(env,call);

4
tester/register_tester.c
View file

@ -398,11 +398,11 @@ static void io_recv_error_retry_immediatly(){
number_of_udp_proxy=get_number_of_udp_proxy(lc);
sal_set_recv_error(lc->sal, 0);
CU_ASSERT_TRUE(wait_for(lc,NULL,&counters->number_of_LinphoneRegistrationProgress,2*(register_ok-number_of_udp_proxy) /*because 1 udp*/));
CU_ASSERT_TRUE(wait_for(lc,NULL,&counters->number_of_LinphoneRegistrationProgress,(register_ok-number_of_udp_proxy)+register_ok /*because 1 udp*/));
CU_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationFailed,0)
sal_set_recv_error(lc->sal, 1); /*reset*/
CU_ASSERT_TRUE(wait_for(lc,lc,&counters->number_of_LinphoneRegistrationOk,2*(register_ok-number_of_udp_proxy)));
CU_ASSERT_TRUE(wait_for(lc,lc,&counters->number_of_LinphoneRegistrationOk,register_ok-number_of_udp_proxy+register_ok));
linphone_core_manager_destroy(mgr);
}