- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13118 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 13:06:34 2009 New Revision: 13118 Log: finish up last commit 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 Wed Apr 22 13:06:34 2009 @@ -3670,8 +3670,17 @@ channel = switch_core_session_get_channel(member->session); if (!new_conference) { - switch_mutex_lock(globals.setup_mutex); - locked = 1; + if (!locked) { + switch_mutex_lock(globals.setup_mutex); + locked = 1; + } + + if ((new_conference = conference_find(conf_name))) { + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } + } if (!(new_conference = conference_find(conf_name))) { /* build a new conference if it doesn't exist */ @@ -3700,13 +3709,6 @@ xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } - if (!xml_cfg.profile) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name); - switch_xml_free(cxml); - cxml = NULL; - goto done; - } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); /* Release the config registry handle */ @@ -3726,8 +3728,10 @@ goto done; } - switch_mutex_unlock(globals.setup_mutex); - locked = 0; + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } /* Set the minimum number of members (once you go above it you cannot go below it) */ new_conference->min = 1; @@ -4715,8 +4719,10 @@ /* if this is a bridging call, and it's not a duplicate, build a */ /* conference object, and skip pin handling, and locked checking */ - switch_mutex_lock(globals.setup_mutex); - locked = 1; + if (!locked) { + switch_mutex_lock(globals.setup_mutex); + locked = 1; + } if (isbr) { char *uuid = switch_core_session_get_uuid(session); @@ -4737,8 +4743,10 @@ goto done; } - switch_mutex_unlock(globals.setup_mutex); - locked = 0; + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } switch_channel_set_variable(channel, "conference_name", conference->name); @@ -4759,8 +4767,15 @@ enforce_security = switch_true(pvar); } + if ((conference = conference_find(conf_name))) { + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } + } + /* if the conference exists, get the pointer to it */ - if (!(conference = conference_find(conf_name))) { + if (!conference) { /* couldn't find the conference, create one */ conference = conference_new(conf_name, xml_cfg, NULL); @@ -4768,8 +4783,10 @@ goto done; } - switch_mutex_unlock(globals.setup_mutex); - locked = 0; + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } switch_channel_set_variable(channel, "conference_name", conference->name);

1 0

[commit] r13117 - freeswitch/trunk/libs/speex
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: stkn Date: Wed Apr 22 12:44:35 2009 New Revision: 13117 Log: Add visibility support for suncc on solaris Modified: freeswitch/trunk/libs/speex/acinclude.m4 freeswitch/trunk/libs/speex/configure.ac Modified: freeswitch/trunk/libs/speex/acinclude.m4 ============================================================================== --- freeswitch/trunk/libs/speex/acinclude.m4 (original) +++ freeswitch/trunk/libs/speex/acinclude.m4 Wed Apr 22 12:44:35 2009 @@ -100,3 +100,20 @@ AC_SUBST(OGG_LIBS) rm -f conf.oggtest ]) + + +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) Modified: freeswitch/trunk/libs/speex/configure.ac ============================================================================== --- freeswitch/trunk/libs/speex/configure.ac (original) +++ freeswitch/trunk/libs/speex/configure.ac Wed Apr 22 12:44:35 2009 @@ -38,6 +38,7 @@ AC_C_INLINE AC_C_RESTRICT +AX_COMPILER_VENDOR AC_MSG_CHECKING(for C99 variable-size arrays) AC_TRY_COMPILE( , [ @@ -89,25 +90,52 @@ ) AC_MSG_RESULT($has_sse) -SAVE_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -fvisibility=hidden" AC_MSG_CHECKING(for ELF visibility) -AC_COMPILE_IFELSE([ -AC_LANG_PROGRAM([[ -#pragma GCC visibility push(hidden) -__attribute__((visibility("default"))) -int var=10; -]])], -[ -has_visibility=yes -AC_DEFINE([EXPORT], [__attribute__((visibility("default")))], [Symbol visibility prefix]) -], -[ -has_visibility=no -AC_DEFINE([EXPORT], [], [Symbol visibility prefix]) -CFLAGS="$SAVE_CFLAGS" -] -) +case "$ax_cv_c_compiler_vendor" in +gnu) + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ + #pragma GCC visibility push(hidden) + __attribute__((visibility("default"))) + int var=10; + ]])], + [ + has_visibility=yes + AC_DEFINE([EXPORT], [__attribute__((visibility("default")))], [Symbol visibility prefix]) + ], + [ + has_visibility=no + AC_DEFINE([EXPORT], [], [Symbol visibility prefix]) + CFLAGS="$SAVE_CFLAGS" + ] + ) + ;; +sun) + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -xldscope=hidden" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ + __attribute__((visibility("default"))) + int var=10; + ]])], + [ + has_visibility=yes + AC_DEFINE([EXPORT], [__attribute__((visibility("default")))], [Symbol visibility prefix]) + ], + [ + has_visibility=no + AC_DEFINE([EXPORT], [], [Symbol visibility prefix]) + CFLAGS="$SAVE_CFLAGS" + ] + ) + ;; +*) + has_visibility=no + AC_DEFINE([EXPORT], [], [Symbol visibility prefix]) + ;; +esac AC_MSG_RESULT($has_visibility) AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)

1 0

