- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11244 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: anthm Date: Thu Jan 15 17:40:11 2009 New Revision: 11244 Log: fix ignored error condition bug reported on the dev list Modified: freeswitch/trunk/src/switch_odbc.c Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Thu Jan 15 17:40:11 2009 @@ -331,7 +331,8 @@ SQLLEN m = 0, t = 0; char *err_str = NULL; int result; - + int err = 0; + switch_assert(callback != NULL); if (!db_is_up(handle)) { @@ -366,6 +367,7 @@ int done = 0; if (!(result = SQLFetch(stmt)) == SQL_SUCCESS) { + err++; break; } @@ -407,9 +409,11 @@ SQLFreeHandle(SQL_HANDLE_STMT, stmt); - return SWITCH_ODBC_SUCCESS; + if (!err) { + return SWITCH_ODBC_SUCCESS; + } - error: + error: /* err_str is already defined for some error cases */ if (err_str != NULL) {

1 0

[commit] r11243 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:32:19 2009 New Revision: 11243 Log: doh Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Jan 15 17:32:19 2009 @@ -83,7 +83,7 @@ /* set the globals so we can use the global paths. */ switch_core_set_globals(); - printf("WTF"); + /* get the full path of the pid file. */ switch_snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile);

1 0

[commit] r11242 - in freeswitch/trunk: conf/sip_profiles src
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:32:03 2009 New Revision: 11242 Log: test Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml Thu Jan 15 17:32:03 2009 @@ -101,10 +101,15 @@    +   -  + <param name="force-register-domain" value="$${domain}"/>  -  + <param name="force-register-db-domain" value="$${domain}"/>    Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Jan 15 17:32:03 2009 @@ -83,7 +83,7 @@ /* set the globals so we can use the global paths. */ switch_core_set_globals(); - + printf("WTF"); /* get the full path of the pid file. */ switch_snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile);

1 0

[commit] r11241 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:29:18 2009 New Revision: 11241 Log: enable these options to make the default more user friendly when it comes to domains Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu Jan 15 17:29:18 2009 @@ -52,7 +52,7 @@  <param name="sip-ip" value="$${local_ip_v4}"/> <param name="hold-music" value="$${hold_music}"/> -  + <param name="apply-nat-acl" value="rfc1918"/>    @@ -144,10 +144,15 @@    +   -  + <param name="force-register-domain" value="$${domain}"/>  -  + <param name="force-register-db-domain" value="$${domain}"/>

1 0

[commit] r11240 - freeswitch/trunk/debian
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:25:05 2009 New Revision: 11240 Log: removal of mrcp from debs Modified: freeswitch/trunk/debian/dirs freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Modified: freeswitch/trunk/debian/dirs ============================================================================== --- freeswitch/trunk/debian/dirs (original) +++ freeswitch/trunk/debian/dirs Thu Jan 15 17:25:05 2009 @@ -6,7 +6,6 @@ opt/freeswitch/conf/directory/default opt/freeswitch/conf/autoload_configs opt/freeswitch/conf/jingle_profiles -opt/freeswitch/conf/mrcp_profiles opt/freeswitch/log opt/freeswitch/db opt/freeswitch/bin/scripts Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Thu Jan 15 17:25:05 2009 @@ -58,7 +58,6 @@ /opt/freeswitch/conf/autoload_configs/local_stream.conf.xml /opt/freeswitch/conf/autoload_configs/conference.conf.xml /opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -/opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml /opt/freeswitch/conf/autoload_configs/modules.conf.xml /opt/freeswitch/conf/autoload_configs/dingaling.conf.xml /opt/freeswitch/conf/autoload_configs/iax.conf.xml @@ -72,5 +71,3 @@ /opt/freeswitch/conf/autoload_configs/fax.conf.xml /opt/freeswitch/conf/jingle_profiles/server.xml /opt/freeswitch/conf/jingle_profiles/client.xml -/opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml -/opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Thu Jan 15 17:25:05 2009 @@ -22,7 +22,6 @@ opt/freeswitch/mod/mod_dptools.so* opt/freeswitch/mod/mod_enum.so* opt/freeswitch/mod/mod_fifo.so* -opt/freeswitch/mod/mod_openmrcp.so* opt/freeswitch/mod/mod_voipcodecs.so* opt/freeswutch/mod/mod_speex.so* opt/freeswitch/mod/mod_dialplan*.so* @@ -106,7 +105,6 @@ opt/freeswitch/conf/autoload_configs/local_stream.conf.xml opt/freeswitch/conf/autoload_configs/conference.conf.xml opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml opt/freeswitch/conf/autoload_configs/modules.conf.xml opt/freeswitch/conf/autoload_configs/dingaling.conf.xml opt/freeswitch/conf/autoload_configs/iax.conf.xml @@ -120,5 +118,3 @@ opt/freeswitch/conf/autoload_configs/fax.conf.xml opt/freeswitch/conf/jingle_profiles/server.xml opt/freeswitch/conf/jingle_profiles/client.xml -opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml -opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Thu Jan 15 17:25:05 2009 @@ -14,7 +14,7 @@ applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit \ applications/mod_rss applications/mod_voicemail applications/mod_fsv \ applications/mod_fax -export ASR_TTS_MODULES=asr_tts/mod_openmrcp +export ASR_TTS_MODULES= export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_voipcodecs export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml export DIRECTORIES_MODULES=

