April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13052 - in freeswitch/trunk/src: . include mod/applications/mod_skel
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mrene Date: Wed Apr 15 21:26:32 2009 New Revision: 13052 Log: xml_config: Fix issue where default NULL strings were ignored on reload Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Wed Apr 15 21:26:32 2009 @@ -100,8 +100,8 @@ #define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext) { _key, _type, _flags, _ptr, _defaultvalue, _data, NULL, _syntax, _helptext } #define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext) { _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL, _helptext} -#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata, _syntax, _helptext) { _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data, _helptext} -#define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL, NULL, NULL } +#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata, _syntax, _helptext) { _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data, _syntax, _helptext } +#define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL, NULL, NULL, NULL, NULL, NULL } /*! * \brief Gets the int representation of an enum Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Wed Apr 15 21:26:32 2009 @@ -89,7 +89,7 @@ "greedy|generous|evil", "Specifies the codec negotiation scheme to be used."), SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL , "yes|no", "If enabled, print out sip messages on the console."), - SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE | CONFIG_REQUIRED, &globals.integer, (void*)100, &config_opt_integer, + SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &globals.integer, (void*)100, &config_opt_integer, NULL, NULL), SWITCH_CONFIG_ITEM_END() }; @@ -108,8 +108,8 @@ SWITCH_STANDARD_API(skel_function) { - stream->write_function(stream, "+OK Reloading\n"); do_config(SWITCH_TRUE); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Wed Apr 15 21:26:32 2009 @@ -232,27 +232,49 @@ newstring = (char*)item->defaultvalue; } - - if (newstring) { - if (string_options->length > 0) { - /* We have a preallocated buffer */ - char *dest = (char*)item->ptr; + if (string_options->length > 0) { + /* We have a preallocated buffer */ + char *dest = (char*)item->ptr; + if (newstring) { if (strncasecmp(dest, newstring, string_options->length)) { switch_copy_string(dest, newstring, string_options->length); changed = SWITCH_TRUE; } } else { - char **dest = (char**)item->ptr; + if (*dest != '\0') { + *dest = '\0'; + changed = SWITCH_TRUE; + } + } + } else if (string_options->pool) { + /* Pool-allocated buffer */ + char **dest = (char**)item->ptr; - if (!*dest || strcasecmp(*dest, newstring)) { - if (string_options->pool) { - *dest = switch_core_strdup(string_options->pool, newstring); - } else { - switch_safe_free(*dest); - *dest = strdup(newstring); - } - changed = SWITCH_TRUE; + if (newstring) { + if (!*dest || strcmp(*dest, newstring)) { + *dest = switch_core_strdup(string_options->pool, newstring); + } + } else { + if (*dest) { + changed = SWITCH_TRUE; + *dest = NULL; + } + } + } else { + /* Dynamically allocated buffer */ + char **dest = (char**)item->ptr; + + if (newstring) { + if (!*dest || strcmp(*dest, newstring)) { + switch_safe_free(*dest); + *dest = strdup(newstring); + changed = SWITCH_TRUE; + } + } else { + if (*dest) { + switch_safe_free(*dest); + changed = SWITCH_TRUE; } } }

1 0

