diff --git a/coreapi/account_creator.c b/coreapi/account_creator.c index 46b947ff6..16d23a221 100644 --- a/coreapi/account_creator.c +++ b/coreapi/account_creator.c @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "linphone/lpconfig.h" #include "c-wrapper/c-wrapper.h" +#include "linphone/api/c-dial-plan.h" #if !_WIN32 #include "regex.h" @@ -402,10 +403,10 @@ LinphoneAccountCreatorPhoneNumberStatusMask linphone_account_creator_set_phone_n if (linphone_dial_plan_is_generic(plan)) { return_status = LinphoneAccountCreatorPhoneNumberStatusInvalidCountryCode; } - if (size < plan->nnl - 1) { + if (size < linphone_dial_plan_get_national_number_length(plan) - 1) { return_status += LinphoneAccountCreatorPhoneNumberStatusTooShort; goto end; - } else if (size > plan->nnl + 1) { + } else if (size > linphone_dial_plan_get_national_number_length(plan) + 1) { return_status += LinphoneAccountCreatorPhoneNumberStatusTooLong; goto end; } else if (return_status & LinphoneAccountCreatorPhoneNumberStatusInvalidCountryCode) { diff --git a/coreapi/dial_plan.c b/coreapi/dial_plan.c index 327521377..1688fde3b 100644 --- a/coreapi/dial_plan.c +++ b/coreapi/dial_plan.c @@ -19,314 +19,3 @@ Copyright (C) 2000 Simon MORLAT (simon.morlat@linphone.org) */ #include "linphone/core_utils.h" - -/* - * http://en.wikipedia.org/wiki/Telephone_numbering_plan - * http://en.wikipedia.org/wiki/Telephone_numbers_in_Europe - * imported from https://en.wikipedia.org/wiki/List_of_mobile_phone_number_series_by_country - */ -static LinphoneDialPlan const dial_plans[]={ - //Country , iso country code, e164 country calling code, number length, international usual prefix - {"Afghanistan" ,"AF" , "93" , 9 , "00" }, - {"Albania" ,"AL" , "355" , 9 , "00" }, - {"Algeria" ,"DZ" , "213" , 9 , "00" }, - {"American Samoa" ,"AS" , "1" , 10 , "011" }, - {"Andorra" ,"AD" , "376" , 6 , "00" }, - {"Angola" ,"AO" , "244" , 9 , "00" }, - {"Anguilla" ,"AI" , "1" , 10 , "011" }, - {"Antigua and Barbuda" ,"AG" , "1" , 10 , "011" }, - {"Argentina" ,"AR" , "54" , 10 , "00" }, - {"Armenia" ,"AM" , "374" , 8 , "00" }, - {"Aruba" ,"AW" , "297" , 7 , "011" }, - {"Australia" ,"AU" , "61" , 9 , "0011"}, - {"Austria" ,"AT" , "43" , 10 , "00" }, - {"Azerbaijan" ,"AZ" , "994" , 9 , "00" }, - {"Bahamas" ,"BS" , "1" , 10 , "011" }, - {"Bahrain" ,"BH" , "973" , 8 , "00" }, - {"Bangladesh" ,"BD" , "880" , 10 , "00" }, - {"Barbados" ,"BB" , "1" , 10 , "011" }, - {"Belarus" ,"BY" , "375" , 9 , "00" }, - {"Belgium" ,"BE" , "32" , 9 , "00" }, - {"Belize" ,"BZ" , "501" , 7 , "00" }, - {"Benin" ,"BJ" , "229" , 8 , "00" }, - {"Bermuda" ,"BM" , "1" , 10 , "011" }, - {"Bhutan" ,"BT" , "975" , 8 , "00" }, - {"Bolivia" ,"BO" , "591" , 8 , "00" }, - {"Bosnia and Herzegovina" ,"BA" , "387" , 8 , "00" }, - {"Botswana" ,"BW" , "267" , 8 , "00" }, - {"Brazil" ,"BR" , "55" , 10 , "00" }, - {"Brunei Darussalam" ,"BN" , "673" , 7 , "00" }, - {"Bulgaria" ,"BG" , "359" , 9 , "00" }, - {"Burkina Faso" ,"BF" , "226" , 8 , "00" }, - {"Burundi" ,"BI" , "257" , 8 , "011" }, - {"Cambodia" ,"KH" , "855" , 9 , "00" }, - {"Cameroon" ,"CM" , "237" , 9 , "00" }, - {"Canada" ,"CA" , "1" , 10 , "011" }, - {"Cape Verde" ,"CV" , "238" , 7 , "00" }, - {"Cayman Islands" ,"KY" , "1" , 10 , "011" }, - {"Central African Republic" ,"CF" , "236" , 8 , "00" }, - {"Chad" ,"TD" , "235" , 8 , "00" }, - {"Chile" ,"CL" , "56" , 9 , "00" }, - {"China" ,"CN" , "86" , 11 , "00" }, - {"Colombia" ,"CO" , "57" , 10 , "00" }, - {"Comoros" ,"KM" , "269" , 7 , "00" }, - {"Congo" ,"CG" , "242" , 9 , "00" }, - {"Congo Democratic Republic" ,"CD" , "243" , 9 , "00" }, - {"Cook Islands" ,"CK" , "682" , 5 , "00" }, - {"Costa Rica" ,"CR" , "506" , 8 , "00" }, - {"Cote d'Ivoire" ,"AD" , "225" , 8 , "00" }, - {"Croatia" ,"HR" , "385" , 9 , "00" }, - {"Cuba" ,"CU" , "53" , 8 , "119" }, - {"Cyprus" ,"CY" , "357" , 8 , "00" }, - {"Czech Republic" ,"CZ" , "420" , 9 , "00" }, - {"Denmark" ,"DK" , "45" , 8 , "00" }, - {"Djibouti" ,"DJ" , "253" , 8 , "00" }, - {"Dominica" ,"DM" , "1" , 10 , "011" }, - {"Dominican Republic" ,"DO" , "1" , 10 , "011" }, - {"Ecuador" ,"EC" , "593" , 9 , "00" }, - {"Egypt" ,"EG" , "20" , 10 , "00" }, - {"El Salvador" ,"SV" , "503" , 8 , "00" }, - {"Equatorial Guinea" ,"GQ" , "240" , 9 , "00" }, - {"Eritrea" ,"ER" , "291" , 7 , "00" }, - {"Estonia" ,"EE" , "372" , 8 , "00" }, - {"Ethiopia" ,"ET" , "251" , 9 , "00" }, - {"Falkland Islands" ,"FK" , "500" , 5 , "00" }, - {"Faroe Islands" ,"FO" , "298" , 6 , "00" }, - {"Fiji" ,"FJ" , "679" , 7 , "00" }, - {"Finland" ,"FI" , "358" , 9 , "00" }, - {"France" ,"FR" , "33" , 9 , "00" }, - {"French Guiana" ,"GF" , "594" , 9 , "00" }, - {"French Polynesia" ,"PF" , "689" , 6 , "00" }, - {"Gabon" ,"GA" , "241" , 8 , "00" }, - {"Gambia" ,"GM" , "220" , 7 , "00" }, - {"Georgia" ,"GE" , "995" , 9 , "00" }, - {"Germany" ,"DE" , "49" , 11 , "00" }, - {"Ghana" ,"GH" , "233" , 9 , "00" }, - {"Gibraltar" ,"GI" , "350" , 8 , "00" }, - {"Greece" ,"GR" , "30" ,10 , "00" }, - {"Greenland" ,"GL" , "299" , 6 , "00" }, - {"Grenada" ,"GD" , "1" , 10 , "011" }, - {"Guadeloupe" ,"GP" , "590" , 9 , "00" }, - {"Guam" ,"GU" , "1" , 10 , "011" }, - {"Guatemala" ,"GT" , "502" , 8 , "00" }, - {"Guinea" ,"GN" , "224" , 8 , "00" }, - {"Guinea-Bissau" ,"GW" , "245" , 7 , "00" }, - {"Guyana" ,"GY" , "592" , 7 , "001" }, - {"Haiti" ,"HT" , "509" , 8 , "00" }, - {"Honduras" ,"HN" , "504" , 8 , "00" }, - {"Hong Kong" ,"HK" , "852" , 8 , "001" }, - {"Hungary" ,"HU" , "36" , 9 , "00" }, - {"Iceland" ,"IS" , "354" , 9 , "00" }, - {"India" ,"IN" , "91" , 10 , "00" }, - {"Indonesia" ,"ID" , "62" , 10 , "001" }, - {"Iran" ,"IR" , "98" , 10 , "00" }, - {"Iraq" ,"IQ" , "964" , 10 , "00" }, - {"Ireland" ,"IE" , "353" , 9 , "00" }, - {"Israel" ,"IL" , "972" , 9 , "00" }, - {"Italy" ,"IT" , "39" , 10 , "00" }, -/* {"Jersey" ,"JE" , "44" , 10 , "00" },*/ - {"Jamaica" ,"JM" , "1" , 10 , "011" }, - {"Japan" ,"JP" , "81" , 10 , "010" }, - {"Jordan" ,"JO" , "962" , 9 , "00" }, - {"Kazakhstan" ,"KZ" , "7" , 10 , "00" }, - {"Kenya" ,"KE" , "254" , 9 , "000" }, - {"Kiribati" ,"KI" , "686" , 5 , "00" }, - {"Korea, North" ,"KP" , "850" , 12 , "99" }, - {"Korea, South" ,"KR" , "82" , 12 , "001" }, - {"Kuwait" ,"KW" , "965" , 8 , "00" }, - {"Kyrgyzstan" ,"KG" , "996" , 9 , "00" }, - {"Laos" ,"LA" , "856" , 10 , "00" }, - {"Latvia" ,"LV" , "371" , 8 , "00" }, - {"Lebanon" ,"LB" , "961" , 7 , "00" }, - {"Lesotho" ,"LS" , "266" , 8 , "00" }, - {"Liberia" ,"LR" , "231" , 8 , "00" }, - {"Libya" ,"LY" , "218" , 8 , "00" }, - {"Liechtenstein" ,"LI" , "423" , 7 , "00" }, - {"Lithuania" ,"LT" , "370" , 8 , "00" }, - {"Luxembourg" ,"LU" , "352" , 9 , "00" }, - {"Macau" ,"MO" , "853" , 8 , "00" }, - {"Macedonia" ,"MK" , "389" , 8 , "00" }, - {"Madagascar" ,"MG" , "261" , 9 , "00" }, - {"Malawi" ,"MW" , "265" , 9 , "00" }, - {"Malaysia" ,"MY" , "60" , 9 , "00" }, - {"Maldives" ,"MV" , "960" , 7 , "00" }, - {"Mali" ,"ML" , "223" , 8 , "00" }, - {"Malta" ,"MT" , "356" , 8 , "00" }, - {"Marshall Islands" ,"MH" , "692" , 7 , "011" }, - {"Martinique" ,"MQ" , "596" , 9 , "00" }, - {"Mauritania" ,"MR" , "222" , 8 , "00" }, - {"Mauritius" ,"MU" , "230" , 7 , "00" }, - {"Mayotte Island" ,"YT" , "262" , 9 , "00" }, - {"Mexico" ,"MX" , "52" , 10 , "00" }, - /*The following is a pseudo dial plan for Mexican mobile phones. See https://en.wikipedia.org/wiki/Telephone_numbers_in_Mexico*/ - {"Mexico" ,"MX" , "521" , 10 , "00" }, - {"Micronesia" ,"FM" , "691" , 7 , "011" }, - {"Moldova" ,"MD" , "373" , 8 , "00" }, - {"Monaco" ,"MC" , "377" , 8 , "00" }, - {"Mongolia" ,"MN" , "976" , 8 , "001" }, - {"Montenegro" ,"ME" , "382" , 8 , "00" }, - {"Montserrat" ,"MS" , "664" , 10 , "011" }, - {"Morocco" ,"MA" , "212" , 9 , "00" }, - {"Mozambique" ,"MZ" , "258" , 9 , "00" }, - {"Myanmar" ,"MM" , "95" , 10 , "00" }, - {"Namibia" ,"NA" , "264" , 9 , "00" }, - {"Nauru" ,"NR" , "674" , 7 , "00" }, - {"Nepal" ,"NP" , "43" , 10 , "00" }, - {"Netherlands" ,"NL" , "31" , 9 , "00" }, - {"New Caledonia" ,"NC" , "687" , 6 , "00" }, - {"New Zealand" ,"NZ" , "64" , 8 , "00" }, - {"Nicaragua" ,"NI" , "505" , 8 , "00" }, - {"Niger" ,"NE" , "227" , 8 , "00" }, - {"Nigeria" ,"NG" , "234" , 10 , "009" }, - {"Niue" ,"NU" , "683" , 4 , "00" }, - {"Norfolk Island" ,"NF" , "672" , 5 , "00" }, - {"Northern Mariana Islands" ,"MP" , "1" , 10 , "011" }, - {"Norway" ,"NO" , "47" , 8 , "00" }, - {"Oman" ,"OM" , "968" , 8 , "00" }, - {"Pakistan" ,"PK" , "92" , 10 , "00" }, - {"Palau" ,"PW" , "680" , 7 , "011" }, - {"Palestine" ,"PS" , "970" , 9 , "00" }, - {"Panama" ,"PA" , "507" , 8 , "00" }, - {"Papua New Guinea" ,"PG" , "675" , 8 , "00" }, - {"Paraguay" ,"PY" , "595" , 9 , "00" }, - {"Peru" ,"PE" , "51" , 9 , "00" }, - {"Philippines" ,"PH" , "63" , 10 , "00" }, - {"Poland" ,"PL" , "48" , 9 , "00" }, - {"Portugal" ,"PT" , "351" , 9 , "00" }, - {"Puerto Rico" ,"PR" , "1" , 10 , "011" }, - {"Qatar" ,"QA" , "974" , 8 , "00" }, - {"R�union Island" ,"RE" , "262" , 9 , "011" }, - {"Romania" ,"RO" , "40" , 9 , "00" }, - {"Russian Federation" ,"RU" , "7" , 10 , "8" }, - {"Rwanda" ,"RW" , "250" , 9 , "00" }, - {"Saint Helena" ,"SH" , "290" , 4 , "00" }, - {"Saint Kitts and Nevis" ,"KN" , "1" , 10 , "011" }, - {"Saint Lucia" ,"LC" , "1" , 10 , "011" }, - {"Saint Pierre and Miquelon" ,"PM" , "508" , 6 , "00" }, - {"Saint Vincent and the Grenadines","VC" , "1" , 10 , "011" }, - {"Samoa" ,"WS" , "685" , 7 , "0" }, - {"San Marino" ,"SM" , "378" , 10 , "00" }, - {"Sao Tome and Principe" ,"ST" , "239" , 7 , "00" }, - {"Saudi Arabia" ,"SA" , "966" , 9 , "00" }, - {"Senegal" ,"SN" , "221" , 9 , "00" }, - {"Serbia" ,"RS" , "381" , 9 , "00" }, - {"Seychelles" ,"SC" , "248" , 7 , "00" }, - {"Sierra Leone" ,"SL" , "232" , 8 , "00" }, - {"Singapore" ,"SG" , "65" , 8 , "001" }, - {"Slovakia" ,"SK" , "421" , 9 , "00" }, - {"Slovenia" ,"SI" , "386" , 8 , "00" }, - {"Solomon Islands" ,"SB" , "677" , 7 , "00" }, - {"Somalia" ,"SO" , "252" , 8 , "00" }, - {"South Africa" ,"ZA" , "27" , 9 , "00" }, - {"Spain" ,"ES" , "34" , 9 , "00" }, - {"Sri Lanka" ,"LK" , "94" , 9 , "00" }, - {"Sudan" ,"SD" , "249" , 9 , "00" }, - {"Suriname" ,"SR" , "597" , 7 , "00" }, - {"Swaziland" ,"SZ" , "268" , 8 , "00" }, - {"Sweden" ,"SE" , "46" , 9 , "00" }, - {"Switzerland" ,"XK" , "41" , 9 , "00" }, - {"Syria" ,"SY" , "963" , 9 , "00" }, - {"Taiwan" ,"TW" , "886" , 9 , "810" }, - {"Tajikistan" ,"TJ" , "992" , 9 , "002" }, - {"Tanzania" ,"TZ" , "255" , 9 , "000" }, - {"Thailand" ,"TH" , "66" , 9 , "001" }, - {"Togo" ,"TG" , "228" , 8 , "00" }, - {"Tokelau" ,"TK" , "690" , 4 , "00" }, - {"Tonga" ,"TO" , "676" , 5 , "00" }, - {"Trinidad and Tobago" ,"TT" , "1" , 10 , "011" }, - {"Tunisia" ,"TN" , "216" , 8 , "00" }, - {"Turkey" ,"TR" , "90" , 10 , "00" }, - {"Turkmenistan" ,"TM" , "993" , 8 , "00" }, - {"Turks and Caicos Islands" ,"TC" , "1" , 7 , "0" }, - {"Tuvalu" ,"TV" , "688" , 5 , "00" }, - {"Uganda" ,"UG" , "256" , 9 , "000" }, - {"Ukraine" ,"UA" , "380" , 9 , "00" }, - {"United Arab Emirates" ,"AE" , "971" , 9 , "00" }, - {"United Kingdom" ,"GB" , "44" , 10 , "00" }, -/* {"United Kingdom" ,"UK" , "44" , 10 , "00" },*/ - {"United States" ,"US" , "1" , 10 , "011" }, - {"Uruguay" ,"UY" , "598" , 8 , "00" }, - {"Uzbekistan" ,"UZ" , "998" , 9 , "8" }, - {"Vanuatu" ,"VU" , "678" , 7 , "00" }, - {"Venezuela" ,"VE" , "58" , 10 , "00" }, - {"Vietnam" ,"VN" , "84" , 9 , "00" }, - {"Wallis and Futuna" ,"WF" , "681" , 5 , "00" }, - {"Yemen" ,"YE" , "967" , 9 , "00" }, - {"Zambia" ,"ZM" , "260" , 9 , "00" }, - {"Zimbabwe" ,"ZW" , "263" , 9 , "00" }, - {NULL ,NULL , "" , 0 , NULL } -}; -static LinphoneDialPlan most_common_dialplan={ "generic" ,"", "", 10, "00"}; - -int linphone_dial_plan_lookup_ccc_from_e164(const char* e164) { - LinphoneDialPlan* dial_plan; - LinphoneDialPlan* elected_dial_plan=NULL; - unsigned int found; - unsigned int i=0; - - if (e164[0]!='+') { - return -1;/*not an e164 number*/ - } - if (e164[1]=='1') { - /*USA case*/ - return 1; - } - do { - found=0; - i++; - for (dial_plan=(LinphoneDialPlan*)dial_plans; dial_plan->country!=NULL; dial_plan++) { - if (strncmp(dial_plan->ccc,&e164[1],i) == 0) { - elected_dial_plan=dial_plan; - found++; - } - } - } while ((found>1 || found==0) && i < sizeof(dial_plan->ccc)); - if (found==1) { - return atoi(elected_dial_plan->ccc); - } else { - return -1; /*not found */ - } - -} -int linphone_dial_plan_lookup_ccc_from_iso(const char* iso) { - LinphoneDialPlan* dial_plan; - for (dial_plan=(LinphoneDialPlan*)dial_plans; dial_plan->country!=NULL; dial_plan++) { - if (strcmp(iso, dial_plan->iso_country_code)==0) { - return atoi(dial_plan->ccc); - } - } - return -1; -} - -const LinphoneDialPlan* linphone_dial_plan_by_ccc_as_int(int ccc) { - int i; - char ccc_as_char[16] = {0}; - snprintf(ccc_as_char,sizeof(ccc_as_char)-1,"%i",ccc); - - for(i=0;dial_plans[i].country!=NULL;++i){ - if (strcmp(ccc_as_char,dial_plans[i].ccc)==0){ - return &dial_plans[i]; - } - } - /*else return a generic "most common" dial plan*/ - return &most_common_dialplan; -} - - -const LinphoneDialPlan* linphone_dial_plan_by_ccc(const char *ccc) { - if (!ccc) { - return &most_common_dialplan; - } - - return linphone_dial_plan_by_ccc_as_int((int)strtol(ccc,NULL,10)); -} - -const LinphoneDialPlan* linphone_dial_plan_get_all() { - return dial_plans; -} - -bool_t linphone_dial_plan_is_generic(const LinphoneDialPlan *ccc) { - if (strcmp(ccc->country, most_common_dialplan.country) == 0) - return TRUE; - return FALSE; -} diff --git a/coreapi/proxy.c b/coreapi/proxy.c index 856a850d9..db2af889e 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -32,6 +32,7 @@ Copyright (C) 2000 Simon MORLAT (simon.morlat@linphone.org) // For migration purpose. #include "address/address-p.h" #include "c-wrapper/c-wrapper.h" +#include "linphone/api/c-dial-plan.h" using namespace LinphonePrivate; @@ -646,7 +647,7 @@ bool_t linphone_proxy_config_normalize_number(LinphoneProxyConfig *proxy, const char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, const char *username) { LinphoneProxyConfig *tmpproxy = proxy ? proxy : linphone_proxy_config_new(); char* result = NULL; - LinphoneDialPlan dialplan = {0}; + const LinphoneDialPlan *dialplan; char * nationnal_significant_number = NULL; int ccc = -1; @@ -656,24 +657,24 @@ char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, c ccc = linphone_dial_plan_lookup_ccc_from_e164(flatten); if (ccc>-1) { /*e164 like phone number*/ - dialplan = *linphone_dial_plan_by_ccc_as_int(ccc); - nationnal_significant_number = strstr(flatten, dialplan.ccc); + dialplan = linphone_dial_plan_by_ccc_as_int(ccc); + nationnal_significant_number = strstr(flatten, linphone_dial_plan_get_country_calling_code(dialplan)); if (nationnal_significant_number) { - nationnal_significant_number +=strlen(dialplan.ccc); + nationnal_significant_number +=strlen(linphone_dial_plan_get_country_calling_code(dialplan)); } } else if (flatten[0] =='+') { ms_message ("Unknown ccc for e164 like number [%s]", flatten); goto end; } else { - dialplan = *linphone_dial_plan_by_ccc(tmpproxy->dial_prefix); //copy dial plan; + dialplan = linphone_dial_plan_by_ccc(tmpproxy->dial_prefix); //copy dial plan; if (tmpproxy->dial_prefix){ - if (strcmp(tmpproxy->dial_prefix,dialplan.ccc) != 0){ + /*if (strcmp(tmpproxy->dial_prefix,linphone_dial_plan_get_country_calling_code(dialplan)) != 0){ //probably generic dialplan, preserving proxy dial prefix - strncpy(dialplan.ccc,tmpproxy->dial_prefix,sizeof(dialplan.ccc)); - } + strncpy(linphone_dial_plan_get_country_calling_code(dialplan),tmpproxy->dial_prefix,sizeof(linphone_dial_plan_get_country_calling_code(dialplan))); + }*/ /*it does not make sens to try replace icp with + if we are not sure from the country we are (I.E tmpproxy->dial_prefix==NULL)*/ - if (strstr(flatten,dialplan.icp)==flatten) { - char *e164 = replace_icp_with_plus(flatten,dialplan.icp); + if (strstr(flatten,linphone_dial_plan_get_international_call_prefix(dialplan))==flatten) { + char *e164 = replace_icp_with_plus(flatten,linphone_dial_plan_get_iso_country_code(dialplan)); result = linphone_proxy_config_normalize_phone_number(tmpproxy,e164); ms_free(e164); goto end; @@ -682,23 +683,23 @@ char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, c } nationnal_significant_number=flatten; } - ms_debug("Using dial plan '%s'",dialplan.country); + ms_debug("Using dial plan '%s'",linphone_dial_plan_get_country(dialplan)); /*if proxy has a dial prefix, modify phonenumber accordingly*/ - if (dialplan.ccc[0]!='\0') { + if (linphone_dial_plan_get_country_calling_code(dialplan)[0]!='\0') { /* the number already starts with + or international prefix*/ /*0. keep at most national number significant digits */ char* nationnal_significant_number_start = nationnal_significant_number + MAX(0, (int)strlen(nationnal_significant_number) - - (int)dialplan.nnl); - ms_debug("Prefix not present. Keeping at most %d digits: %s", dialplan.nnl, nationnal_significant_number_start); + - (int)linphone_dial_plan_get_national_number_length(dialplan)); + ms_debug("Prefix not present. Keeping at most %d digits: %s", linphone_dial_plan_get_national_number_length(dialplan), nationnal_significant_number_start); /*1. First prepend international calling prefix or +*/ /*2. Second add prefix*/ /*3. Finally add user digits */ result = ms_strdup_printf("%s%s%s" - , tmpproxy->dial_escape_plus ? dialplan.icp : "+" - , dialplan.ccc + , tmpproxy->dial_escape_plus ? linphone_dial_plan_get_international_call_prefix(dialplan) : "+" + , linphone_dial_plan_get_country_calling_code(dialplan) , nationnal_significant_number_start); ms_debug("Prepended prefix resulted in %s", result); } diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index b0cd5236b..31f1c52d6 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -84,6 +84,7 @@ set(C_API_HEADER_FILES c-chat-message-cbs.h c-chat-room.h c-chat-room-cbs.h + c-dial-plan.h c-event-log.h c-participant.h c-types.h diff --git a/include/linphone/api/c-dial-plan.h b/include/linphone/api/c-dial-plan.h new file mode 100644 index 000000000..00339ae1b --- /dev/null +++ b/include/linphone/api/c-dial-plan.h @@ -0,0 +1,91 @@ +/* + * c-dial-plan.h + * Copyright (C) 2010-2017 Belledonne Communications SARL + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef _C_DIAL_PLAN_H_ +#define _C_DIAL_PLAN_H_ + +#include "linphone/api/c-types.h" + +// ============================================================================= + +#ifdef __cplusplus + extern "C" { +#endif // ifdef __cplusplus + +/** + * @addtogroup misc + * @{ + */ + + LINPHONE_PUBLIC const char * linphone_dial_plan_get_country(const LinphoneDialPlan *dp); + LINPHONE_PUBLIC const char * linphone_dial_plan_get_iso_country_code(const LinphoneDialPlan *dp); + LINPHONE_PUBLIC const char * linphone_dial_plan_get_country_calling_code(const LinphoneDialPlan *dp); + LINPHONE_PUBLIC int linphone_dial_plan_get_national_number_length(const LinphoneDialPlan *dp); + LINPHONE_PUBLIC const char * linphone_dial_plan_get_international_call_prefix(const LinphoneDialPlan *dp); + + /** + *Function to get call country code from ISO 3166-1 alpha-2 code, ex: FR returns 33 + *@param iso country code alpha2 + *@return call country code or -1 if not found + */ +LINPHONE_PUBLIC int linphone_dial_plan_lookup_ccc_from_iso(const char* iso); + +/** + *Function to get call country code from an e164 number, ex: +33952650121 will return 33 + *@param e164 phone number + *@return call country code or -1 if not found + */ +LINPHONE_PUBLIC int linphone_dial_plan_lookup_ccc_from_e164(const char* e164); + +/** + * Return NULL-terminated array of all known dial plans + * @deprecated use linphone_dial_plan_get_all_list instead +**/ +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(); + +/** + * Find best match for given CCC + * @return Return matching dial plan, or a generic one if none found +**/ +LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_by_ccc(const char *ccc); +/** + * Find best match for given CCC + * @return Return matching dial plan, or a generic one if none found + **/ +LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_by_ccc_as_int(int ccc); + +/** + * Return if given plan is generic +**/ +LINPHONE_PUBLIC bool_t linphone_dial_plan_is_generic(const LinphoneDialPlan *ccc); + +/** + * @} + */ + +#ifdef __cplusplus + } +#endif // ifdef __cplusplus + +#endif // ifndef _C_DIAL_PLAN_H_ diff --git a/include/linphone/api/c-types.h b/include/linphone/api/c-types.h index 16d86f3fb..980e40eec 100644 --- a/include/linphone/api/c-types.h +++ b/include/linphone/api/c-types.h @@ -117,6 +117,12 @@ typedef struct _LinphoneChatMessageCbs LinphoneChatMessageCbs; **/ typedef struct _LinphoneParticipant LinphoneParticipant; +/** +* Represents a dial plan +* @ingroup misc +**/ +typedef struct _LinphoneDialPlan LinphoneDialPlan; + // ----------------------------------------------------------------------------- // EventLog. // ----------------------------------------------------------------------------- diff --git a/include/linphone/core_utils.h b/include/linphone/core_utils.h index 5f7a97bab..52cd791bd 100644 --- a/include/linphone/core_utils.h +++ b/include/linphone/core_utils.h @@ -87,51 +87,6 @@ void linphone_core_add_iterate_hook(LinphoneCore *lc, LinphoneCoreIterateHook ho void linphone_core_remove_iterate_hook(LinphoneCore *lc, LinphoneCoreIterateHook hook, void *hook_data); -typedef struct _LinphoneDialPlan { - const char *country; - const char* iso_country_code; /* ISO 3166-1 alpha-2 code, ex: FR for France*/ - char ccc[8]; /*country calling code*/ - int nnl; /*maximum national number length*/ - const char * icp; /*international call prefix, ex: 00 in europe*/ -} LinphoneDialPlan; - -/** - * @ingroup misc - *Function to get call country code from ISO 3166-1 alpha-2 code, ex: FR returns 33 - *@param iso country code alpha2 - *@return call country code or -1 if not found - */ -LINPHONE_PUBLIC int linphone_dial_plan_lookup_ccc_from_iso(const char* iso); - -/** - * @ingroup misc - *Function to get call country code from an e164 number, ex: +33952650121 will return 33 - *@param e164 phone number - *@return call country code or -1 if not found - */ -LINPHONE_PUBLIC int linphone_dial_plan_lookup_ccc_from_e164(const char* e164); - -/** - * Return NULL-terminated array of all known dial plans -**/ -LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_get_all(void); - -/** - * Find best match for given CCC - * @return Return matching dial plan, or a generic one if none found -**/ -LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_by_ccc(const char *ccc); -/** - * Find best match for given CCC - * @return Return matching dial plan, or a generic one if none found - **/ -LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_by_ccc_as_int(int ccc); - -/** - * Return if given plan is generic -**/ -LINPHONE_PUBLIC bool_t linphone_dial_plan_is_generic(const LinphoneDialPlan *ccc); - #ifdef __cplusplus } #endif diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d8c0c1c1..b134e0b81 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -86,6 +86,8 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES db/session/db-session-p.h db/session/db-session-provider.h db/session/db-session.h + dial-plan/dial-plan-p.h + dial-plan/dial-plan.h enums.h event-log/call-event.h event-log/chat-message-event.h @@ -124,6 +126,7 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES c-wrapper/api/c-chat-message.cpp c-wrapper/api/c-chat-room-cbs.cpp c-wrapper/api/c-chat-room.cpp + c-wrapper/api/c-dial-plan.cpp c-wrapper/api/c-event-log.cpp c-wrapper/api/c-participant.cpp c-wrapper/internal/c-sal.cpp @@ -162,6 +165,7 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES db/main-db.cpp db/session/db-session-provider.cpp db/session/db-session.cpp + dial-plan/dial-plan.cpp event-log/call-event.cpp event-log/chat-message-event.cpp event-log/conference-event.cpp diff --git a/src/c-wrapper/api/c-dial-plan.cpp b/src/c-wrapper/api/c-dial-plan.cpp new file mode 100644 index 000000000..2ec2f2f58 --- /dev/null +++ b/src/c-wrapper/api/c-dial-plan.cpp @@ -0,0 +1,90 @@ +/* + * c-dial-plan.cpp + * Copyright (C) 2010-2017 Belledonne Communications SARL + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "linphone/api/c-dial-plan.h" + +#include "linphone/wrapper_utils.h" +#include "c-wrapper/c-wrapper.h" +#include "dial-plan/dial-plan.h" + +// ============================================================================= + +using namespace std; + +L_DECLARE_C_OBJECT_IMPL(DialPlan); + +const char * linphone_dial_plan_get_country(const LinphoneDialPlan *dp) { + //return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(dp).getCountry()); + return NULL; +} + +const char * linphone_dial_plan_get_iso_country_code(const LinphoneDialPlan *dp) { + //return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(dp).getIsoCountryCode()); + return NULL; +} + +const char * linphone_dial_plan_get_country_calling_code(const LinphoneDialPlan *dp) { + //return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(dp).getCountryCallingCode()); + return NULL; +} + +int linphone_dial_plan_get_national_number_length(const LinphoneDialPlan *dp) { + //return L_GET_CPP_PTR_FROM_C_OBJECT(dp).getNationalNumberLength(); + return -1; +} + +const char * linphone_dial_plan_get_international_call_prefix(const LinphoneDialPlan *dp) { + //return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(dp).getInternationalCallPrefix()); + return NULL; +} + +int linphone_dial_plan_lookup_ccc_from_e164(const char* e164) { + return LinphonePrivate::DialPlan::lookupCccFromE164(L_C_TO_STRING(e164)); +} + +int linphone_dial_plan_lookup_ccc_from_iso(const char* iso) { + return LinphonePrivate::DialPlan::lookupCccFromIso(L_C_TO_STRING(iso)); +} + +const LinphoneDialPlan* linphone_dial_plan_by_ccc_as_int(int ccc) { + //LinphonePrivate::DialPlan dp = LinphonePrivate::DialPlan::findByCccAsInt(ccc); + //return L_GET_C_BACK_PTR(); + return NULL; //TODO +} + +const LinphoneDialPlan* linphone_dial_plan_by_ccc(const char *ccc) { + //LinphonePrivate::DialPlan dp = LinphonePrivate::DialPlan::findByCcc(L_C_TO_STRING(ccc)); + //return L_GET_C_BACK_PTR(); + return NULL; //TODO +} + +const LinphoneDialPlan* linphone_dial_plan_get_all() { + return NULL; //TODO +} + +const bctbx_list_t * linphone_dial_plan_get_all_list() { + //const list dps = LinphonePrivate::DialPlan::getAllDialPlans(); + //return L_GET_RESOLVED_C_LIST_FROM_CPP_LIST(); + return NULL; //TODO +} + +bool_t linphone_dial_plan_is_generic(const LinphoneDialPlan *ccc) { + //return L_GET_CPP_PTR_FROM_C_OBJECT(ccc).isGeneric(); + return FALSE; +} \ No newline at end of file diff --git a/src/c-wrapper/c-wrapper.h b/src/c-wrapper/c-wrapper.h index 9a2ef349f..c7322f97e 100644 --- a/src/c-wrapper/c-wrapper.h +++ b/src/c-wrapper/c-wrapper.h @@ -72,6 +72,7 @@ BELLE_SIP_TYPE_ID(LinphoneContactSearch), BELLE_SIP_TYPE_ID(LinphoneContent), BELLE_SIP_TYPE_ID(LinphoneCore), BELLE_SIP_TYPE_ID(LinphoneCoreCbs), +BELLE_SIP_TYPE_ID(LinphoneDialPlan), BELLE_SIP_TYPE_ID(LinphoneErrorInfo), BELLE_SIP_TYPE_ID(LinphoneEvent), BELLE_SIP_TYPE_ID(LinphoneFactory), diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp index 5d7918755..103f61a40 100644 --- a/src/db/main-db.cpp +++ b/src/db/main-db.cpp @@ -888,7 +888,9 @@ shared_ptr MainDb::findChatRoom (const string &peerAddress) const { void MainDb::cleanHistory (const string &, FilterMask) {} - shared_ptr MainDb::findChatRoom (const string &) const {} + shared_ptr MainDb::findChatRoom (const string &) const { + return nullptr; + } bool MainDb::import (Backend, const string &) { return false; diff --git a/src/dial-plan/dial-plan-p.h b/src/dial-plan/dial-plan-p.h new file mode 100644 index 000000000..c6a48bdca --- /dev/null +++ b/src/dial-plan/dial-plan-p.h @@ -0,0 +1,44 @@ +/* + * dial-plan-p.h + * Copyright (C) 2010-2017 Belledonne Communications SARL + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef _DIAL_PLAN_P_H_ +#define _DIAL_PLAN_P_H_ + +#include "dial-plan.h" +#include "object/clonable-object-p.h" + +// ============================================================================= + +LINPHONE_BEGIN_NAMESPACE + +class DialPlanPrivate : public ClonableObjectPrivate { + +public: + std::string country; + std::string isoCountryCode; /* ISO 3166-1 alpha-2 code, ex: FR for France*/ + std::string countryCallingCode; /*country calling code*/ + int nationalNumberLength = 0; /*maximum national number length*/ + std::string internationalCallPrefix; /*international call prefix, ex: 00 in europe*/ + + L_DECLARE_PUBLIC(DialPlan); +}; + +LINPHONE_END_NAMESPACE + +#endif // ifndef _DIAL_PLAN_P_H_ diff --git a/src/dial-plan/dial-plan.cpp b/src/dial-plan/dial-plan.cpp new file mode 100644 index 000000000..8b66c1bce --- /dev/null +++ b/src/dial-plan/dial-plan.cpp @@ -0,0 +1,399 @@ +/* + * dial-plan.cpp + * Copyright (C) 2010-2017 Belledonne Communications SARL + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "linphone/utils/utils.h" + +#include "dial-plan-p.h" +#include "c-wrapper/c-wrapper.h" +#include "logger/logger.h" + +// ============================================================================= + +using namespace std; + +LINPHONE_BEGIN_NAMESPACE + +/* + * http://en.wikipedia.org/wiki/Telephone_numbering_plan + * http://en.wikipedia.org/wiki/Telephone_numbers_in_Europe + * imported from https://en.wikipedia.org/wiki/List_of_mobile_phone_number_series_by_country + */ +static list const DialPlans = { + //Country , iso country code, e164 country calling code, number length, international usual prefix + {"Afghanistan" ,"AF" , "93" , 9 , "00" }, + {"Albania" ,"AL" , "355" , 9 , "00" }, + {"Algeria" ,"DZ" , "213" , 9 , "00" }, + {"American Samoa" ,"AS" , "1" , 10 , "011" }, + {"Andorra" ,"AD" , "376" , 6 , "00" }, + {"Angola" ,"AO" , "244" , 9 , "00" }, + {"Anguilla" ,"AI" , "1" , 10 , "011" }, + {"Antigua and Barbuda" ,"AG" , "1" , 10 , "011" }, + {"Argentina" ,"AR" , "54" , 10 , "00" }, + {"Armenia" ,"AM" , "374" , 8 , "00" }, + {"Aruba" ,"AW" , "297" , 7 , "011" }, + {"Australia" ,"AU" , "61" , 9 , "0011"}, + {"Austria" ,"AT" , "43" , 10 , "00" }, + {"Azerbaijan" ,"AZ" , "994" , 9 , "00" }, + {"Bahamas" ,"BS" , "1" , 10 , "011" }, + {"Bahrain" ,"BH" , "973" , 8 , "00" }, + {"Bangladesh" ,"BD" , "880" , 10 , "00" }, + {"Barbados" ,"BB" , "1" , 10 , "011" }, + {"Belarus" ,"BY" , "375" , 9 , "00" }, + {"Belgium" ,"BE" , "32" , 9 , "00" }, + {"Belize" ,"BZ" , "501" , 7 , "00" }, + {"Benin" ,"BJ" , "229" , 8 , "00" }, + {"Bermuda" ,"BM" , "1" , 10 , "011" }, + {"Bhutan" ,"BT" , "975" , 8 , "00" }, + {"Bolivia" ,"BO" , "591" , 8 , "00" }, + {"Bosnia and Herzegovina" ,"BA" , "387" , 8 , "00" }, + {"Botswana" ,"BW" , "267" , 8 , "00" }, + {"Brazil" ,"BR" , "55" , 10 , "00" }, + {"Brunei Darussalam" ,"BN" , "673" , 7 , "00" }, + {"Bulgaria" ,"BG" , "359" , 9 , "00" }, + {"Burkina Faso" ,"BF" , "226" , 8 , "00" }, + {"Burundi" ,"BI" , "257" , 8 , "011" }, + {"Cambodia" ,"KH" , "855" , 9 , "00" }, + {"Cameroon" ,"CM" , "237" , 9 , "00" }, + {"Canada" ,"CA" , "1" , 10 , "011" }, + {"Cape Verde" ,"CV" , "238" , 7 , "00" }, + {"Cayman Islands" ,"KY" , "1" , 10 , "011" }, + {"Central African Republic" ,"CF" , "236" , 8 , "00" }, + {"Chad" ,"TD" , "235" , 8 , "00" }, + {"Chile" ,"CL" , "56" , 9 , "00" }, + {"China" ,"CN" , "86" , 11 , "00" }, + {"Colombia" ,"CO" , "57" , 10 , "00" }, + {"Comoros" ,"KM" , "269" , 7 , "00" }, + {"Congo" ,"CG" , "242" , 9 , "00" }, + {"Congo Democratic Republic" ,"CD" , "243" , 9 , "00" }, + {"Cook Islands" ,"CK" , "682" , 5 , "00" }, + {"Costa Rica" ,"CR" , "506" , 8 , "00" }, + {"Cote d'Ivoire" ,"AD" , "225" , 8 , "00" }, + {"Croatia" ,"HR" , "385" , 9 , "00" }, + {"Cuba" ,"CU" , "53" , 8 , "119" }, + {"Cyprus" ,"CY" , "357" , 8 , "00" }, + {"Czech Republic" ,"CZ" , "420" , 9 , "00" }, + {"Denmark" ,"DK" , "45" , 8 , "00" }, + {"Djibouti" ,"DJ" , "253" , 8 , "00" }, + {"Dominica" ,"DM" , "1" , 10 , "011" }, + {"Dominican Republic" ,"DO" , "1" , 10 , "011" }, + {"Ecuador" ,"EC" , "593" , 9 , "00" }, + {"Egypt" ,"EG" , "20" , 10 , "00" }, + {"El Salvador" ,"SV" , "503" , 8 , "00" }, + {"Equatorial Guinea" ,"GQ" , "240" , 9 , "00" }, + {"Eritrea" ,"ER" , "291" , 7 , "00" }, + {"Estonia" ,"EE" , "372" , 8 , "00" }, + {"Ethiopia" ,"ET" , "251" , 9 , "00" }, + {"Falkland Islands" ,"FK" , "500" , 5 , "00" }, + {"Faroe Islands" ,"FO" , "298" , 6 , "00" }, + {"Fiji" ,"FJ" , "679" , 7 , "00" }, + {"Finland" ,"FI" , "358" , 9 , "00" }, + {"France" ,"FR" , "33" , 9 , "00" }, + {"French Guiana" ,"GF" , "594" , 9 , "00" }, + {"French Polynesia" ,"PF" , "689" , 6 , "00" }, + {"Gabon" ,"GA" , "241" , 8 , "00" }, + {"Gambia" ,"GM" , "220" , 7 , "00" }, + {"Georgia" ,"GE" , "995" , 9 , "00" }, + {"Germany" ,"DE" , "49" , 11 , "00" }, + {"Ghana" ,"GH" , "233" , 9 , "00" }, + {"Gibraltar" ,"GI" , "350" , 8 , "00" }, + {"Greece" ,"GR" , "30" ,10 , "00" }, + {"Greenland" ,"GL" , "299" , 6 , "00" }, + {"Grenada" ,"GD" , "1" , 10 , "011" }, + {"Guadeloupe" ,"GP" , "590" , 9 , "00" }, + {"Guam" ,"GU" , "1" , 10 , "011" }, + {"Guatemala" ,"GT" , "502" , 8 , "00" }, + {"Guinea" ,"GN" , "224" , 8 , "00" }, + {"Guinea-Bissau" ,"GW" , "245" , 7 , "00" }, + {"Guyana" ,"GY" , "592" , 7 , "001" }, + {"Haiti" ,"HT" , "509" , 8 , "00" }, + {"Honduras" ,"HN" , "504" , 8 , "00" }, + {"Hong Kong" ,"HK" , "852" , 8 , "001" }, + {"Hungary" ,"HU" , "36" , 9 , "00" }, + {"Iceland" ,"IS" , "354" , 9 , "00" }, + {"India" ,"IN" , "91" , 10 , "00" }, + {"Indonesia" ,"ID" , "62" , 10 , "001" }, + {"Iran" ,"IR" , "98" , 10 , "00" }, + {"Iraq" ,"IQ" , "964" , 10 , "00" }, + {"Ireland" ,"IE" , "353" , 9 , "00" }, + {"Israel" ,"IL" , "972" , 9 , "00" }, + {"Italy" ,"IT" , "39" , 10 , "00" }, +/* {"Jersey" ,"JE" , "44" , 10 , "00" },*/ + {"Jamaica" ,"JM" , "1" , 10 , "011" }, + {"Japan" ,"JP" , "81" , 10 , "010" }, + {"Jordan" ,"JO" , "962" , 9 , "00" }, + {"Kazakhstan" ,"KZ" , "7" , 10 , "00" }, + {"Kenya" ,"KE" , "254" , 9 , "000" }, + {"Kiribati" ,"KI" , "686" , 5 , "00" }, + {"Korea, North" ,"KP" , "850" , 12 , "99" }, + {"Korea, South" ,"KR" , "82" , 12 , "001" }, + {"Kuwait" ,"KW" , "965" , 8 , "00" }, + {"Kyrgyzstan" ,"KG" , "996" , 9 , "00" }, + {"Laos" ,"LA" , "856" , 10 , "00" }, + {"Latvia" ,"LV" , "371" , 8 , "00" }, + {"Lebanon" ,"LB" , "961" , 7 , "00" }, + {"Lesotho" ,"LS" , "266" , 8 , "00" }, + {"Liberia" ,"LR" , "231" , 8 , "00" }, + {"Libya" ,"LY" , "218" , 8 , "00" }, + {"Liechtenstein" ,"LI" , "423" , 7 , "00" }, + {"Lithuania" ,"LT" , "370" , 8 , "00" }, + {"Luxembourg" ,"LU" , "352" , 9 , "00" }, + {"Macau" ,"MO" , "853" , 8 , "00" }, + {"Macedonia" ,"MK" , "389" , 8 , "00" }, + {"Madagascar" ,"MG" , "261" , 9 , "00" }, + {"Malawi" ,"MW" , "265" , 9 , "00" }, + {"Malaysia" ,"MY" , "60" , 9 , "00" }, + {"Maldives" ,"MV" , "960" , 7 , "00" }, + {"Mali" ,"ML" , "223" , 8 , "00" }, + {"Malta" ,"MT" , "356" , 8 , "00" }, + {"Marshall Islands" ,"MH" , "692" , 7 , "011" }, + {"Martinique" ,"MQ" , "596" , 9 , "00" }, + {"Mauritania" ,"MR" , "222" , 8 , "00" }, + {"Mauritius" ,"MU" , "230" , 7 , "00" }, + {"Mayotte Island" ,"YT" , "262" , 9 , "00" }, + {"Mexico" ,"MX" , "52" , 10 , "00" }, + /*The following is a pseudo dial plan for Mexican mobile phones. See https://en.wikipedia.org/wiki/Telephone_numbers_in_Mexico*/ + {"Mexico" ,"MX" , "521" , 10 , "00" }, + {"Micronesia" ,"FM" , "691" , 7 , "011" }, + {"Moldova" ,"MD" , "373" , 8 , "00" }, + {"Monaco" ,"MC" , "377" , 8 , "00" }, + {"Mongolia" ,"MN" , "976" , 8 , "001" }, + {"Montenegro" ,"ME" , "382" , 8 , "00" }, + {"Montserrat" ,"MS" , "664" , 10 , "011" }, + {"Morocco" ,"MA" , "212" , 9 , "00" }, + {"Mozambique" ,"MZ" , "258" , 9 , "00" }, + {"Myanmar" ,"MM" , "95" , 10 , "00" }, + {"Namibia" ,"NA" , "264" , 9 , "00" }, + {"Nauru" ,"NR" , "674" , 7 , "00" }, + {"Nepal" ,"NP" , "43" , 10 , "00" }, + {"Netherlands" ,"NL" , "31" , 9 , "00" }, + {"New Caledonia" ,"NC" , "687" , 6 , "00" }, + {"New Zealand" ,"NZ" , "64" , 8 , "00" }, + {"Nicaragua" ,"NI" , "505" , 8 , "00" }, + {"Niger" ,"NE" , "227" , 8 , "00" }, + {"Nigeria" ,"NG" , "234" , 10 , "009" }, + {"Niue" ,"NU" , "683" , 4 , "00" }, + {"Norfolk Island" ,"NF" , "672" , 5 , "00" }, + {"Northern Mariana Islands" ,"MP" , "1" , 10 , "011" }, + {"Norway" ,"NO" , "47" , 8 , "00" }, + {"Oman" ,"OM" , "968" , 8 , "00" }, + {"Pakistan" ,"PK" , "92" , 10 , "00" }, + {"Palau" ,"PW" , "680" , 7 , "011" }, + {"Palestine" ,"PS" , "970" , 9 , "00" }, + {"Panama" ,"PA" , "507" , 8 , "00" }, + {"Papua New Guinea" ,"PG" , "675" , 8 , "00" }, + {"Paraguay" ,"PY" , "595" , 9 , "00" }, + {"Peru" ,"PE" , "51" , 9 , "00" }, + {"Philippines" ,"PH" , "63" , 10 , "00" }, + {"Poland" ,"PL" , "48" , 9 , "00" }, + {"Portugal" ,"PT" , "351" , 9 , "00" }, + {"Puerto Rico" ,"PR" , "1" , 10 , "011" }, + {"Qatar" ,"QA" , "974" , 8 , "00" }, + {"R�union Island" ,"RE" , "262" , 9 , "011" }, + {"Romania" ,"RO" , "40" , 9 , "00" }, + {"Russian Federation" ,"RU" , "7" , 10 , "8" }, + {"Rwanda" ,"RW" , "250" , 9 , "00" }, + {"Saint Helena" ,"SH" , "290" , 4 , "00" }, + {"Saint Kitts and Nevis" ,"KN" , "1" , 10 , "011" }, + {"Saint Lucia" ,"LC" , "1" , 10 , "011" }, + {"Saint Pierre and Miquelon" ,"PM" , "508" , 6 , "00" }, + {"Saint Vincent and the Grenadines","VC" , "1" , 10 , "011" }, + {"Samoa" ,"WS" , "685" , 7 , "0" }, + {"San Marino" ,"SM" , "378" , 10 , "00" }, + {"Sao Tome and Principe" ,"ST" , "239" , 7 , "00" }, + {"Saudi Arabia" ,"SA" , "966" , 9 , "00" }, + {"Senegal" ,"SN" , "221" , 9 , "00" }, + {"Serbia" ,"RS" , "381" , 9 , "00" }, + {"Seychelles" ,"SC" , "248" , 7 , "00" }, + {"Sierra Leone" ,"SL" , "232" , 8 , "00" }, + {"Singapore" ,"SG" , "65" , 8 , "001" }, + {"Slovakia" ,"SK" , "421" , 9 , "00" }, + {"Slovenia" ,"SI" , "386" , 8 , "00" }, + {"Solomon Islands" ,"SB" , "677" , 7 , "00" }, + {"Somalia" ,"SO" , "252" , 8 , "00" }, + {"South Africa" ,"ZA" , "27" , 9 , "00" }, + {"Spain" ,"ES" , "34" , 9 , "00" }, + {"Sri Lanka" ,"LK" , "94" , 9 , "00" }, + {"Sudan" ,"SD" , "249" , 9 , "00" }, + {"Suriname" ,"SR" , "597" , 7 , "00" }, + {"Swaziland" ,"SZ" , "268" , 8 , "00" }, + {"Sweden" ,"SE" , "46" , 9 , "00" }, + {"Switzerland" ,"XK" , "41" , 9 , "00" }, + {"Syria" ,"SY" , "963" , 9 , "00" }, + {"Taiwan" ,"TW" , "886" , 9 , "810" }, + {"Tajikistan" ,"TJ" , "992" , 9 , "002" }, + {"Tanzania" ,"TZ" , "255" , 9 , "000" }, + {"Thailand" ,"TH" , "66" , 9 , "001" }, + {"Togo" ,"TG" , "228" , 8 , "00" }, + {"Tokelau" ,"TK" , "690" , 4 , "00" }, + {"Tonga" ,"TO" , "676" , 5 , "00" }, + {"Trinidad and Tobago" ,"TT" , "1" , 10 , "011" }, + {"Tunisia" ,"TN" , "216" , 8 , "00" }, + {"Turkey" ,"TR" , "90" , 10 , "00" }, + {"Turkmenistan" ,"TM" , "993" , 8 , "00" }, + {"Turks and Caicos Islands" ,"TC" , "1" , 7 , "0" }, + {"Tuvalu" ,"TV" , "688" , 5 , "00" }, + {"Uganda" ,"UG" , "256" , 9 , "000" }, + {"Ukraine" ,"UA" , "380" , 9 , "00" }, + {"United Arab Emirates" ,"AE" , "971" , 9 , "00" }, + {"United Kingdom" ,"GB" , "44" , 10 , "00" }, +/* {"United Kingdom" ,"UK" , "44" , 10 , "00" },*/ + {"United States" ,"US" , "1" , 10 , "011" }, + {"Uruguay" ,"UY" , "598" , 8 , "00" }, + {"Uzbekistan" ,"UZ" , "998" , 9 , "8" }, + {"Vanuatu" ,"VU" , "678" , 7 , "00" }, + {"Venezuela" ,"VE" , "58" , 10 , "00" }, + {"Vietnam" ,"VN" , "84" , 9 , "00" }, + {"Wallis and Futuna" ,"WF" , "681" , 5 , "00" }, + {"Yemen" ,"YE" , "967" , 9 , "00" }, + {"Zambia" ,"ZM" , "260" , 9 , "00" }, + {"Zimbabwe" ,"ZW" , "263" , 9 , "00" }, + {NULL ,NULL , "" , 0 , NULL } +}; + +const DialPlan DialPlan::MostCommon("generic", "", "", 10, "00"); + +DialPlan::DialPlan (const string &country, const string &isoCountryCode, const string &ccc, int nnl, const string &icp) : ClonableObject(*new DialPlanPrivate) { + L_D(); + d->country = country; + d->isoCountryCode = isoCountryCode; + d->countryCallingCode = ccc; + d->nationalNumberLength = nnl; + d->internationalCallPrefix = icp; +} + +DialPlan::DialPlan (const DialPlan &src) : ClonableObject(*new DialPlanPrivate) { + L_D(); + d->country = src.getCountry(); + d->isoCountryCode = src.getIsoCountryCode(); + d->countryCallingCode = src.getCountryCallingCode(); + d->nationalNumberLength = src.getNationalNumberLength(); + d->internationalCallPrefix = src.getInternationalCallPrefix(); +} + +DialPlan::~DialPlan () { + +} + +DialPlan &DialPlan::operator= (const DialPlan &src) { + L_D(); + + if (this != &src) { + d->country = src.getCountry(); + d->isoCountryCode = src.getIsoCountryCode(); + d->countryCallingCode = src.getCountryCallingCode(); + d->nationalNumberLength = src.getNationalNumberLength(); + d->internationalCallPrefix = src.getInternationalCallPrefix(); + } + + return *this; +} + +const string& DialPlan::getCountry() const { + L_D(); + return d->country; +} + +const string& DialPlan::getIsoCountryCode() const { + L_D(); + return d->isoCountryCode; +} + +const string& DialPlan::getCountryCallingCode() const { + L_D(); + return d->countryCallingCode; +} + +int DialPlan::getNationalNumberLength() const { + L_D(); + return d->nationalNumberLength; +} + +const string& DialPlan::getInternationalCallPrefix() const { + L_D(); + return d->internationalCallPrefix; +} + +bool DialPlan::isGeneric() const { + L_D(); + return d->country == MostCommon.getCountry(); +} + +int DialPlan::lookupCccFromE164(string e164) { + if (e164[0] != '+') { + return -1; /*not an e164 number*/ + } + if (e164[1]=='1') { /*USA case*/ + return 1; + } + + DialPlan electedDialPlan; + unsigned int found; + unsigned int i = 0; + + do { + found = 0; + i++; + for (const auto &dp : DialPlans) { + if (strncmp(dp.getCountryCallingCode().c_str(), &e164[1], i) == 0) { + electedDialPlan = dp; + found++; + } + } + } while ((found > 1 || found == 0) && i < e164.length() - 1); + + if (found == 1) { + return atoi(electedDialPlan.getCountryCallingCode().c_str()); + } else { + return -1; /*not found */ + } +} + +int DialPlan::lookupCccFromIso(string iso) { + for (const auto &dp : DialPlans) { + if (dp.getIsoCountryCode() == iso) { + return atoi(dp.getCountryCallingCode().c_str()); + } + } + return -1; +} + +const DialPlan& DialPlan::findByCccAsInt(int ccc) { + string cccString = to_string(ccc); + return DialPlan::findByCcc(cccString); +} + +const DialPlan& DialPlan::findByCcc(const string& ccc) { + if (ccc.empty()) { + return MostCommon; + } + + for (const auto &dp : DialPlans) { + if (dp.getCountryCallingCode() == ccc) { + return dp; + } + } + /*else return a generic "most common" dial plan*/ + return MostCommon; +} + +const std::list& DialPlan::getAllDialPlans() { + return DialPlans; +} + +LINPHONE_END_NAMESPACE \ No newline at end of file diff --git a/src/dial-plan/dial-plan.h b/src/dial-plan/dial-plan.h new file mode 100644 index 000000000..b25a8853e --- /dev/null +++ b/src/dial-plan/dial-plan.h @@ -0,0 +1,63 @@ +/* + * dial-plan.h + * Copyright (C) 2010-2017 Belledonne Communications SARL + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef _DIAL_PLAN_H_ +#define _DIAL_PLAN_H_ + +#include +#include "object/clonable-object.h" + +// ============================================================================= + +LINPHONE_BEGIN_NAMESPACE + +class DialPlanPrivate; + +class LINPHONE_PUBLIC DialPlan : public ClonableObject { +public: + DialPlan (const std::string &country = "", const std::string &isoCountryCode = "", const std::string &ccc = "", int nnl = 0, const std::string &icp = ""); + DialPlan (const DialPlan &src); + ~DialPlan (); + + DialPlan &operator= (const DialPlan &src); + + const std::string& getCountry() const; + const std::string& getIsoCountryCode() const; + const std::string& getCountryCallingCode() const; + int getNationalNumberLength() const; + const std::string& getInternationalCallPrefix() const; + bool isGeneric() const; + + static const DialPlan MostCommon; + + static int lookupCccFromE164(std::string e164); + static int lookupCccFromIso(std::string iso); + static const DialPlan& findByCccAsInt(int ccc); + static const DialPlan& findByCcc(const std::string& ccc); + static const std::list& getAllDialPlans(); + +private: + static std::list const DialPlans; + + L_DECLARE_PRIVATE(DialPlan); +}; + +LINPHONE_END_NAMESPACE + +#endif // ifndef _DIAL_PLAN_H_ diff --git a/wrappers/java/migration.sh b/wrappers/java/migration.sh index ef80e0005..7626a7745 100644 --- a/wrappers/java/migration.sh +++ b/wrappers/java/migration.sh @@ -231,9 +231,6 @@ eval "$SED_START 's/enableDownloadOpenH264(/OpenH264DownloadHelper.enableDownloa #DialPlan #LinphoneBuffer #Call.zoomVideo() -#Factory.instance().setLogCollectionPath(getFilesDir().getAbsolutePath()); -#Factory.instance().enableLogCollection(isDebugEnabled); -#Factory.instance().setDebugMode(isDebugEnabled, getString(R.string.app_name)); #AccountCreator.updatePassword #Android specifics not wrapped automatically @@ -264,3 +261,6 @@ eval "$SED_START 's/enableDownloadOpenH264(/OpenH264DownloadHelper.enableDownloa #Core.setCpuCount() => Not needed anymore, can be removed #AccountCreator.getPrefix => linphone_dial_plan_lookup_ccc_from_e164 #ProxyConfig.lookupCCCFromIso=> linphone_dial_plan_lookup_ccc_from_iso +#Factory.instance().setLogCollectionPath(getFilesDir().getAbsolutePath()); => Core.setLogCollectionPath +#Factory.instance().enableLogCollection(isDebugEnabled); => COre.enableLogCollection +#Factory.instance().setDebugMode(isDebugEnabled, getString(R.string.app_name)); => Core.setLogLevelMask