January 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11363 - freeswitch/branches/1.0/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Thu Jan 22 12:17:41 2009 New Revision: 11363 Log: mod_sofia: improve outbound registration error message (r:11059) Modified: freeswitch/branches/1.0/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/branches/1.0/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/branches/1.0/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/branches/1.0/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Jan 22 12:17:41 2009 @@ -1252,8 +1252,8 @@ break; default: sofia_private->gateway->state = REG_STATE_FAILED; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Registration Failed with status %d. failure #%d\n", - sofia_private->gateway->name, status, ++sofia_private->gateway->failures); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Registration Failed with status %s [%d]. failure #%d\n", + sofia_private->gateway->name, switch_str_nil(phrase), status, ++sofia_private->gateway->failures); break; } if (ostate != sofia_private->gateway->state) {

1 0

[commit] r11362 - freeswitch/branches/1.0/docs
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Thu Jan 22 12:15:21 2009 New Revision: 11362 Log: bump version number (r:11058,11361) Modified: freeswitch/branches/1.0/docs/Doxygen.conf Modified: freeswitch/branches/1.0/docs/Doxygen.conf ============================================================================== --- freeswitch/branches/1.0/docs/Doxygen.conf (original) +++ freeswitch/branches/1.0/docs/Doxygen.conf Thu Jan 22 12:15:21 2009 @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = FreeSWITCH -PROJECT_NUMBER = 1.0.1 +PROJECT_NUMBER = 1.0.3 OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English

1 0

[commit] r11361 - freeswitch/trunk/docs
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Thu Jan 22 12:12:26 2009 New Revision: 11361 Log: update version number Modified: freeswitch/trunk/docs/Doxygen.conf Modified: freeswitch/trunk/docs/Doxygen.conf ============================================================================== --- freeswitch/trunk/docs/Doxygen.conf (original) +++ freeswitch/trunk/docs/Doxygen.conf Thu Jan 22 12:12:26 2009 @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = FreeSWITCH -PROJECT_NUMBER = 1.0.2 +PROJECT_NUMBER = 1.0.3 OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English

1 0