[commit] r13051 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: rupa Date: Wed Apr 15 20:54:15 2009 New Revision: 13051 Log: update xml config callback code Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Wed Apr 15 20:54:15 2009 @@ -106,35 +106,39 @@ #ifdef SWITCH_HAVE_ODBC char *odbc_user = NULL; char *odbc_pass = NULL; + char *odbc_dsn = NULL; switch_odbc_handle_t *odbc = NULL; - if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dsn data: %s\n", globals.odbc_dsn); + if (globals.db_mutex) { + switch_mutex_lock(globals.db_mutex); } - /* setup dsn */ - if (globals.odbc_dsn) { - if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { - *odbc_user++ = '\0'; - if ((odbc_pass = strchr(odbc_user, ':'))) { - *odbc_pass++ = '\0'; + if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { + odbc_dsn = strdup(*((char**)data->ptr)); + + if(switch_strlen_zero(odbc_dsn)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No local database defined.\n"); + } else { + if ((odbc_user = strchr(odbc_dsn, ':'))) { + *odbc_user++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connecting to dsn: %s, %s, %s.\n", globals.odbc_dsn, odbc_user, odbc_pass); + + /* setup dsn */ + + if (!(odbc = switch_odbc_handle_new(odbc_dsn, odbc_user, odbc_pass))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + switch_goto_status(SWITCH_STATUS_FALSE, done); + } + if (switch_odbc_handle_connect(odbc) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + switch_goto_status(SWITCH_STATUS_FALSE, done); } - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connecting to dsn: %s, %s, %s.\n", globals.odbc_dsn, odbc_user, odbc_pass); - - if (globals.db_mutex) { - switch_mutex_lock(globals.db_mutex); - } - - if (!(odbc = switch_odbc_handle_new(globals.odbc_dsn, odbc_user, odbc_pass))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); - switch_goto_status(SWITCH_STATUS_FALSE, done); - } - if (switch_odbc_handle_connect(odbc) != SWITCH_ODBC_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); - switch_goto_status(SWITCH_STATUS_FALSE, done); } /* ok, we have a new connection, tear down old one */ @@ -158,6 +162,7 @@ if (globals.db_mutex) { switch_mutex_unlock(globals.db_mutex); } + switch_safe_free(odbc_dsn); #endif return status; } @@ -168,8 +173,8 @@ SWITCH_CONFIG_ITEM_STRING_STRDUP("url", CONFIG_RELOAD, &globals.url, NULL, "http://server.example.com/app?number=${caller_id_number}", "URL for the CID lookup service"), SWITCH_CONFIG_ITEM("cache", SWITCH_CONFIG_BOOL, CONFIG_RELOAD, &globals.cache, SWITCH_FALSE, NULL, "true|false", "whether to cache via cidlookup"), SWITCH_CONFIG_ITEM("cache-expire", SWITCH_CONFIG_INT, CONFIG_RELOAD, &globals.cache_expire, (void *)300, NULL, "expire", "seconds to preserve num->name cache"), - SWITCH_CONFIG_ITEM_STRING_STRDUP("sql", CONFIG_RELOAD, &globals.sql, NULL, "sql whre number=${caller_id_number}", "SQL to run if overriding CID"), - SWITCH_CONFIG_ITEM_CALLBACK("odbc-dsn", SWITCH_CONFIG_STRING, CONFIG_RELOAD, &globals.odbc_dsn, NULL, config_callback_dsn, &config_opt_dsn, + SWITCH_CONFIG_ITEM_STRING_STRDUP("sql", CONFIG_RELOAD, &globals.sql, "", "sql whre number=${caller_id_number}", "SQL to run if overriding CID"), + SWITCH_CONFIG_ITEM_CALLBACK("odbc-dsn", SWITCH_CONFIG_STRING, CONFIG_RELOAD, &globals.odbc_dsn, "", config_callback_dsn, &config_opt_dsn, "db:user:passwd", "Database to use."), SWITCH_CONFIG_ITEM_END() }; @@ -186,7 +191,6 @@ static void event_handler(switch_event_t *event) { do_config(SWITCH_TRUE); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "cidlookup Reloaded\n"); } #ifdef SWITCH_HAVE_ODBC

1 0