[commit] r13116 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 12:41:51 2009 New Revision: 13116 Log: serialize 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 Wed Apr 22 12:41:51 2009 @@ -72,6 +72,7 @@ switch_hash_t *conference_hash; switch_mutex_t *id_mutex; switch_mutex_t *hash_mutex; + switch_mutex_t *setup_mutex; uint32_t id_pool; int32_t running; uint32_t threads; @@ -356,6 +357,8 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async); static switch_status_t conference_say(conference_obj_t *conference, const char *text, uint32_t leadin); static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim); +static conference_obj_t *conference_find(char *name); + SWITCH_STANDARD_API(conf_api_main); static switch_status_t conference_outcall(conference_obj_t *conference, @@ -3636,7 +3639,8 @@ char *conf_name = NULL, *profile_name; switch_event_t *params = NULL; conference_obj_t *new_conference = NULL; - + int locked = 0; + switch_assert(conference != NULL); switch_assert(stream != NULL); @@ -3657,7 +3661,7 @@ switch_channel_t *channel; switch_event_t *event; switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; - + if (!id || !(member = conference_member_get(conference, id))) { stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); continue; @@ -3666,7 +3670,10 @@ channel = switch_core_session_get_channel(member->session); if (!new_conference) { - if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + switch_mutex_lock(globals.setup_mutex); + locked = 1; + + if (!(new_conference = conference_find(conf_name))) { /* build a new conference if it doesn't exist */ switch_memory_pool_t *pool = NULL; conf_xml_cfg_t xml_cfg = { 0 }; @@ -3719,6 +3726,9 @@ goto done; } + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + /* Set the minimum number of members (once you go above it you cannot go below it) */ new_conference->min = 1; @@ -3772,6 +3782,12 @@ } done: + + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } + if (params) { switch_event_destroy(&params); } @@ -4047,7 +4063,7 @@ if (argc && argv[0]) { conference_obj_t *conference = NULL; - if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]))) { + if ((conference = conference_find(argv[0]))) { if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); goto done; @@ -4614,6 +4630,7 @@ char *dpin = NULL; conf_xml_cfg_t xml_cfg = { 0 }; switch_event_t *params = NULL; + int locked = 0; /* Save the original read codec. */ if (!(read_codec = switch_core_session_get_read_codec(session))) { @@ -4669,7 +4686,7 @@ } else { profile_name = "default"; } - + #if 0 if (0) { member.dtmf_parser = conference->dtmf_parser; @@ -4697,6 +4714,10 @@ /* if this is a bridging call, and it's not a duplicate, build a */ /* conference object, and skip pin handling, and locked checking */ + + switch_mutex_lock(globals.setup_mutex); + locked = 1; + if (isbr) { char *uuid = switch_core_session_get_uuid(session); @@ -4704,7 +4725,7 @@ conf_name = uuid; } - if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + if ((conference = conference_find(conf_name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s already exists!\n", conf_name); goto done; } @@ -4716,6 +4737,9 @@ goto done; } + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + switch_channel_set_variable(channel, "conference_name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ @@ -4736,7 +4760,7 @@ } /* if the conference exists, get the pointer to it */ - if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + if (!(conference = conference_find(conf_name))) { /* couldn't find the conference, create one */ conference = conference_new(conf_name, xml_cfg, NULL); @@ -4744,6 +4768,9 @@ goto done; } + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + switch_channel_set_variable(channel, "conference_name", conference->name); /* Set MOH from variable if not set */ @@ -4954,6 +4981,11 @@ done: + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } + if (member.read_resampler) { switch_resample_destroy(&member.read_resampler); } @@ -5020,7 +5052,6 @@ switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_mutex_lock(globals.hash_mutex); - switch_core_hash_insert(globals.conference_hash, conference->name, conference); switch_mutex_unlock(globals.hash_mutex); switch_thread_create(&thread, thd_attr, conference_thread_run, conference, conference->pool); } @@ -5090,7 +5121,7 @@ } - if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, name))) { + if (!(conference = conference_find(name))) { switch_core_chat_send(proto, CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", "Conference not active.", NULL, NULL); return SWITCH_STATUS_FALSE; } @@ -5207,6 +5238,17 @@ return status; } +static conference_obj_t *conference_find(char *name) +{ + conference_obj_t *conference; + + switch_mutex_lock(globals.hash_mutex); + conference = switch_core_hash_find(globals.conference_hash, name); + switch_mutex_unlock(globals.hash_mutex); + + return conference; +} + /* create a new conferene with a specific profile */ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_memory_pool_t *pool) { @@ -5254,6 +5296,8 @@ return NULL; } + switch_mutex_lock(globals.hash_mutex); + /* parse the profile tree for param values */ if (cfg.profile) for (xml_kvp = switch_xml_child(cfg.profile, "param"); xml_kvp; xml_kvp = xml_kvp->next) { @@ -5395,7 +5439,8 @@ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); status = SWITCH_STATUS_TERM; - return NULL; + conference = NULL; + goto end; } } @@ -5403,7 +5448,8 @@ if (!(conference = switch_core_alloc(pool, sizeof(*conference)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); status = SWITCH_STATUS_TERM; - return NULL; + conference = NULL; + goto end; } /* initialize the conference object with settings from the specified profile */ @@ -5558,6 +5604,11 @@ switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool); switch_thread_rwlock_create(&conference->rwlock, conference->pool); switch_mutex_init(&conference->member_mutex, SWITCH_MUTEX_NESTED, conference->pool); + switch_core_hash_insert(globals.conference_hash, conference->name, conference); + + end: + + switch_mutex_unlock(globals.hash_mutex); return conference; } @@ -5582,7 +5633,7 @@ *e = '\0'; } - if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + if ((conference = conference_find(conf_name))) { if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name); @@ -5713,6 +5764,7 @@ switch_mutex_init(&globals.conference_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); switch_mutex_init(&globals.id_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); + switch_mutex_init(&globals.setup_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); /* Subscribe to presence request events */ if (switch_event_bind_removable(modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r13115 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: mcollins Date: Wed Apr 22 12:21:31 2009 New Revision: 13115 Log: Latest revision of Spanish prompts file; thanks to Milena 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 Wed Apr 22 12:21:31 2009 @@ -6,7 +6,7 @@ <en> <ascii> <prompt phrase="Espacio" filename="32.wav"/> - <prompt phrase="Signo de n�mero" filename="35.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"/> @@ -24,7 +24,7 @@ <prompt phrase="LL" filename="???.wav"/> <prompt phrase="M" filename="109.wav"/> <prompt phrase="N" filename="110.wav"/> - <prompt phrase="�" filename="???.wav"/> + <prompt phrase="Ñ" filename="???.wav"/> <prompt phrase="O" filename="111.wav"/> <prompt phrase="P" filename="112.wav"/> <prompt phrase="Q" filename="113.wav"/> @@ -85,7 +85,7 @@ <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="Dieciséis" filename="16.wav"/> <prompt phrase="Diecisiete" filename="17.wav"/> <prompt phrase="Dieciocho" filename="18.wav"/> <prompt phrase="Diecinueve" filename="19.wav"/> @@ -96,10 +96,10 @@ --> <prompt phrase="Veintiuno" filename="21.wav"/> <prompt phrase="Veintidos" filename="22.wav"/> - <prompt phrase="Veintitr�s" filename="23.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="Veintiséis" filename="26.wav"/> <prompt phrase="Veintisiete" filename="27.wav"/> <prompt phrase="Veintiocho" filename="28.wav"/> <prompt phrase="Veintinueve" filename="29.wav"/> @@ -130,37 +130,37 @@ <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="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="Décimo" filename="h-10.wav"/>  - <prompt phrase="Und�cimo" filename="h-11.wav"/> - <prompt phrase="Duod�cimo" filename="h-12.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="Decimosé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="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="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="Signo de número" filename="pound.wav"/> <prompt phrase="Asterisco" filename="star.wav"/> <prompt phrase="Mil" filename="thousand.wav"/> </digits> @@ -171,7 +171,7 @@ <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="Dólares" filename="dollars.wav"/> <prompt phrase="Menos" filename="minus.wav"/> <prompt phrase="Negativo" filename="negative.wav"/> </currency> @@ -181,10 +181,10 @@ <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="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="Sábado" filename="day-6.wav"/> <prompt phrase="Hora" filename="hour.wav"/> <prompt phrase="Horas" filename="hours.wav"/> <prompt phrase="Minuto" filename="minute.wav"/> @@ -207,134 +207,134 @@ <prompt phrase="Segundo" filename="second.wav"/> <prompt phrase="Segundos" filename="seconds.wav"/> <prompt phrase="Hoy" filename="today.wav"/> - <prompt phrase="Ma�ana" filename="tomorrow.wav"/> + <prompt phrase="Mañana" filename="tomorrow.wav"/> <prompt phrase="Ayer" filename="yesterday.wav"/> </time> <voicemail> - <prompt phrase="La persona a la extensi�n" filename="vm-person.wav"/> + <prompt phrase="La persona a la extensión" filename="vm-person.wav"/> <prompt phrase="marcado urgente" filename="vm-marked-urgent.wav"/> - <prompt phrase="correo electr�nico" filename="vm-emailed.wav"/> + <prompt phrase="correo electrónico" filename="vm-emailed.wav"/> <prompt phrase="usted tiene" filename="vm-you_have.wav"/> <prompt phrase="por favor ingrese su numero de usuario, seguido por" filename="vm-enter_id.wav"/> - <prompt phrase="por favor ingrese su contrase�a, seguido por" filename="vm-enter_pass.wav"/> - <prompt phrase="inicio de sesi�n incorrectos" filename="vm-fail_auth.wav"/> - <prompt phrase="bienvenido a su buz�n de voz" filename="vm-hello.wav"/> + <prompt phrase="por favor ingrese su contraseña, seguido por" filename="vm-enter_pass.wav"/> + <prompt phrase="inicio de sesión incorrectos" filename="vm-fail_auth.wav"/> + <prompt phrase="bienvenido a su buzon de voz" filename="vm-hello.wav"/> <prompt phrase="Gracias por llamar" filename="vm-goodbye.wav"/> - <prompt phrase="En el tono, por favor anote su nombre, pulse cualquier tecla o dejar de hablar para poner fin a la grabaci�n." filename="vm-record_name1.wav"/> - <prompt phrase="choose a greeting between 1 and 9" filename="vm-choose_greeting_choose.wav"/> - <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> - <prompt phrase="too many failed attempts" filename="vm-abort.wav"/> - <prompt phrase="to change your password" filename="vm-change_password.wav"/> - <prompt phrase="record your greeting at the tone, press any key or stop talking to end the recording" filename="vm-record_greeting.wav"/> - <prompt phrase="record your message at the tone, press any key or stop talking to end the recording" filename="vm-record_message.wav"/> - <prompt phrase="is not available" filename="vm-play_greeting.wav"/> - <prompt phrase="urgent new" filename="vm-urgent-new.wav"/> - <prompt phrase="new" filename="vm-new.wav"/> - <prompt phrase="urgent saved" filename="vm-urgent-saved.wav"/> - <prompt phrase="saved" filename="vm-saved.wav"/> - <prompt phrase="message" filename="vm-message.wav"/> - <prompt phrase="messages" filename="vm-messages.wav"/> - <prompt phrase="press" filename="vm-press.wav"/> - <prompt phrase="to listen to new messages" filename="vm-listen_new.wav"/> - <prompt phrase="to listen to saved messages" filename="vm-listen_saved.wav"/> - <prompt phrase="for advanced options" filename="vm-advanced.wav"/> - <prompt phrase="to exit" filename="vm-to_exit.wav"/> - <prompt phrase="to record a greeting" filename="vm-record_greeting.wav"/> - <prompt phrase="to choose greeting" filename="vm-choose_greeting.wav"/> - <prompt phrase="to record your name" filename="vm-record_name2.wav"/> - <prompt phrase="for the main menu" filename="vm-main_menu.wav"/> - <prompt phrase="to listen to the recording" filename="vm-listen_to_recording.wav"/> - <prompt phrase="to save the recording" filename="vm-save_recording.wav"/> - <prompt phrase="to rerecord" filename="vm-rerecord.wav"/> - <prompt phrase="to mark this message urgent" filename="vm-mark-urgent.wav"/> - <prompt phrase="to continue" filename="vm-continue.wav"/> - <prompt phrase="to listen to the recording again" filename="vm-listen_to_recording_again.wav"/> - <prompt phrase="to delete the recording" filename="vm-delete_recording.wav"/> - <prompt phrase="to forward the recording to your email" filename="vm-forward_to_email.wav"/> - <prompt phrase="greeting" filename="vm-greeting.wav"/> - <prompt phrase="selected" filename="vm-selected.wav"/> - <prompt phrase="is not available" filename="vm-not_available.wav"/> - <prompt phrase="message number" filename="vm-message_number.wav"/> - <prompt phrase="deleted" filename="vm-deleted.wav"/> - <prompt phrase="Your recording is below the minimum acceptable length, please try again" filename="vm-too-small.wav"/> - <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> - <prompt phrase="to return the call now" filename="vm-return_call.wav"/> - <prompt phrase="urgent" filename="vm-urgent.wav"/> + <prompt phrase="después del tono, por favor anote su nombre, pulse cualquier tecla o deje de hablar para poner fin a la grabación." filename="vm-record_name1.wav"/> + <prompt phrase="elija un saludo entre 1 y 9" filename="vm-choose_greeting_choose.wav"/> + <prompt phrase="valor inválido" filename="vm-choose_greeting_fail.wav"/> + <prompt phrase="demasiados intentos fallidos" filename="vm-abort.wav"/> + <prompt phrase="para cambiar su clave" filename="vm-change_password.wav"/> + <prompt phrase="grabe su saludo después del tono, pulse cualquier tecla o deje de hablar para poner fin a la grabación" filename="vm-record_greeting.wav"/> + <prompt phrase="grabe su mensaje después del tono, pulse cualquier tecla o deje de hablar para poner fin a la grabación" filename="vm-record_message.wav"/> + <prompt phrase="no está disponible" filename="vm-play_greeting.wav"/> + <prompt phrase="urgente nuevo" filename="vm-urgent-new.wav"/> + <prompt phrase="nuevo" filename="vm-new.wav"/> + <prompt phrase="urgente guardado" filename="vm-urgent-saved.wav"/> + <prompt phrase="guardado" filename="vm-saved.wav"/> + <prompt phrase="mensaje" filename="vm-message.wav"/> + <prompt phrase="mensajes" filename="vm-messages.wav"/> + <prompt phrase="presione" filename="vm-press.wav"/> + <prompt phrase="para escuchar mensajes nuevos" filename="vm-listen_new.wav"/> + <prompt phrase="para escuchar mensajes guardados" filename="vm-listen_saved.wav"/> + <prompt phrase="para opciones avanzadas" filename="vm-advanced.wav"/> + <prompt phrase="para salir" filename="vm-to_exit.wav"/> + <prompt phrase="para guardar un saludo" filename="vm-record_greeting.wav"/> + <prompt phrase="para elegir un saludo" filename="vm-choose_greeting.wav"/> + <prompt phrase="para grabar su nombre" filename="vm-record_name2.wav"/> + <prompt phrase="para el menú principal" filename="vm-main_menu.wav"/> + <prompt phrase="para escuchar la grabación" filename="vm-listen_to_recording.wav"/> + <prompt phrase="para guardar la grabación" filename="vm-save_recording.wav"/> + <prompt phrase="para regrabar" filename="vm-rerecord.wav"/> + <prompt phrase="para marcar este mensaje como urgente" filename="vm-mark-urgent.wav"/> + <prompt phrase="para continuar" filename="vm-continue.wav"/> + <prompt phrase="para escuchar la grabación de nuevo" filename="vm-listen_to_recording_again.wav"/> + <prompt phrase="para eliminar la grabación" filename="vm-delete_recording.wav"/> + <prompt phrase="para enviar la grabación a su e-mail" filename="vm-forward_to_email.wav"/> + <prompt phrase="saludo" filename="vm-greeting.wav"/> + <prompt phrase="seleccionado" filename="vm-selected.wav"/> + <prompt phrase="no está disponible" filename="vm-not_available.wav"/> + <prompt phrase="mensaje número" filename="vm-message_number.wav"/> + <prompt phrase="eliminado" filename="vm-deleted.wav"/> + <prompt phrase="Su grabación es demasiado corta, por favor intente de nuevo" filename="vm-too-small.wav"/> + <prompt phrase="en la bandeja de entrada" filename="vm-in_folder.wav"/> + <prompt phrase="para devolver la llamada" filename="vm-return_call.wav"/> + <prompt phrase="urgente" filename="vm-urgent.wav"/> </voicemail> <conference> <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/> <prompt phrase="NULL" filename="conf-nack.wav" type="tone"/> - <prompt phrase="You are now muted." filename="conf-muted.wav"/> - <prompt phrase="You are now unmuted." filename="conf-unmuted.wav"/> - <prompt phrase="You are currently the only person in this conference." filename="conf-alone.wav"/> + <prompt phrase="Usted ahora está silenciado." filename="conf-muted.wav"/> + <prompt phrase="Usted ya no está silenciado." filename="conf-unmuted.wav"/> + <prompt phrase="En este momento usted es la única persona en la conferencia." filename="conf-alone.wav"/> <prompt phrase="NULL" filename="conf-perpetual.wav" type="music"/> <prompt phrase="NULL" filename="conf-enter.wav" type="tone"/> <prompt phrase="NULL" filename="conf-exit.wav" type="tone"/> - <prompt phrase="You have been kicked from this conference." filename="conf-kicked.wav"/> - <prompt phrase="This conference is locked." filename="conf-locked.wav"/> - <prompt phrase="The conference is now locked." filename="conf-is-locked.wav"/> - <prompt phrase="The conference is now unlocked." filename="conf-is-unlocked.wav"/> - <prompt phrase="Please enter the conference pin number." filename="conf-pin.wav"/> - <prompt phrase="Invalid pin number, try again." filename="conf-bad-pin.wav"/> - <prompt phrase="goodbye" filename="conf-goodbye.wav"/> - <prompt phrase="Welcome to the conference." filename="conf-welcome.wav"/> + <prompt phrase="Usted ha sido expulsado de la conferencia." filename="conf-kicked.wav"/> + <prompt phrase="Esta conferencia está bloqueada." filename="conf-locked.wav"/> + <prompt phrase="La conferencia está ahora bloqueada." filename="conf-is-locked.wav"/> + <prompt phrase="La conferencia está ahora desbloqueada." filename="conf-is-unlocked.wav"/> + <prompt phrase="Por favor ingrese el pin de la conferencia." filename="conf-pin.wav"/> + <prompt phrase="Pin inválido, intente de nuevo." filename="conf-bad-pin.wav"/> + <prompt phrase="hasta luego" filename="conf-goodbye.wav"/> + <prompt phrase="Bienvenido a la conferencia." filename="conf-welcome.wav"/> </conference> <ivr> - <prompt phrase="Account number" filename="ivr-account_number.wav"/> - <prompt phrase="Connect to caller" filename="ivr-connect_to_caller.wav"/> - <prompt phrase="If you know your party's extension, please enter it now" filename="ivr-enter_ext_pound.wav"/> - <prompt phrase="Please enter an extension followed by the pound sign" filename="ivr-enter_ext.wav"/> - <prompt phrase="For this person" filename="ivr-for_this_person.wav"/> - <prompt phrase="Please hold while I connect your call" filename="ivr-hold_connect_call.wav"/> - <prompt phrase="I'm sorry" filename="ivr-im_sorry.wav"/> - <prompt phrase="Please" filename="ivr-please.wav"/> - <prompt phrase="Please return our call at" filename="ivr-please_return_our_call_at.wav"/> - <prompt phrase="Regarding reference number" filename="ivr-regarding_reference_number.wav"/> - <prompt phrase="This is a sample IVR submenu..." filename="ivr-sample_submenu.wav"/> - <prompt phrase="Please say your name after the tone" filename="ivr-say_name.wav"/> - <prompt phrase="Send this caller to voicemail" filename="ivr-send_to_voicemail.wav"/> - <prompt phrase="To speak to a customer service representative" filename="ivr-speak_to_a_customer_service_representative.wav"/> - <prompt phrase="Take a message" filename="ivr-take_a_message.wav"/> - <prompt phrase="Thank you" filename="ivr-thank_you.wav"/> - <prompt phrase="That was an invalid entry" filename="ivr-that_was_an_invalid_entry.wav"/> - <prompt phrase="This is a call from" filename="ivr-this_is_a_call_from.wav"/> - <prompt phrase="This IVR will let you test some of the features..." filename="ivr-this_ivr_will_let_you_test_features.wav"/> - <prompt phrase="To call the FreeSWITCH conference" filename="ivr-to_call_the_freeswitch_conference.wav"/> - <prompt phrase="To do a FreeSWITCH echo test" filename="ivr-to_do_a_freeswitch_echo_test.wav"/> - <prompt phrase="To do a fwd echo test" filename="ivr-to_do_a_fwd_echo_test.wav"/> - <prompt phrase="To hear a sample IVR submenu" filename="ivr-to_hear_sample_submenu.wav"/> - <prompt phrase="To hear screaming monkeys" filename="ivr-to_hear_screaming_monkeys.wav"/> - <prompt phrase="To list to music on hold" filename="ivr-to_listen_to_moh.wav"/> - <prompt phrase="To repeat these options" filename="ivr-to_repeat_these_options.wav"/> - <prompt phrase="To return to the previous menu" filename="ivr-to_return_to_previous_menu.wav"/> - <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="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"/> - <prompt phrase="Last name first" filename="ivr-last_name_first.wav"/> - <prompt phrase="First name first" filename="ivr-first_name_first.wav"/> - <prompt phrase="Press 1 for Q or Z." filename="ivr-press_one_q_or_z.wav"/> - <prompt phrase="Sales" filename="ivr-sales.wav"/> - <prompt phrase="Customer service" filename="ivr-customer_service.wav"/> - <prompt phrase="Technical support" filename="ivr-technical_support.wav"/> - <prompt phrase="Operator" filename="ivr-operator.wav"/> + <prompt phrase="Número de cuenta" filename="ivr-account_number.wav"/> + <prompt phrase="Conectar con quien llama" filename="ivr-connect_to_caller.wav"/> + <prompt phrase="Si conoce la extensión, por favor ingrésela ahora" filename="ivr-enter_ext_pound.wav"/> + <prompt phrase="por favor ingrese el número de una extensión seguido del signo de número" filename="ivr-enter_ext.wav"/> + <prompt phrase="Para esta persona" filename="ivr-for_this_person.wav"/> + <prompt phrase="Por favor espere mientras conecto su llamada" filename="ivr-hold_connect_call.wav"/> + <prompt phrase="Lo siento" filename="ivr-im_sorry.wav"/> + <prompt phrase="Por favor" filename="ivr-please.wav"/> + <prompt phrase="Por favor devuelva nuestra llamada al" filename="ivr-please_return_our_call_at.wav"/> + <prompt phrase="Acerca del número de referencia" filename="ivr-regarding_reference_number.wav"/> + <prompt phrase="Este es un ejemplo de un submenú de audiorrespuesta..." filename="ivr-sample_submenu.wav"/> + <prompt phrase="Por favor diga su nombre después del tono" filename="ivr-say_name.wav"/> + <prompt phrase="Enviar a esta persona que llama al buzón de voz" filename="ivr-send_to_voicemail.wav"/> + <prompt phrase="Para hablar con un representante de servicio al cliente" filename="ivr-speak_to_a_customer_service_representative.wav"/> + <prompt phrase="Tomar un mensaje" filename="ivr-take_a_message.wav"/> + <prompt phrase="Gracias" filename="ivr-thank_you.wav"/> + <prompt phrase="Esa fue una entrada inválida" filename="ivr-that_was_an_invalid_entry.wav"/> + <prompt phrase="Esta es una llamada de" filename="ivr-this_is_a_call_from.wav"/> + <prompt phrase="Este menú de audiorrespuesta le permitirá probar algunas de las características..." filename="ivr-this_ivr_will_let_you_test_features.wav"/> + <prompt phrase="Para llamar a la conferencia de FreeSWITCH" filename="ivr-to_call_the_freeswitch_conference.wav"/> + <prompt phrase="Para hacer una prueba de eco de FreeSWITCH" filename="ivr-to_do_a_freeswitch_echo_test.wav"/> + <prompt phrase="Para hacer una prueba de eco de FWD" filename="ivr-to_do_a_fwd_echo_test.wav"/> + <prompt phrase="Para escuchar un ejemplo de un submenú de audio respuesta" filename="ivr-to_hear_sample_submenu.wav"/> + <prompt phrase="Para escuchar simios gritando" filename="ivr-to_hear_screaming_monkeys.wav"/> + <prompt phrase="Para escuchar música de llamada en espera" filename="ivr-to_listen_to_moh.wav"/> + <prompt phrase="Para repetir estas opciones" filename="ivr-to_repeat_these_options.wav"/> + <prompt phrase="Para regresar al menú anterior" filename="ivr-to_return_to_previous_menu.wav"/> + <prompt phrase="Para hablar con un operador" filename="ivr-to_speak_with_an_operator.wav"/> + <prompt phrase="Bienvenido a FreeSWITCH, el futuro de la telefonía" filename="ivr-welcome_to_freeswitch.wav"/> + <prompt phrase="Usted puede colgar en cualquier momento para salir" filename="ivr-you_may_exit_by_hanging_up.wav"/> + <prompt phrase="o" filename="ivr-or.wav"/> + <prompt phrase="no" filename="ivr-not.wav"/> + <prompt phrase="llamar" filename="ivr-call.wav"/> + <prompt phrase="Usted puede" filename="ivr-you_may.wav"/> + <prompt phrase="hola" filename="ivr-hello.wav"/> + <prompt phrase="Usando el teclado de su teléfono..." filename="ivr-use_telephone_keypad.wav"/> + <prompt phrase="por favor deletree el nombre de la persona a la cual está intentando contactar." filename="ivr-spell_name.wav"/> + <prompt phrase="Primero el apellido" filename="ivr-last_name_first.wav"/> + <prompt phrase="Primero el nombre" filename="ivr-first_name_first.wav"/> + <prompt phrase="Presione 1 para Q ó Z." filename="ivr-press_one_q_or_z.wav"/> + <prompt phrase="Ventas" filename="ivr-sales.wav"/> + <prompt phrase="Servicio al cliente" filename="ivr-customer_service.wav"/> + <prompt phrase="Soporte técnico" filename="ivr-technical_support.wav"/> + <prompt phrase="Operador" filename="ivr-operator.wav"/> </ivr> <misc> - <prompt phrase="This call has been secured" filename="call_secured.wav"/> - <prompt phrase="Followed by pound" filename="followed.wav"/> - <prompt phrase="If you are this person" filename="if_you_are_this_person.wav"/> - <prompt phrase="If you would like to" filename="if_you_would_like_to.wav"/> - <prompt phrase="Provide reference number" filename="provide_reference_number.wav"/> - <prompt phrase="Please enter extension you want to transfer to" filename="transfer1.wav"/> - <prompt phrase="Transfer" filename="transfer2.wav"/> - <prompt phrase="We are trying to reach" filename="we_are_trying_to_reach.wav"/> - <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> + <prompt phrase="Esta llamada ha sido asegurada" filename="call_secured.wav"/> + <prompt phrase="Seguido del signo de número" filename="followed.wav"/> + <prompt phrase="Si usted es esta persona" filename="if_you_are_this_person.wav"/> + <prompt phrase="Si usted desea" filename="if_you_would_like_to.wav"/> + <prompt phrase="Diga el número de referencia" filename="provide_reference_number.wav"/> + <prompt phrase="Por favor pulse la extensión a la cual desea transferir" filename="transfer1.wav"/> + <prompt phrase="Transferir" filename="transfer2.wav"/> + <prompt phrase="Estamos tratando de contactar" filename="we_are_trying_to_reach.wav"/> + <prompt phrase="Un error ha ocurrido, por favor contacte al administrador" filename="error.wav"/> </misc> </en> </language> \ No newline at end of file

1 0

[commit] r13114 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: brian Date: Wed Apr 22 10:16:37 2009 New Revision: 13114 Log: more cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Wed Apr 22 10:16:37 2009 @@ -1830,7 +1830,7 @@ if (strcasecmp(argv[1], profile->name)) { stream->write_function(stream, " <alias-of>%s</alias-of>\n", switch_str_nil(profile->name)); } - stream->write_function(stream, " <DB-name>%s</DB-name>\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, " <db-name>%s</db-name>\n", switch_str_nil(profile->dbname)); stream->write_function(stream, " <pres-hosts>%s</pres-hosts>\n", switch_str_nil(profile->presence_hosts)); stream->write_function(stream, " <dialplan>%s</dialplan>\n", switch_str_nil(profile->dialplan)); stream->write_function(stream, " <context>%s</context>\n", switch_str_nil(profile->context)); @@ -1933,7 +1933,7 @@ sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse); if (sofia_test_pflag(profile, PFLAG_TLS)) { - stream->write_function(stream, "<profile>\n<Name>%s</Name>\n<Type>%s</Type>\n<Data>%s</Data>\n<State>%s (%u) (TLS)</State>\n</profile>\n", profile->name, "profile", profile->tls_url, + stream->write_function(stream, "<profile>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s (%u) (TLS)</state>\n</profile>\n", profile->name, "profile", profile->tls_url, sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse); }

1 0

[commit] r13113 - in freeswitch/trunk/src: include mod/applications/mod_limit
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 10:02:32 2009 New Revision: 13113 Log: MODAPP-264 prevent multiple bindings of the same event_hooks to make code simpler in mod_limit Modified: freeswitch/trunk/src/include/switch_core_event_hook.h freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_event_hook.h (original) +++ freeswitch/trunk/src/include/switch_core_event_hook.h Wed Apr 22 10:02:32 2009 @@ -183,12 +183,12 @@ assert(_NAME != NULL); \ for (ptr = session->event_hooks._NAME; ptr && ptr->next; ptr = ptr->next) \ if (ptr->_NAME == _NAME) return SWITCH_STATUS_FALSE; \ + if (ptr && ptr->_NAME == _NAME) return SWITCH_STATUS_FALSE; \ if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { \ hook->_NAME = _NAME ; \ if (! session->event_hooks._NAME ) { \ session->event_hooks._NAME = hook; \ } else { \ - for (ptr = session->event_hooks._NAME; ptr && ptr->next; ptr = ptr->next); \ ptr->next = hook; \ } \ return SWITCH_STATUS_SUCCESS; \ Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Apr 22 10:02:32 2009 @@ -67,7 +67,6 @@ } limit_hash_item_t; typedef struct { - uint8_t have_state_handler; switch_hash_t *hash; } limit_hash_private_t; @@ -377,7 +376,7 @@ /* Remove handler */ switch_core_event_hook_remove_state_change(session, hash_state_handler); - pvt->have_state_handler = 0; + switch_mutex_unlock(globals.limit_hash_mutex); } @@ -778,7 +777,6 @@ char buf[80] = ""; callback_t cbt = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); - switch_bool_t new_channel = SWITCH_FALSE; if (!switch_strlen_zero(data)) { mydata = switch_core_session_strdup(session, data); @@ -812,7 +810,6 @@ } - new_channel = !switch_channel_get_variable(channel, "limit_realm"); switch_channel_set_variable(channel, "limit_realm", realm); switch_channel_set_variable(channel, "limit_id", id); switch_channel_set_variable(channel, "limit_max", argv[2]); @@ -829,9 +826,9 @@ goto done; } - if (new_channel) { - switch_core_event_hook_add_state_change(session, db_state_handler); - } + switch_core_event_hook_add_state_change(session, db_state_handler); + switch_core_event_hook_add_state_change(session, db_state_handler); + sql = switch_mprintf("insert into limit_data (hostname, realm, id, uuid) values('%q','%q','%q','%q');", globals.hostname, realm, id, switch_core_session_get_uuid(session)); @@ -1025,11 +1022,9 @@ switch_channel_set_variable(channel, "limit_rate", srate); switch_channel_set_variable(channel, switch_core_session_sprintf(session, "limit_rate_%s", hashkey), srate); } - - if (!pvt->have_state_handler) { - switch_core_event_hook_add_state_change(session, hash_state_handler); - pvt->have_state_handler = 1; - } + + switch_core_event_hook_add_state_change(session, hash_state_handler); + end: switch_mutex_unlock(globals.limit_hash_mutex);