[commit] r11360 - freeswitch/branches/1.0/libs/esl
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Thu Jan 22 11:47:57 2009 New Revision: 11360 Log: fs_cli: add "debug" command to change the esl debug level at runtime (r:11057) Modified: freeswitch/branches/1.0/libs/esl/fs_cli.c Modified: freeswitch/branches/1.0/libs/esl/fs_cli.c ============================================================================== --- freeswitch/branches/1.0/libs/esl/fs_cli.c (original) +++ freeswitch/branches/1.0/libs/esl/fs_cli.c Thu Jan 22 11:47:57 2009 @@ -285,6 +285,17 @@ goto end; } + + if (!strncasecmp(cmd, "debug", 5)){ + int tmp_debug = atoi(cmd+6); + if (tmp_debug > -1 && tmp_debug < 8){ + esl_global_set_default_logger(tmp_debug); + printf("fs_cli debug level set to %d\n", tmp_debug); + } else { + printf("fs_cli debug level must be 0 - 7\n"); + } + goto end; + } printf("Unknown command [%s]\n", cmd); } else {

1 0

[commit] r11359 - freeswitch/branches/1.0/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Thu Jan 22 11:45:22 2009 New Revision: 11359 Log: mod_event_socket: add ability to use a comma sep list of events on event-sink create-listener (r:11056) Modified: freeswitch/branches/1.0/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/branches/1.0/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/1.0/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/1.0/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Thu Jan 22 11:45:22 2009 @@ -719,6 +719,7 @@ listener->last_flush = switch_timestamp(NULL); if (events) { + char delim = ','; if (switch_stristr("xml", format)) { listener->format = EVENT_FORMAT_XML; @@ -727,11 +728,15 @@ } edup = strdup(events); - + + if (strchr(edup, ' ')) { + delim = ' '; + } + for (cur = edup; cur; count++) { switch_event_types_t type; - if ((next = strchr(cur, ' '))) { + if ((next = strchr(cur, delim))) { *next++ = '\0'; }

1 0

[commit] r11358 - freeswitch/branches/1.0/conf/autoload_configs
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Thu Jan 22 11:35:15 2009 New Revision: 11358 Log: mod_easyroute: add configuration file example for custom-query (r:11055) Modified: freeswitch/branches/1.0/conf/autoload_configs/easyroute.conf.xml Modified: freeswitch/branches/1.0/conf/autoload_configs/easyroute.conf.xml ============================================================================== --- freeswitch/branches/1.0/conf/autoload_configs/easyroute.conf.xml (original) +++ freeswitch/branches/1.0/conf/autoload_configs/easyroute.conf.xml Thu Jan 22 11:35:15 2009 @@ -10,5 +10,16 @@  <param name="default-gateway" value="192.168.66.6"/> + +  +  </settings> </configuration>

1 0

[commit] r11357 - freeswitch/branches/1.0/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Thu Jan 22 11:28:25 2009 New Revision: 11357 Log: mod_easyroute: add custom-query configuration option (r:11054) Modified: freeswitch/branches/1.0/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/branches/1.0/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/branches/1.0/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/branches/1.0/src/mod/applications/mod_easyroute/mod_easyroute.c Thu Jan 22 11:28:25 2009 @@ -68,6 +68,7 @@ char *default_techprofile; char *default_gateway; switch_mutex_t *mutex; + char *custom_query; #ifdef SWITCH_HAVE_ODBC switch_odbc_handle_t *master_odbc; #else @@ -84,6 +85,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_dsn, globals.db_dsn); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_default_techprofile, globals.default_techprofile); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_default_gateway, globals.default_gateway); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_custom_query, globals.custom_query); static int route_callback(void *pArg, int argc, char **argv, char **columnNames) { @@ -117,28 +119,30 @@ for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "db_username")) { + if (!strcasecmp(var, "db-username")) { set_global_db_username(val); - } else if (!strcasecmp(var, "db_password")) { + } else if (!strcasecmp(var, "db-password")) { set_global_db_password(val); - } else if (!strcasecmp(var, "db_dsn")) { + } else if (!strcasecmp(var, "db-dsn")) { set_global_db_dsn(val); } else if (!strcasecmp(var, "default-techprofile")) { set_global_default_techprofile(val); } else if (!strcasecmp(var, "default-gateway")) { set_global_default_gateway(val); + } else if (!strcasecmp(var, "custom-query")) { + set_global_custom_query(val); } } } done: - if (!globals.db_username) { + if (switch_strlen_zero(globals.db_username)) { set_global_db_username("root"); } - if (!globals.db_password) { + if (switch_strlen_zero(globals.db_password)) { set_global_db_password("password"); } - if (!globals.db_dsn) { + if (switch_strlen_zero(globals.db_dsn)) { set_global_db_dsn("easyroute"); } @@ -196,8 +200,13 @@ route_callback_t pdata; memset(&pdata, 0, sizeof(pdata)); - - snprintf(sql, 1025, SQL_LOOKUP, dn); + if (!globals.custom_query){ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing static Query\n[%s]\n", SQL_LOOKUP); + snprintf(sql, 1024, SQL_LOOKUP, dn); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing custom Query\n[%s]\n", globals.custom_query); + snprintf(sql, 1024, globals.custom_query, dn); + } if (globals.mutex){ switch_mutex_lock(globals.mutex); @@ -207,7 +216,7 @@ if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, route_callback, &pdata) == SWITCH_ODBC_SUCCESS){ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL Query\n[%s]\n", sql); char tmp_profile[129]; - char tmp_gateway[16]; + char tmp_gateway[129]; if (switch_strlen_zero(pdata.limit)) { switch_set_string(results->limit, "9999" ); @@ -234,7 +243,7 @@ } switch_snprintf(results->dialstring, 256, "%s/%s@%s", tmp_profile , results->translated, tmp_gateway); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "THE ROUTE [%s]", results->dialstring); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "THE ROUTE [%s]\n", results->dialstring); if (switch_strlen_zero(pdata.group)){ switch_set_string(results->group, "");

1 0

[commit] r11356 - in freeswitch/trunk/src: . include mod/applications/mod_fifo
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: anthm Date: Thu Jan 22 08:01:15 2009 New Revision: 11356 Log: tweak fifo and add app_flags Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Jan 22 08:01:15 2009 @@ -504,6 +504,10 @@ SWITCH_DECLARE(void) switch_channel_clear_private_flag(switch_channel_t *channel, uint32_t flags); SWITCH_DECLARE(int) switch_channel_test_private_flag(switch_channel_t *channel, uint32_t flags); +SWITCH_DECLARE(void) switch_channel_set_app_flag(switch_channel_t *channel, uint32_t flags); +SWITCH_DECLARE(void) switch_channel_clear_app_flag(switch_channel_t *channel, uint32_t flags); +SWITCH_DECLARE(int) switch_channel_test_app_flag(switch_channel_t *channel, uint32_t flags); + /** @} */ SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Jan 22 08:01:15 2009 @@ -846,6 +846,12 @@ CF_FLAG_MAX } switch_channel_flag_t; + +typedef enum { + CF_APP_TAGGED = (1 << 0) +} switch_channel_app_flag_t; + + /*! \enum switch_frame_flag_t \brief Frame Flags 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 Thu Jan 22 08:01:15 2009 @@ -42,7 +42,6 @@ static switch_status_t load_config(int reload, int del_all); #define MAX_PRI 10 - struct fifo_node { char *name; switch_mutex_t *mutex; @@ -847,8 +846,9 @@ switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_channel_set_variable(channel, "fifo_status", "WAITING"); switch_channel_set_variable(channel, "fifo_timestamp", date); + switch_channel_set_variable(channel, "fifo_serviced_uuid", NULL); - switch_channel_set_flag(channel, CF_TAGGED); + switch_channel_set_app_flag(channel, CF_APP_TAGGED); if (chime_list) { char *list_dup = switch_core_session_strdup(session, chime_list); @@ -878,7 +878,6 @@ } if ((serviced_uuid = switch_channel_get_variable(channel, "fifo_serviced_uuid"))) { - switch_channel_set_variable(channel, "fifo_serviced_uuid", NULL); break; } @@ -921,7 +920,7 @@ } } - switch_channel_clear_flag(channel, CF_TAGGED); + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); abort: @@ -1176,7 +1175,7 @@ switch_channel_set_flag(other_channel, CF_BREAK); - while (switch_channel_ready(channel) && switch_channel_ready(other_channel) && switch_channel_test_flag(other_channel, CF_TAGGED)) { + while (switch_channel_ready(channel) && switch_channel_ready(other_channel) && switch_channel_test_app_flag(other_channel, CF_APP_TAGGED)) { status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { break; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Jan 22 08:01:15 2009 @@ -118,6 +118,7 @@ uint8_t flags[CF_FLAG_MAX]; uint8_t state_flags[CF_FLAG_MAX]; uint32_t private_flags; + uint32_t app_flags; switch_caller_profile_t *caller_profile; const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; int state_handler_index; @@ -789,6 +790,32 @@ return (channel->private_flags & flags); } +SWITCH_DECLARE(void) switch_channel_set_app_flag(switch_channel_t *channel, uint32_t flags) +{ + switch_assert(channel != NULL); + switch_mutex_lock(channel->flag_mutex); + channel->app_flags |= flags; + switch_mutex_unlock(channel->flag_mutex); +} + +SWITCH_DECLARE(void) switch_channel_clear_app_flag(switch_channel_t *channel, uint32_t flags) +{ + switch_assert(channel != NULL); + switch_mutex_lock(channel->flag_mutex); + if (!flags) { + channel->app_flags = 0; + } else { + channel->app_flags &= ~flags; + } + switch_mutex_unlock(channel->flag_mutex); +} + +SWITCH_DECLARE(int) switch_channel_test_app_flag(switch_channel_t *channel, uint32_t flags) +{ + switch_assert(channel != NULL); + return (channel->app_flags & flags); +} + SWITCH_DECLARE(void) switch_channel_set_state_flag(switch_channel_t *channel, switch_channel_flag_t flag) { switch_assert(channel != NULL);

1 0

[commit] r11355 - freeswitch/trunk/src
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Wed Jan 21 22:37:02 2009 New Revision: 11355 Log: more const madness Modified: freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Jan 21 22:37:02 2009 @@ -1251,7 +1251,7 @@ char *func_val = NULL; int nv = 0; - nv = switch_string_var_check((char *)in, SWITCH_FALSE); + nv = switch_string_var_check_const(in); if (!nv) { return (char *) in;

1 0

[commit] r11354 - freeswitch/trunk/src
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: mikej Date: Wed Jan 21 22:07:47 2009 New Revision: 11354 Log: more const madness Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Jan 21 22:07:47 2009 @@ -1839,7 +1839,7 @@ return (char *) in; } - nv = switch_string_var_check((char *)in, SWITCH_FALSE); + nv = switch_string_var_check_const(in); if (!nv) { return (char *) in;

1 0