- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13638 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: mikej Date: Fri Jun 5 11:16:56 2009 New Revision: 13638 Log: mod_conference: don't transfer back to the same conference Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Jun 5 11:16:56 2009 @@ -3933,15 +3933,17 @@ /* move the member from the old conference to the new one */ switch_mutex_lock(member->control_mutex); - conference_del_member(conference, member); - conference_add_member(new_conference, member); - - if (conference->rate != new_conference->rate) { - if (setup_media(member, new_conference)) { - switch_clear_flag_locked(member, MFLAG_RUNNING); - } else { - switch_channel_set_app_flag(channel, CF_APP_TAGGED); - switch_set_flag_locked(member, MFLAG_RESTART); + if (conference != new_conference) { + conference_del_member(conference, member); + conference_add_member(new_conference, member); + + if (conference->rate != new_conference->rate) { + if (setup_media(member, new_conference)) { + switch_clear_flag_locked(member, MFLAG_RUNNING); + } else { + switch_channel_set_app_flag(channel, CF_APP_TAGGED); + switch_set_flag_locked(member, MFLAG_RESTART); + } } }

1 0

[commit] r13637 - in freeswitch/trunk: . libs libs/apr/build libs/ilbc/src libs/libg722_1/src libs/libsndfile/Cfg libs/libsndfile/M4 libs/libsndfile/programs libs/libsndfile/src libs/libsndfile/tests src/mod/applications/mod_cluechoo src/mod/codecs/mod_siren src/mod/endpoints/mod_sofia src/mod/event_handlers/mod_erlang_event src/mod/formats/mod_file_string
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: brian Date: Fri Jun 5 10:50:30 2009 New Revision: 13637 Log: ignore Modified: freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/apr/build/ (props changed) freeswitch/trunk/libs/ilbc/src/ (props changed) freeswitch/trunk/libs/libg722_1/src/ (props changed) freeswitch/trunk/libs/libsndfile/Cfg/ (props changed) freeswitch/trunk/libs/libsndfile/M4/ (props changed) freeswitch/trunk/libs/libsndfile/programs/ (props changed) freeswitch/trunk/libs/libsndfile/src/ (props changed) freeswitch/trunk/libs/libsndfile/tests/ (props changed) freeswitch/trunk/src/mod/applications/mod_cluechoo/ (props changed) freeswitch/trunk/src/mod/codecs/mod_siren/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ (props changed) freeswitch/trunk/src/mod/formats/mod_file_string/ (props changed) Changes in other areas also in this revision: Modified: freeswitch/trunk/ (props changed)

1 0

