- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13067 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 17 Apr '09

17 Apr '09

Author: mcollins Date: Thu Apr 16 19:10:06 2009 New Revision: 13067 Log: Updates to phrase_es.xml; gracias krzie, javar, y los otros Modified: freeswitch/trunk/docs/phrase/phrase_es.xml Modified: freeswitch/trunk/docs/phrase/phrase_es.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_es.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_es.xml Thu Apr 16 19:10:06 2009 @@ -5,10 +5,10 @@ <language> <en> <ascii> - <prompt phrase="Space" filename="32.wav"/> - <prompt phrase="Pound" filename="35.wav"/> - <prompt phrase="Star" filename="42.wav"/> - <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="Espacio" filename="32.wav"/> + <prompt phrase="Signo de n�mero" filename="35.wav"/> + <prompt phrase="Asterisco" filename="42.wav"/> + <prompt phrase="Punto" filename="46.wav"/> <prompt phrase="A" filename="97.wav"/> <prompt phrase="B" filename="98.wav"/> <prompt phrase="C" filename="99.wav"/> @@ -21,8 +21,10 @@ <prompt phrase="J" filename="106.wav"/> <prompt phrase="K" filename="107.wav"/> <prompt phrase="L" filename="108.wav"/> + <prompt phrase="LL" filename="???.wav"/> <prompt phrase="M" filename="109.wav"/> <prompt phrase="N" filename="110.wav"/> + <prompt phrase="�" filename="???.wav"/> <prompt phrase="O" filename="111.wav"/> <prompt phrase="P" filename="112.wav"/> <prompt phrase="Q" filename="113.wav"/> @@ -37,8 +39,8 @@ <prompt phrase="Z" filename="122.wav"/> </ascii> <phonetic-ascii> - <prompt phrase="Space" filename="32.wav"/> - <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="Espacio" filename="32.wav"/> + <prompt phrase="Punto" filename="46.wav"/> <prompt phrase="Alpha" filename="97.wav"/> <prompt phrase="Bravo" filename="98.wav"/> <prompt phrase="Charlie" filename="99.wav"/> @@ -67,12 +69,12 @@ <prompt phrase="Zulu" filename="122.wav"/> </phonetic-ascii> <digits> - <prompt phrase="Cerro" filename="0.wav"/> + <prompt phrase="Cero" filename="0.wav"/> <prompt phrase="Uno" filename="1.wav"/> <prompt phrase="Dos" filename="2.wav"/> <prompt phrase="Tres" filename="3.wav"/> <prompt phrase="Cuatro" filename="4.wav"/> - <prompt phrase="Cinqo" filename="5.wav"/> + <prompt phrase="Cinco" filename="5.wav"/> <prompt phrase="Seis" filename="6.wav"/> <prompt phrase="Siete" filename="7.wav"/> <prompt phrase="Ocho" filename="8.wav"/> @@ -83,86 +85,123 @@ <prompt phrase="Trece" filename="13.wav"/> <prompt phrase="Catorce" filename="14.wav"/> <prompt phrase="Quince" filename="15.wav"/> - <prompt phrase="Dieciséis" filename="16.wav"/> - <prompt phrase="Diecisiete " filename="17.wav"/> - <prompt phrase="Dieciocho " filename="18.wav"/> - <prompt phrase="Diecinueve " filename="19.wav"/> - <prompt phrase="Veinte " filename="20.wav"/> - <prompt phrase="Thirty" filename="30.wav"/> - <prompt phrase="Fourty" filename="40.wav"/> - <prompt phrase="Fifty" filename="50.wav"/> - <prompt phrase="Sixty" filename="60.wav"/> - <prompt phrase="Seventy" filename="70.wav"/> - <prompt phrase="Eighty" filename="80.wav"/> - <prompt phrase="Ninety" filename="90.wav"/> - <prompt phrase="Dot" filename="dot.wav"/> - <prompt phrase="First" filename="h-1.wav"/> - <prompt phrase="Second" filename="h-2.wav"/> - <prompt phrase="Third" filename="h-3.wav"/> - <prompt phrase="Fourth" filename="h-4.wav"/> - <prompt phrase="Fifth" filename="h-5.wav"/> - <prompt phrase="Sixth" filename="h-6.wav"/> - <prompt phrase="Seventh" filename="h-7.wav"/> - <prompt phrase="Eighth" filename="h-8.wav"/> - <prompt phrase="Nineth" filename="h-9.wav"/> - <prompt phrase="Tenth" filename="h-10.wav"/> - <prompt phrase="Eleventh" filename="h-11.wav"/> - <prompt phrase="Twelveth" filename="h-12.wav"/> - <prompt phrase="Thirteenth" filename="h-13.wav"/> - <prompt phrase="Fourteenth" filename="h-14.wav"/> - <prompt phrase="Fifteenth" filename="h-15.wav"/> - <prompt phrase="Sixteenth" filename="h-16.wav"/> - <prompt phrase="Seventeenth" filename="h-17.wav"/> - <prompt phrase="Eighteenth" filename="h-18.wav"/> - <prompt phrase="Nineteenth" filename="h-19.wav"/> - <prompt phrase="Twentieth" filename="h-20.wav"/> - <prompt phrase="Thirtieth" filename="h-30.wav"/> - <prompt phrase="Hundred" filename="hundred.wav"/> - <prompt phrase="Million" filename="million.wav"/> - <prompt phrase="Period" filename="period.wav"/> - <prompt phrase="Point" filename="point.wav"/> - <prompt phrase="Pound" filename="pound.wav"/> - <prompt phrase="Star" filename="star.wav"/> - <prompt phrase="Thousand" filename="thousand.wav"/> + <prompt phrase="Diecis�is" filename="16.wav"/> + <prompt phrase="Diecisiete" filename="17.wav"/> + <prompt phrase="Dieciocho" filename="18.wav"/> + <prompt phrase="Diecinueve" filename="19.wav"/> + <prompt phrase="Veinte" filename="20.wav"/> + + <prompt phrase="Veintiuno" filename="21.wav"/> + <prompt phrase="Veintidos" filename="22.wav"/> + <prompt phrase="Veintitr�s" filename="23.wav"/> + <prompt phrase="Veinticuatro" filename="24.wav"/> + <prompt phrase="Veinticinco" filename="25.wav"/> + <prompt phrase="Veintis�is" filename="26.wav"/> + <prompt phrase="Veintisiete" filename="27.wav"/> + <prompt phrase="Veintiocho" filename="28.wav"/> + <prompt phrase="Veintinueve" filename="29.wav"/> + <prompt phrase="Treinta" filename="30.wav"/> + <prompt phrase="Cuarenta" filename="40.wav"/> + <prompt phrase="Cincuenta" filename="50.wav"/> + <prompt phrase="Sesenta" filename="60.wav"/> + <prompt phrase="Setenta" filename="70.wav"/> + <prompt phrase="Ochenta" filename="80.wav"/> + <prompt phrase="Noventa" filename="90.wav"/> + <prompt phrase="Punto" filename="dot.wav"/> + + <prompt phrase="Primero" filename="h-1.wav"/> + <prompt phrase="Segundo" filename="h-2.wav"/> + <prompt phrase="Tercero" filename="h-3.wav"/> + <prompt phrase="Cuarto" filename="h-4.wav"/> + <prompt phrase="Quinto" filename="h-5.wav"/> + <prompt phrase="Sexto" filename="h-6.wav"/> + <prompt phrase="S�ptimo" filename="h-7.wav"/> + <prompt phrase="Octavo" filename="h-8.wav"/> + <prompt phrase="Noveno" filename="h-9.wav"/> + <prompt phrase="D�cimo" filename="h-10.wav"/> + + <prompt phrase="Und�cimo" filename="h-11.wav"/> + <prompt phrase="Duod�cimo" filename="h-12.wav"/> + <prompt phrase="Decimotecero" filename="h-13.wav"/> + <prompt phrase="Decimocuarto" filename="h-14.wav"/> + <prompt phrase="Decimoquinto" filename="h-15.wav"/> + <prompt phrase="Decimosexto" filename="h-16.wav"/> + <prompt phrase="Decimo�ptimo" filename="h-17.wav"/> + <prompt phrase="Decimoctavo" filename="h-18.wav"/> + <prompt phrase="Decimonoveno" filename="h-19.wav"/> + <prompt phrase="Vig�simo" filename="h-20.wav"/> + <prompt phrase="Trig�simo" filename="h-30.wav"/> + <prompt phrase="Cien" filename="hundred.wav"/> + <prompt phrase="Mill?n" filename="million.wav"/> + <prompt phrase="Per�odo" filename="period.wav"/> + <prompt phrase="Punto" filename="point.wav"/> + <prompt phrase="Signo de n�mero" filename="pound.wav"/> + <prompt phrase="Asterisco" filename="star.wav"/> + <prompt phrase="Mil" filename="thousand.wav"/> </digits> <currency> - <prompt phrase="And" filename="and.wav"/> - <prompt phrase="Cent" filename="cent.wav"/> + <prompt phrase="Y" filename="and.wav"/> + <prompt phrase="Centavo" filename="cent.wav"/> <prompt phrase="Central" filename="central.wav"/> - <prompt phrase="Cents per minute" filename="cents-per-minute.wav"/> - <prompt phrase="Cents" filename="cents.wav"/> - <prompt phrase="Dollar" filename="dollar.wav"/> - <prompt phrase="Dollars" filename="dollars.wav"/> - <prompt phrase="Minus" filename="minus.wav"/> - <prompt phrase="Negative" filename="negative.wav"/> + <prompt phrase="Centavos por minuto" filename="cents-per-minute.wav"/> + <prompt phrase="Centavos" filename="cents.wav"/> + <prompt phrase="Dolar" filename="dollar.wav"/> + <prompt phrase="D�lares" filename="dollars.wav"/> + <prompt phrase="Menos" filename="minus.wav"/> + <prompt phrase="Negativo" filename="negative.wav"/> </currency> <time> <prompt phrase="A.M." filename="a-m.wav"/> - <prompt phrase="At" filename="at.wav"/> - <prompt phrase="Sunday" filename="day-0.wav"/> - <prompt phrase="Monday" filename="day-1.wav"/> - <prompt phrase="Tuesday" filename="day-2.wav"/> - <prompt phrase="Wednesday" filename="day-3.wav"/> - <prompt phrase="Thursday" filename="day-4.wav"/> - <prompt phrase="Friday" filename="day-5.wav"/> - <prompt phrase="Saturday" filename="day-6.wav"/> - <prompt phrase="Hour" filename="hour.wav"/> - <prompt phrase="Hours" filename="hours.wav"/> - <prompt phrase="Minute" filename="minute.wav"/> - <prompt phrase="Minutes" filename="minutes.wav"/> - <prompt phrase="January" filename="mon-0.wav"/> - <prompt phrase="Febuary" filename="mon-1.wav"/> - <prompt phrase="March" filename="mon-2.wav"/> - <prompt phrase="April" filename="mon-3.wav"/> - <prompt phrase="May" filename="mon-4.wav"/> - <prompt phrase="June" filename="mon-5.wav"/> - <prompt phrase="July" filename="mon-6.wav"/> - <prompt phrase="August" filename="mon-7.wav"/> - <prompt phrase="September" filename="mon-8.wav"/> - <prompt phrase="October" filename="mon-9.wav"/> - <prompt phrase="November" filename="mon-10.wav"/> - <prompt phrase="December" filename="mon-11.wav"/> - <prompt phrase="O'Clock" filename="oclock.wav"/> + <prompt phrase="A" filename="at.wav"/> + <prompt phrase="Domingo" filename="day-0.wav"/> + <prompt phrase="Lunes" filename="day-1.wav"/> + <prompt phrase="Martes" filename="day-2.wav"/> + <prompt phrase="Mi�rcoles" filename="day-3.wav"/> + <prompt phrase="Jueves" filename="day-4.wav"/> + <prompt phrase="Viernes" filename="day-5.wav"/> + <prompt phrase="S�bado" filename="day-6.wav"/> + <prompt phrase="Hora" filename="hour.wav"/> + <prompt phrase="Horas" filename="hours.wav"/> + <prompt phrase="Minuto" filename="minute.wav"/> + <prompt phrase="Minutos" filename="minutes.wav"/> + <prompt phrase="Enero" filename="mon-0.wav"/> + <prompt phrase="Febrero" filename="mon-1.wav"/> + <prompt phrase="Marzo" filename="mon-2.wav"/> + <prompt phrase="Abril" filename="mon-3.wav"/> + <prompt phrase="Mayo" filename="mon-4.wav"/> + <prompt phrase="Junio" filename="mon-5.wav"/> + <prompt phrase="Julio" filename="mon-6.wav"/> + <prompt phrase="Agosto" filename="mon-7.wav"/> + <prompt phrase="Septiembre" filename="mon-8.wav"/> + <prompt phrase="Octubre" filename="mon-9.wav"/> + <prompt phrase="Noviembre" filename="mon-10.wav"/> + <prompt phrase="Diciembre" filename="mon-11.wav"/> + <prompt phrase="En punto" filename="oclock.wav"/> <prompt phrase="oh" filename="oh.wav"/> <prompt phrase="P.M." filename="p-m.wav"/> <prompt phrase="Second" filename="second.wav"/> @@ -271,10 +310,10 @@ <prompt phrase="To speak with an operator" filename="ivr-to_speak_with_an_operator.wav"/> <prompt phrase="Welcome to FreeSWITCH, the future of telephony" filename="ivr-welcome_to_freeswitch.wav"/> <prompt phrase="You may exit at any time by simply hanging up" filename="ivr-you_may_exit_by_hanging_up.wav"/> - <prompt phrase="or" filename ="ivr-or.wav"/> - <prompt phrase="not" filename ="ivr-not.wav"/> - <prompt phrase="call" filename ="ivr-call.wav"/> - <prompt phrase="You may" filename ="ivr-you_may.wav"/> + <prompt phrase="or" filename="ivr-or.wav"/> + <prompt phrase="not" filename="ivr-not.wav"/> + <prompt phrase="call" filename="ivr-call.wav"/> + <prompt phrase="You may" filename="ivr-you_may.wav"/> <prompt phrase="hello" filename="ivr-hello.wav"/> <prompt phrase="Using your telephone keypad..." filename="ivr-use_telephone_keypad.wav"/> <prompt phrase="please spell the name of the person you are trying to reach." filename="ivr-spell_name.wav"/> @@ -298,4 +337,4 @@ <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> </misc> </en> -</language> +</language> \ No newline at end of file

