- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2008 - freeswitch/trunk/conf
by Freeswitch SVN 20 Jul '06

20 Jul '06

Author: anthm Date: Wed Jul 19 23:38:27 2006 New Revision: 2008 Modified: freeswitch/trunk/conf/freeswitch.xml Log: make mod_portaudio start by default Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Jul 19 23:38:27 2006 @@ -28,7 +28,7 @@  <load module="mod_exosip"/>  -  + <load module="mod_portaudio"/>

1 0

[commit] r2007 - freeswitch/trunk
by Freeswitch SVN 20 Jul '06

20 Jul '06

Author: anthm Date: Wed Jul 19 23:07:43 2006 New Revision: 2007 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: test for prefix write and don't fail if directory already exists Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Jul 19 23:07:43 2006 @@ -163,7 +163,7 @@ @rm -f build/freeswitch.env @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) - mkdir $(PREFIX) + mkdir -p $(PREFIX) ./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe ./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX) ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX) Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Wed Jul 19 23:07:43 2006 @@ -1093,7 +1093,7 @@ @rm -f build/freeswitch.env @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) - mkdir $(PREFIX) + mkdir -p $(PREFIX) ./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe ./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX) ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)

1 0

[commit] r2004 - freeswitch/trunk
by Freeswitch SVN 20 Jul '06

20 Jul '06

Author: anthm Date: Wed Jul 19 20:08:12 2006 New Revision: 2004 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: test for prefix write Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Jul 19 20:08:12 2006 @@ -163,6 +163,7 @@ @rm -f build/freeswitch.env @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) + mkdir $(PREFIX) ./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe ./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX) ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX) Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Wed Jul 19 20:08:12 2006 @@ -1093,6 +1093,7 @@ @rm -f build/freeswitch.env @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) + mkdir $(PREFIX) ./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe ./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX) ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)

1 0

[commit] r1999 - freeswitch/trunk/src
by Freeswitch SVN 19 Jul '06

19 Jul '06

Author: anthm Date: Wed Jul 19 17:14:49 2006 New Revision: 1999 Modified: freeswitch/trunk/src/switch_xml.c Log: fix xml no config catch-22 Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Wed Jul 19 17:14:49 2006 @@ -912,7 +912,7 @@ switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open XML Root!\n"); + *err = "Cannot Open XML Root!"; } if (hasmain) {

1 0

[commit] r1992 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 19 Jul '06

19 Jul '06

Author: anthm Date: Wed Jul 19 15:16:42 2006 New Revision: 1992 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add a count to show 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 Wed Jul 19 15:16:42 2006 @@ -184,20 +184,28 @@ return SWITCH_STATUS_SUCCESS; } +struct holder { + switch_stream_handle_t *stream; + uint32_t count; +}; + + + static int show_callback(void *pArg, int argc, char **argv, char **columnNames){ - switch_stream_handle_t *stream = (switch_stream_handle_t *) pArg; + struct holder *holder = (struct holder *) pArg; - stream->write_function(stream, "%s|%s\n", argv[0], argv[1] ? argv[1] : "NULL"); + holder->stream->write_function(holder->stream, "%s|%s\n", argv[0], argv[1] ? argv[1] : "NULL"); + holder->count++; return 0; } - static switch_status_t show_function(char *cmd, switch_stream_handle_t *stream) { char sql[1024]; char *errmsg; switch_core_db_t *db = switch_core_db_handle(); - + struct holder holder; + if (!cmd) { sprintf (sql, "select * from interfaces"); } @@ -220,12 +228,17 @@ return SWITCH_STATUS_SUCCESS; } - switch_core_db_exec(db, sql, show_callback, stream, &errmsg); + holder.stream = stream; + holder.count = 0; + switch_core_db_exec(db, sql, show_callback, &holder, &errmsg); + if (errmsg) { stream->write_function(stream, "SQL ERR [%s]\n",errmsg); switch_core_db_free(errmsg); errmsg = NULL; + } else { + stream->write_function(stream, "%u total.\n", holder.count); } switch_core_db_close(db);

1 0

[commit] r1988 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Jul '06

19 Jul '06

