From 36628c4f0dbd34f48031d1cd62a7d560e791f94c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 10 Jul 2023 11:30:31 +0200
Subject: [PATCH] Fixed find friend by phone number when number has
international prefix but no '+' + improved performances a bit
---
coreapi/friend.c | 91 +++++++++++++++++++++++---------
coreapi/friendlist.c | 37 +++++++++++--
coreapi/private_functions.h | 6 +++
include/linphone/api/c-account.h | 4 +-
src/c-wrapper/api/c-account.cpp | 47 +++++++++++------
tester/setup_tester.c | 38 +++++++++++--
6 files changed, 171 insertions(+), 52 deletions(-)
diff --git a/coreapi/friend.c b/coreapi/friend.c
index b736eaabc9..0e9d7f4260 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -576,6 +576,31 @@ bctbx_list_t *linphone_friend_get_phone_numbers_with_label(const LinphoneFriend
return NULL;
}
+bool_t _linphone_friend_has_phone_number(const LinphoneFriend *lf,
+ const LinphoneAccount *account,
+ const char *normalized_phone_number) {
+ if (!lf || !normalized_phone_number) return FALSE;
+
+ bool_t found = FALSE;
+ bctbx_list_t *numbers = linphone_friend_get_phone_numbers(lf);
+ bctbx_list_t *it = NULL;
+ for (it = numbers; it != NULL; it = bctbx_list_next(it)) {
+ const char *value = (const char *)bctbx_list_get_data(it);
+ char *normalized_value = linphone_account_normalize_phone_number(account, value);
+ if (normalized_value) {
+ if (strcmp(normalized_value, normalized_phone_number) == 0) {
+ found = TRUE;
+ ms_free(normalized_value);
+ break;
+ }
+ ms_free(normalized_value);
+ }
+ }
+ bctbx_list_free(numbers);
+
+ return found;
+}
+
bool_t linphone_friend_has_phone_number(const LinphoneFriend *lf, const char *phoneNumber) {
if (!lf || !phoneNumber) return FALSE;
@@ -587,6 +612,11 @@ bool_t linphone_friend_has_phone_number(const LinphoneFriend *lf, const char *ph
return FALSE;
}
+ if (!linphone_core_vcard_supported()) {
+ ms_warning("SDK built without vCard support, can't do a phone number search without it");
+ return FALSE;
+ }
+
bool_t found = FALSE;
const bctbx_list_t *elem;
const bctbx_list_t *accounts = linphone_core_get_account_list(lf->lc);
@@ -594,21 +624,7 @@ bool_t linphone_friend_has_phone_number(const LinphoneFriend *lf, const char *ph
account = (LinphoneAccount *)bctbx_list_get_data(elem);
char *normalized_phone_number = linphone_account_normalize_phone_number(account, phoneNumber);
- if (linphone_core_vcard_supported()) {
- bctbx_list_t *numbers = linphone_friend_get_phone_numbers(lf);
- bctbx_list_t *it = NULL;
- for (it = numbers; it != NULL; it = bctbx_list_next(it)) {
- const char *value = (const char *)bctbx_list_get_data(it);
- char *normalized_value = linphone_account_normalize_phone_number(account, value);
- if (normalized_value && strcmp(normalized_value, normalized_phone_number) == 0) {
- found = TRUE;
- ms_free(normalized_value);
- break;
- }
- if (normalized_value) ms_free(normalized_value);
- }
- bctbx_list_free(numbers);
- }
+ found = _linphone_friend_has_phone_number(lf, account, normalized_phone_number);
if (normalized_phone_number) ms_free(normalized_phone_number);
if (found) break;
@@ -617,6 +633,40 @@ bool_t linphone_friend_has_phone_number(const LinphoneFriend *lf, const char *ph
return found;
}
+LinphoneFriend *linphone_core_find_friend_by_phone_number(const LinphoneCore *lc, const char *phoneNumber) {
+ LinphoneAccount *account = linphone_core_get_default_account(lc);
+ // Account can be null, both linphone_account_is_phone_number and linphone_account_normalize_phone_number can handle
+ // it
+ if (phoneNumber == NULL || !linphone_account_is_phone_number(account, phoneNumber)) {
+ ms_warning("Phone number [%s] isn't valid", phoneNumber);
+ return NULL;
+ }
+
+ if (!linphone_core_vcard_supported()) {
+ ms_warning("SDK built without vCard support, can't do a phone number search without it");
+ return NULL;
+ }
+
+ const bctbx_list_t *elem;
+ const bctbx_list_t *accounts = linphone_core_get_account_list(lc);
+ for (elem = accounts; elem != NULL; elem = bctbx_list_next(elem)) {
+ account = (LinphoneAccount *)bctbx_list_get_data(elem);
+ char *normalized_phone_number = linphone_account_normalize_phone_number(account, phoneNumber);
+
+ bctbx_list_t *lists = lc->friends_lists;
+ LinphoneFriend *lf = NULL;
+ while (lists && !lf) {
+ LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
+ lf = _linphone_friend_list_find_friend_by_phone_number(list, account, normalized_phone_number);
+ lists = bctbx_list_next(lists);
+ }
+
+ ms_free(normalized_phone_number);
+ if (lf) return lf;
+ }
+ return NULL;
+}
+
void linphone_friend_remove_phone_number(LinphoneFriend *lf, const char *phone) {
if (!lf || !phone || !lf->vcard) return;
@@ -1182,17 +1232,6 @@ LinphoneFriend *linphone_core_find_friend(const LinphoneCore *lc, const Linphone
return lf;
}
-LinphoneFriend *linphone_core_find_friend_by_phone_number(const LinphoneCore *lc, const char *phoneNumber) {
- bctbx_list_t *lists = lc->friends_lists;
- LinphoneFriend *lf = NULL;
- while (lists && !lf) {
- LinphoneFriendList *list = (LinphoneFriendList *)bctbx_list_get_data(lists);
- lf = linphone_friend_list_find_friend_by_phone_number(list, phoneNumber);
- lists = bctbx_list_next(lists);
- }
- return lf;
-}
-
bctbx_list_t *linphone_core_find_friends(const LinphoneCore *lc, const LinphoneAddress *addr) {
bctbx_list_t *result = NULL;
bctbx_list_t *lists = lc->friends_lists;
diff --git a/coreapi/friendlist.c b/coreapi/friendlist.c
index a2f80aff5d..997ea07bcf 100644
--- a/coreapi/friendlist.c
+++ b/coreapi/friendlist.c
@@ -1098,14 +1098,14 @@ LinphoneFriend *linphone_friend_list_find_friend_by_address(const LinphoneFriend
return lf;
}
-LinphoneFriend *linphone_friend_list_find_friend_by_phone_number(const LinphoneFriendList *list,
- const char *phoneNumber) {
+LinphoneFriend *_linphone_friend_list_find_friend_by_phone_number(const LinphoneFriendList *list,
+ const LinphoneAccount *account,
+ const char *normalized_phone_number) {
LinphoneFriend *result = NULL;
-
const bctbx_list_t *elem;
for (elem = list->friends; elem != NULL; elem = bctbx_list_next(elem)) {
LinphoneFriend *lf = (LinphoneFriend *)bctbx_list_get_data(elem);
- if (linphone_friend_has_phone_number(lf, phoneNumber)) {
+ if (_linphone_friend_has_phone_number(lf, account, normalized_phone_number)) {
result = lf;
break;
}
@@ -1114,6 +1114,35 @@ LinphoneFriend *linphone_friend_list_find_friend_by_phone_number(const LinphoneF
return result;
}
+LinphoneFriend *linphone_friend_list_find_friend_by_phone_number(const LinphoneFriendList *list,
+ const char *phoneNumber) {
+ LinphoneFriend *result = NULL;
+ LinphoneAccount *account = linphone_core_get_default_account(list->lc);
+ // Account can be null, both linphone_account_is_phone_number and linphone_account_normalize_phone_number can handle
+ // it
+ if (phoneNumber == NULL || !linphone_account_is_phone_number(account, phoneNumber)) {
+ ms_warning("Phone number [%s] isn't valid", phoneNumber);
+ return result;
+ }
+
+ if (!linphone_core_vcard_supported()) {
+ ms_warning("SDK built without vCard support, can't do a phone number search without it");
+ return NULL;
+ }
+
+ const bctbx_list_t *elem;
+ const bctbx_list_t *accounts = linphone_core_get_account_list(list->lc);
+ for (elem = accounts; elem != NULL; elem = bctbx_list_next(elem)) {
+ account = (LinphoneAccount *)bctbx_list_get_data(elem);
+ char *normalized_phone_number = linphone_account_normalize_phone_number(account, phoneNumber);
+ result = _linphone_friend_list_find_friend_by_phone_number(list, account, normalized_phone_number);
+ ms_free(normalized_phone_number);
+ if (result) return result;
+ }
+
+ return result;
+}
+
bctbx_list_t *linphone_friend_list_find_friends_by_address(const LinphoneFriendList *list,
const LinphoneAddress *address) {
LinphoneAddress *clean_addr = linphone_address_clone(address);
diff --git a/coreapi/private_functions.h b/coreapi/private_functions.h
index 81d0b896c3..5a8ef6f1f7 100644
--- a/coreapi/private_functions.h
+++ b/coreapi/private_functions.h
@@ -214,6 +214,9 @@ void linphone_friend_list_subscription_state_changed(LinphoneCore *lc,
LinphoneEvent *lev,
LinphoneSubscriptionState state);
void linphone_friend_list_invalidate_friends_maps(LinphoneFriendList *list);
+LinphoneFriend *_linphone_friend_list_find_friend_by_phone_number(const LinphoneFriendList *list,
+ const LinphoneAccount *account,
+ const char *normalized_phone_number);
/**
* Removes all bodyless friend lists.
@@ -265,6 +268,9 @@ LinphoneFriendListCbs *linphone_friend_list_cbs_new(void);
void linphone_friend_list_set_current_callbacks(LinphoneFriendList *friend_list, LinphoneFriendListCbs *cbs);
void linphone_friend_add_addresses_and_numbers_into_maps(LinphoneFriend *lf, LinphoneFriendList *list);
void linphone_friend_notify_presence_received(LinphoneFriend *lf);
+bool_t _linphone_friend_has_phone_number(const LinphoneFriend *lf,
+ const LinphoneAccount *account,
+ const char *normalized_phone_number);
int linphone_parse_host_port(const char *input, char *host, size_t hostlen, int *port);
int parse_hostname_to_addr(const char *server, struct sockaddr_storage *ss, socklen_t *socklen, int default_port);
diff --git a/include/linphone/api/c-account.h b/include/linphone/api/c-account.h
index fba62277e3..10ddcdc110 100644
--- a/include/linphone/api/c-account.h
+++ b/include/linphone/api/c-account.h
@@ -263,7 +263,7 @@ LINPHONE_PUBLIC int linphone_account_get_unread_chat_message_count(LinphoneAccou
* @param username The string to parse. @notnil
* @return TRUE if input is a phone number, FALSE otherwise.
**/
-LINPHONE_PUBLIC bool_t linphone_account_is_phone_number(LinphoneAccount *account, const char *username);
+LINPHONE_PUBLIC bool_t linphone_account_is_phone_number(const LinphoneAccount *account, const char *username);
/**
* Normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222
@@ -275,7 +275,7 @@ LINPHONE_PUBLIC bool_t linphone_account_is_phone_number(LinphoneAccount *account
* @return NULL if input is an invalid phone number, normalized phone number from username input otherwise. @maybenil
* @tobefreed
*/
-LINPHONE_PUBLIC char *linphone_account_normalize_phone_number(LinphoneAccount *account, const char *username);
+LINPHONE_PUBLIC char *linphone_account_normalize_phone_number(const LinphoneAccount *account, const char *username);
/**
* Normalize a human readable sip uri into a fully qualified LinphoneAddress.
diff --git a/src/c-wrapper/api/c-account.cpp b/src/c-wrapper/api/c-account.cpp
index 8f5d12e463..ea37052049 100644
--- a/src/c-wrapper/api/c-account.cpp
+++ b/src/c-wrapper/api/c-account.cpp
@@ -182,7 +182,7 @@ void _linphone_account_notify_registration_state_changed(LinphoneAccount *accoun
linphone_account_cbs_get_registration_state_changed, state, message);
}
-bool_t linphone_account_is_phone_number(BCTBX_UNUSED(LinphoneAccount *account), const char *username) {
+bool_t linphone_account_is_phone_number(BCTBX_UNUSED(const LinphoneAccount *account), const char *username) {
if (!username) return FALSE;
const char *p;
@@ -223,16 +223,26 @@ static char *replace_icp_with_plus(char *phone, const char *icp) {
return (strstr(phone, icp) == phone) ? ms_strdup_printf("+%s", phone + strlen(icp)) : ms_strdup(phone);
}
-char *linphone_account_normalize_phone_number(LinphoneAccount *account, const char *username) {
- LinphoneAccountParams *tmpparams = account ? NULL : linphone_account_params_new(NULL);
- LinphoneAccount *tmpaccount = account ? account : linphone_account_new(NULL, tmpparams);
- if (tmpparams) linphone_account_params_unref(tmpparams);
+char *linphone_account_normalize_phone_number(const LinphoneAccount *account, const char *username) {
char *result = NULL;
std::shared_ptr<DialPlan> dialplan;
char *nationnal_significant_number = NULL;
int ccc = -1;
+ const char *dial_prefix;
+ bool_t dial_escape_plus;
- if (linphone_account_is_phone_number(tmpaccount, username)) {
+ if (account) {
+ const LinphoneAccountParams *accountParams = linphone_account_get_params(account);
+ dial_prefix = linphone_account_params_get_international_prefix(accountParams);
+ dial_escape_plus = linphone_account_params_get_dial_escape_plus_enabled(accountParams);
+ } else {
+ LinphoneAccountParams *accountParams = linphone_account_params_new(NULL);
+ dial_prefix = linphone_account_params_get_international_prefix(accountParams);
+ dial_escape_plus = linphone_account_params_get_dial_escape_plus_enabled(accountParams);
+ linphone_account_params_unref(accountParams);
+ }
+
+ if (linphone_account_is_phone_number(account, username)) {
char *flatten = linphone_account_flatten_phone_number(username);
ms_debug("Flattened number is '%s' for '%s'", flatten, username);
@@ -247,24 +257,35 @@ char *linphone_account_normalize_phone_number(LinphoneAccount *account, const ch
ms_message("Unknown ccc for e164 like number [%s]", flatten);
goto end;
} else {
- const char *dial_prefix =
- linphone_account_params_get_international_prefix(linphone_account_get_params(tmpaccount));
if (dial_prefix) {
dialplan = DialPlan::findByCcc(dial_prefix); // copy dial plan;
} else {
dialplan = DialPlan::MostCommon;
}
+
if (dial_prefix) {
- if (strcmp(dial_prefix, dialplan->getCountryCallingCode().c_str()) != 0) {
+ const char *country_calling_code = dialplan->getCountryCallingCode().c_str();
+ if (strcmp(dial_prefix, country_calling_code) != 0) {
// probably generic dialplan, preserving proxy dial prefix
dialplan->setCountryCallingCode(dial_prefix);
+ country_calling_code = dial_prefix;
+ }
+
+ // If phone number starts by international prefix but without +, add it
+ if (strstr(flatten, country_calling_code) == flatten &&
+ strlen(flatten) > strlen(country_calling_code)) {
+ ms_warning("Phone number seems to start by international prefix but without '+', adding it");
+ char *e164 = ms_strdup_printf("+%s", flatten);
+ result = linphone_account_normalize_phone_number(account, e164);
+ ms_free(e164);
+ goto end;
}
/*it does not make sens to try replace icp with + if we are not sure from the country we are (I.E
* dial_prefix==NULL)*/
if (strstr(flatten, dialplan->getInternationalCallPrefix().c_str()) == flatten) {
char *e164 = replace_icp_with_plus(flatten, dialplan->getInternationalCallPrefix().c_str());
- result = linphone_account_normalize_phone_number(tmpaccount, e164);
+ result = linphone_account_normalize_phone_number(account, e164);
ms_free(e164);
goto end;
}
@@ -286,8 +307,6 @@ char *linphone_account_normalize_phone_number(LinphoneAccount *account, const ch
/*1. First prepend international calling prefix or +*/
/*2. Second add prefix*/
/*3. Finally add user digits */
- bool_t dial_escape_plus =
- linphone_account_params_get_dial_escape_plus_enabled(linphone_account_get_params(tmpaccount));
result = ms_strdup_printf("%s%s%s", dial_escape_plus ? dialplan->getInternationalCallPrefix().c_str() : "+",
dialplan->getCountryCallingCode().c_str(), nationnal_significant_number_start);
ms_debug("Prepended prefix resulted in %s", result);
@@ -300,10 +319,6 @@ char *linphone_account_normalize_phone_number(LinphoneAccount *account, const ch
ms_free(flatten);
}
}
- if (account == NULL) {
- // linphone_account_params_unref(tmpparams);
- linphone_account_unref(tmpaccount);
- }
return result;
}
diff --git a/tester/setup_tester.c b/tester/setup_tester.c
index e074aeca97..00520fcc40 100644
--- a/tester/setup_tester.c
+++ b/tester/setup_tester.c
@@ -3155,9 +3155,10 @@ static void ldap_features_more_results(void) {
// Check when magic search is limited to 30 items
linphone_magic_search_get_contacts_list_async(magicSearch, "Big", "", LinphoneMagicSearchSourceLdapServers,
- LinphoneMagicSearchAggregationNone);
+ LinphoneMagicSearchAggregationNone);
// add 10ms to let some times to timeout callbacks.
- BC_ASSERT_TRUE(wait_for_until(manager->lc, NULL, &stat->number_of_LinphoneMagicSearchResultReceived, 1, maxTimeout*1000 + 10));
+ BC_ASSERT_TRUE(wait_for_until(manager->lc, NULL, &stat->number_of_LinphoneMagicSearchResultReceived, 1,
+ maxTimeout * 1000 + 10));
resultList = linphone_magic_search_get_last_search(magicSearch);
BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 30, int, "%d");
bctbx_list_free_with_data(resultList, (bctbx_list_free_func)linphone_search_result_unref);
@@ -3167,9 +3168,10 @@ static void ldap_features_more_results(void) {
linphone_magic_search_set_search_limit(magicSearch, 100);
linphone_magic_search_get_contacts_list_async(magicSearch, "Big", "", LinphoneMagicSearchSourceLdapServers,
- LinphoneMagicSearchAggregationNone);
+ LinphoneMagicSearchAggregationNone);
// add 10ms to let some times to timeout callbacks.
- BC_ASSERT_TRUE(wait_for_until(manager->lc, NULL, &stat->number_of_LinphoneMagicSearchResultReceived, 1, maxTimeout*1000 + 10));
+ BC_ASSERT_TRUE(wait_for_until(manager->lc, NULL, &stat->number_of_LinphoneMagicSearchResultReceived, 1,
+ maxTimeout * 1000 + 10));
resultList = linphone_magic_search_get_last_search(magicSearch);
BC_ASSERT_EQUAL((int)bctbx_list_size(resultList), 100, int, "%d");
bctbx_list_free_with_data(resultList, (bctbx_list_free_func)linphone_search_result_unref);
@@ -3290,6 +3292,33 @@ static void dial_plan(void) {
bctbx_list_free_with_data(dial_plans, (bctbx_list_free_func)linphone_dial_plan_unref);
}
+static void friend_phone_number_lookup_without_plus(void) {
+ LinphoneCoreManager *manager = linphone_core_manager_new("marie_rc");
+ LinphoneCore *core = manager->lc;
+
+ LinphoneFriend *lf = linphone_core_create_friend(core);
+ linphone_friend_set_name(lf, "Test Number");
+ linphone_friend_add_phone_number(lf, "+4912345678901");
+ linphone_core_add_friend(core, lf);
+ linphone_friend_unref(lf);
+
+ LinphoneFriend *found = linphone_core_find_friend_by_phone_number(core, "4912345678901");
+ BC_ASSERT_PTR_NULL(found);
+
+ const bctbx_list_t *accounts = linphone_core_get_account_list(core);
+ LinphoneAccount *account = (LinphoneAccount *)bctbx_list_get_data(accounts);
+ const LinphoneAccountParams *params = linphone_account_get_params(account);
+ LinphoneAccountParams *cloned_params = linphone_account_params_clone(params);
+ linphone_account_params_set_international_prefix(cloned_params, "49");
+ linphone_account_set_params(account, cloned_params);
+ linphone_account_params_unref(cloned_params);
+
+ found = linphone_core_find_friend_by_phone_number(core, "4912345678901");
+ BC_ASSERT_PTR_NOT_NULL(found);
+
+ linphone_core_manager_destroy(manager);
+}
+
static void audio_devices(void) {
LinphoneCoreManager *manager = linphone_core_manager_new("marie_rc");
LinphoneCore *core = manager->lc;
@@ -3539,6 +3568,7 @@ test_t setup_tests[] = {
TEST_NO_TAG("Ldap params edition with check", ldap_params_edition_with_check),
TEST_NO_TAG("Delete friend in linphone rc", delete_friend_from_rc),
TEST_NO_TAG("Dialplan", dial_plan),
+ TEST_NO_TAG("Friend phone number lookup without plus", friend_phone_number_lookup_without_plus),
TEST_NO_TAG("Audio devices", audio_devices),
TEST_NO_TAG("Migrate from call history database", migration_from_call_history_db),
};
--
GitLab