1 0

[commit] r13066 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: andrew Date: Thu Apr 16 18:02:41 2009 New Revision: 13066 Log: Reply appropriately to net_adm:ping() Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Thu Apr 16 18:02:41 2009 @@ -800,50 +800,138 @@ } -int handle_msg(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) +/* fake enough of the net_kernel module to be able to respond to net_adm:ping */ +/* {'$gen_call', {<cpx(a)freecpx.128.0>, #Ref<254770.4.0>}, {is_auth, cpx@freecpx} */ +static switch_status_t handle_net_kernel_msg(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) { - int type, type2, size, version, arity, tmpindex; - switch_status_t ret = SWITCH_STATUS_SUCCESS; + int version, size, type, arity; + char atom[MAXATOMLEN]; + erlang_ref ref; + erlang_pid pid; buf->index = 0; ei_decode_version(buf->buff, &buf->index, &version); ei_get_type(buf->buff, &buf->index, &type, &size); - switch(type) { - case ERL_SMALL_TUPLE_EXT : - case ERL_LARGE_TUPLE_EXT : - tmpindex = buf->index; - ei_decode_tuple_header(buf->buff, &tmpindex, &arity); - ei_get_type(buf->buff, &tmpindex, &type2, &size); - - switch(type2) { - case ERL_ATOM_EXT: - ret = handle_msg_tuple(listener,msg,buf,rbuf); - break; - case ERL_REFERENCE_EXT : - case ERL_NEW_REFERENCE_EXT : - ret = handle_ref_tuple(listener, msg, buf, rbuf); - default : - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type); - /* some other kind of erlang term */ - ei_x_encode_tuple_header(rbuf, 2); - ei_x_encode_atom(rbuf, "error"); - ei_x_encode_atom(rbuf, "undef"); - break; + if (type != ERL_SMALL_TUPLE_EXT && type != ERL_SMALL_TUPLE_EXT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not a tuple\n"); + return SWITCH_STATUS_FALSE; + } + + ei_decode_tuple_header(buf->buff, &buf->index, &arity); + + if (arity != 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "wrong arity\n"); + return SWITCH_STATUS_FALSE; + } + + if (ei_decode_atom(buf->buff, &buf->index, atom) || strncmp(atom, "$gen_call", MAXATOMLEN)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not gen_call\n"); + return SWITCH_STATUS_FALSE; + } + + ei_get_type(buf->buff, &buf->index, &type, &size); + + if (type != ERL_SMALL_TUPLE_EXT && type != ERL_SMALL_TUPLE_EXT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not a tuple\n"); + return SWITCH_STATUS_FALSE; + } + + ei_decode_tuple_header(buf->buff, &buf->index, &arity); + + if (arity != 2) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "wrong arity\n"); + return SWITCH_STATUS_FALSE; + } + + if (ei_decode_pid(buf->buff, &buf->index, &pid) || ei_decode_ref(buf->buff, &buf->index, &ref)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "decoding pid and ref error\n"); + return SWITCH_STATUS_FALSE; + } + + ei_get_type(buf->buff, &buf->index, &type, &size); + + if (type != ERL_SMALL_TUPLE_EXT && type != ERL_SMALL_TUPLE_EXT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not a tuple\n"); + return SWITCH_STATUS_FALSE; + } + + ei_decode_tuple_header(buf->buff, &buf->index, &arity); + + if (arity != 2) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "bad arity\n"); + return SWITCH_STATUS_FALSE; + } + + if (ei_decode_atom(buf->buff, &buf->index, atom) || strncmp(atom, "is_auth", MAXATOMLEN)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not is_auth\n"); + return SWITCH_STATUS_FALSE; + } + + /* To ! {Tag, Reply} */ + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_ref(rbuf, &ref); + ei_x_encode_atom(rbuf, "yes"); + + switch_mutex_lock(listener->sock_mutex); + ei_send(listener->sockfd, &pid, rbuf->buff, rbuf->index); + switch_mutex_unlock(listener->sock_mutex); +#ifdef EI_DEBUG + ei_x_print_msg(rbuf, &pid, 1); +#endif + + return SWITCH_STATUS_FALSE; +} + + +int handle_msg(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) +{ + int type, type2, size, version, arity, tmpindex; + switch_status_t ret = SWITCH_STATUS_SUCCESS; + + if (msg->msgtype == ERL_REG_SEND && !strncmp(msg->toname, "net_kernel", MAXATOMLEN)) { + /* try to respond to ping stuff */ + ret = handle_net_kernel_msg(listener, msg, buf, rbuf); + } else { + buf->index = 0; + ei_decode_version(buf->buff, &buf->index, &version); + ei_get_type(buf->buff, &buf->index, &type, &size); + switch(type) { + case ERL_SMALL_TUPLE_EXT : + case ERL_LARGE_TUPLE_EXT : + tmpindex = buf->index; + ei_decode_tuple_header(buf->buff, &tmpindex, &arity); + ei_get_type(buf->buff, &tmpindex, &type2, &size); + + switch(type2) { + case ERL_ATOM_EXT: + ret = handle_msg_tuple(listener,msg,buf,rbuf); + break; + case ERL_REFERENCE_EXT : + case ERL_NEW_REFERENCE_EXT : + ret = handle_ref_tuple(listener, msg, buf, rbuf); + default : + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type); + /* some other kind of erlang term */ + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "undef"); + break; + } + + break; + + case ERL_ATOM_EXT : + ret = handle_msg_atom(listener,msg,buf,rbuf); + break; + + default : + /* some other kind of erlang term */ + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "undef"); + break; } - - break; - - case ERL_ATOM_EXT : - ret = handle_msg_atom(listener,msg,buf,rbuf); - break; - - default : - /* some other kind of erlang term */ - ei_x_encode_tuple_header(rbuf, 2); - ei_x_encode_atom(rbuf, "error"); - ei_x_encode_atom(rbuf, "undef"); - break; } if (SWITCH_STATUS_FALSE==ret) {

1 0

[commit] r13065 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: anthm Date: Thu Apr 16 17:13:55 2009 New Revision: 13065 Log: autoflush on bridge and add bridge_hangup_cause variable to indicate the hangup cause of the last bridged channel Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Thu Apr 16 17:13:55 2009 @@ -351,7 +351,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, switch_io_flag_t io_flags); -SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session); +SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session, switch_rtp_flush_t flush); /*! \brief Enable VAD on an RTP Session Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Apr 16 17:13:55 2009 @@ -110,6 +110,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE "bridge_hangup_cause" #define SWITCH_READ_TERMINATOR_USED_VARIABLE "read_terminator_used" #define SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE "send_silence_when_idle" #define SWITCH_CURRENT_APPLICATION_VARIABLE "current_application" @@ -443,6 +444,11 @@ switch_rtp_numbers_t outbound; } switch_rtp_stats_t; +typedef enum { + SWITCH_RTP_FLUSH_ONCE, + SWITCH_RTP_FLUSH_STICK, + SWITCH_RTP_FLUSH_UNSTICK +} switch_rtp_flush_t; #define SWITCH_RTP_CNG_PAYLOAD 13 @@ -464,7 +470,7 @@ SWITCH_RTP_FLAG_DATAWAIT - Do not return from reads unless there is data even when non blocking SWITCH_RTP_FLAG_BUGGY_2833 - Emulate the bug in cisco equipment to allow interop SWITCH_RTP_FLAG_PASS_RFC2833 - Pass 2833 (ignore it) - SWITCH_RTP_FLAG_AUTO_CNG - Generate outbound CNG frames when idle + SWITCH_RTP_FLAG_AUTO_CNG - Generate outbound CNG frames when idle </pre> */ typedef enum { @@ -489,7 +495,8 @@ SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18), SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19), SWITCH_RTP_FLAG_FLUSH = (1 << 20), - SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21) + SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21), + SWITCH_RTP_FLAG_STICKY_FLUSH = (1 << 22) } switch_rtp_flag_enum_t; typedef uint32_t switch_rtp_flag_t; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Apr 16 17:13:55 2009 @@ -1015,10 +1015,18 @@ goto end; case SWITCH_MESSAGE_INDICATE_BRIDGE: + if (switch_rtp_ready(tech_pvt->rtp_session)) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + } + goto end; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + if (switch_rtp_ready(tech_pvt->rtp_session)) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_UNSTICK); + } + goto end; case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: if (switch_rtp_ready(tech_pvt->rtp_session)) { - rtp_flush_read_buffer(tech_pvt->rtp_session); + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); } goto end; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Apr 16 17:13:55 2009 @@ -829,6 +829,7 @@ int br = 0; int inner_bridge = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); const char *var; + switch_call_cause_t cause; switch_channel_set_flag(caller_channel, CF_ORIGINATOR); @@ -961,6 +962,14 @@ switch_cond_next(); } + if ((cause = switch_channel_get_cause(caller_channel))) { + switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE, switch_channel_cause2str(cause)); + } + + if ((cause = switch_channel_get_cause(peer_channel))) { + switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE, switch_channel_cause2str(cause)); + } + switch_core_session_rwunlock(peer_session); } else { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Apr 16 17:13:55 2009 @@ -1330,10 +1330,20 @@ } } -SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session) +SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session, switch_rtp_flush_t flush) { if (switch_rtp_ready(rtp_session) && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH); + switch (flush) { + case SWITCH_RTP_FLUSH_STICK: + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH); + break; + case SWITCH_RTP_FLUSH_UNSTICK: + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH); + break; + default: + break; + } } } @@ -1459,7 +1469,7 @@ int do_cng = 0; if (rtp_session->timer.interval) { - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH)) { + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) { if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { hot_socket = 1; } @@ -1526,7 +1536,7 @@ } if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { - rtp_flush_read_buffer(rtp_session); + rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE); } if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) {

1 0

[commit] r13064 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mikej Date: Thu Apr 16 14:08:31 2009 New Revision: 13064 Log: revert temporary hack Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Thu Apr 16 14:08:31 2009 @@ -1154,7 +1154,7 @@ if (status == 423) { unsigned my_expires = 0; - if (cr->cr_sip && cr->cr_sip->sip_expires) + if (cr->cr_sip->sip_expires) my_expires = cr->cr_sip->sip_expires->ex_delta; if (sip->sip_min_expires && @@ -1209,8 +1209,7 @@ } } - if (500 <= status && status < 600 && - cr->cr_sip && + if (0 && 500 <= status && status < 600 && sip->sip_retry_after && sip->sip_retry_after->af_delta < 32) { su_timer_t *timer;

1 0

[commit] r13063 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mikej Date: Thu Apr 16 12:21:54 2009 New Revision: 13063 Log: Thu Apr 16 12:11:33 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: added yet another test case for re-INVITE glare S2_CASE("2.6.5", "Re-INVITE glare and 500 Retry-After", "NUA receives re-INVITE, replies with 200, " "sends re-INVITE, gets 500, gets ACK, retrys INVITE," "sends BYE."); test case for SFSIP-135 and SFSIP-137 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 16 12:21:54 2009 @@ -1 +1 @@ -Thu Apr 16 12:18:30 CDT 2009 +Thu Apr 16 12:20:45 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Thu Apr 16 12:21:54 2009 @@ -1710,9 +1710,9 @@ invite = s2_sip_wait_for_request(SIP_METHOD_INVITE); fail_if(!invite); - respond_with_sdp(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, - SIPTAG_RETRY_AFTER_STR("8"), - TAG_END()); + s2_sip_respond_to(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, + SIPTAG_RETRY_AFTER_STR("8"), + TAG_END()); s2_sip_free_message(invite); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_if(!ack); @@ -1789,8 +1789,8 @@ fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_INVITE, NULL, - SIPTAG_USER_AGENT_STR("evil (evil) evil"), - TAG_END()); + SIPTAG_USER_AGENT_STR("evil (evil) evil"), + TAG_END()); nua_respond(nh, SIP_200_OK, TAG_END()); @@ -1851,6 +1851,70 @@ } END_TEST +START_TEST(call_2_6_5) +{ + nua_handle_t *nh; + struct event *reinvite; + struct message *invite, *ack, *response; + + /* Test case for FreeSwitch bugs #SFSIP-135, #SFSIP-137 */ + + S2_CASE("2.6.5", "Re-INVITE glare and 500 Retry-After", + "NUA receives re-INVITE, replies with 200, " + "sends re-INVITE, gets 500, gets ACK, retrys INVITE," + "sends BYE."); + + nh = invite_to_nua(TAG_END()); + + soa_generate_offer(soa, 1, NULL); + request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); + reinvite = s2_wait_for_event(nua_i_invite, 200); fail_unless(reinvite != NULL); + fail_unless(s2_check_callstate(nua_callstate_completed)); + response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE); + fail_if(!response); + s2_sip_update_dialog(dialog, response); + process_answer(response); + s2_sip_free_message(response); + + nua_invite(nh, TAG_END()); + fail_unless(s2_check_callstate(nua_callstate_calling)); + invite = s2_sip_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + s2_sip_respond_to(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, + SIPTAG_RETRY_AFTER_STR("7"), + TAG_END()); + s2_sip_free_message(invite); + ack = s2_sip_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + s2_sip_free_message(ack); + + /* We get nua_r_invite with 100 trying (and 500 in sip->sip_status) */ + fail_unless_event(nua_r_invite, 100); + + fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); + fail_unless_event(nua_i_ack, 200); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + s2_nua_fast_forward(10, s2base->root); + + fail_unless(s2_check_callstate(nua_callstate_calling)); + + invite = s2_sip_wait_for_request(SIP_METHOD_INVITE); + process_offer(invite); + + respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); + fail_unless_event(nua_r_invite, 200); + fail_unless(s2_check_callstate(nua_callstate_ready)); + ack = s2_sip_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + s2_sip_free_message(ack); + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + TCase *reinvite_tcase(int threading) { TCase *tc = tcase_create("2.6 - re-INVITEs"); @@ -1861,6 +1925,7 @@ tcase_add_test(tc, call_2_6_2); tcase_add_test(tc, call_2_6_3); tcase_add_test(tc, call_2_6_4); + tcase_add_test(tc, call_2_6_5); } return tc; }

