- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9483 - freeswitch/trunk/src
by Freeswitch SVN 08 Sep '08

08 Sep '08

Author: brian Date: Mon Sep 8 16:35:17 2008 New Revision: 9483 Modified: freeswitch/trunk/src/switch_core_sqldb.c Log: fix function to be in the proper locaiton Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Mon Sep 8 16:35:17 2008 @@ -430,9 +430,9 @@ ");\n"; char create_calls_sql[] = "CREATE TABLE calls (\n" - " function VARCHAR(255),\n" " created VARCHAR(255),\n" " created_epoch INTEGER,\n" + " function VARCHAR(255),\n" " caller_cid_name VARCHAR(255),\n" " caller_cid_num VARCHAR(255),\n" " caller_dest_num VARCHAR(255),\n"

1 0

[commit] r9480 - in freeswitch/trunk: . build
by Freeswitch SVN 08 Sep '08

08 Sep '08

Author: anthm Date: Mon Sep 8 14:10:28 2008 New Revision: 9480 Added: freeswitch/trunk/build/sounds_version.txt Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Log: don't require another configure when you just change the sound files version Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Sep 8 14:10:28 2008 @@ -16,9 +16,10 @@ @target=`echo $@ | sed -e 's|^.*-||'`; \ target_prefix=`echo $@ | sed -e 's|-.*$$||'`; \ sound_perfix=`echo $@ | sed -e 's|-.*||'`; \ + sounds_version=`cat build/sounds_version.txt`;\ full_sound_dir=`echo $@ | sed -e 's|^sounds||' | sed -e 's|^-||' | sed -e 's|-install$$||'`; \ test ! -z $$full_sound_dir || full_sound_dir=`echo $(DEFAULT_SOUNDS)`; \ - soundfile=`echo freeswitch-sounds-$$full_sound_dir-$(SOUNDS_VERSION).tar.gz`; \ + soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$sounds_version.tar.gz`; \ if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \ if test "$$target_prefix" = "sounds"; then \ if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)$(PREFIX)/sounds/; else $(GETSOUNDS) $$soundfile ; fi; \ Added: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/build/sounds_version.txt Mon Sep 8 14:10:28 2008 @@ -0,0 +1 @@ +1.0.3 Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Sep 8 14:10:28 2008 @@ -8,7 +8,6 @@ AC_SUBST(SWITCH_VERSION_MINOR, [0]) AC_SUBST(SWITCH_VERSION_MICRO, [trunk]) #AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here]) -AC_SUBST(SOUNDS_VERSION, [1.0.3]) AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])

1 0

[commit] r9477 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 07 Sep '08

07 Sep '08

Author: brian Date: Sun Sep 7 12:07:41 2008 New Revision: 9477 Modified: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload Log: escape the comma as this sets PCMA to zero intead of the expected results. Modified: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload Sun Sep 7 12:07:41 2008 @@ -1,7 +1,7 @@ <include> <extension name="tollfreegateway.com"> <condition field="destination_number" expression="^1?(8(00|55|66|77|88)[2-9]\d{6})$"> - <action application="bridge" data="{absolute_codec_string=PCMU,PCMA}sofia/${use_profile}/9313371$1(a)sip.tollfreegateway.com"/> + <action application="bridge" data="{absolute_codec_string=PCMU\,PCMA}sofia/${use_profile}/9313371$1(a)sip.tollfreegateway.com"/> </condition> </extension> </include>

1 0

[commit] r9476 - in freeswitch/trunk/src: . include
by Freeswitch SVN 07 Sep '08

07 Sep '08

