- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13238 - freeswitch/trunk/build
by FreeSWITCH SVN 06 May '09

06 May '09

Author: brian Date: Tue May 5 23:41:13 2009 New Revision: 13238 Log: bump sounds Modified: freeswitch/trunk/build/sounds_version.txt Modified: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- freeswitch/trunk/build/sounds_version.txt (original) +++ freeswitch/trunk/build/sounds_version.txt Tue May 5 23:41:13 2009 @@ -1 +1 @@ -1.0.8 \ No newline at end of file +1.0.9

1 0

[commit] r13237 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 05 May '09

05 May '09

Author: anthm Date: Tue May 5 17:15:52 2009 New Revision: 13237 Log: fix evil send myself a refer bug FSCORE-350 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Tue May 5 17:15:52 2009 @@ -554,6 +554,10 @@ } if (sofia_private && sofia_private->destroy_me) { + if (tech_pvt) { + tech_pvt->sofia_private = NULL; + } + if (nh) { nua_handle_bind(nh, NULL); }

1 0

[commit] r13236 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 05 May '09

05 May '09

Author: anthm Date: Tue May 5 14:35:31 2009 New Revision: 13236 Log: yipee, ten millionth bug in mod_loopaback Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Tue May 5 14:35:31 2009 @@ -542,16 +542,15 @@ *frame = NULL; - mutex = tech_pvt->mutex; - switch_mutex_lock(mutex); - - if (!switch_channel_ready(channel)) { goto end; } switch_core_timer_next(&tech_pvt->timer); + mutex = tech_pvt->mutex; + switch_mutex_lock(mutex); + if (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { if (tech_pvt->write_frame) { switch_frame_free(&tech_pvt->write_frame);

1 0

[commit] r13235 - freeswitch/trunk/libs/esl/ruby
by FreeSWITCH SVN 05 May '09

05 May '09

Author: brian Date: Tue May 5 12:30:06 2009 New Revision: 13235 Log: ESL-15 Added: freeswitch/trunk/libs/esl/ruby/server3.rb Added: freeswitch/trunk/libs/esl/ruby/server3.rb ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/ruby/server3.rb Tue May 5 12:30:06 2009 @@ -0,0 +1,66 @@ +#!/usr/bin/ruby + +# Simple Ruby ESL example that forks a new process for every connection. +# Called like this: <action application="socket" data="localhost:8086 async full"/> +# +# Try pressing 5, 8 or 9 when the file is played and see what happens +# +# Contributed by Mikael Bjerkeland + +require "ESL" +require 'socket' +include Socket::Constants +bind_address = "127.0.0.1" +bind_port = 8086 + +def time_now + Time.now.strftime("%Y-%m-%d %H:%M:%S") +end + +socket = Socket.new(AF_INET, SOCK_STREAM, 0) +sockaddr = Socket.sockaddr_in(bind_port, bind_address) +socket.bind(sockaddr) +socket.listen(5) +puts "Listening for connections on #{bind_address}:#{bind_port}" +loop do + client_socket, client_sockaddr = socket.accept #_nonblock + pid = fork do + @con = ESL::ESLconnection.new(client_socket.fileno) + info = @con.getInfo + uuid = info.getHeader("UNIQUE-ID") + @con.sendRecv("myevents") + @con.sendRecv("divert_events on") + + puts "#{time_now} [#{uuid}] Call to [#{info.getHeader("Caller-Destination-Number")}]" + @con.execute("log", "1, Wee-wa-wee-wa") + @con.execute("info", "") + @con.execute("answer", "") + @con.execute("playback", "/usr/local/freeswitch/sounds/music/8000/suite-espanola-op-47-leyenda.wav") + + while @con.connected + e = @con.recvEvent + + if e + name = e.getHeader("Event-Name") + puts "EVENT: #{name}" + break if name == "SERVER_DISCONNECTED" + if name == "DTMF" + digit = e.getHeader("DTMF-DIGIT") + duration = e.getHeader("DTMF-DURATION") + puts "DTMF DIGIT #{digit} (#{duration})" + if digit == "5" + @con.execute("log", "1, WHA HA HA. User pressed 5") + elsif digit == "8" + # TODO: close connection without hangup in order to proceed in dialplan. How? + elsif digit == "9" + @con.execute("transfer", "99355151") + end + end + + end + end + puts "Connection closed" + end + + Process.detach(pid) +end

1 0

[commit] r13234 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 05 May '09

05 May '09

Author: brian Date: Tue May 5 10:51:30 2009 New Revision: 13234 Log: clean up Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Tue May 5 10:51:30 2009 @@ -1,5 +1,5 @@ - <profile name="external"> +   <gateways> <X-PRE-PROCESS cmd="include" data="external/*.xml"/> 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 Tue May 5 10:51:30 2009 @@ -1,8 +1,8 @@ - - <profile name="internal-ipv6"> +  +   <settings>  Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue May 5 10:51:30 2009 @@ -1,12 +1,12 @@ - - - <profile name="internal"> +  + +   <aliases> <alias name="default"/>

1 0

[commit] r13233 - freeswitch/trunk/src
by FreeSWITCH SVN 05 May '09

05 May '09

Author: anthm Date: Tue May 5 10:09:32 2009 New Revision: 13233 Log: fix memory issue in core file resampling code Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Tue May 5 10:09:32 2009 @@ -122,7 +122,7 @@ } } - if (fh->pre_buffer_datalen) { + if (0 && fh->pre_buffer_datalen) { //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Prebuffering %d bytes\n", (int)fh->pre_buffer_datalen); switch_buffer_create_dynamic(&fh->pre_buffer, fh->pre_buffer_datalen * fh->channels, fh->pre_buffer_datalen * fh->channels / 2, 0); fh->pre_buffer_data = switch_core_alloc(fh->memory_pool, fh->pre_buffer_datalen * fh->channels); @@ -232,11 +232,13 @@ switch_assert(fh->buffer); } if (!fh->dbuf || fh->dbuflen < fh->resampler->to_len * 2) { + void *mem; fh->dbuflen = fh->resampler->to_len * 2; - fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); + mem = realloc(fh->dbuf, fh->dbuflen); + switch_assert(mem); + fh->dbuf = mem; } - switch_assert(fh->resampler->to_len <= fh->dbuflen); - + switch_assert(fh->resampler->to_len * 2 <= fh->dbuflen); memcpy((int16_t *) fh->dbuf, fh->resampler->to, fh->resampler->to_len * 2); switch_buffer_write(fh->buffer, fh->dbuf, fh->resampler->to_len * 2); @@ -286,10 +288,13 @@ if (fh->resampler->to_len > orig_len * fh->channels) { if (!fh->dbuf) { + void *mem; fh->dbuflen = fh->resampler->to_len * 2; - fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); + mem = realloc(fh->dbuf, fh->dbuflen); + switch_assert(mem); + fh->dbuf = mem; } - switch_assert(fh->resampler->to_len <= fh->dbuflen); + switch_assert(fh->resampler->to_len * 2 <= fh->dbuflen); memcpy(fh->dbuf, fh->resampler->to, fh->resampler->to_len * 2); data = fh->dbuf; } else { @@ -314,13 +319,14 @@ rlen = switch_buffer_inuse(fh->pre_buffer); if (rlen >= fh->pre_buffer_datalen) { - blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); - if (!asis) blen /= 2; - if (fh->channels) blen /= fh->channels; - if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { - *len = 0; + if ((blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen))) { + if (!asis) blen /= 2; + if (fh->channels) blen /= fh->channels; + if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { + *len = 0; + } + fh->samples_out += blen; } - fh->samples_out += blen; } return status; @@ -409,11 +415,12 @@ int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); while((rlen = switch_buffer_inuse(fh->pre_buffer))) { - blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); - if (!asis) blen /= 2; - if (fh->channels) blen /= fh->channels; - if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) { - break; + if ((blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen))) { + if (!asis) blen /= 2; + if (fh->channels) blen /= fh->channels; + if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) { + break; + } } } } @@ -432,6 +439,9 @@ switch_core_destroy_memory_pool(&fh->memory_pool); } + switch_safe_free(fh->dbuf); + + return status; }

1 0

[commit] r13231 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 May '09

04 May '09

Author: mrene Date: Mon May 4 17:53:41 2009 New Revision: 13231 Log: MODENDP-206 Ignore ptime when missing instead of using @0i - thanks stangor Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon May 4 17:53:41 2009 @@ -2487,7 +2487,11 @@ } if (match) { - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (int) map->rm_rate, ptime); + if(ptime > 0) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (unsigned int) map->rm_rate, ptime); + } else { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh", imp->iananame, (unsigned int) map->rm_rate); + } already_did[imp->ianacode] = 1; break; } @@ -2524,7 +2528,11 @@ } if (match) { - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (int) map->rm_rate, ptime); + if(ptime > 0) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (unsigned int) map->rm_rate, ptime); + } else { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh", imp->iananame, (unsigned int) map->rm_rate); + } already_did[imp->ianacode] = 1; break; }