1 0

[commit] r13062 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mikej Date: Thu Apr 16 12:18:56 2009 New Revision: 13062 Log: Thu Apr 16 12:04:08 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_client, nua_session: avoid restarting in-progress transactions This is supposed to fix bugs #SFSIP-135 and #SFSIP-137. Thanks for Tamas Jalsovszky and kawarod for reporting the problem. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 16 12:18:56 2009 @@ -1 +1 @@ -Thu Apr 16 10:00:29 CDT 2009 +Thu Apr 16 12:18:30 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Thu Apr 16 12:18:56 2009 @@ -413,6 +413,20 @@ return 0; } +/** Check if client request is in progress. + * + * A client request is in progress, if + * 1) it has actual transaction going on + * 2) it is waiting credentials from application + * 3) it is waiting for Retry-After timer + */ +int +nua_client_request_in_progress(nua_client_request_t const *cr) +{ + return cr && + (cr->cr_orq || cr->cr_wait_for_cred || cr->cr_timer); +} + /**Initialize client request for sending. * * This function is called when the request is taken from queue and sent. @@ -1564,7 +1578,7 @@ break; } - if (cr && cr->cr_orq == NULL) { + if (cr && !nua_client_request_in_progress(cr)) { nua_client_init_request(cr); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.h Thu Apr 16 12:18:56 2009 @@ -250,6 +250,8 @@ return cr && cr->cr_prev; } +int nua_client_request_in_progress(nua_client_request_t const *cr); + int nua_client_request_complete(nua_client_request_t *cr); int nua_client_request_remove(nua_client_request_t *cr); int nua_client_request_clean(nua_client_request_t *cr); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Thu Apr 16 12:18:56 2009 @@ -1535,7 +1535,7 @@ if (ss->ss_state >= nua_callstate_terminating || /* INVITE is in progress or being authenticated */ - (cr && (cr->cr_orq || cr->cr_wait_for_cred))) + nua_client_request_in_progress(cr)) return; /* UPDATE has been queued */