Author: anthm Date: Wed Jul 19 14:34:28 2006 New Revision: 1988 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c Log: name change for c++ compate Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Jul 19 14:34:28 2006 @@ -121,7 +121,7 @@ \param new new value (if > 0) \return the current session limit */ -SWITCH_DECLARE(uint32_t) switch_core_session_limit(uint32_t new); +SWITCH_DECLARE(uint32_t) switch_core_session_limit(uint32_t new_limit); /*! \brief Destroy the core Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Jul 19 14:34:28 2006 @@ -2926,10 +2926,10 @@ } -SWITCH_DECLARE(uint32_t) switch_core_session_limit(uint32_t new) +SWITCH_DECLARE(uint32_t) switch_core_session_limit(uint32_t new_limit) { - if (new) { - runtime.session_limit = new; + if (new_limit) { + runtime.session_limit = new_limit; } return runtime.session_limit;

1 0

[commit] r1979 - freeswitch/trunk/conf
by Freeswitch SVN 19 Jul '06

19 Jul '06

Author: anthm Date: Wed Jul 19 09:29:03 2006 New Revision: 1979 Modified: freeswitch/trunk/conf/freeswitch.xml Log: update example Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Jul 19 09:29:03 2006 @@ -79,7 +79,7 @@  <param name="port" value="4569"/> <param name="dialplan" value="XML"/> - <param name="codec-prefs" value="PCMU@20,PCMA,speex,L16"/> + <param name="codec-prefs" value="PCMU@20i,PCMA,speex,L16"/> <param name="codec-master" value="us"/> <param name="codec-rates" value="8"/> </settings> @@ -119,7 +119,11 @@ <param name="dtmf-duration" value="100"/>  - <param name="codec-prefs" value="PCMU@20,PCMA@20"/> + <param name="codec-prefs" value="PCMU@20i,PCMA@20i"/> +  +   <param name="rfc2833-pt" value="101"/>

1 0

[commit] r1963 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Jul '06

19 Jul '06

Author: anthm Date: Tue Jul 18 21:19:46 2006 New Revision: 1963 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core.c Log: small fix to sql shipping stuff Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Jul 18 21:19:46 2006 @@ -92,7 +92,7 @@ #define SWITCH_MAX_STATE_HANDLERS 30 #define SWITCH_TRUE 1 #define SWITCH_FALSE 0 -#define SWITCH_CORE_QUEUE_LEN 20000 +#define SWITCH_CORE_QUEUE_LEN 100000 typedef enum { SWITCH_XML_SECTION_RESULT = 0, Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jul 18 21:19:46 2006 @@ -2730,7 +2730,7 @@ uint32_t itterations = 0; uint8_t trans = 0; switch_time_t last_commit = switch_time_now(); - uint32_t freq = 1000, target = 500, diff = 0; + uint32_t freq = 1000, target = 1000, diff = 0; if (!runtime.event_db) { runtime.event_db = switch_core_db_handle(); @@ -2810,7 +2810,7 @@ switch (event->event_id) { case SWITCH_EVENT_CHANNEL_DESTROY: - switch_core_db_mprintf("delete from channels where uuid='%s'", switch_event_get_header(event, "unique-id")); + sql = switch_core_db_mprintf("delete from channels where uuid='%s'", switch_event_get_header(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_CREATE: sql = switch_core_db_mprintf("insert into channels (uuid,created,name,state) values('%q','%q','%q','%q')",

1 0

[commit] r1957 - in freeswitch/trunk/src: . mod/codecs/mod_speex mod/endpoints/mod_dingaling mod/endpoints/mod_exosip mod/endpoints/mod_iax
by Freeswitch SVN 18 Jul '06

18 Jul '06

Author: anthm Date: Tue Jul 18 14:34:42 2006 New Revision: 1957 Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/switch_rtp.c Log: codec tweak Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Tue Jul 18 14:34:42 2006 @@ -202,8 +202,6 @@ } - - speex_bits_pack(&context->encoder_bits, 15, 5); *encoded_data_len = speex_bits_write(&context->encoder_bits, (char *) encoded_data, context->encoder_frame_size); speex_bits_reset(&context->encoder_bits); @@ -226,6 +224,7 @@ return SWITCH_STATUS_FALSE; } + buf = decoded_data; if (*flag & SWITCH_CODEC_FLAG_SILENCE) { speex_decode_int(context->decoder_state, NULL, buf); @@ -276,7 +275,7 @@ /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 640, /*.bytes_per_frame */ 1280, - /*.encoded_bytes_per_frame */ 43, + /*.encoded_bytes_per_frame */ 0, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, @@ -295,7 +294,7 @@ /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 320, /*.bytes_per_frame */ 640, - /*.encoded_bytes_per_frame */ 43, + /*.encoded_bytes_per_frame */ 0, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, @@ -315,7 +314,7 @@ /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 160, /*.bytes_per_frame */ 320, - /*.encoded_bytes_per_frame */ 29, + /*.encoded_bytes_per_frame */ 0, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Jul 18 14:34:42 2006 @@ -291,15 +291,15 @@ } if (!(tech_pvt->rtp_session = switch_rtp_new(tech_pvt->profile->ip, - tech_pvt->local_port, - tech_pvt->remote_ip, - tech_pvt->remote_port, - tech_pvt->codec_num, - tech_pvt->read_codec.implementation->encoded_bytes_per_frame, - tech_pvt->read_codec.implementation->microseconds_per_frame, - flags, - NULL, - &err, switch_core_session_get_pool(tech_pvt->session)))) { + tech_pvt->local_port, + tech_pvt->remote_ip, + tech_pvt->remote_port, + tech_pvt->codec_num, + 0, + tech_pvt->read_codec.implementation->microseconds_per_frame, + flags, + NULL, + &err, switch_core_session_get_pool(tech_pvt->session)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP ERROR %s\n", err); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return -1; @@ -784,8 +784,12 @@ } if (tech_pvt->read_frame.datalen > 0) { - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (tech_pvt->read_frame.datalen / bytes); + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = (tech_pvt->read_frame.datalen / bytes); + } else { + frames = 1; + } samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame; tech_pvt->timestamp_recv += (int32_t) samples; @@ -841,9 +845,13 @@ switch_set_flag_locked(tech_pvt, TFLAG_WRITING); + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = ((int) frame->datalen / bytes); + } else { + frames = 1; + } - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = ((int) frame->datalen / bytes); samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; //printf("%s send %d bytes %d samples in %d frames ts=%d\n", switch_channel_get_name(channel), frame->datalen, samples, frames, tech_pvt->timestamp_send); Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Tue Jul 18 14:34:42 2006 @@ -562,7 +562,7 @@ tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, tech_pvt->read_codec.implementation->ianacode, - tech_pvt->read_codec.implementation->encoded_bytes_per_frame, + 0, //tech_pvt->read_codec.implementation->encoded_bytes_per_frame, ms, flags, key, @@ -718,8 +718,12 @@ if (tech_pvt->read_frame.datalen > 0) { tech_pvt->last_read = switch_time_now(); - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (tech_pvt->read_frame.datalen / bytes); + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = (tech_pvt->read_frame.datalen / bytes); + } else { + frames = 1; + } samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame; tech_pvt->timestamp_recv += (int32_t) samples; @@ -776,8 +780,12 @@ switch_set_flag_locked(tech_pvt, TFLAG_WRITING); if (switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) { - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = ((int) frame->datalen / bytes); + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = ((int) frame->datalen / bytes); + } else { + frames = 1; + } samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; } else { assert(0); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Jul 18 14:34:42 2006 @@ -1099,8 +1099,12 @@ break; } - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (int) (tech_pvt->read_frame.datalen / bytes); + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = (int) (tech_pvt->read_frame.datalen / bytes); + } else { + frames = 1; + } tech_pvt->read_frame.samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Jul 18 14:34:42 2006 @@ -796,10 +796,11 @@ switch_sockaddr_ip_get(&tx_host, rtp_session->from_addr); switch_sockaddr_ip_get(&old_host, rtp_session->remote_addr); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Auto Changing port from %s:%u to %s:%u\n", - old_host, old, tx_host, rtp_session->from_addr->port); - switch_rtp_set_remote_address(rtp_session, tx_host, rtp_session->from_addr->port, &err); + if (!switch_strlen_zero(tx_host) && rtp_session->from_addr->port > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Auto Changing port from %s:%u to %s:%u\n", + old_host, old, tx_host, rtp_session->from_addr->port); + switch_rtp_set_remote_address(rtp_session, tx_host, rtp_session->from_addr->port, &err); + } } switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } @@ -1083,7 +1084,8 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VAD) && rtp_session->recv_msg.header.pt == rtp_session->vad_data.read_codec->implementation->ianacode && - datalen == rtp_session->vad_data.read_codec->implementation->encoded_bytes_per_frame) { + ((datalen == rtp_session->vad_data.read_codec->implementation->encoded_bytes_per_frame) || + (datalen > SWITCH_RTP_CNG_PAYLOAD && rtp_session->vad_data.read_codec->implementation->encoded_bytes_per_frame == 0))) { int16_t decoded[SWITCH_RECCOMMENDED_BUFFER_SIZE/sizeof(int16_t)]; uint32_t rate; uint32_t flags;

1 0

[commit] r1954 - freeswitch/trunk/scripts/rss
by Freeswitch SVN 18 Jul '06

18 Jul '06

Author: anthm Date: Tue Jul 18 12:57:16 2006 New Revision: 1954 Added: freeswitch/trunk/scripts/rss/syncrss.pl (contents, props changed) Log: add syncrss.pl script for use with mod_rss Added: freeswitch/trunk/scripts/rss/syncrss.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/rss/syncrss.pl Tue Jul 18 12:57:16 2006 @@ -0,0 +1,23 @@ +#!/usr/local/bin/perl + +my $home = shift; + +$home or die "Usage: $0 <dir>\n"; +chdir($home); + +my $hash = { + 'freeswitch.rss' => 'http://www.freeswitch.org/xml.php' + }; + + +foreach (keys %{$hash}) { + my ($dl) = $hash->{$_} =~ /\/([^\/]+)$/; + + my $cmd = "rm -f $_ $dl ; wget $hash->{$_}"; + if ($dl ne $_) { + $cmd .= "; /bin/mv $dl $_"; + } + $cmd .= "\n"; + print $cmd; + system($cmd); +}

1 0