1 0

[commit] r11239 - freeswitch/trunk
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:15:59 2009 New Revision: 11239 Log: tweak spec Modified: freeswitch/trunk/freeswitch.spec Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu Jan 15 17:15:59 2009 @@ -153,7 +153,7 @@ PASSTHRU_CODEC_MODULES="codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr" SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_curl languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone" APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_fsv" -ASR_TTS_MODULES="asr_tts/mod_openmrcp asr_tts/mod_pocketsphinx asr_tts/mod_flite" +ASR_TTS_MODULES="asr_tts/mod_pocketsphinx asr_tts/mod_flite" CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_speex" DIALPLANS_MODULES="dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml" DIRECTORIES_MODULES= @@ -323,7 +323,6 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/local_stream.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/logfile.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/modules.conf.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/openmrcp.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/pocketsphinx.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/portaudio.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/post_load_modules.conf.xml @@ -376,7 +375,6 @@ %{prefix}/mod/mod_limit.so* %{prefix}/mod/mod_rss.so* %{prefix}/mod/mod_voicemail.so* -%{prefix}/mod/mod_openmrcp.so* %{prefix}/mod/mod_pocketsphinx.so* %{prefix}/mod/mod_flite.so* %{prefix}/mod/mod_ilbc.so*

1 0

[commit] r11238 - in freeswitch/trunk/conf: autoload_configs mrcp_profiles
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:13:45 2009 New Revision: 11238 Log: remove these files Removed: freeswitch/trunk/conf/autoload_configs/openmrcp.conf.xml freeswitch/trunk/conf/mrcp_profiles/

1 0

[commit] r11237 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: mikej Date: Thu Jan 15 17:05:50 2009 New Revision: 11237 Log: fix windows build Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Thu Jan 15 17:05:50 2009 @@ -380,10 +380,14 @@ static void sock_setup(esl_handle_t *handle) { +#ifdef WIN32 + BOOL bOptVal = TRUE; + int bOptLen = sizeof(BOOL); + setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&bOptVal, bOptLen); +#else int x = 1; - setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, &x, sizeof(x)); - +#endif } ESL_DECLARE(esl_status_t) esl_attach_handle(esl_handle_t *handle, esl_socket_t socket, struct sockaddr_in addr)

1 0

[commit] r11236 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: andrew Date: Thu Jan 15 16:58:59 2009 New Revision: 11236 Log: Commit patch from MODENDP-174 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jan 15 16:58:59 2009 @@ -1030,7 +1030,7 @@ static switch_status_t devlist(char **argv, int argc, switch_stream_handle_t *stream) { - int i, numDevices; + int i, numDevices, prev; const PaDeviceInfo *deviceInfo; numDevices = Pa_GetDeviceCount(); @@ -1039,7 +1039,32 @@ } for (i = 0; i < numDevices; i++) { deviceInfo = Pa_GetDeviceInfo(i); - stream->write_function(stream, "%d;%s;%d;%d\n", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels); + stream->write_function(stream, "%d;%s;%d;%d;", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels); + + prev = 0; + if (globals.ringdev == i) { + stream->write_function(stream, "r"); + prev = 1; + } + + if (globals.indev == i) { + if (prev) { + stream->write_function(stream, ","); + } + stream->write_function(stream, "i"); + prev = 1; + } + + if (globals.outdev == i) { + if (prev) { + stream->write_function(stream, ","); + } + stream->write_function(stream, "o"); + prev = 1; + } + + stream->write_function(stream, "\n"); + } return SWITCH_STATUS_SUCCESS;

1 0

[commit] r11235 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: mikej Date: Thu Jan 15 16:50:50 2009 New Revision: 11235 Log: fix windows build Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jan 15 16:50:50 2009 @@ -1769,14 +1769,13 @@ globals.ringdev = devval; } } else if ((argv[1] && !strcasecmp(argv[0], "play")) || !strcasecmp(argv[0], "ringtest")) { + switch_file_handle_t fh = { 0 }; + char *playfile = NULL; if (globals.audio_stream) { switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n"); goto done; } - switch_file_handle_t fh = { 0 }; - char *playfile = NULL; - if (!strcasecmp(argv[0], "ringtest")) { playfile = globals.ring_file; } else { @@ -1816,7 +1815,8 @@ if (engage_device(globals.sample_rate, globals.codec_ms) == SWITCH_STATUS_SUCCESS) { int samples = 0; int success = 0; - for(int i = 0; i < 400; i++) { + int i; + for(i = 0; i < 400; i++) { if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_packet, &globals.timer))) { WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.timer);

1 0