[commit] r13050 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: rupa Date: Wed Apr 15 20:32:34 2009 New Revision: 13050 Log: cleanup xml config handling Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 15 20:32:34 2009 @@ -67,7 +67,6 @@ if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { memcached_str = *((char**)data->ptr); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcached data: %s\n", memcached_str); /* initialize main ptr */ memcached_server = memcached_servers_parse(memcached_str); @@ -79,7 +78,7 @@ if ((servercount = memcached_server_list_count(memcached_server)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No memcache servers defined. Server string: %s.\n", memcached_str); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%u servers defined.\n", servercount); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u servers defined (%s).\n", servercount, memcached_str); } /* setup memcached */ @@ -102,7 +101,6 @@ } switch_goto_status(SWITCH_STATUS_SUCCESS, end); - end: if (memcached_server) { @@ -117,19 +115,17 @@ return status; } -static switch_xml_config_string_options_t config_opt_memcache_servers = {NULL, 0, NULL}; /* anything is ok here */ +static switch_xml_config_string_options_t config_opt_memcache_servers = {NULL, 0, NULL}; /* anything ok */ static switch_xml_config_item_t instructions[] = { /* parameter name type reloadable pointer default value options structure */ - SWITCH_CONFIG_ITEM_CALLBACK("memcache-servers", SWITCH_CONFIG_STRING, CONFIG_REQUIRED | CONFIG_RELOAD, &globals.memcached_str, NULL, config_callback_memcached, &config_opt_memcache_servers, + SWITCH_CONFIG_ITEM_CALLBACK("memcache-servers", SWITCH_CONFIG_STRING, CONFIG_REQUIRED | CONFIG_RELOAD, &globals.memcached_str, "", config_callback_memcached, &config_opt_memcache_servers, "host,host:port,host", "List of memcached servers."), SWITCH_CONFIG_ITEM_END() }; static switch_status_t do_config(switch_bool_t reload) { - memset(&globals, 0, sizeof(globals)); - if (switch_xml_config_parse_module_settings("memcache.conf", reload, instructions) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; } @@ -141,7 +137,6 @@ static void event_handler(switch_event_t *event) { do_config(SWITCH_TRUE); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Memcache Reloaded\n"); } SWITCH_STANDARD_API(memcache_function) @@ -342,6 +337,8 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + memset(&globals, 0, sizeof(globals)); + do_config(SWITCH_FALSE); if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) {

1 0

[commit] r13049 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: robertj Date: Wed Apr 15 20:14:12 2009 New Revision: 13049 Log: Fixed ability to send a string as user indications (DTMF) thanks Peter Olsson Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Apr 15 20:14:12 2009 @@ -687,12 +687,20 @@ OpalLocalConnection::OnEstablished(); } + PBoolean FSConnection::SendUserInputTone(char tone, unsigned duration) { switch_dtmf_t dtmf = { tone, duration }; return switch_channel_queue_dtmf(m_fsChannel, &dtmf) == SWITCH_STATUS_SUCCESS; } + +PBoolean FSConnection::SendUserInputString(const PString & value) +{ + return OpalConnection::SendUserInputString(value); +} + + OpalMediaFormatList FSConnection::GetMediaFormats() const { if (m_switchMediaFormats.IsEmpty()) { Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Wed Apr 15 20:14:12 2009 @@ -192,6 +192,7 @@ virtual PBoolean OnOpenMediaStream(OpalMediaStream & stream); virtual OpalMediaFormatList GetMediaFormats() const; virtual PBoolean SendUserInputTone(char tone, unsigned duration); + virtual PBoolean SendUserInputString(const PString & value); void SetCodecs();

1 0

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

15 Apr '09

Author: rupa Date: Wed Apr 15 18:36:34 2009 New Revision: 13048 Log: set perpetual_sound from channel var 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 15 18:36:34 2009 @@ -4750,6 +4750,10 @@ if(switch_strlen_zero(conference->moh_sound)) { conference->moh_sound = switch_core_strdup(conference->pool, switch_channel_get_variable(channel, "conference_moh_sound")); } + /* Set perpetual-sound from variable if not set */ + if(switch_strlen_zero(conference->perpetual_sound)) { + conference->perpetual_sound = switch_core_strdup(conference->pool, switch_channel_get_variable(channel, "conference_perpetual_sound")); + } /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 1;

1 0

[commit] r13047 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: anthm Date: Wed Apr 15 17:01:27 2009 New Revision: 13047 Log: fix fifo issues Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Apr 15 17:01:27 2009 @@ -38,7 +38,7 @@ SWITCH_MODULE_DEFINITION(mod_fifo, mod_fifo_load, mod_fifo_shutdown, NULL); #define FIFO_EVENT "fifo::info" - +#define FIFO_DELAY_DESTROY 100 static switch_status_t load_config(int reload, int del_all); #define MAX_PRI 10 @@ -369,13 +369,16 @@ { fifo_node_t *node; int x = 0; + switch_memory_pool_t *pool; if (!globals.running) { return NULL; } - node = switch_core_alloc(globals.pool, sizeof(*node)); - node->pool = globals.pool; + switch_core_new_memory_pool(&pool); + + node = switch_core_alloc(pool, sizeof(*node)); + node->pool = pool; node->name = switch_core_strdup(node->pool, name); for (x = 0; x < MAX_PRI; x++) { @@ -387,7 +390,9 @@ switch_thread_rwlock_create(&node->rwlock, node->pool); switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, node->pool); node->importance = importance; + switch_mutex_lock(globals.mutex); switch_core_hash_insert(globals.fifo_hash, name, node); + switch_mutex_unlock(globals.mutex); return node; } @@ -526,7 +531,7 @@ sql = switch_mprintf("select uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, " "next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname " - "from fifo_outbound where (fifo_name = '%s') and (use_count < simo_count) and (next_avail = 0 or next_avail <= %ld) " + "from fifo_outbound where (fifo_name = '%q') and (use_count < simo_count) and (next_avail = 0 or next_avail <= %ld) " "order by outbound_call_count", node->name, (long) switch_epoch_time_now(NULL)); switch_assert(sql); @@ -747,6 +752,7 @@ } } + if (!(node = switch_core_hash_find(globals.fifo_hash, nlist[i]))) { node = create_node(nlist[i], importance); } @@ -963,12 +969,15 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Action", cd.do_orbit ? "timeout" : "abort"); switch_event_fire(&event); } + + switch_mutex_lock(globals.mutex); switch_mutex_lock(node->mutex); node_remove_uuid(node, uuid); node->caller_count--; switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); send_presence(node); + switch_mutex_unlock(globals.mutex); } @@ -1406,6 +1415,19 @@ } done: + + switch_mutex_lock(globals.mutex); + if (node && node->ready == FIFO_DELAY_DESTROY && node->consumer_count == 0 && node->caller_count == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s removed. (delayed)\n", node->name); + switch_core_hash_delete(globals.fifo_hash, node->name); + switch_core_hash_destroy(&node->caller_hash); + switch_core_hash_destroy(&node->consumer_hash); + switch_thread_rwlock_unlock(node->rwlock); + switch_core_destroy_memory_pool(&node->pool); + } + switch_mutex_unlock(globals.mutex); + + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); switch_core_media_bug_resume(session); @@ -1460,7 +1482,9 @@ static int xml_outbound(switch_xml_t xml, fifo_node_t *node, char *container, char *tag, int cc_off, int verbose) { struct xml_helper h; - char *sql = "select uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname from fifo_outbound"; + char *sql = switch_mprintf("select uuid, fifo_name, originate_string, simo_count, use_count, timeout, " + "lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, " + "hostname from fifo_outbound where fifo_name = '%q'", node->name); h.xml = xml; h.node = node; @@ -1471,6 +1495,8 @@ fifo_execute_sql_callback(globals.sql_mutex, sql, xml_callback, &h); + switch_safe_free(sql); + return h.cc_off; } @@ -1763,12 +1789,14 @@ switch_hash_index_t *hi; fifo_node_t *node; void *val; + switch_mutex_lock(globals.mutex); for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); if ((node = (fifo_node_t *) val) && node->is_static) { node->ready = 0; } } + switch_mutex_unlock(globals.mutex); } if (del_all) { @@ -1869,6 +1897,8 @@ switch_hash_index_t *hi; void *val, *pop; fifo_node_t *node; + switch_mutex_lock(globals.mutex); + top: for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); @@ -1877,8 +1907,8 @@ } if (node_consumer_wait_count(node) || node->consumer_count || node_idle_consumers(node)) { - node->ready = 1; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s not removed, still in use.\n", node->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s removal delayed, still in use.\n", node->name); + node->ready = FIFO_DELAY_DESTROY; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s removed.\n", node->name); switch_thread_rwlock_wrlock(node->rwlock); @@ -1887,12 +1917,16 @@ free(pop); } } - + + switch_core_hash_delete(globals.fifo_hash, node->name); switch_core_hash_destroy(&node->caller_hash); switch_core_hash_destroy(&node->consumer_hash); switch_thread_rwlock_unlock(node->rwlock); + switch_core_destroy_memory_pool(&node->pool); + goto top; } } + switch_mutex_unlock(globals.mutex); } @@ -1924,7 +1958,8 @@ node->has_outbound = 1; sql = switch_mprintf("insert into fifo_outbound " - "(uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname) " + "(uuid, fifo_name, originate_string, simo_count, use_count, timeout, " + "lag, next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname) " "values ('%q','%q','%q',%d,%d,%d,%d,%d,%ld,0,0,0,'%q')", digest, fifo_name, originate_string, simo_count, 0, timeout, lag, 0, (long)expires, globals.hostname ); @@ -2088,7 +2123,7 @@ stop_node_thread(); } - + top: for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); @@ -2101,9 +2136,12 @@ } } + switch_core_hash_delete(globals.fifo_hash, node->name); switch_core_hash_destroy(&node->caller_hash); switch_core_hash_destroy(&node->consumer_hash); switch_thread_rwlock_unlock(node->rwlock); + switch_core_destroy_memory_pool(&node->pool); + goto top; } switch_core_hash_destroy(&globals.fifo_hash); memset(&globals, 0, sizeof(globals));

1 0

[commit] r13046 - in freeswitch/trunk/conf: autoload_configs dialplan
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mcollins Date: Wed Apr 15 15:33:49 2009 New Revision: 13046 Log: Add ext 9991 as ClueCon ext; use transfer instead of bridge on demo ivr opt #4 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Wed Apr 15 15:33:49 2009 @@ -15,9 +15,9 @@ <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>  - <entry action="menu-exec-app" digits="4" param="bridge sofia/$${domain}/brian(a)bkw.org"/>  - <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  - <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>  + <entry action="menu-exec-app" digits="4" param="transfer 9991 XML default"/>  + <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  + <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>  <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML features"/> <entry action="menu-top" digits="9"/>  </menu> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Apr 15 15:33:49 2009 @@ -540,6 +540,13 @@ </condition> </extension> + <extension name="ClueCon"> + <condition field="destination_number" expression="^9991$"> + <action application="set" data="effective_caller_id_name=ClueCon"/> + <action application="bridge" data="sofia/$${domain}/brian(a)bkw.org"/> + </condition> + </extension> + <extension name="show_info"> <condition field="destination_number" expression="^9992$"> <action application="answer"/>

1 0

[commit] r13045 - freeswitch/trunk/conf/lang/ru/demo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: buklov Date: Wed Apr 15 15:13:53 2009 New Revision: 13045 Log: Update phrase_ru.xml to include v1.0.8 sound prompts Modified: freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml Modified: freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/ru/demo/demo-ivr.xml Wed Apr 15 15:13:53 2009 @@ -1,68 +1,61 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="Windows-1252"?> <include> <macro name="demo_ivr_count"> <input pattern="^(\d+)$"> <match> - <action function="play-file" data="voicemail/vm-you_have.wav"/> - <action function="say" data="$1" method="pronounced" type="name_spelled"/> - <action function="play-file" data="voicemail/vm-messages.wav"/> + <action function="play-file" data="voicemail/vm-you_have.wav"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> + <action function="play-file" data="voicemail/vm-messages.wav"/> </match> </input> </macro> - <macro name="demo_ivr_main_menu">  + <macro name="demo_ivr_main_menu" pause="250">  <input pattern="(.*)"> <match>  <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>  - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/> <action function="execute" data="sleep(1500)"/> <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/1.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/2.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/3.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/4.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> - <action function="execute" data="sleep(250)"/> + <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/5.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/9.wav"/> @@ -73,48 +66,42 @@   - <macro name="demo_ivr_main_menu_short"> + <macro name="demo_ivr_main_menu_short" pause="250"> <input pattern="(.*)"> <match>  <action function="execute" data="sleep(1000)"/> <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/1.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/2.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/3.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/4.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/5.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/9.wav"/> @@ -128,16 +115,14 @@ <input pattern="(.*)"> <match> <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-sample_submenu.wav"/> - <action function="execute" data="sleep(250)"/> +  <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/star.wav"/> - <action function="execute" data="sleep(250)"/> + </match> </input> </macro> @@ -149,11 +134,10 @@ <match>  <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/> - <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/star.wav"/> - <action function="execute" data="sleep(250)"/> + </match> </input> </macro>

1 0

[commit] r13044 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: buklov Date: Wed Apr 15 15:10:40 2009 New Revision: 13044 Log: Update phrase_ru.xml to include v1.0.8 sound prompts 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 Wed Apr 15 15:10:40 2009 @@ -427,6 +427,7 @@ <prompt phrase="для того что бы послать собощение " filename= "vm-send_message_now.wav"/> <prompt phrase="пожалуйста, введите добавочный номер для отправки сообщения" filename= "vm-forward_enter_ext.wav"/> <prompt phrase="Неправильный добавочный номер" filename= "vm-that_was_an_invalid_ext.wav"/> + <prompt phrase="Почтовый ящик переполнен. Пожалуйста перезвоните позже" filename= "vm-mailbox_full.wav"/> </voicemail> <conference> <prompt phrase="NULL " filename= "conf-ack type.wav"/> @@ -491,6 +492,21 @@ <prompt phrase="Центр обслуживания клиентов " filename= "ivr-customer_service.wav"/> <prompt phrase="Отдел технической поддержки " filename= "ivr-technical_support.wav"/> <prompt phrase="Оператор " filename= "ivr-operator.wav"/> + <prompt phrase="Вы набрали несуществующий добавочный номер" filename= "ivr-you_have_dialed_an_invalid_extension.wav"/> + <prompt phrase="Пожалйста, наберите добавочный номер и нажмите клавишу решетка" filename= "ivr-please_enter_extension_followed_by_pound.wav"/> + <prompt phrase="Пожалуйста введите ваш пинкод и нажмите клавишу решётка" filename= "ivr-please_enter_pin_followed_by_pound.wav"/> + <prompt phrase="Ваш пин код или номер не верны" filename= "ivr-pin_or_extension_is-invalid.wav"/> + <prompt phrase="вы почти закрепили этот телефон за вашей учётной записью" filename= "ivr-you_are_about_to_provision_this_phone.wav"/> + <prompt phrase="пожалуйста повторите ваш пин код для подтверждения" filename= "ivr-please_reenter_your_pin.wav"/> + <prompt phrase="Для регистрации на clueCon , пожалуйста нажмите .." filename= "ivr-register_for_cluecon.wav"/> + <prompt phrase="Для входа" filename= "ivr-to_log_in.wav"/> + <prompt phrase="Для выхода" filename= "ivr-to_log_out.wav"/> + <prompt phrase="Вы вошли" filename= "ivr-you_are_now_logged_in.wav"/> + <prompt phrase="Вы вышли" filename= "ivr-you_are_now_logged_out.wav"/> + <prompt phrase="Попробуйте снова" filename= "ivr-please_try_again.wav"/> + <prompt phrase="Вы почти закрепили этот телефон за Вашим добавочным номером" filename= "ivr-provision_phone_permanently_to_extension.wav"/> + <prompt phrase="Пожалуйста введите добавочный номер за которым вы хотите закрепить этот телефон и нажмите решётку" filename= "ivr-extension_to_provision_this_phone.wav"/> + <prompt phrase="Спасибо, этот телефон сейчас перезагрузится" filename= "ivr-this_phone_will_now_reboot.wav"/> </ivr> <misc> <prompt phrase="Этот звонок шифруется " filename= "call_secured.wav"/>

1 0

[commit] r13043 - in freeswitch/trunk/conf: autoload_configs lang/en/demo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mcollins Date: Wed Apr 15 14:58:45 2009 New Revision: 13043 Log: Update sample IVR to include ClueCon reg option :) Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Wed Apr 15 14:58:45 2009 @@ -15,8 +15,9 @@ <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>  - <entry action="menu-sub" digits="4" param="demo_ivr_submenu"/>  + <entry action="menu-exec-app" digits="4" param="bridge sofia/$${domain}/brian(a)bkw.org"/>  <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  + <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>  <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML features"/> <entry action="menu-top" digits="9"/>  </menu> Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Wed Apr 15 14:58:45 2009 @@ -41,19 +41,22 @@ <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/3.wav"/> -  - <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> - <action function="play-file" data="ivr/ivr-please.wav"/> - <action function="play-file" data="voicemail/vm-press.wav"/> +  + <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/> <action function="play-file" data="digits/4.wav"/>  <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> - <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/5.wav"/> +  + <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/6.wav"/> +  <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> <action function="play-file" data="ivr/ivr-please.wav"/>

1 0