[commit] r13636 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: mrene Date: Fri Jun 5 10:01:54 2009 New Revision: 13636 Log: Use a new natpmp_t object for every request Modified: freeswitch/trunk/src/switch_nat.c Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Fri Jun 5 10:01:54 2009 @@ -41,7 +41,6 @@ typedef struct { switch_memory_pool_t *pool; switch_nat_type_t nat_type; - natpmp_t natpmp; struct UPNPUrls urls; struct IGDdatas data; char pub_addr[16]; @@ -105,10 +104,11 @@ natpmpresp_t response; char *pubaddr = NULL; fd_set fds; + natpmp_t natpmp; - initnatpmp(&nat_globals.natpmp); - r = sendpublicaddressrequest(&nat_globals.natpmp); + initnatpmp(&natpmp); + r = sendpublicaddressrequest(&natpmp); if (r < 0) { goto end; @@ -120,10 +120,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking for PMP %d/%d\n", i, max); FD_ZERO(&fds); - FD_SET(nat_globals.natpmp.s, &fds); - getnatpmprequesttimeout(&nat_globals.natpmp, &timeout); + FD_SET(natpmp.s, &fds); + getnatpmprequesttimeout(&natpmp, &timeout); select(FD_SETSIZE, &fds, NULL, NULL, &timeout); - r = readnatpmpresponseorretry(&nat_globals.natpmp, &response); + r = readnatpmpresponseorretry(&natpmp, &response); } while(r == NATPMP_TRYAGAIN && i < max); if (r < 0) { @@ -134,9 +134,7 @@ switch_set_string(nat_globals.pub_addr, pubaddr); nat_globals.nat_type = SWITCH_NAT_TYPE_PMP; - if (r) { - closenatpmp(&nat_globals.natpmp); - } + closenatpmp(&natpmp); end: @@ -175,21 +173,24 @@ switch_status_t status = SWITCH_STATUS_FALSE; natpmpresp_t response; int r; + natpmp_t natpmp; + initnatpmp(&natpmp); + if (proto == SWITCH_NAT_TCP) { - sendnewportmappingrequest(&nat_globals.natpmp, NATPMP_PROTOCOL_TCP, port, port, 31104000); + sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_TCP, port, port, 31104000); } else if(proto == SWITCH_NAT_UDP) { - sendnewportmappingrequest(&nat_globals.natpmp, NATPMP_PROTOCOL_UDP, port, port, 31104000); + sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_UDP, port, port, 31104000); } do { fd_set fds; struct timeval timeout = { 1, 0 }; FD_ZERO(&fds); - FD_SET(nat_globals.natpmp.s, &fds); - getnatpmprequesttimeout(&nat_globals.natpmp, &timeout); + FD_SET(natpmp.s, &fds); + getnatpmprequesttimeout(&natpmp, &timeout); select(FD_SETSIZE, &fds, NULL, NULL, &timeout); - r = readnatpmpresponseorretry(&nat_globals.natpmp, &response); + r = readnatpmpresponseorretry(&natpmp, &response); } while(r == NATPMP_TRYAGAIN); if (r == 0) { @@ -210,7 +211,9 @@ status = SWITCH_STATUS_SUCCESS; } - + + closenatpmp(&natpmp); + return status; } @@ -244,21 +247,24 @@ switch_status_t status = SWITCH_STATUS_FALSE; natpmpresp_t response; int r; + natpmp_t natpmp; + + initnatpmp(&natpmp); if (proto == SWITCH_NAT_TCP) { - sendnewportmappingrequest(&nat_globals.natpmp, NATPMP_PROTOCOL_TCP, port, port, 0); + sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_TCP, port, port, 0); } else if(proto == SWITCH_NAT_UDP) { - sendnewportmappingrequest(&nat_globals.natpmp, NATPMP_PROTOCOL_UDP, port, port, 0); + sendnewportmappingrequest(&natpmp, NATPMP_PROTOCOL_UDP, port, port, 0); } do { fd_set fds; struct timeval timeout; FD_ZERO(&fds); - FD_SET(nat_globals.natpmp.s, &fds); - getnatpmprequesttimeout(&nat_globals.natpmp, &timeout); + FD_SET(natpmp.s, &fds); + getnatpmprequesttimeout(&natpmp, &timeout); select(FD_SETSIZE, &fds, NULL, NULL, &timeout); - r = readnatpmpresponseorretry(&nat_globals.natpmp, &response); + r = readnatpmpresponseorretry(&natpmp, &response); } while(r == NATPMP_TRYAGAIN); if (r == 0) { @@ -269,6 +275,8 @@ response.pnu.newportmapping.privateport); status = SWITCH_STATUS_SUCCESS; } + + closenatpmp(&natpmp); return status; } @@ -337,9 +345,7 @@ SWITCH_DECLARE(void) switch_nat_shutdown(void) { - if (nat_globals.nat_type == SWITCH_NAT_TYPE_PMP) { - closenatpmp(&nat_globals.natpmp); - } + }

1 0

[commit] r13635 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: mrene Date: Fri Jun 5 09:39:28 2009 New Revision: 13635 Log: fix Modified: freeswitch/trunk/src/switch_nat.c Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Fri Jun 5 09:39:28 2009 @@ -184,7 +184,7 @@ do { fd_set fds; - struct timeval timeout; + struct timeval timeout = { 1, 0 }; FD_ZERO(&fds); FD_SET(nat_globals.natpmp.s, &fds); getnatpmprequesttimeout(&nat_globals.natpmp, &timeout);

1 0

[commit] r13634 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: buklov Date: Fri Jun 5 04:39:17 2009 New Revision: 13634 Log: fix Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_ru.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_ru.xml Fri Jun 5 04:39:17 2009 @@ -1035,17 +1035,17 @@ <prompt phrase="woodlark" filename="woodlark.wav"/> <prompt phrase="yesteryear" filename="yesteryear.wav"/>  - <prompt phrase="Добро пожаловать в агента безопасности ZRTP" filename="zrtp-enroll_welcome.wav"/> + <prompt phrase="Добро пожаловать в агента регистрации шифрования ZRTP" filename="zrtp-enroll_welcome.wav"/>  <prompt phrase="Вы должны выбрать строку аутентификации с партнером по разговору, Если она не совпадет, система сообщит вам разрывом линии." filename="zrtp-check_sas.wav"/>  - <prompt phrase="Только телефоны, прошедшие аутентификацию, могут быть сконфигурированы для доверия системе для обеспечения ZRTP защищенных звонков, так что такой звонок не даст эффекта." filename="zrtp-enroll_not_sip_registered.wav"/> + <prompt phrase="Только телефоны, прошедшие аутентификацию, могут быть сконфигурированы для доверия системе для обеспечения ZRTP шифрованных звонков, так что такой звонок не даст эффекта." filename="zrtp-enroll_not_sip_registered.wav"/>  - <prompt phrase="Ваш телефон сообщит, что он уже доверяет системе для перенаправления ZRTP безопасных звонков, так что больше делать ничего не нужно будет" filename="zrtp-enroll_already_enrolled.wav"/> + <prompt phrase="Ваш телефон сообщит, что он уже доверяет системе для перенаправления ZRTP шифрованных звонков, так что больше делать ничего не нужно будет" filename="zrtp-enroll_already_enrolled.wav"/>  <prompt phrase="Только телефоны, с поддержкой протокола ZRTP могут использовать такую функцию. Ваш телефон не поддерживает ZRTP протокол и звонок не даст эффекта ZRTP защиты." filename="zrtp-enroll_notzrtp.wav"/>  - <prompt phrase="Система оборудована для проведения защищенных ZRTP звонков. Вы должны решить, если вы хотите чтобы система была задействована для приема и возможно мониторинга ваших защищенных звонков. Вы можете повесить трубку после окончания разговора." filename="zrtp-enroll_confirmed.wav"/> + <prompt phrase="Система оборудована для проведения шифрованных ZRTP звонков. Вы должны решить, если вы хотите чтобы система была задействована для приема и возможно мониторинга ваших защищенных звонков. Вы можете повесить трубку после окончания разговора." filename="zrtp-enroll_confirmed.wav"/>  <prompt phrase="Договоритесь с партнером по разговору о парольной фразе." filename="zrtp-is_secure.wav"/>  @@ -1053,17 +1053,17 @@  <prompt phrase="Парольная фраза проверена." filename="zrtp-is_verified.wav"/>  - <prompt phrase="Спасибо за Ваш звонок. До свидания." filename="zrtp-thankyou_goodbye.wav"/> + <prompt phrase="Спасибо за звонок. До свидания." filename="zrtp-thankyou_goodbye.wav"/>  <prompt phrase="Что-то происходит не так." filename="zrtp-somethings_wrong.wav"/>  <prompt phrase="Ошибка." filename="zrtp-status_error.wav"/>  - <prompt phrase="Звонок не защищен." filename="zrtp-status_notsecure.wav"/> + <prompt phrase="Ваш разговор не шифруется" filename="zrtp-status_notsecure.wav"/>  - <prompt phrase="Звонок защищен." filename="zrtp-status_secure.wav"/> + <prompt phrase="Ваш разговор шифруется." filename="zrtp-status_secure.wav"/>  - <prompt phrase="Защита звонка." filename="zrtp-status_securing.wav"/> + <prompt phrase="Шифрованный вызов." filename="zrtp-status_securing.wav"/>  </zrtp> </ru>

1 0

[commit] r13633 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: buklov Date: Fri Jun 5 04:25:58 2009 New Revision: 13633 Log: add translate zrtp Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_ru.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_ru.xml Fri Jun 5 04:25:58 2009 @@ -520,6 +520,552 @@ <prompt phrase="Мы пытаемся связаться" filename="we_are_trying_to_reach.wav"/>  <prompt phrase="Произошла ошибка, пожалуйста обратитесь к администратору" filename="error.wav"/>  </misc> + <zrtp> +  + <prompt phrase="Algol" filename="Algol.wav"/> + <prompt phrase="Apollo" filename="Apollo.wav"/> + <prompt phrase="Athens" filename="Athens.wav"/> + <prompt phrase="Atlantic" filename="Atlantic.wav"/> + <prompt phrase="Aztec" filename="Aztec.wav"/> + <prompt phrase="Babylon" filename="Babylon.wav"/> + <prompt phrase="Belfast" filename="Belfast.wav"/> + <prompt phrase="Bradbury" filename="Bradbury.wav"/> + <prompt phrase="Brazilian" filename="Brazilian.wav"/> + <prompt phrase="Burbank" filename="Burbank.wav"/> + <prompt phrase="Burlington" filename="Burlington.wav"/> + <prompt phrase="Camelot" filename="Camelot.wav"/> + <prompt phrase="Capricorn" filename="Capricorn.wav"/> + <prompt phrase="Cherokee" filename="Cherokee.wav"/> + <prompt phrase="Chicago" filename="Chicago.wav"/> + <prompt phrase="Christmas" filename="Christmas.wav"/> + <prompt phrase="Dakota" filename="Dakota.wav"/> + <prompt phrase="December" filename="December.wav"/> + <prompt phrase="Dupont" filename="Dupont.wav"/> + <prompt phrase="Eskimo" filename="Eskimo.wav"/> + <prompt phrase="Galveston" filename="Galveston.wav"/> + <prompt phrase="Geiger" filename="Geiger.wav"/> + <prompt phrase="Hamilton" filename="Hamilton.wav"/> + <prompt phrase="Istanbul" filename="Istanbul.wav"/> + <prompt phrase="Jamaica" filename="Jamaica.wav"/> + <prompt phrase="Jupiter" filename="Jupiter.wav"/> + <prompt phrase="Medusa" filename="Medusa.wav"/> + <prompt phrase="Mohawk" filename="Mohawk.wav"/> + <prompt phrase="Montana" filename="Montana.wav"/> + <prompt phrase="Neptune" filename="Neptune.wav"/> + <prompt phrase="Norwegian" filename="Norwegian.wav"/> + <prompt phrase="Oakland" filename="Oakland.wav"/> + <prompt phrase="October" filename="October.wav"/> + <prompt phrase="Ohio" filename="Ohio.wav"/> + <prompt phrase="Orlando" filename="Orlando.wav"/> + <prompt phrase="Pacific" filename="Pacific.wav"/> + <prompt phrase="Pandora" filename="Pandora.wav"/> + <prompt phrase="Pegasus" filename="Pegasus.wav"/> + <prompt phrase="Pluto" filename="Pluto.wav"/> + <prompt phrase="Saturday" filename="Saturday.wav"/> + <prompt phrase="Scotland" filename="Scotland.wav"/> + <prompt phrase="Trojan" filename="Trojan.wav"/> + <prompt phrase="Virginia" filename="Virginia.wav"/> + <prompt phrase="Vulcan" filename="Vulcan.wav"/> + <prompt phrase="Waterloo" filename="Waterloo.wav"/> + <prompt phrase="Wichita" filename="Wichita.wav"/> + <prompt phrase="Wilmington" filename="Wilmington.wav"/> + <prompt phrase="Wyoming" filename="Wyoming.wav"/> + <prompt phrase="Yucatan" filename="Yucatan.wav"/> + <prompt phrase="Zulu" filename="Zulu.wav"/> + <prompt phrase="aardvark" filename="aardvark.wav"/> + <prompt phrase="absurd" filename="absurd.wav"/> + <prompt phrase="accrue" filename="accrue.wav"/> + <prompt phrase="acme" filename="acme.wav"/> + <prompt phrase="adrift" filename="adrift.wav"/> + <prompt phrase="adroitness" filename="adroitness.wav"/> + <prompt phrase="adult" filename="adult.wav"/> + <prompt phrase="adviser" filename="adviser.wav"/> + <prompt phrase="afflict" filename="afflict.wav"/> + <prompt phrase="aftermath" filename="aftermath.wav"/> + <prompt phrase="aggregate" filename="aggregate.wav"/> + <prompt phrase="ahead" filename="ahead.wav"/> + <prompt phrase="aimless" filename="aimless.wav"/> + <prompt phrase="alkali" filename="alkali.wav"/> + <prompt phrase="allow" filename="allow.wav"/> + <prompt phrase="almighty" filename="almighty.wav"/> + <prompt phrase="alone" filename="alone.wav"/> + <prompt phrase="ammo" filename="ammo.wav"/> + <prompt phrase="amulet" filename="amulet.wav"/> + <prompt phrase="amusement" filename="amusement.wav"/> + <prompt phrase="ancient" filename="ancient.wav"/> + <prompt phrase="antenna" filename="antenna.wav"/> + <prompt phrase="apple" filename="apple.wav"/> + <prompt phrase="applicant" filename="applicant.wav"/> + <prompt phrase="armistice" filename="armistice.wav"/> + <prompt phrase="article" filename="article.wav"/> + <prompt phrase="artist" filename="artist.wav"/> + <prompt phrase="assume" filename="assume.wav"/> + <prompt phrase="asteroid" filename="asteroid.wav"/> + <prompt phrase="atlas" filename="atlas.wav"/> + <prompt phrase="atmosphere" filename="atmosphere.wav"/> + <prompt phrase="autopsy" filename="autopsy.wav"/> + <prompt phrase="baboon" filename="baboon.wav"/> + <prompt phrase="backfield" filename="backfield.wav"/> + <prompt phrase="backward" filename="backward.wav"/> + <prompt phrase="backwater" filename="backwater.wav"/> + <prompt phrase="banjo" filename="banjo.wav"/> + <prompt phrase="barbecue" filename="barbecue.wav"/> + <prompt phrase="beaming" filename="beaming.wav"/> + <prompt phrase="bedlamp" filename="bedlamp.wav"/> + <prompt phrase="beehive" filename="beehive.wav"/> + <prompt phrase="beeswax" filename="beeswax.wav"/> + <prompt phrase="befriend" filename="befriend.wav"/> + <prompt phrase="belowground" filename="belowground.wav"/> + <prompt phrase="berserk" filename="berserk.wav"/> + <prompt phrase="bifocals" filename="bifocals.wav"/> + <prompt phrase="billiard" filename="billiard.wav"/> + <prompt phrase="bison" filename="bison.wav"/> + <prompt phrase="blackjack" filename="blackjack.wav"/> + <prompt phrase="blockade" filename="blockade.wav"/> + <prompt phrase="blowtorch" filename="blowtorch.wav"/> + <prompt phrase="bluebird" filename="bluebird.wav"/> + <prompt phrase="bodyguard" filename="bodyguard.wav"/> + <prompt phrase="bombast" filename="bombast.wav"/> + <prompt phrase="bookseller" filename="bookseller.wav"/> + <prompt phrase="bookshelf" filename="bookshelf.wav"/> + <prompt phrase="borderline" filename="borderline.wav"/> + <prompt phrase="bottomless" filename="bottomless.wav"/> + <prompt phrase="brackish" filename="brackish.wav"/> + <prompt phrase="bravado" filename="bravado.wav"/> + <prompt phrase="breadline" filename="breadline.wav"/> + <prompt phrase="breakaway" filename="breakaway.wav"/> + <prompt phrase="breakup" filename="breakup.wav"/> + <prompt phrase="brickyard" filename="brickyard.wav"/> + <prompt phrase="briefcase" filename="briefcase.wav"/> + <prompt phrase="businessman" filename="businessman.wav"/> + <prompt phrase="butterfat" filename="butterfat.wav"/> + <prompt phrase="button" filename="button.wav"/> + <prompt phrase="buzzard" filename="buzzard.wav"/> + <prompt phrase="candidate" filename="candidate.wav"/> + <prompt phrase="cannonball" filename="cannonball.wav"/> + <prompt phrase="caravan" filename="caravan.wav"/> + <prompt phrase="caretaker" filename="caretaker.wav"/> + <prompt phrase="celebrate" filename="celebrate.wav"/> + <prompt phrase="cellulose" filename="cellulose.wav"/> + <prompt phrase="cement" filename="cement.wav"/> + <prompt phrase="certify" filename="certify.wav"/> + <prompt phrase="chairlift" filename="chairlift.wav"/> + <prompt phrase="chambermaid" filename="chambermaid.wav"/> + <prompt phrase="chatter" filename="chatter.wav"/> + <prompt phrase="checkup" filename="checkup.wav"/> + <prompt phrase="chisel" filename="chisel.wav"/> + <prompt phrase="choking" filename="choking.wav"/> + <prompt phrase="chopper" filename="chopper.wav"/> + <prompt phrase="clamshell" filename="clamshell.wav"/> + <prompt phrase="classic" filename="classic.wav"/> + <prompt phrase="classroom" filename="classroom.wav"/> + <prompt phrase="cleanup" filename="cleanup.wav"/> + <prompt phrase="clergyman" filename="clergyman.wav"/> + <prompt phrase="clockwork" filename="clockwork.wav"/> + <prompt phrase="cobra" filename="cobra.wav"/> + <prompt phrase="coherence" filename="coherence.wav"/> + <prompt phrase="combustion" filename="combustion.wav"/> + <prompt phrase="commando" filename="commando.wav"/> + <prompt phrase="commence" filename="commence.wav"/> + <prompt phrase="company" filename="company.wav"/> + <prompt phrase="component" filename="component.wav"/> + <prompt phrase="concert" filename="concert.wav"/> + <prompt phrase="concurrent" filename="concurrent.wav"/> + <prompt phrase="confidence" filename="confidence.wav"/> + <prompt phrase="conformist" filename="conformist.wav"/> + <prompt phrase="congregate" filename="congregate.wav"/> + <prompt phrase="consensus" filename="consensus.wav"/> + <prompt phrase="consulting" filename="consulting.wav"/> + <prompt phrase="corporate" filename="corporate.wav"/> + <prompt phrase="corrosion" filename="corrosion.wav"/> + <prompt phrase="councilman" filename="councilman.wav"/> + <prompt phrase="cowbell" filename="cowbell.wav"/> + <prompt phrase="crackdown" filename="crackdown.wav"/> + <prompt phrase="cranky" filename="cranky.wav"/> + <prompt phrase="crossover" filename="crossover.wav"/> + <prompt phrase="crowfoot" filename="crowfoot.wav"/> + <prompt phrase="crucial" filename="crucial.wav"/> + <prompt phrase="crucifix" filename="crucifix.wav"/> + <prompt phrase="crumpled" filename="crumpled.wav"/> + <prompt phrase="crusade" filename="crusade.wav"/> + <prompt phrase="cubic" filename="cubic.wav"/> + <prompt phrase="cumbersome" filename="cumbersome.wav"/> + <prompt phrase="customer" filename="customer.wav"/> + <prompt phrase="dashboard" filename="dashboard.wav"/> + <prompt phrase="deadbolt" filename="deadbolt.wav"/> + <prompt phrase="decadence" filename="decadence.wav"/> + <prompt phrase="decimal" filename="decimal.wav"/> + <prompt phrase="deckhand" filename="deckhand.wav"/> + <prompt phrase="designing" filename="designing.wav"/> + <prompt phrase="detector" filename="detector.wav"/> + <prompt phrase="detergent" filename="detergent.wav"/> + <prompt phrase="determine" filename="determine.wav"/> + <prompt phrase="dictator" filename="dictator.wav"/> + <prompt phrase="dinosaur" filename="dinosaur.wav"/> + <prompt phrase="direction" filename="direction.wav"/> + <prompt phrase="disable" filename="disable.wav"/> + <prompt phrase="disbelief" filename="disbelief.wav"/> + <prompt phrase="disruptive" filename="disruptive.wav"/> + <prompt phrase="distortion" filename="distortion.wav"/> + <prompt phrase="document" filename="document.wav"/> + <prompt phrase="dogsled" filename="dogsled.wav"/> + <prompt phrase="dragnet" filename="dragnet.wav"/> + <prompt phrase="drainage" filename="drainage.wav"/> + <prompt phrase="dreadful" filename="dreadful.wav"/> + <prompt phrase="drifter" filename="drifter.wav"/> + <prompt phrase="dropper" filename="dropper.wav"/> + <prompt phrase="drumbeat" filename="drumbeat.wav"/> + <prompt phrase="drunken" filename="drunken.wav"/> + <prompt phrase="dwelling" filename="dwelling.wav"/> + <prompt phrase="eating" filename="eating.wav"/> + <prompt phrase="edict" filename="edict.wav"/> + <prompt phrase="egghead" filename="egghead.wav"/> + <prompt phrase="eightball" filename="eightball.wav"/> + <prompt phrase="embezzle" filename="embezzle.wav"/> + <prompt phrase="enchanting" filename="enchanting.wav"/> + <prompt phrase="endorse" filename="endorse.wav"/> + <prompt phrase="endow" filename="endow.wav"/> + <prompt phrase="enlist" filename="enlist.wav"/> + <prompt phrase="enrollment" filename="enrollment.wav"/> + <prompt phrase="enterprise" filename="enterprise.wav"/> + <prompt phrase="equation" filename="equation.wav"/> + <prompt phrase="equipment" filename="equipment.wav"/> + <prompt phrase="erase" filename="erase.wav"/> + <prompt phrase="escapade" filename="escapade.wav"/> + <prompt phrase="escape" filename="escape.wav"/> + <prompt phrase="everyday" filename="everyday.wav"/> + <prompt phrase="examine" filename="examine.wav"/> + <prompt phrase="exceed" filename="exceed.wav"/> + <prompt phrase="existence" filename="existence.wav"/> + <prompt phrase="exodus" filename="exodus.wav"/> + <prompt phrase="eyeglass" filename="eyeglass.wav"/> + <prompt phrase="eyetooth" filename="eyetooth.wav"/> + <prompt phrase="facial" filename="facial.wav"/> + <prompt phrase="fallout" filename="fallout.wav"/> + <prompt phrase="fascinate" filename="fascinate.wav"/> + <prompt phrase="filament" filename="filament.wav"/> + <prompt phrase="finicky" filename="finicky.wav"/> + <prompt phrase="flagpole" filename="flagpole.wav"/> + <prompt phrase="flatfoot" filename="flatfoot.wav"/> + <prompt phrase="flytrap" filename="flytrap.wav"/> + <prompt phrase="forever" filename="forever.wav"/> + <prompt phrase="fortitude" filename="fortitude.wav"/> + <prompt phrase="fracture" filename="fracture.wav"/> + <prompt phrase="framework" filename="framework.wav"/> + <prompt phrase="freedom" filename="freedom.wav"/> + <prompt phrase="frequency" filename="frequency.wav"/> + <prompt phrase="frighten" filename="frighten.wav"/> + <prompt phrase="gadgetry" filename="gadgetry.wav"/> + <prompt phrase="gazelle" filename="gazelle.wav"/> + <prompt phrase="getaway" filename="getaway.wav"/> + <prompt phrase="glitter" filename="glitter.wav"/> + <prompt phrase="glossary" filename="glossary.wav"/> + <prompt phrase="glucose" filename="glucose.wav"/> + <prompt phrase="goggles" filename="goggles.wav"/> + <prompt phrase="goldfish" filename="goldfish.wav"/> + <prompt phrase="gossamer" filename="gossamer.wav"/> + <prompt phrase="graduate" filename="graduate.wav"/> + <prompt phrase="gravity" filename="gravity.wav"/> + <prompt phrase="gremlin" filename="gremlin.wav"/> + <prompt phrase="guidance" filename="guidance.wav"/> + <prompt phrase="guitarist" filename="guitarist.wav"/> + <prompt phrase="hamburger" filename="hamburger.wav"/> + <prompt phrase="hamlet" filename="hamlet.wav"/> + <prompt phrase="handiwork" filename="handiwork.wav"/> + <prompt phrase="hazardous" filename="hazardous.wav"/> + <prompt phrase="headwaters" filename="headwaters.wav"/> + <prompt phrase="hemisphere" filename="hemisphere.wav"/> + <prompt phrase="hesitate" filename="hesitate.wav"/> + <prompt phrase="hideaway" filename="hideaway.wav"/> + <prompt phrase="highchair" filename="highchair.wav"/> + <prompt phrase="hockey" filename="hockey.wav"/> + <prompt phrase="holiness" filename="holiness.wav"/> + <prompt phrase="hurricane" filename="hurricane.wav"/> + <prompt phrase="hydraulic" filename="hydraulic.wav"/> + <prompt phrase="impartial" filename="impartial.wav"/> + <prompt phrase="impetus" filename="impetus.wav"/> + <prompt phrase="inception" filename="inception.wav"/> + <prompt phrase="indigo" filename="indigo.wav"/> + <prompt phrase="indoors" filename="indoors.wav"/> + <prompt phrase="indulge" filename="indulge.wav"/> + <prompt phrase="inertia" filename="inertia.wav"/> + <prompt phrase="infancy" filename="infancy.wav"/> + <prompt phrase="inferno" filename="inferno.wav"/> + <prompt phrase="informant" filename="informant.wav"/> + <prompt phrase="insincere" filename="insincere.wav"/> + <prompt phrase="insurgent" filename="insurgent.wav"/> + <prompt phrase="integrate" filename="integrate.wav"/> + <prompt phrase="intention" filename="intention.wav"/> + <prompt phrase="inventive" filename="inventive.wav"/> + <prompt phrase="inverse" filename="inverse.wav"/> + <prompt phrase="involve" filename="involve.wav"/> + <prompt phrase="island" filename="island.wav"/> + <prompt phrase="jawbone" filename="jawbone.wav"/> + <prompt phrase="keyboard" filename="keyboard.wav"/> + <prompt phrase="kickoff" filename="kickoff.wav"/> + <prompt phrase="kiwi" filename="kiwi.wav"/> + <prompt phrase="klaxon" filename="klaxon.wav"/> + <prompt phrase="leprosy" filename="leprosy.wav"/> + <prompt phrase="letterhead" filename="letterhead.wav"/> + <prompt phrase="liberty" filename="liberty.wav"/> + <prompt phrase="locale" filename="locale.wav"/> + <prompt phrase="lockup" filename="lockup.wav"/> + <prompt phrase="maritime" filename="maritime.wav"/> + <prompt phrase="matchmaker" filename="matchmaker.wav"/> + <prompt phrase="maverick" filename="maverick.wav"/> + <prompt phrase="megaton" filename="megaton.wav"/> + <prompt phrase="merit" filename="merit.wav"/> + <prompt phrase="microscope" filename="microscope.wav"/> + <prompt phrase="microwave" filename="microwave.wav"/> + <prompt phrase="midsummer" filename="midsummer.wav"/> + <prompt phrase="millionaire" filename="millionaire.wav"/> + <prompt phrase="minnow" filename="minnow.wav"/> + <prompt phrase="miracle" filename="miracle.wav"/> + <prompt phrase="miser" filename="miser.wav"/> + <prompt phrase="misnomer" filename="misnomer.wav"/> + <prompt phrase="molasses" filename="molasses.wav"/> + <prompt phrase="molecule" filename="molecule.wav"/> + <prompt phrase="monument" filename="monument.wav"/> + <prompt phrase="mosquito" filename="mosquito.wav"/> + <prompt phrase="mural" filename="mural.wav"/> + <prompt phrase="music" filename="music.wav"/> + <prompt phrase="narrative" filename="narrative.wav"/> + <prompt phrase="nebula" filename="nebula.wav"/> + <prompt phrase="necklace" filename="necklace.wav"/> + <prompt phrase="newborn" filename="newborn.wav"/> + <prompt phrase="newsletter" filename="newsletter.wav"/> + <prompt phrase="nightbird" filename="nightbird.wav"/> + <prompt phrase="obtuse" filename="obtuse.wav"/> + <prompt phrase="offload" filename="offload.wav"/> + <prompt phrase="onlooker" filename="onlooker.wav"/> + <prompt phrase="optic" filename="optic.wav"/> + <prompt phrase="opulent" filename="opulent.wav"/> + <prompt phrase="orca" filename="orca.wav"/> + <prompt phrase="outfielder" filename="outfielder.wav"/> + <prompt phrase="pandemic" filename="pandemic.wav"/> + <prompt phrase="paperweight" filename="paperweight.wav"/> + <prompt phrase="paragon" filename="paragon.wav"/> + <prompt phrase="paragraph" filename="paragraph.wav"/> + <prompt phrase="paramount" filename="paramount.wav"/> + <prompt phrase="passenger" filename="passenger.wav"/> + <prompt phrase="payday" filename="payday.wav"/> + <prompt phrase="peachy" filename="peachy.wav"/> + <prompt phrase="pedigree" filename="pedigree.wav"/> + <prompt phrase="penetrate" filename="penetrate.wav"/> + <prompt phrase="perceptive" filename="perceptive.wav"/> + <prompt phrase="performance" filename="performance.wav"/> + <prompt phrase="pharmacy" filename="pharmacy.wav"/> + <prompt phrase="pheasant" filename="pheasant.wav"/> + <prompt phrase="phonetic" filename="phonetic.wav"/> + <prompt phrase="photograph" filename="photograph.wav"/> + <prompt phrase="physique" filename="physique.wav"/> + <prompt phrase="pioneer" filename="pioneer.wav"/> + <prompt phrase="playhouse" filename="playhouse.wav"/> + <prompt phrase="pocketful" filename="pocketful.wav"/> + <prompt phrase="politeness" filename="politeness.wav"/> + <prompt phrase="positive" filename="positive.wav"/> + <prompt phrase="potato" filename="potato.wav"/> + <prompt phrase="preclude" filename="preclude.wav"/> + <prompt phrase="prefer" filename="prefer.wav"/> + <prompt phrase="preshrunk" filename="preshrunk.wav"/> + <prompt phrase="printer" filename="printer.wav"/> + <prompt phrase="processor" filename="processor.wav"/> + <prompt phrase="provincial" filename="provincial.wav"/> + <prompt phrase="prowler" filename="prowler.wav"/> + <prompt phrase="proximate" filename="proximate.wav"/> + <prompt phrase="puberty" filename="puberty.wav"/> + <prompt phrase="publisher" filename="publisher.wav"/> + <prompt phrase="pupil" filename="pupil.wav"/> + <prompt phrase="puppy" filename="puppy.wav"/> + <prompt phrase="pyramid" filename="pyramid.wav"/> + <prompt phrase="python" filename="python.wav"/> + <prompt phrase="quadrant" filename="quadrant.wav"/> + <prompt phrase="quantity" filename="quantity.wav"/> + <prompt phrase="quiver" filename="quiver.wav"/> + <prompt phrase="quota" filename="quota.wav"/> + <prompt phrase="racketeer" filename="racketeer.wav"/> + <prompt phrase="ragtime" filename="ragtime.wav"/> + <prompt phrase="ratchet" filename="ratchet.wav"/> + <prompt phrase="rebellion" filename="rebellion.wav"/> + <prompt phrase="rebirth" filename="rebirth.wav"/> + <prompt phrase="recipe" filename="recipe.wav"/> + <prompt phrase="recover" filename="recover.wav"/> + <prompt phrase="reform" filename="reform.wav"/> + <prompt phrase="regain" filename="regain.wav"/> + <prompt phrase="reindeer" filename="reindeer.wav"/> + <prompt phrase="rematch" filename="rematch.wav"/> + <prompt phrase="repay" filename="repay.wav"/> + <prompt phrase="repellent" filename="repellent.wav"/> + <prompt phrase="replica" filename="replica.wav"/> + <prompt phrase="reproduce" filename="reproduce.wav"/> + <prompt phrase="resistor" filename="resistor.wav"/> + <prompt phrase="responsive" filename="responsive.wav"/> + <prompt phrase="retouch" filename="retouch.wav"/> + <prompt phrase="retraction" filename="retraction.wav"/> + <prompt phrase="retrieval" filename="retrieval.wav"/> + <prompt phrase="retrospect" filename="retrospect.wav"/> + <prompt phrase="revenge" filename="revenge.wav"/> + <prompt phrase="revenue" filename="revenue.wav"/> + <prompt phrase="revival" filename="revival.wav"/> + <prompt phrase="revolver" filename="revolver.wav"/> + <prompt phrase="reward" filename="reward.wav"/> + <prompt phrase="rhythm" filename="rhythm.wav"/> + <prompt phrase="ribcage" filename="ribcage.wav"/> + <prompt phrase="ringbolt" filename="ringbolt.wav"/> + <prompt phrase="robust" filename="robust.wav"/> + <prompt phrase="rocker" filename="rocker.wav"/> + <prompt phrase="ruffled" filename="ruffled.wav"/> + <prompt phrase="sailboat" filename="sailboat.wav"/> + <prompt phrase="sandalwood" filename="sandalwood.wav"/> + <prompt phrase="sardonic" filename="sardonic.wav"/> + <prompt phrase="savagery" filename="savagery.wav"/> + <prompt phrase="sawdust" filename="sawdust.wav"/> + <prompt phrase="scallion" filename="scallion.wav"/> + <prompt phrase="scavenger" filename="scavenger.wav"/> + <prompt phrase="scenic" filename="scenic.wav"/> + <prompt phrase="scorecard" filename="scorecard.wav"/> + <prompt phrase="seabird" filename="seabird.wav"/> + <prompt phrase="select" filename="select.wav"/> + <prompt phrase="sensation" filename="sensation.wav"/> + <prompt phrase="sentence" filename="sentence.wav"/> + <prompt phrase="shadow" filename="shadow.wav"/> + <prompt phrase="shamrock" filename="shamrock.wav"/> + <prompt phrase="showgirl" filename="showgirl.wav"/> + <prompt phrase="skullcap" filename="skullcap.wav"/> + <prompt phrase="skydive" filename="skydive.wav"/> + <prompt phrase="slingshot" filename="slingshot.wav"/> + <prompt phrase="slowdown" filename="slowdown.wav"/> + <prompt phrase="snapline" filename="snapline.wav"/> + <prompt phrase="snapshot" filename="snapshot.wav"/> + <prompt phrase="snowcap" filename="snowcap.wav"/> + <prompt phrase="snowslide" filename="snowslide.wav"/> + <prompt phrase="sociable" filename="sociable.wav"/> + <prompt phrase="solo" filename="solo.wav"/> + <prompt phrase="southward" filename="southward.wav"/> + <prompt phrase="souvenir" filename="souvenir.wav"/> + <prompt phrase="soybean" filename="soybean.wav"/> + <prompt phrase="spaniel" filename="spaniel.wav"/> + <prompt phrase="spearhead" filename="spearhead.wav"/> + <prompt phrase="specialist" filename="specialist.wav"/> + <prompt phrase="speculate" filename="speculate.wav"/> + <prompt phrase="spellbind" filename="spellbind.wav"/> + <prompt phrase="spheroid" filename="spheroid.wav"/> + <prompt phrase="spigot" filename="spigot.wav"/> + <prompt phrase="spindle" filename="spindle.wav"/> + <prompt phrase="spyglass" filename="spyglass.wav"/> + <prompt phrase="stagehand" filename="stagehand.wav"/> + <prompt phrase="stagnate" filename="stagnate.wav"/> + <prompt phrase="stairway" filename="stairway.wav"/> + <prompt phrase="standard" filename="standard.wav"/> + <prompt phrase="stapler" filename="stapler.wav"/> + <prompt phrase="steamship" filename="steamship.wav"/> + <prompt phrase="sterling" filename="sterling.wav"/> + <prompt phrase="stethoscope" filename="stethoscope.wav"/> + <prompt phrase="stockman" filename="stockman.wav"/> + <prompt phrase="stopwatch" filename="stopwatch.wav"/> + <prompt phrase="stormy" filename="stormy.wav"/> + <prompt phrase="stupendous" filename="stupendous.wav"/> + <prompt phrase="sugar" filename="sugar.wav"/> + <prompt phrase="supportive" filename="supportive.wav"/> + <prompt phrase="surmount" filename="surmount.wav"/> + <prompt phrase="surrender" filename="surrender.wav"/> + <prompt phrase="suspense" filename="suspense.wav"/> + <prompt phrase="suspicious" filename="suspicious.wav"/> + <prompt phrase="sweatband" filename="sweatband.wav"/> + <prompt phrase="swelter" filename="swelter.wav"/> + <prompt phrase="sympathy" filename="sympathy.wav"/> + <prompt phrase="tactics" filename="tactics.wav"/> + <prompt phrase="talon" filename="talon.wav"/> + <prompt phrase="tambourine" filename="tambourine.wav"/> + <prompt phrase="tapeworm" filename="tapeworm.wav"/> + <prompt phrase="telephone" filename="telephone.wav"/> + <prompt phrase="tempest" filename="tempest.wav"/> + <prompt phrase="therapist" filename="therapist.wav"/> + <prompt phrase="tiger" filename="tiger.wav"/> + <prompt phrase="tissue" filename="tissue.wav"/> + <prompt phrase="tobacco" filename="tobacco.wav"/> + <prompt phrase="tolerance" filename="tolerance.wav"/> + <prompt phrase="tomorrow" filename="tomorrow.wav"/> + <prompt phrase="tonic" filename="tonic.wav"/> + <prompt phrase="topmost" filename="topmost.wav"/> + <prompt phrase="torpedo" filename="torpedo.wav"/> + <prompt phrase="tracker" filename="tracker.wav"/> + <prompt phrase="tradition" filename="tradition.wav"/> + <prompt phrase="transit" filename="transit.wav"/> + <prompt phrase="trauma" filename="trauma.wav"/> + <prompt phrase="travesty" filename="travesty.wav"/> + <prompt phrase="treadmill" filename="treadmill.wav"/> + <prompt phrase="trombonist" filename="trombonist.wav"/> + <prompt phrase="trouble" filename="trouble.wav"/> + <prompt phrase="truncated" filename="truncated.wav"/> + <prompt phrase="tumor" filename="tumor.wav"/> + <prompt phrase="tunnel" filename="tunnel.wav"/> + <prompt phrase="tycoon" filename="tycoon.wav"/> + <prompt phrase="typewriter" filename="typewriter.wav"/> + <prompt phrase="ultimate" filename="ultimate.wav"/> + <prompt phrase="uncut" filename="uncut.wav"/> + <prompt phrase="undaunted" filename="undaunted.wav"/> + <prompt phrase="underfoot" filename="underfoot.wav"/> + <prompt phrase="unearth" filename="unearth.wav"/> + <prompt phrase="unicorn" filename="unicorn.wav"/> + <prompt phrase="unify" filename="unify.wav"/> + <prompt phrase="universe" filename="universe.wav"/> + <prompt phrase="unravel" filename="unravel.wav"/> + <prompt phrase="unwind" filename="unwind.wav"/> + <prompt phrase="upcoming" filename="upcoming.wav"/> + <prompt phrase="uproot" filename="uproot.wav"/> + <prompt phrase="upset" filename="upset.wav"/> + <prompt phrase="upshot" filename="upshot.wav"/> + <prompt phrase="vacancy" filename="vacancy.wav"/> + <prompt phrase="vagabond" filename="vagabond.wav"/> + <prompt phrase="vapor" filename="vapor.wav"/> + <prompt phrase="vertigo" filename="vertigo.wav"/> + <prompt phrase="village" filename="village.wav"/> + <prompt phrase="virus" filename="virus.wav"/> + <prompt phrase="visitor" filename="visitor.wav"/> + <prompt phrase="vocalist" filename="vocalist.wav"/> + <prompt phrase="voyager" filename="voyager.wav"/> + <prompt phrase="waffle" filename="waffle.wav"/> + <prompt phrase="wallet" filename="wallet.wav"/> + <prompt phrase="warranty" filename="warranty.wav"/> + <prompt phrase="watchword" filename="watchword.wav"/> + <prompt phrase="wayside" filename="wayside.wav"/> + <prompt phrase="whimsical" filename="whimsical.wav"/> + <prompt phrase="willow" filename="willow.wav"/> + <prompt phrase="woodlark" filename="woodlark.wav"/> + <prompt phrase="yesteryear" filename="yesteryear.wav"/> +  + <prompt phrase="Добро пожаловать в агента безопасности ZRTP" filename="zrtp-enroll_welcome.wav"/> +  + <prompt phrase="Вы должны выбрать строку аутентификации с партнером по разговору, Если она не совпадет, система сообщит вам разрывом линии." filename="zrtp-check_sas.wav"/> +  + <prompt phrase="Только телефоны, прошедшие аутентификацию, могут быть сконфигурированы для доверия системе для обеспечения ZRTP защищенных звонков, так что такой звонок не даст эффекта." filename="zrtp-enroll_not_sip_registered.wav"/> +  + <prompt phrase="Ваш телефон сообщит, что он уже доверяет системе для перенаправления ZRTP безопасных звонков, так что больше делать ничего не нужно будет" filename="zrtp-enroll_already_enrolled.wav"/> +  + <prompt phrase="Только телефоны, с поддержкой протокола ZRTP могут использовать такую функцию. Ваш телефон не поддерживает ZRTP протокол и звонок не даст эффекта ZRTP защиты." filename="zrtp-enroll_notzrtp.wav"/> +  + <prompt phrase="Система оборудована для проведения защищенных ZRTP звонков. Вы должны решить, если вы хотите чтобы система была задействована для приема и возможно мониторинга ваших защищенных звонков. Вы можете повесить трубку после окончания разговора." filename="zrtp-enroll_confirmed.wav"/> +  + <prompt phrase="Договоритесь с партнером по разговору о парольной фразе." filename="zrtp-is_secure.wav"/> +  + <prompt phrase="Парольная фраза на данный момент не проверена" filename="zrtp-is_unverified.wav"/> +  + <prompt phrase="Парольная фраза проверена." filename="zrtp-is_verified.wav"/> +  + <prompt phrase="Спасибо за Ваш звонок. До свидания." filename="zrtp-thankyou_goodbye.wav"/> +  + <prompt phrase="Что-то происходит не так." filename="zrtp-somethings_wrong.wav"/> +  + <prompt phrase="Ошибка." filename="zrtp-status_error.wav"/> +  + <prompt phrase="Звонок не защищен." filename="zrtp-status_notsecure.wav"/> +  + <prompt phrase="Звонок защищен." filename="zrtp-status_secure.wav"/> +  + <prompt phrase="Защита звонка." filename="zrtp-status_securing.wav"/> +  + </zrtp> </ru> </language>

1 0

[commit] r13632 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: buklov Date: Fri Jun 5 02:42:00 2009 New Revision: 13632 Log: small fix Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_ru.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_ru.xml Fri Jun 5 02:42:00 2009 @@ -77,7 +77,7 @@ <prompt phrase="Первый" filename="h-1m.wav"/> <prompt phrase="Первое" filename="h-1n.wav"/> <prompt phrase="Первая" filename="h-1f.wav"/> - <prompt phrase="Одна" filename="h-1xx.wav"/> + <prompt phrase="Одной" filename="h-1xx.wav"/> <prompt phrase="Два" filename="2.wav"/> <prompt phrase="Две" filename="2f.wav"/> <prompt phrase="Два" filename="2n.wav"/>

1 0

[commit] r13631 - freeswitch/trunk/src/mod/say/mod_say_ru
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: buklov Date: Fri Jun 5 02:41:22 2009 New Revision: 13631 Log: add new rule Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c Fri Jun 5 02:41:22 2009 @@ -39,7 +39,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Michael B. Murdock <mike(a)mmurdock.org> - * Boris Buklov <buklov(a)mail.ru> + * Boris Buklov (BBV) <buklov(a)mail.ru> * * mod_say_ru.c -- Say for Russian * Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h (original) +++ freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h Fri Jun 5 02:41:22 2009 @@ -1,3 +1,12 @@ +/* Contributor(s): + * + * Boris Buklov (BBV) <buklov(a)mail.ru> + * + * mod_say_ru.c -- Say for Russian + * + */ + + //слишком много падежей поэтому пришлось сделать массив значений //пример таблицы склонений для 1 ниже по ссылкам //http://ru.wiktionary.org/wiki/%D0%BE%D0%B4%D0%B8%D0%BD @@ -136,9 +145,9 @@ //женский #define m_12 {\ - {"","","","","","","",""},\ - {"","","","","","","","","","","","","",""},\ - {"","","","","","","","","","","","","",""},\ + {"0","h-1xx","h-2xx","h-3xx","h-4xx","h-5xx","h-","xx"},\ + {"","","1xx","thousands-i","h-2xx","thousands","h-3xx","thousands","h-4xx","thousands","h-5xx","thousands","h-","xx"},\ + {"","","1x","million-a","h-2xx","millions","h-3xx","millions","h-4xx","millions","h-5xx","millions","h-","xx"},\ 0,\ }\

1 0

[commit] r13630 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: brian Date: Thu Jun 4 23:12:26 2009 New Revision: 13630 Log: fix this cuz its wrong Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Jun 4 23:12:26 2009 @@ -1319,7 +1319,7 @@ const char* format; const char *alt = NULL; - if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->profile->local_network)) { + if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) { sipip = tech_pvt->profile->extsipip; } else { sipip = tech_pvt->profile->extsipip ? tech_pvt->profile->extsipip : tech_pvt->profile->sipip;

1 0

[commit] r13629 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/endpoints/mod_sofia mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 05 Jun '09

05 Jun '09

Author: mrene Date: Thu Jun 4 21:30:44 2009 New Revision: 13629 Log: add an external port output parameter to switch_nat_add_mapping and use it in sofia_glue_tech_choose_port Modified: freeswitch/trunk/src/include/switch_nat.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_nat.c Modified: freeswitch/trunk/src/include/switch_nat.h ============================================================================== --- freeswitch/trunk/src/include/switch_nat.h (original) +++ freeswitch/trunk/src/include/switch_nat.h Thu Jun 4 21:30:44 2009 @@ -59,9 +59,22 @@ \note Generally called by the core_init */ SWITCH_DECLARE(void) switch_nat_init(switch_memory_pool_t *pool); +/*! + \brief Shuts down the NAT Traversal System +*/ SWITCH_DECLARE(void) switch_nat_shutdown(void); -SWITCH_DECLARE(switch_status_t) switch_nat_add_mapping(switch_port_t port, switch_nat_ip_proto_t proto); +/*! + \brief Maps a port through the NAT Traversal System + \param port Internal port to map + \param proto Protocol + \param external_port [out] Mapped external port +*/ +SWITCH_DECLARE(switch_status_t) switch_nat_add_mapping(switch_port_t port, switch_nat_ip_proto_t proto, switch_port_t *external_port); +/*! + \brief Deletes a NAT mapping + \param proto Protocol +*/ SWITCH_DECLARE(switch_status_t) switch_nat_del_mapping(switch_port_t port, switch_nat_ip_proto_t proto); Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Jun 4 21:30:44 2009 @@ -49,6 +49,7 @@ int argc; char *mydata = NULL, *argv[4]; switch_nat_ip_proto_t proto = SWITCH_NAT_UDP; + switch_port_t external_port = 0; if (!cmd) { goto error; @@ -70,8 +71,8 @@ } if (argv[0] && switch_stristr("add", argv[0])) { - if (switch_nat_add_mapping((switch_port_t)atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "true"); + if (switch_nat_add_mapping((switch_port_t)atoi(argv[1]), proto, &external_port) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "%d", (int)external_port); goto ok; } } else if (argv[0] && switch_stristr("del", argv[0])) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Jun 4 21:30:44 2009 @@ -762,13 +762,13 @@ ); if (sofia_test_pflag(profile, PFLAG_AUTO_NAT)) { - if (switch_nat_add_mapping(profile->sip_port, SWITCH_NAT_UDP) == SWITCH_STATUS_SUCCESS) { + if (switch_nat_add_mapping(profile->sip_port, SWITCH_NAT_UDP, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created UDP nat mapping for %s port %d\n", profile->name, profile->sip_port); } - if (switch_nat_add_mapping(profile->sip_port, SWITCH_NAT_TCP) == SWITCH_STATUS_SUCCESS) { + if (switch_nat_add_mapping(profile->sip_port, SWITCH_NAT_TCP, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created TCP nat mapping for %s port %d\n", profile->name, profile->sip_port); } - if(sofia_test_pflag(profile, PFLAG_TLS) && switch_nat_add_mapping(profile->tls_sip_port, SWITCH_NAT_TCP) == SWITCH_STATUS_SUCCESS) { + if(sofia_test_pflag(profile, PFLAG_TLS) && switch_nat_add_mapping(profile->tls_sip_port, SWITCH_NAT_TCP, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created TCP/TLS nat mapping for %s port %d\n", profile->name, profile->tls_sip_port); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Jun 4 21:30:44 2009 @@ -630,6 +630,7 @@ switch_port_t sdp_port; char tmp[50]; const char *use_ip = NULL; + switch_port_t external_port = 0; if (!force) { if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || @@ -667,12 +668,12 @@ if (tech_pvt->profile->extrtpip && sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) { tech_pvt->adv_sdp_audio_ip = switch_core_session_strdup(tech_pvt->session, tech_pvt->profile->extrtpip); - switch_nat_add_mapping((switch_port_t)sdp_port, SWITCH_NAT_UDP); + switch_nat_add_mapping((switch_port_t)sdp_port, SWITCH_NAT_UDP, &external_port); } else { tech_pvt->adv_sdp_audio_ip = switch_core_session_strdup(tech_pvt->session, ip); } - tech_pvt->adv_sdp_audio_port = sdp_port; + tech_pvt->adv_sdp_audio_port = external_port != 0 ? external_port : sdp_port; switch_snprintf(tmp, sizeof(tmp), "%d", sdp_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip); @@ -686,6 +687,7 @@ char *ip = tech_pvt->profile->rtpip; switch_port_t sdp_port; char tmp[50]; + switch_port_t external_port = 0; if (!force) { if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) @@ -712,11 +714,11 @@ } } - tech_pvt->adv_sdp_video_port = sdp_port; - if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) { - switch_nat_add_mapping((switch_port_t)sdp_port, SWITCH_NAT_UDP); + switch_nat_add_mapping((switch_port_t)sdp_port, SWITCH_NAT_UDP, &external_port); } + + tech_pvt->adv_sdp_video_port = external_port != 0 ? external_port : sdp_port; switch_snprintf(tmp, sizeof(tmp), "%d", sdp_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_VIDEO_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Thu Jun 4 21:30:44 2009 @@ -2291,7 +2291,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket up listening on %s:%u\n", prefs.ip, prefs.port); if (prefs.nat_map) { - switch_nat_add_mapping(prefs.port, SWITCH_NAT_TCP); + switch_nat_add_mapping(prefs.port, SWITCH_NAT_TCP, NULL); } break; Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Thu Jun 4 21:30:44 2009 @@ -170,7 +170,7 @@ } } -static switch_status_t switch_nat_add_mapping_pmp(switch_port_t port, switch_nat_ip_proto_t proto) +static switch_status_t switch_nat_add_mapping_pmp(switch_port_t port, switch_nat_ip_proto_t proto, switch_port_t *external_port) { switch_status_t status = SWITCH_STATUS_FALSE; natpmpresp_t response; @@ -198,6 +198,16 @@ response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), response.pnu.newportmapping.privateport); + if (external_port) { + *external_port = response.pnu.newportmapping.mappedpublicport; + } else if (response.pnu.newportmapping.mappedpublicport != response.pnu.newportmapping.privateport) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "External port %hu protocol %s was not available, it was instead mapped to %hu", + response.pnu.newportmapping.privateport, + response.type == NATPMP_RESPTYPE_UDPPORTMAPPING ? "UDP" : + (response.type == NATPMP_RESPTYPE_TCPPORTMAPPING ? "TCP" : "UNKNOWN"), + response.pnu.newportmapping.mappedpublicport); + } + status = SWITCH_STATUS_SUCCESS; } @@ -285,16 +295,20 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_nat_add_mapping(switch_port_t port, switch_nat_ip_proto_t proto) +SWITCH_DECLARE(switch_status_t) switch_nat_add_mapping(switch_port_t port, switch_nat_ip_proto_t proto, switch_port_t *external_port) { switch_status_t status = SWITCH_STATUS_FALSE; switch (nat_globals.nat_type) { case SWITCH_NAT_TYPE_PMP: - status = switch_nat_add_mapping_pmp(port, proto); + status = switch_nat_add_mapping_pmp(port, proto, external_port); break; case SWITCH_NAT_TYPE_UPNP: - status = switch_nat_add_mapping_upnp(port, proto); + if ((status = switch_nat_add_mapping_upnp(port, proto)) && status == SWITCH_STATUS_SUCCESS) { + if (external_port) { + *external_port = port; + } + } break; default: break;

1 0