Author: robertj Date: Sat Sep 6 23:59:39 2008 New Revision: 9476 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_codec.c Log: Added some const kerywords to parameters. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sat Sep 6 23:59:39 2008 @@ -1058,8 +1058,8 @@ \return SWITCH_STATUS_SUCCESS if the handle is allocated */ SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, - char *codec_name, - char *fmtp, + const char *codec_name, + const char *fmtp, uint32_t rate, int ms, int channels, Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Sat Sep 6 23:59:39 2008 @@ -260,13 +260,13 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, char *codec_name, char *fmtp, +SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, const char *codec_name, const char *fmtp, uint32_t rate, int ms, int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool) { const switch_codec_interface_t *codec_interface; const switch_codec_implementation_t *iptr, *implementation = NULL; - char *mode = fmtp; + const char *mode = fmtp; switch_assert(codec != NULL); switch_assert(codec_name != NULL);

1 0

[commit] r9475 - in freeswitch/trunk: libs/codec/ilbc libs/libdingaling libs/libteletone libs/portaudio/build/msvc libs/voipcodecs libs/win32/curl libs/win32/howl libs/win32/iksemel libs/win32/libresample libs/win32/libsndfile libs/win32/speex libs/win32/udns libs/xmlrpc-c/Windows src/mod/applications/mod_commands src/mod/applications/mod_conference src/mod/applications/mod_dptools src/mod/applications/mod_enum src/mod/applications/mod_esf src/mod/applications/mod_expr src/mod/application
by Freeswitch SVN 07 Sep '08

07 Sep '08

Author: robertj Date: Sat Sep 6 23:58:24 2008 New Revision: 9475 Modified: freeswitch/trunk/libs/codec/ilbc/ (props changed) freeswitch/trunk/libs/libdingaling/ (props changed) freeswitch/trunk/libs/libteletone/ (props changed) freeswitch/trunk/libs/portaudio/build/msvc/ (props changed) freeswitch/trunk/libs/voipcodecs/ (props changed) freeswitch/trunk/libs/win32/curl/ (props changed) freeswitch/trunk/libs/win32/howl/ (props changed) freeswitch/trunk/libs/win32/iksemel/ (props changed) freeswitch/trunk/libs/win32/libresample/ (props changed) freeswitch/trunk/libs/win32/libsndfile/ (props changed) freeswitch/trunk/libs/win32/speex/ (props changed) freeswitch/trunk/libs/win32/udns/ (props changed) freeswitch/trunk/libs/xmlrpc-c/Windows/ (props changed) freeswitch/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/trunk/src/mod/applications/mod_conference/ (props changed) freeswitch/trunk/src/mod/applications/mod_dptools/ (props changed) freeswitch/trunk/src/mod/applications/mod_enum/ (props changed) freeswitch/trunk/src/mod/applications/mod_esf/ (props changed) freeswitch/trunk/src/mod/applications/mod_expr/ (props changed) freeswitch/trunk/src/mod/applications/mod_fifo/ (props changed) freeswitch/trunk/src/mod/applications/mod_fsv/ (props changed) freeswitch/trunk/src/mod/applications/mod_limit/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/applications/mod_voicemail/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/ (props changed) freeswitch/trunk/src/mod/codecs/mod_amr/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g723_1/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_h26x/ (props changed) freeswitch/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_speex/ (props changed) freeswitch/trunk/src/mod/codecs/mod_voipcodecs/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_socket/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ (props changed) freeswitch/trunk/src/mod/formats/mod_local_stream/ (props changed) freeswitch/trunk/src/mod/formats/mod_native_file/ (props changed) freeswitch/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/trunk/src/mod/formats/mod_tone_stream/ (props changed) freeswitch/trunk/src/mod/languages/mod_lua/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/ (props changed) freeswitch/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/trunk/src/mod/loggers/mod_logfile/ (props changed) freeswitch/trunk/src/mod/say/mod_say_de/ (props changed) freeswitch/trunk/src/mod/say/mod_say_en/ (props changed) freeswitch/trunk/src/mod/say/mod_say_es/ (props changed) freeswitch/trunk/src/mod/say/mod_say_fr/ (props changed) freeswitch/trunk/src/mod/say/mod_say_it/ (props changed) freeswitch/trunk/src/mod/say/mod_say_nl/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_curl/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ (props changed) freeswitch/trunk/w32/Console/ (props changed) Log: Added ignore of lower case version of MSVC build directories (debug/Debug are distinct)

1 0

[commit] r9474 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Sep '08

07 Sep '08

Author: mikej Date: Sat Sep 6 22:56:56 2008 New Revision: 9474 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix info dtmf passing of non numbers Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Sat Sep 6 22:56:56 2008 @@ -2918,9 +2918,11 @@ if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf-relay")) { /* Try and find signal information in the payload */ if ((signal_ptr = switch_stristr("Signal=", sip->sip_payload->pl_data))) { + int tmp; /* move signal_ptr where we need it (right past Signal=) */ signal_ptr = signal_ptr + 7; - dtmf.digit = *signal_ptr; + tmp = atoi(signal_ptr); + dtmf.digit = switch_rfc2833_to_char(tmp); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n"); goto fail; @@ -2935,7 +2937,8 @@ dtmf.duration = tmp * 8; } } else if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf")) { - dtmf.digit = *sip->sip_payload->pl_data; + int tmp = atoi(sip->sip_payload->pl_data); + dtmf.digit = switch_rfc2833_to_char(tmp); } else { goto fail; }