1 0

[commit] r13061 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mikej Date: Thu Apr 16 10:00:42 2009 New Revision: 13061 Log: Wed Apr 8 16:37:43 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: do not restart CANCEL requests Ignore-this: 2c9d51bbafca2256630a0ea73982abea Fixes FreesWitch bug SFSIP-134, reported by vile, initial patch by Mike Jerris. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 16 10:00:42 2009 @@ -1 +1 @@ -Thu Apr 16 09:59:45 CDT 2009 +Thu Apr 16 10:00:29 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Thu Apr 16 10:00:42 2009 @@ -1436,6 +1436,10 @@ static int nua_cancel_client_request(nua_client_request_t *cr, msg_t *msg, sip_t *sip, tagi_t const *tags); +static int nua_cancel_client_check_restart(nua_client_request_t *cr, + int status, + char const *phrase, + sip_t const *sip); nua_client_methods_t const nua_cancel_client_methods = { SIP_METHOD_CANCEL, /* crm_method, crm_method_name */ @@ -1447,8 +1451,8 @@ }, NULL, /* crm_template */ NULL, /* crm_init */ - nua_cancel_client_request, /* crm_send */ - NULL, /* crm_check_restart */ + nua_cancel_client_request, /* .. not really crm_send */ + nua_cancel_client_check_restart, /* crm_check_restart */ NULL, /* crm_recv */ NULL, /* crm_preliminary */ NULL, /* crm_report */ @@ -1488,6 +1492,16 @@ return 0; } +static int +nua_cancel_client_check_restart(nua_client_request_t *cr, + int status, + char const *phrase, + sip_t const *sip) +{ + /* We cannot really restart CANCEL */ + return 0; +} + /** @NUA_EVENT nua_r_cancel * * Answer to outgoing CANCEL.

1 0

[commit] r13060 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: buklov Date: Thu Apr 16 10:00:41 2009 New Revision: 13060 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 Thu Apr 16 10:00:41 2009 @@ -378,7 +378,7 @@ <prompt phrase="Неправильный номер " filename= "vm-fail_auth.wav"/>  <prompt phrase="Добро пожаловать в Вашу голосовую почту " filename= "vm-hello.wav"/>  <prompt phrase="До свидания " filename= "vm-goodbye.wav"/>  - <prompt phrase="После сигнала, произнесите ваше приветствие, для окончания записи нажмите любую клавишу или перестаньте говорить" filename= "vm-record_name1.wav"/>  + <prompt phrase="После сигнала, пожалуйста, сообщите свое имя, для окончания записи нажмите любую клавишу или перестаньте говорить." filename= "vm-record_name1.wav"/>  <prompt phrase="Выберите приветствие от единицы до девяти " filename= "vm-choose_greeting_choose.wav"/>  <prompt phrase="Неправильное значение " filename= "vm-choose_greeting_fail.wav"/>  <prompt phrase="Слишком много неудачных попыток " filename= "vm-abort.wav"/>

1 0

[commit] r13059 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mikej Date: Thu Apr 16 09:59:59 2009 New Revision: 13059 Log: Tue Mar 24 07:39:57 CDT 2009 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * nua/check_register.c: fixed up value setting for NAT-imitating received parameters Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 16 09:59:59 2009 @@ -1 +1 @@ -Tue Mar 24 10:52:57 CDT 2009 +Thu Apr 16 09:59:45 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Thu Apr 16 09:59:59 2009 @@ -200,10 +200,11 @@ /* ---------------------------------------------------------------------- */ -static char const *receive_natted = "received=4.255.255.9"; +static char const receive_natted[] = "received=4.255.255.9"; +static char const receive_natted2[] = "received=4.255.255.10"; /* Return Via that looks very natted */ -static sip_via_t *natted_via(struct message *m) +static sip_via_t *natted_via(struct message *m, const char *receive_natted) { su_home_t *h; sip_via_t *via; @@ -245,7 +246,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -260,7 +261,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -290,7 +291,7 @@ s2_sip_respond_to(m, NULL, SIP_401_UNAUTHORIZED, SIPTAG_WWW_AUTHENTICATE_STR(s2_auth_digest_str), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -310,7 +311,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -354,7 +355,7 @@ fail_if(!m); s2_sip_respond_to(m, NULL, SIP_407_PROXY_AUTH_REQUIRED, - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(m); @@ -364,7 +365,7 @@ fail_if(!m); fail_if(!m->sip->sip_proxy_authorization); s2_sip_respond_to(m, NULL, SIP_200_OK, - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -375,7 +376,7 @@ m = s2_sip_wait_for_request(SIP_METHOD_OPTIONS); s2_sip_respond_to(m, NULL, SIP_200_OK, - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -388,7 +389,7 @@ m = s2_sip_wait_for_request(SIP_METHOD_OPTIONS); s2_sip_respond_to(m, NULL, SIP_200_OK, - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted2)), TAG_END()); s2_sip_free_message(m); @@ -402,7 +403,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted2)), TAG_END()); s2_sip_free_message(m); @@ -428,7 +429,7 @@ mark_point(); make_auth_natted_register(nh, - NUTAG_OUTBOUND("no-options-keepalive"), + NUTAG_OUTBOUND("no-options-keepalive, no-validate"), TAG_END()); s2->registration->nh = nh; @@ -444,7 +445,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted2)), TAG_END()); s2_sip_free_message(m); @@ -458,7 +459,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted2)), TAG_END()); s2_sip_free_message(m); @@ -490,7 +491,7 @@ s2_sip_respond_to(m, NULL, 400, "Bad Contact", - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -503,7 +504,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -540,7 +541,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -555,7 +556,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -617,7 +618,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -633,7 +634,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -680,7 +681,7 @@ s2_sip_respond_to(m, NULL, SIP_401_UNAUTHORIZED, SIPTAG_WWW_AUTHENTICATE_STR(s2_auth_digest_str), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); fail_unless_event(nua_r_register, 401); @@ -698,7 +699,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m); @@ -713,7 +714,7 @@ s2_sip_respond_to(m, NULL, SIP_200_OK, SIPTAG_CONTACT(s2->registration->contact), - SIPTAG_VIA(natted_via(m)), + SIPTAG_VIA(natted_via(m, receive_natted)), TAG_END()); s2_sip_free_message(m);

