- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7121 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: stkn Date: Mon Jan 7 06:21:24 2008 New Revision: 7121 Modified: freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_timer.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_loadable_module.c Log: Spelling fixes #3 Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Mon Jan 7 06:21:24 2008 @@ -119,7 +119,7 @@ if (channels == 2) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stereo is not currently supported. please downsample audio source to mono.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stereo is currently unsupported. please downsample audio source to mono.\n"); return SWITCH_STATUS_GENERR; } @@ -204,12 +204,12 @@ switch_assert(decoded_data != NULL); if (!codec->implementation) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initialized!\n"); return SWITCH_STATUS_GENERR; } if (!switch_test_flag(codec, SWITCH_CODEC_FLAG_ENCODE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec's encoder is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec's encoder is not initialized!\n"); return SWITCH_STATUS_GENERR; } @@ -234,12 +234,12 @@ if (!codec->implementation) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initialized!\n"); return SWITCH_STATUS_GENERR; } if (!switch_test_flag(codec, SWITCH_CODEC_FLAG_DECODE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec's decoder is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec's decoder is not initialized!\n"); return SWITCH_STATUS_GENERR; } @@ -254,7 +254,7 @@ switch_assert(codec != NULL); if (!codec->implementation) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initialized!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_core_timer.c ============================================================================== --- freeswitch/trunk/src/switch_core_timer.c (original) +++ freeswitch/trunk/src/switch_core_timer.c Mon Jan 7 06:21:24 2008 @@ -66,7 +66,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_next(switch_timer_t *timer) { if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); return SWITCH_STATUS_GENERR; } @@ -81,7 +81,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer) { if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); return SWITCH_STATUS_GENERR; } @@ -91,7 +91,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer) { if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); return SWITCH_STATUS_GENERR; } @@ -102,7 +102,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_destroy(switch_timer_t *timer) { if (!timer->timer_interface) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initialized!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Jan 7 06:21:24 2008 @@ -1154,7 +1154,7 @@ for(i = 0; i < cont->index; i++) { if (!switch_strlen_zero(cont->list[cont->index].key) && !strcasecmp(key, cont->list[cont->index].key)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Renabling %s\n", key); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-enabling %s\n", key); cont->list[cont->index].up = 1; teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 7 06:21:24 2008 @@ -730,7 +730,7 @@ and_argc = switch_separate_string(pipe_names[r], ',', peer_names, (sizeof(peer_names) / sizeof(peer_names[0]))); if ((flags & SOF_NOBLOCK) && and_argc > 1) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Only calling the first elemnent in the list in this mode.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Only calling the first element in the list in this mode.\n"); and_argc = 1; } Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Jan 7 06:21:24 2008 @@ -694,7 +694,7 @@ } if (load_func_ptr == NULL) { - err = "Cannot locate symbol 'switch_module_load' please make sure this is a vaild module."; + err = "Cannot locate symbol 'switch_module_load' please make sure this is a valid module."; break; } @@ -1018,7 +1018,7 @@ } if (!count) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "No modules loaded assuming 'load all'\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "No modules loaded, assuming 'load all'\n"); all = 1; }

1 0

[commit] r7120 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: stkn Date: Mon Jan 7 05:55:15 2008 New Revision: 7120 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_menu.c Log: Spelling fixes #2 Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 7 05:55:15 2008 @@ -675,12 +675,12 @@ /* INIT APR and Create the pool context */ if (apr_initialize() != SWITCH_STATUS_SUCCESS) { - *err = "FATAL ERROR! Could not initilize APR\n"; + *err = "FATAL ERROR! Could not initialize APR\n"; return SWITCH_STATUS_MEMERR; } if (!(runtime.memory_pool = switch_core_memory_init())) { - *err = "FATAL ERROR! Could noat allocate memory pool\n"; + *err = "FATAL ERROR! Could not allocate memory pool\n"; return SWITCH_STATUS_MEMERR; } switch_assert(runtime.memory_pool != NULL); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Jan 7 05:55:15 2008 @@ -409,7 +409,7 @@ switch_assert(channel != NULL); if (!switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Careful, Channel is unaswered. Pre-answering...\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Careful, Channel is unanswered. Pre-answering...\n"); switch_channel_pre_answer(channel); } Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Mon Jan 7 05:55:15 2008 @@ -492,7 +492,7 @@ if (xml_ctx != NULL && name != NULL && xml_ctx->pool != NULL && switch_ivr_menu_stack_xml_find(xml_ctx, name) == NULL) { switch_ivr_menu_xml_map_t *map = switch_core_alloc(xml_ctx->pool, sizeof(switch_ivr_menu_xml_map_t)); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_ivr_menu_stack_xml_add bindng '%s'\n", name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_ivr_menu_stack_xml_add binding '%s'\n", name); // and we have memory if (map != NULL) { map->name = switch_core_strdup(xml_ctx->pool, name);

1 0

[commit] r7119 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: stkn Date: Mon Jan 7 05:45:06 2008 New Revision: 7119 Modified: freeswitch/trunk/src/switch.c Log: Spelling fixes #1 Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Jan 7 05:45:06 2008 @@ -400,7 +400,7 @@ } if (apr_initialize() != SWITCH_STATUS_SUCCESS) { - fprintf(stderr, "FATAL ERROR! Could not initilize APR\n"); + fprintf(stderr, "FATAL ERROR! Could not initialize APR\n"); return 255; } @@ -466,7 +466,7 @@ switch_file_write(fd, pid_buffer, &pid_len); if (switch_core_init_and_modload(flags, nc ? SWITCH_FALSE : SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { - fprintf(stderr, "Cannot Initilize [%s]\n", err); + fprintf(stderr, "Cannot Initialize [%s]\n", err); return 255; }