1 0

[commit] r9473 - freeswitch/trunk/src
by Freeswitch SVN 06 Sep '08

06 Sep '08

Author: mikej Date: Sat Sep 6 19:05:23 2008 New Revision: 9473 Modified: freeswitch/trunk/src/switch_core_io.c Log: fix FSCORE-182, don't try to pass the frame flags across as that will leave us with some untrue assumptions on the new frame. Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Sat Sep 6 19:05:23 2008 @@ -256,7 +256,6 @@ session->raw_read_frame.ssrc = read_frame->ssrc; session->raw_read_frame.seq = read_frame->seq; session->raw_read_frame.m = read_frame->m; - session->raw_read_frame.flags = read_frame->flags; session->raw_read_frame.payload = read_frame->payload; read_frame = &session->raw_read_frame; break; @@ -279,7 +278,6 @@ session->raw_read_frame.ssrc = read_frame->ssrc; session->raw_read_frame.seq = read_frame->seq; session->raw_read_frame.m = read_frame->m; - session->raw_read_frame.flags = read_frame->flags; session->raw_read_frame.payload = read_frame->payload; read_frame = &session->raw_read_frame; status = SWITCH_STATUS_SUCCESS; @@ -411,7 +409,6 @@ session->enc_read_frame.ssrc = read_frame->ssrc; session->enc_read_frame.seq = read_frame->seq; session->enc_read_frame.m = read_frame->m; - session->enc_read_frame.flags = read_frame->flags; session->enc_read_frame.payload = session->read_codec->implementation->ianacode; } *frame = &session->enc_read_frame; @@ -421,7 +418,6 @@ session->raw_read_frame.timestamp = read_frame->timestamp; session->raw_read_frame.payload = enc_frame->codec->implementation->ianacode; session->raw_read_frame.m = read_frame->m; - session->enc_read_frame.flags = read_frame->flags; session->raw_read_frame.ssrc = read_frame->ssrc; session->raw_read_frame.seq = read_frame->seq; *frame = &session->raw_read_frame; @@ -621,7 +617,6 @@ session->raw_write_frame.timestamp = frame->timestamp; session->raw_write_frame.rate = frame->rate; session->raw_write_frame.m = frame->m; - session->raw_write_frame.flags = frame->flags; session->raw_write_frame.ssrc = frame->ssrc; session->raw_write_frame.seq = frame->seq; session->raw_write_frame.payload = frame->payload; @@ -774,7 +769,6 @@ session->enc_write_frame.timestamp = frame->timestamp; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; session->enc_write_frame.m = frame->m; - session->enc_write_frame.flags = frame->flags; session->enc_write_frame.ssrc = frame->ssrc; session->enc_write_frame.seq = frame->seq; write_frame = &session->enc_write_frame; @@ -784,7 +778,6 @@ enc_frame->samples = enc_frame->datalen / sizeof(int16_t); enc_frame->timestamp = frame->timestamp; enc_frame->m = frame->m; - enc_frame->flags = frame->flags; enc_frame->seq = frame->seq; enc_frame->ssrc = frame->ssrc; enc_frame->payload = enc_frame->codec->implementation->ianacode; @@ -838,7 +831,6 @@ session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); session->enc_write_frame.m = frame->m; - session->enc_write_frame.flags = frame->flags; session->enc_write_frame.ssrc = frame->ssrc; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; @@ -860,7 +852,6 @@ session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); session->enc_write_frame.m = frame->m; - session->enc_write_frame.flags = frame->flags; session->enc_write_frame.ssrc = frame->ssrc; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; @@ -875,7 +866,6 @@ enc_frame->codec = session->write_codec; enc_frame->samples = enc_frame->datalen / sizeof(int16_t); enc_frame->m = frame->m; - enc_frame->flags = frame->flags; enc_frame->ssrc = frame->ssrc; enc_frame->payload = enc_frame->codec->implementation->ianacode; write_frame = enc_frame;