1 0

[commit] r13230 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 May '09

04 May '09

Author: anthm Date: Mon May 4 16:48:10 2009 New Revision: 13230 Log: fix mem corruption on failed register Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Mon May 4 16:48:10 2009 @@ -537,8 +537,7 @@ break; } - if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private) || - (!session && (status >= 300 && status != 401 && status != 407))) { + if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private)) { nua_handle_bind(nh, NULL); nua_handle_destroy(nh); nh = NULL;

1 0

[commit] r13229 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 May '09

04 May '09

Author: anthm Date: Mon May 4 16:41:42 2009 New Revision: 13229 Log: fix mem corruption on failed register Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon May 4 16:41:42 2009 @@ -1385,23 +1385,6 @@ if (ostate != sofia_private->gateway->state) { sofia_reg_fire_custom_gateway_state_event(sofia_private->gateway); } - - - if (status >= 300) { - if (sofia_private) { - if (sofia_private->gateway) { - nua_handle_destroy(sofia_private->gateway->nh); - sofia_private->gateway->nh = NULL; - nua_handle_bind(sofia_private->gateway->nh, NULL); - sofia_private->gateway->sofia_private = NULL; - } else { - nua_handle_destroy(nh); - } - sofia_private_free(sofia_private); - } else { - nua_handle_destroy(nh); - } - } } }

1 0

[commit] r13228 - freeswitch/trunk/src
by FreeSWITCH SVN 04 May '09

04 May '09

Author: mrene Date: Mon May 4 15:43:09 2009 New Revision: 13228 Log: Make { } vars take precedence over channel variables Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon May 4 15:43:09 2009 @@ -1082,7 +1082,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "variable string %d = [%s]\n", x, var_array[x]); if ((inner_var_count = switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { - + switch_event_del_header(var_event, inner_var_array[0]); switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]); } }

1 0