1 0

[commit] r13112 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: mikej Date: Tue Apr 21 18:27:53 2009 New Revision: 13112 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Tue Apr 21 18:27:53 2009 @@ -19439,6 +19439,18 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_direction(void * jarg1) { + int jresult ; + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + switch_call_direction_t result; + + arg1 = (switch_channel_t *)jarg1; + result = (switch_call_direction_t)switch_channel_direction(arg1); + jresult = result; + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create(void * jarg1, void * jarg2, void * jarg3) { int jresult ; switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Tue Apr 21 18:27:53 2009 @@ -2703,6 +2703,11 @@ freeswitchPINVOKE.switch_channel_set_hangup_time(SWIGTYPE_p_switch_channel.getCPtr(channel)); } + public static switch_call_direction_t switch_channel_direction(SWIGTYPE_p_switch_channel channel) { + switch_call_direction_t ret = (switch_call_direction_t)freeswitchPINVOKE.switch_channel_direction(SWIGTYPE_p_switch_channel.getCPtr(channel)); + return ret; + } + public static switch_status_t switch_buffer_create(SWIGTYPE_p_apr_pool_t pool, SWIGTYPE_p_p_switch_buffer buffer, SWIGTYPE_p_switch_size_t max_len) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_buffer_create(SWIGTYPE_p_apr_pool_t.getCPtr(pool), SWIGTYPE_p_p_switch_buffer.getCPtr(buffer), SWIGTYPE_p_switch_size_t.getCPtr(max_len)); if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); @@ -9121,6 +9126,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_hangup_time")] public static extern void switch_channel_set_hangup_time(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_direction")] + public static extern int switch_channel_direction(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_buffer_create")] public static extern int switch_buffer_create(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); @@ -20372,6 +20380,8 @@ SWITCH_EVENT_SESSION_HEARTBEAT, SWITCH_EVENT_CLIENT_DISCONNECTED, SWITCH_EVENT_SERVER_DISCONNECTED, + SWITCH_EVENT_SEND_INFO, + SWITCH_EVENT_RECV_INFO, SWITCH_EVENT_ALL }

1 0

[commit] r13111 - freeswitch/trunk/src/include
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 17:51:28 2009 New Revision: 13111 Log: make state_handler macros not let you install the same one more than once Modified: freeswitch/trunk/src/include/switch_core_event_hook.h Modified: freeswitch/trunk/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_event_hook.h (original) +++ freeswitch/trunk/src/include/switch_core_event_hook.h Tue Apr 21 17:51:28 2009 @@ -181,6 +181,8 @@ { \ switch_io_event_hook_##_NAME##_t *hook, *ptr; \ assert(_NAME != NULL); \ + for (ptr = session->event_hooks._NAME; ptr && ptr->next; ptr = ptr->next) \ + if (ptr->_NAME == _NAME) return SWITCH_STATUS_FALSE; \ if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { \ hook->_NAME = _NAME ; \ if (! session->event_hooks._NAME ) { \

1 0

[commit] r13110 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: stkn Date: Tue Apr 21 17:43:18 2009 New Revision: 13110 Log: Change call counter status output for consistency Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Tue Apr 21 17:43:18 2009 @@ -1672,10 +1672,10 @@ stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); stream->write_function(stream, "STUN-ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); stream->write_function(stream, "STUN-AUTO-DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); - stream->write_function(stream, "CallsIN \t%d\n", profile->ib_calls); - stream->write_function(stream, "FailedCallsIN \t%d\n", profile->ib_failed_calls); - stream->write_function(stream, "CallsOUT \t%d\n", profile->ob_calls); - stream->write_function(stream, "FailedCallsOUT \t%d\n", profile->ob_failed_calls); + stream->write_function(stream, "CALLS-IN \t%d\n", profile->ib_calls); + stream->write_function(stream, "FAILED-CALLS-IN \t%d\n", profile->ib_failed_calls); + stream->write_function(stream, "CALLS-OUT \t%d\n", profile->ob_calls); + stream->write_function(stream, "FAILED-CALLS-OUT \t%d\n", profile->ob_failed_calls); } stream->write_function(stream, "\nRegistrations:\n%s\n", line);

1 0

[commit] r13109 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: brian Date: Tue Apr 21 17:26:21 2009 New Revision: 13109 Log: cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Tue Apr 21 17:26:21 2009 @@ -1670,8 +1670,8 @@ stream->write_function(stream, "LATE-NEG \t%s\n", sofia_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); stream->write_function(stream, "PROXY-MEDIA \t%s\n", sofia_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); - stream->write_function(stream, "STUN_ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, "STUN_AUTO_DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + stream->write_function(stream, "STUN-ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, "STUN-AUTO-DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); stream->write_function(stream, "CallsIN \t%d\n", profile->ib_calls); stream->write_function(stream, "FailedCallsIN \t%d\n", profile->ib_failed_calls); stream->write_function(stream, "CallsOUT \t%d\n", profile->ob_calls);

1 0