1 0

[commit] r7118 - freeswitch/trunk
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: mikej Date: Mon Jan 7 03:33:53 2008 New Revision: 7118 Modified: freeswitch/trunk/Makefile.am Log: typo Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Jan 7 03:33:53 2008 @@ -259,7 +259,7 @@ core: $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la -core-clean: clean core +core-clean: clean_core core-install: core_install

1 0

[commit] r7117 - freeswitch/trunk/build
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: mikej Date: Mon Jan 7 03:32:43 2008 New Revision: 7117 Modified: freeswitch/trunk/build/getsounds.sh.in Log: fix untar of sounds on non linux (FSBUILD-31) Modified: freeswitch/trunk/build/getsounds.sh.in ============================================================================== --- freeswitch/trunk/build/getsounds.sh.in (original) +++ freeswitch/trunk/build/getsounds.sh.in Mon Jan 7 03:32:43 2008 @@ -29,7 +29,7 @@ if [ ! -z $install ] ; then test -d $install || mkdir $install - cd $install && $ZCAT -c -d $DIR/$tarfile | $TAR x + cd $install && $ZCAT -c -d $DIR/$tarfile | $TAR xf - fi exit 0

1 0

[commit] r7116 - freeswitch/trunk
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: mikej Date: Mon Jan 7 03:22:18 2008 New Revision: 7116 Modified: freeswitch/trunk/Makefile.am Log: add core-clean and core-install make targets Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Jan 7 03:22:18 2008 @@ -259,6 +259,10 @@ core: $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la +core-clean: clean core + +core-install: core_install + clean_core: clean-libLTLIBRARIES install_core: install-libLTLIBRARIES

1 0

[commit] r7115 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: brian Date: Sun Jan 6 18:03:12 2008 New Revision: 7115 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: put this usage syntax in the right place Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Sun Jan 6 18:03:12 2008 @@ -537,7 +537,7 @@ return SWITCH_STATUS_SUCCESS; } -#define CTL_SYNTAX "[hupall|pause|resume|shutdown]" +#define CTL_SYNTAX "[hupall|pause|resume|shutdown|reclaim_mem|max_sessions [num]|loglevel [level]]" SWITCH_STANDARD_API(ctl_function) { int argc; @@ -601,7 +601,7 @@ switch_core_session_ctl(SCSC_SPS, &arg); stream->write_function(stream, "+OK sessions per second: %d\n", arg); } else { - stream->write_function(stream, "-ERR INVALID COMMAND\nUSAGE: fsctl [hupall|pause|resume|shutdown|reclaim_mem|max_sessions [num]|loglevel [level]]\n"); + stream->write_function(stream, "-ERR INVALID COMMAND\nUSAGE: fsctl %s", CTL_SYNTAX); goto end; }

1 0

[commit] r7114 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: mikej Date: Sun Jan 6 17:56:10 2008 New Revision: 7114 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: cleanup. 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 Sun Jan 6 17:56:10 2008 @@ -3913,36 +3913,29 @@ SWITCH_STANDARD_APP(conference_auto_function) { - switch_channel_t *channel = NULL; + switch_channel_t *channel = switch_core_session_get_channel(session); call_list_t *call_list, *np; - char *addition = (char *) data; - channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); call_list = switch_channel_get_private(channel, "_conference_autocall_list_"); - if (switch_strlen_zero(addition)) { + if (switch_strlen_zero(data)) { call_list = NULL; } else { np = switch_core_session_alloc(session, sizeof(*np)); switch_assert(np != NULL); - np->string = switch_core_session_strdup(session, addition); + np->string = switch_core_session_strdup(session, data); if (call_list) { np->next = call_list; np->itteration = call_list->itteration + 1; } else { np->itteration = 1; } - call_list = np; - } - switch_channel_set_private(channel, "_conference_autocall_list_", call_list); - - } /* Application interface function that is called from the dialplan to join the channel to a conference */

1 0

[commit] r7113 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: mikej Date: Sun Jan 6 17:36:41 2008 New Revision: 7113 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: unused vars and a bit more error checking. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sun Jan 6 17:36:41 2008 @@ -1046,7 +1046,6 @@ SWITCH_STANDARD_APP(speak_function) { switch_channel_t *channel = switch_core_session_get_channel(session); - switch_codec_t *codec = switch_core_session_get_read_codec(session); char buf[10]; char *argv[4] = { 0 }; int argc; @@ -1056,7 +1055,6 @@ char *mydata = NULL; switch_input_args_t args = { 0 }; - switch_assert(codec != NULL); switch_assert(channel != NULL); if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) { @@ -1253,14 +1251,15 @@ SWITCH_STANDARD_APP(record_session_function) { - switch_channel_t *channel = switch_core_session_get_channel(session); char *p, *path = NULL; uint32_t limit = 0; - switch_assert(channel != NULL); + if (switch_strlen_zero(data)) { + return; + } path = switch_core_session_strdup(session, data); - if ((p = strchr(path, '+'))) { + if (path && (p = strchr(path, '+'))) { char *q = p - 1; while(q && *q == ' ') { *q = '\0';

1 0

[commit] r7112 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: mikej Date: Sun Jan 6 17:34:59 2008 New Revision: 7112 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Log: fix build. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Sun Jan 6 17:34:59 2008 @@ -114,7 +114,9 @@ unsigned rmem = 0, wmem = 0; int events = SU_WAIT_IN; int s; +#if HAVE_IP_ADD_MEMBERSHIP su_sockaddr_t *su = (su_sockaddr_t *)ai->ai_addr; +#endif int const one = 1; (void)one; s = su_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);

1 0