mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-28 08:39:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build issues linked to DialPlan.

Browse source
This commit is contained in:
Ghislain MARY 2017-10-16 10:54:58 +02:00
parent 0bab59418d
commit 243c9212ba
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/linphone/api/c-api.h
View file

@ -31,6 +31,7 @@
#include "linphone/api/c-chat-message-cbs.h"
#include "linphone/api/c-chat-room.h"
#include "linphone/api/c-chat-room-cbs.h"
#include "linphone/api/c-dial-plan.h"
#include "linphone/api/c-event-log.h"
#include "linphone/api/c-participant.h"
#include "linphone/api/c-types.h"

2
include/linphone/api/c-dial-plan.h
View file

@ -86,7 +86,7 @@ LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_get_all(void);
/**
* @return {\bctbx_list const LinphoneDialPlan*} of all known dial plans
**/
LINPHONE_PUBLIC const bctbx_list_t * linphone_dial_plan_get_all_list();
LINPHONE_PUBLIC const bctbx_list_t * linphone_dial_plan_get_all_list(void);
/**
* Find best match for given CCC

10
tester/presence_server_tester.c
View file

@ -971,12 +971,12 @@ static void long_term_presence_with_phone_without_sip(void) {
while ((dialPlan = linphone_dial_plan_by_ccc_as_int(bctbx_random()%900)) == linphone_dial_plan_by_ccc(NULL));
/*now with have a dialplan*/
for (i = 0; i < MIN((size_t)dialPlan->nnl,sizeof(phone)-1); i++) {
for (i = 0; i < MIN((size_t)linphone_dial_plan_get_national_number_length(dialPlan),sizeof(phone)-1); i++) {
phone[i] = '0' + rand() % 10;
}
phone[i]='\0';
e164=ms_strdup_printf("+%s%s",dialPlan->ccc,phone);
e164=ms_strdup_printf("+%s%s",linphone_dial_plan_get_country_calling_code(dialPlan),phone);
ms_message("Phone number is %s, e164 is %s", phone, e164);
@ -1001,7 +1001,7 @@ static void long_term_presence_with_phone_without_sip(void) {
/*know adding ccc to proxy config*/
proxy_config = linphone_core_get_default_proxy_config(pauline->lc);
linphone_proxy_config_edit(proxy_config);
linphone_proxy_config_set_dial_prefix(proxy_config, dialPlan->ccc);
linphone_proxy_config_set_dial_prefix(proxy_config, linphone_dial_plan_get_country_calling_code(dialPlan));
linphone_proxy_config_done(proxy_config);
/*re-create sub list*/
linphone_friend_list_enable_subscriptions(linphone_core_get_default_friend_list(pauline->lc), FALSE);
@ -1032,12 +1032,12 @@ static char * generate_random_e164_phone_from_dial_plan(const LinphoneDialPlan *
char phone[64];
size_t i;
/*now with have a dialplan*/
for (i = 0; i < MIN((size_t)dialPlan->nnl,sizeof(phone)-1); i++) {
for (i = 0; i < MIN((size_t)linphone_dial_plan_get_national_number_length(dialPlan),sizeof(phone)-1); i++) {
phone[i] = '0' + rand() % 10;
}
phone[i]='\0';
return ms_strdup_printf("+%s%s",dialPlan->ccc,phone);
return ms_strdup_printf("+%s%s",linphone_dial_plan_get_country_calling_code(dialPlan),phone);
}
/* use case:
I have a friend, I invite him to use Linphone for the first time.