1 0

[commit] r9472 - freeswitch/trunk/src
by Freeswitch SVN 06 Sep '08

06 Sep '08

Author: brian Date: Sat Sep 6 14:00:35 2008 New Revision: 9472 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix timer_name check in rtp Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Sep 6 14:00:35 2008 @@ -798,7 +798,7 @@ rtp_session->ms_per_packet = ms_per_packet; rtp_session->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval; - if (!strcasecmp(timer_name, "none")) { + if (timer_name && !strcasecmp(timer_name, "none")) { timer_name = NULL; }

1 0

[commit] r9471 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 05 Sep '08

05 Sep '08

Author: anthm Date: Fri Sep 5 17:37:33 2008 New Revision: 9471 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: fix unload Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Fri Sep 5 17:37:33 2008 @@ -34,8 +34,9 @@ #define DEFAULT_PREBUFFER_SIZE 1024 * 16 SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load); -SWITCH_MODULE_DEFINITION(mod_local_stream, mod_local_stream_load, NULL, NULL); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_local_stream_shutdown); +SWITCH_MODULE_DEFINITION(mod_local_stream, mod_local_stream_load, mod_local_stream_shutdown, NULL); + struct local_stream_source; @@ -45,6 +46,7 @@ } globals; static int RUNNING = 1; +static int THREADS = 0; struct local_stream_context { struct local_stream_source *source; @@ -107,6 +109,10 @@ switch_size_t used; int skip = 0; + switch_mutex_lock(globals.mutex); + THREADS++; + switch_mutex_unlock(globals.mutex); + if (!source->prebuf) { source->prebuf = DEFAULT_PREBUFFER_SIZE; } @@ -257,6 +263,10 @@ switch_core_destroy_memory_pool(&source->pool); + switch_mutex_lock(globals.mutex); + THREADS--; + switch_mutex_unlock(globals.mutex); + return NULL; } @@ -507,7 +517,12 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_local_stream_shutdown) { RUNNING = 0; - switch_yield(500000); + switch_event_unbind_callback(event_handler); + + while(THREADS > 0) { + switch_yield(100000); + } + switch_core_hash_destroy(&globals.source_hash); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9470 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_fax
by Freeswitch SVN 05 Sep '08

05 Sep '08

Author: brian Date: Fri Sep 5 17:20:15 2008 New Revision: 9470 Added: freeswitch/trunk/conf/autoload_configs/fax.conf.xml Removed: freeswitch/trunk/src/mod/applications/mod_fax/fax.conf.xml Log: move fax config Added: freeswitch/trunk/conf/autoload_configs/fax.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/autoload_configs/fax.conf.xml Fri Sep 5 17:20:15 2008 @@ -0,0 +1,12 @@ +<configuration name="fax.conf" description="FAX application configuration"> + <settings> + <param name="use-ecm" value="true"/> + <param name="verbose" value="false"/> + <param name="disable-v17" value="false"/> + <param name="ident" value="SpanDSP Fax Ident"/> + <param name="header" value="SpanDSP Fax Header"/> + + <param name="spool-dir" value="/tmp"/> + <param name="file-prefix" value="faxrx"/> + </settings> +</configuration>

1 0