1 0

[commit] r13058 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: buklov Date: Thu Apr 16 09:50:31 2009 New Revision: 13058 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 Thu Apr 16 09:50:31 2009 @@ -373,12 +373,12 @@ <prompt phrase="Помечено как важное " filename= "vm-marked_urgent.wav"/>  <prompt phrase="отправлен на электронную почту" filename= "vm-emailed.wav"/>  <prompt phrase="у Вас " filename= "vm-you_have.wav"/>  - <prompt phrase="Пожалуйста, введите свой номер " filename= "vm-enter_id.wav"/>  + <prompt phrase="Пожалуйста, введите свой идентификатор " filename= "vm-enter_id.wav"/>  <prompt phrase="Пожалуйста, введите свой пароль " filename= "vm-enter_pass.wav"/>  <prompt phrase="Неправильный номер " filename= "vm-fail_auth.wav"/>  <prompt phrase="Добро пожаловать в Вашу голосовую почту " filename= "vm-hello.wav"/>  <prompt phrase="До свидания " filename= "vm-goodbye.wav"/>  - <prompt phrase="После сигнала, пожалуйста, запишите свое имя, для окончания записи нажмите любую клавишу или перестаньте говорить. " filename= "vm-record_name1.wav"/>  + <prompt phrase="После сигнала, произнесите ваше приветствие, для окончания записи нажмите любую клавишу или перестаньте говорить" filename= "vm-record_name1.wav"/>  <prompt phrase="Выберите приветствие от единицы до девяти " filename= "vm-choose_greeting_choose.wav"/>  <prompt phrase="Неправильное значение " filename= "vm-choose_greeting_fail.wav"/>  <prompt phrase="Слишком много неудачных попыток " filename= "vm-abort.wav"/>  @@ -386,17 +386,17 @@ <prompt phrase="После сигнала, запишите свое приветствие, для окончания записи нажмите любую клавишу или перестаньте говорить " filename= "vm-to_record_greeting.wav"/>  <prompt phrase="После сигнала, запишите свое сообщение, для окончания записи нажмите любую клавишу или перестаньте говорить " filename= "vm-record_message.wav"/>  <prompt phrase="не доступно " filename= "vm-play_greeting.wav"/>  - <prompt phrase="новых важных" filename= "vm-urgent-newx.wav"/>  - <prompt phrase="новое важное " filename= "vm-urgent-new.wav"/>  + <prompt phrase="новых срочных" filename= "vm-urgent-newx.wav"/>  + <prompt phrase="новое срочное " filename= "vm-urgent-new.wav"/>  <prompt phrase="новое " filename= "vm-new.wav"/>  <prompt phrase="новых " filename= "vm-newx .wav"/>  - <prompt phrase="важное сохранено " filename= "vm-urgent-saved.wav"/>  + <prompt phrase="срочное сообщение сохранено" filename= "vm-urgent-saved.wav"/>  <prompt phrase="сохранено " filename= "vm-saved.wav"/>  <prompt phrase="сообщение " filename= "vm-message.wav"/>  <prompt phrase="сообщений " filename= "vm-messagex.wav"/>  <prompt phrase="сообщения " filename= "vm-messages.wav"/>  <prompt phrase="нажмите " filename= "vm-press.wav"/>  - <prompt phrase="для прослушивания новых сообщений " filename= "vm-listen_new.wav"/>  + <prompt phrase="чтобы прослушать новые сообщения" filename= "vm-listen_new.wav"/>  <prompt phrase="для прослушивания сохраненных сообщений " filename= "vm-listen_saved.wav"/>  <prompt phrase="для дополнительных параметров " filename= "vm-advanced.wav"/>  <prompt phrase="для выхода " filename= "vm-to_exit.wav"/>  @@ -407,7 +407,7 @@ <prompt phrase="прослушать запись " filename= "vm-listen_to_recording.wav"/>  <prompt phrase="сохранить запись " filename= "vm-save_recording.wav"/>  <prompt phrase="записать " filename= "vm-rerecord.wav"/>  - <prompt phrase="пометить это сообщение срочным " filename= "vm-mark-urgent.wav"/>  + <prompt phrase="пометить это сообщение как срочное" filename= "vm-mark-urgent.wav"/>  <prompt phrase="для продолжения " filename= "vm-continue.wav"/>  <prompt phrase="прослушать запись снова " filename= "vm-listen_to_recording_again.wav"/>  <prompt phrase="удалить запись " filename= "vm-delete_recording.wav"/>  @@ -422,7 +422,7 @@ <prompt phrase="в папке Входящие " filename= "vm-in_folder.wav"/>  <prompt phrase="что бы перезвонить" filename= "vm-return_call_1.wav"/>  <prompt phrase="для возврата вызова " filename= "vm-return_call.wav"/>  - <prompt phrase="Важное" filename= "vm-urgent.wav"/>  + <prompt phrase="Срочное" filename= "vm-urgent.wav"/>  <prompt phrase="добавить вступление к сообщению" filename= "vm-forward_add_intro.wav"/>  <prompt phrase="для того что бы послать собощение " filename= "vm-send_message_now.wav"/>  <prompt phrase="пожалуйста, введите добавочный номер для отправки сообщения" filename= "vm-forward_enter_ext.wav"/>  @@ -457,22 +457,22 @@ <prompt phrase="Извините " filename= "ivr-im_sorry.wav"/>  <prompt phrase="Пожалуйста " filename= "ivr-please.wav"/>  <prompt phrase="Пожалуйста, перезвоните нам в … " filename= "ivr-please_return_our_call_at.wav"/>  - <prompt phrase="Согласно номера ссылки " filename= "ivr-regarding_reference_number.wav"/>  - <prompt phrase="Это простое ivr подменю " filename= "ivr-sample_submenu.wav"/>  - <prompt phrase="Пожалуйста, назовите свое имя после сигнала " filename= "ivr-say_name.wav"/>  + <prompt phrase="относительно номера ссылки" filename= "ivr-regarding_reference_number.wav"/>  + <prompt phrase="Это простое голосовое подменю" filename= "ivr-sample_submenu.wav"/>  + <prompt phrase="Пожалуйста, представьтесь после сигнала" filename= "ivr-say_name.wav"/>  <prompt phrase="Перенаправить на голосовую почту " filename= "ivr-send_to_voicemail.wav"/>  <prompt phrase="Для разговора с представителем по обслуживанию клиентов " filename= "ivr-speak_to_a_customer_service_representative.wav"/>  - <prompt phrase="Примите сообщение " filename= "ivr-take_a_message.wav"/>  + <prompt phrase="принять сообщение." filename= "ivr-take_a_message.wav"/>  <prompt phrase="Спасибо " filename= "ivr-thank_you.wav"/>  <prompt phrase="Неправильное значение " filename= "ivr-that_was_an_invalid_entry.wav"/>  <prompt phrase="Этот звонок от " filename= "ivr-this_is_a_call_from.wav"/>  - <prompt phrase="Это голосовое приветствие позволит Вам протестировать некоторые функции " filename= "ivr-this_ivr_will_let_you_test_features.wav"/>  + <prompt phrase="это голосовое меню позволит Вам протестировать некоторые функции" filename= "ivr-this_ivr_will_let_you_test_features.wav"/>  <prompt phrase="Для того чтобы набрать конференцию ФС ___ " filename= "ivr-to_call_the_freeswitch_conference.wav"/>  <prompt phrase="Для выполнения эхо-теста в ФС " filename= "ivr-to_do_a_freeswitch_echo_test.wav"/>  <prompt phrase="Для выполнения эхо-теста free world dialed " filename= "ivr-to_do_a_fwd_echo_test.wav"/>  - <prompt phrase="Для прослушивания примера голосового подменю " filename= "ivr-to_hear_sample_submenu.wav"/>  + <prompt phrase="чтобы прослушать пример голосового подменю " filename= "ivr-to_hear_sample_submenu.wav"/>  <prompt phrase="Чтобы услышать кричащих обезьян " filename= "ivr-to_hear_screaming_monkeys.wav"/>  - <prompt phrase="Для выбора мелодий в режиме ожидания " filename= "ivr-to_listen_to_moh.wav"/>  + <prompt phrase="Для прослушивания списка мелодий в режиме ожидания " filename= "ivr-to_listen_to_moh.wav"/>  <prompt phrase="Для повтора этих параметров " filename= "ivr-to_repeat_these_options.wav"/>  <prompt phrase="Для возврата к предыдущему меню " filename= "ivr-to_return_to_previous_menu.wav"/>  <prompt phrase="Для соединения с оператором " filename= "ivr-to_speak_with_an_operator.wav"/>  @@ -516,7 +516,7 @@ <prompt phrase="Предоставьте номер ссылки " filename= "provide_reference_number.wav"/>  <prompt phrase="Пожалуйста, введите добавочный номер на который хотите перевести звонок " filename= "transfer1.wav"/>  <prompt phrase="Перевод" filename= "transfer2.wav"/>  - <prompt phrase="Мы пытаемся дозвониться " filename= "we_are_trying_to_reach.wav"/>  + <prompt phrase="Мы пытаемся связаться" filename= "we_are_trying_to_reach.wav"/>  <prompt phrase="Произошла ошибка, пожалуйста обратитесь к администратору " filename= "error.wav"/>  </misc> </ru>

1 0