- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9236 - freeswitch/trunk/src
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 11:37:50 2008 New Revision: 9236 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c Log: fix out-of-bounds pointer in variable expansion detected by MSCV (thanks for nothing linux) FSCORE-171 Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Aug 11 11:37:50 2008 @@ -1598,7 +1598,7 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel, const char *in) { char *p, *c = NULL; - char *data, *indup; + char *data, *indup, *endof_indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; const char *q; char *cloned_sub_val = NULL, *sub_val = NULL; @@ -1632,11 +1632,12 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); + endof_indup = end_of_p(indup); if ((data = malloc(olen))) { memset(data, 0, olen); c = data; - for (p = indup; p && *p; p++) { + for (p = indup; p && p < endof_indup && *p; p++) { vtype = 0; if (*p == '\\') { @@ -1699,7 +1700,7 @@ e++; } - p = e; + p = e > endof_indup ? endof_indup : e; if ((vval = strchr(vname, '('))) { e = vval - 1; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Aug 11 11:37:50 2008 @@ -1190,7 +1190,7 @@ SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const char *in) { char *p, *c = NULL; - char *data, *indup; + char *data, *indup, *endof_indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; const char *q, *sub_val = NULL; char *cloned_sub_val = NULL; @@ -1219,11 +1219,12 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); + endof_indup = end_of_p(indup); if ((data = malloc(olen))) { memset(data, 0, olen); c = data; - for (p = indup; p && *p; p++) { + for (p = indup; p && p < endof_indup && *p; p++) { vtype = 0; if (*p == '\\') { @@ -1286,7 +1287,7 @@ e++; } - p = e; + p = e > endof_indup ? endof_indup : e; if ((vval = strchr(vname, '('))) { e = vval - 1;

1 0

[commit] r9235 - freeswitch/trunk/libs/stfu
by Freeswitch SVN 10 Aug '08

10 Aug '08

Author: anthm Date: Sat Aug 9 22:17:21 2008 New Revision: 9235 Modified: freeswitch/trunk/libs/stfu/stfu.c Log: STFU n FIX Modified: freeswitch/trunk/libs/stfu/stfu.c ============================================================================== --- freeswitch/trunk/libs/stfu/stfu.c (original) +++ freeswitch/trunk/libs/stfu/stfu.c Sat Aug 9 22:17:21 2008 @@ -125,7 +125,7 @@ } for(index = 0; index < STFU_MAX_TRACK; index++) { - if (track[index] > most) { + if (track[index] > track[most]) { most = index; } }

1 0

[commit] r9234 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Aug '08

10 Aug '08

Author: anthm Date: Sat Aug 9 21:41:46 2008 New Revision: 9234 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix MODENDP-124 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Aug 9 21:41:46 2008 @@ -162,6 +162,7 @@ static int hangup_cause_to_sip(switch_call_cause_t cause) { switch (cause) { + case SWITCH_CAUSE_UNALLOCATED_NUMBER: case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET: case SWITCH_CAUSE_NO_ROUTE_DESTINATION: return 404; @@ -170,7 +171,6 @@ case SWITCH_CAUSE_NO_USER_RESPONSE: return 408; case SWITCH_CAUSE_NO_ANSWER: - return 480; case SWITCH_CAUSE_SUBSCRIBER_ABSENT: return 480; case SWITCH_CAUSE_CALL_REJECTED:

1 0

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

07 Aug '08

Author: anthm Date: Thu Aug 7 11:44:29 2008 New Revision: 9233 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Thu Aug 7 11:44:29 2008 @@ -1649,7 +1649,7 @@ profile->context = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "apply-nat-acl")) { if (profile->acl_count < SOFIA_MAX_ACL) { - if (!profile->extsipip && switch_check_network_list_ip(profile->sipip, val)) { + if (!profile->extsipip && profile->sipip && switch_check_network_list_ip(profile->sipip, val)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not adding acl %s because it's the local network\n", val); } else { profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val);

1 0

[commit] r9232 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 06 Aug '08

06 Aug '08

Author: anthm Date: Wed Aug 6 19:33:58 2008 New Revision: 9232 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add patch from MODAPP-123 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Aug 6 19:33:58 2008 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Bret McDanel <trixter AT 0xdecafbad.com> + * John Wehle (john(a)feith.com) * * mod_voicemail.c -- Voicemail Module * @@ -2785,8 +2786,8 @@ char read_date[80] = ""; char rss_date[80] = ""; switch_size_t retsize; - long l_created = 0; - long l_read = 0; + switch_time_t l_created = 0; + switch_time_t l_read = 0; long l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; @@ -2796,11 +2797,11 @@ char title_aft[128 * 3] = ""; if (argc > 0) { - l_created = atol(argv[0]) * 1000000; + l_created = switch_time_make (atol(argv[0]), 0); } if (argc > 1) { - l_read = atol(argv[1]) * 1000000; + l_read = switch_time_make (atol(argv[1]), 0); } if (argc > 9) { @@ -2877,8 +2878,8 @@ char *fname; switch_size_t flen; switch_file_t *fd; - long l_created = 0; - long l_read = 0; + switch_time_t l_created = 0; + switch_time_t l_read = 0; long l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; @@ -2886,11 +2887,11 @@ char heard[80]; if (argc > 0) { - l_created = atol(argv[0]) * 1000000; + l_created = switch_time_make (atol(argv[0]), 0); } if (argc > 1) { - l_read = atol(argv[1]) * 1000000; + l_read = switch_time_make (atol(argv[1]), 0); } if (argc > 9) {

1 0

[commit] r9231 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Aug '08

06 Aug '08

Author: anthm Date: Wed Aug 6 19:25:24 2008 New Revision: 9231 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Aug 6 19:25:24 2008 @@ -626,8 +626,12 @@ if (tech_pvt->read_frame.datalen > 0) { size_t bytes = 0; int frames = 1; - + if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) { + if (!tech_pvt->read_codec.implementation) { + *frame = NULL; + return SWITCH_STATUS_GENERR; + } if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame)) { frames = (tech_pvt->read_frame.datalen / bytes); }

1 0

[commit] r9230 - freeswitch/trunk/src
by Freeswitch SVN 06 Aug '08

06 Aug '08

Author: anthm Date: Wed Aug 6 15:56:44 2008 New Revision: 9230 Modified: freeswitch/trunk/src/switch_xml.c Log: umm ya Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Wed Aug 6 15:56:44 2008 @@ -1486,6 +1486,8 @@ goto end; } + status = SWITCH_STATUS_FALSE; + if (ip) { if ((*user = switch_xml_find_child(*domain, "user", "ip", ip))) { status = SWITCH_STATUS_SUCCESS;

1 0

[commit] r9229 - in freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk: . generators/voice_events_controller/templates lib/core lib/core/voice_events lib/core/voice_view lib/freeswitch lib/freeswitch/voice_model
by Freeswitch SVN 06 Aug '08

06 Aug '08

Author: jpalley Date: Wed Aug 6 12:17:30 2008 New Revision: 9229 Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/README freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/routes.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/install.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/telegraph.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/router.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/action_controller_extensions.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/dispatcher.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/interface.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/request.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/template.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_events_server.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_channel_model.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_conference_model.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_connector.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_sip_model.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_interface.rb freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_server.rb Log: updates to telegraph. Rails 2.1, bug fixes, imprveoments Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/README ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/README (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/README Wed Aug 6 12:17:30 2008 @@ -1,7 +1,7 @@ Telegraph for FreeSWITCH -Please see http://code.google.com/p/telegraph for more information +Please see http://developer.idapted.com/plugins/telegraph for more information -Telegraph allows you to write MVC voice application in Ruby on Rails that tightly integrate with the web. In our second release we go FreeSWITCH (the new OSS carrier grade switch) and Rails 2. Here's the details: +Telegraph allows you to write MVC voice application in Ruby on Rails that tightly integrate with the web. In our second release we go FreeSWITCH (the new OSS carrier grade switch) and Rails 2.1. Here's the details: For the FreeSWITCH fan: - Complete implementation of Outbound Socket, Event (Inbound) Socket and XML-RPC Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/routes.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/routes.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/generators/voice_events_controller/templates/routes.rb Wed Aug 6 12:17:30 2008 @@ -11,4 +11,9 @@ map.default :<%= file_name %> end + + def self.filter(params) + return true + end + end Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/install.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/install.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/install.rb Wed Aug 6 12:17:30 2008 @@ -5,7 +5,9 @@ #Copy script files %w{voice_view voice_events}.each do |f| - File.copy "#{dir}/lib/#{f}", "#{dir}/../../../script/#{f}" + dest = "#{dir}/../../../script/#{f}" + File.copy "#{dir}/lib/#{f}", dest + File.chmod 0755, dest end #Copy configuration Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/telegraph.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/telegraph.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/telegraph.rb Wed Aug 6 12:17:30 2008 @@ -1,9 +1,9 @@ Mime::Type.register "telegraph/voice", :voice module Telegraph def self.config - rails_config = File.join(RAILS_ROOT, 'config/telegraph') + rails_config = File.join(RAILS_ROOT, 'config/telegraph.yml') if File.exist?(rails_config) - yml = YAML.load(File.open(File.join(RAILS_ROOT, 'config/telegraph.yml'))) + yml = YAML.load(File.open(rails_config)) else yml = YAML.load(File.open(File.join(RAILS_ROOT, 'vendor/plugins/telegraph/lib/telegraph.yml'))) end Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/router.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/router.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_events/router.rb Wed Aug 6 12:17:30 2008 @@ -13,9 +13,12 @@ @routes << {:controller=>name, :block=>nil} end + def dispatch!(event_name, params) controller_name = @routes.detect{|r| - r[:block].nil? || r[:block].call(params)}[:controller] + r[:block].nil? || r[:block].call(params)} + raise("No Route For Event: #{event_name}\n\nPARAMS:\n#{params.inspect}") if controller_name.nil? + controller_name=controller_name[:controller] controller = controller_from_name(controller_name) controller.params = params controller.send(event_name.to_sym) Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/action_controller_extensions.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/action_controller_extensions.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/action_controller_extensions.rb Wed Aug 6 12:17:30 2008 @@ -1,6 +1,7 @@ module ActionController class Base def render_voice(&block) + response.interface.controller = self begin yield response.interface end Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/dispatcher.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/dispatcher.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/dispatcher.rb Wed Aug 6 12:17:30 2008 @@ -36,6 +36,7 @@ @request.next_action=nil ActionController::Dispatcher.new(StdOutEmulator.new, @request, @response).dispatch #Check for errors + if @response.headers['Status'] == "500 Internal Server Error" or @response.headers['Status'] == "406 Not Acceptable" @request.interface.hangup break Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/interface.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/interface.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/interface.rb Wed Aug 6 12:17:30 2008 @@ -1,9 +1,30 @@ module Telegraph module VoiceView + class Form + attr_accessor :elements + def initialize + @elements = Array.new + end + + def numeric_input(param, pars={}) + @elements << {:type=>:get_dtmf, :sound=>pars[:sound], :param=>param, :timeout=>pars[:timeout] || 5000, :max_digits=>pars[:max_digits] || 7, :terminators=>pars[:terminators]} + end + + def submit(args) + @elements << {:type=>'submit', :args=>args} + end + + def record_input(label, filename, param, max_time=10, beep=true, silence_detect=10) + @elements << {:type=>'record_input',:label=>label, :filename=>filename,:param=>param, :max_time=>max_time, :beep=>beep, :silence_detect=>silence_detect} + end + end class Interface - def redirect(args) - @request.create_redirect args + attr_accessor :controller + + def redirect_to(args) + create_redirect @controller.url_for(args.merge(:only_path=>true)) end + # The following has not been updated/tested with FreeSWITCH. # It should work with minor modifications for someone who needs the features @@ -13,18 +34,20 @@ # str.split(' ').each {|e| say_element(e)} # end # - # def form (opts={}) - # form = Telegraph::CallForm.new - # @params = {} - # yield form - # - # for element in form.elements - # build_form_element(element) - # end - # - # @params.update(opts[:url]) - # @request.create_redirect @params - # end + def form (opts={}) + form = Telegraph::VoiceView::Form.new + @params = {} + yield form + + for element in form.elements + build_form_element(element) + end + + url = opts[:url] || opts + url = @controller.url_for(args.merge(:only_path=>true)) unless url.is_a?(String) + method = opts[:method].to_s.upcase || "POST" + create_redirect url, method + end # # def extract_hash(key, value) # split_key=key.split('[') Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/request.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/request.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/request.rb Wed Aug 6 12:17:30 2008 @@ -10,7 +10,7 @@ # def initialize(interface, cgi, query_parameters ={}, request_parameters = {}, session_opts = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS) @interface = interface - @query_parameters = query_parameters + @query_parameters = query_parameters @session_options = session_opts @redirect = false @env = {} @@ -24,7 +24,7 @@ @cgi = cgi @host = "voice_view" @request_uri = "/" - @env['REQUEST_METHOD'] = "POST" + @env['REQUEST_METHOD'] = @interface.params['http_method'] || "GET" @path= @interface.url @session_options['session_id'] = @interface.params['session_id'] Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/template.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/template.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/core/voice_view/template.rb Wed Aug 6 12:17:30 2008 @@ -28,8 +28,8 @@ #options = Haml::Template.options.dup puts "COMPILE" puts template - - "controller.render_voice do |voice|\n #{template}\n end" + + "controller.render_voice do |voice|\n #{template.source}\n end" # Haml::Engine.new(template, options).send(:precompiled_with_ambles, []) end @@ -40,4 +40,4 @@ end end -ActionView::Base.register_template_handler(:freeswitch, Telegraph::VoiceView::Template) +ActionView::Template.register_template_handler(:freeswitch, Telegraph::VoiceView::Template) Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_events_server.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_events_server.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_events_server.rb Wed Aug 6 12:17:30 2008 @@ -85,8 +85,9 @@ headers[:content] = data[2] if data[2] event_name = headers[:event_name].downcase - event_name = "custom_" + headers[:event_subclass].gsub('::', '_') if headers[:event_name] == "CUSTOM" + event_name = "custom_" + headers[:event_subclass].gsub('::', '_') if headers[:event_name] == "CUSTOM" begin + return unless VoiceEventsRouter.filter(headers) Telegraph.log "CALLING: #{event_name}" @routes.dispatch!(event_name.to_sym, headers) # @voice_events.params = headers @@ -104,6 +105,7 @@ rescue Exception => e Telegraph.log "Error in sending event: #{headers[:event_name]}" Telegraph.log e.inspect + Telegraph.log e.backtrace else @ar_reconnected_retried = false Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_channel_model.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_channel_model.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_channel_model.rb Wed Aug 6 12:17:30 2008 @@ -12,10 +12,10 @@ @exists = nil @last_error = nil def initialize(params={}) - @params = params + @params = params.with_indifferent_access @uuid = params[:uuid] @job_uuid = params[:job_uuid] - @@connector = params[:connector] || VoiceConnector.new + @@connector ||= params[:connector] || VoiceConnector.new @valid=true end @@ -68,8 +68,12 @@ end def method_missing(method, *args) - properties = self.dump - properties[method] ? properties[method] : properties["channel_#{method}"] + if @params[method] + return @params[method] + else + properties = self.dump + properties[method] ? properties[method] : properties["channel_#{method}"] + end end @@ -93,7 +97,8 @@ if meth == :all channels_csv = voice_connector.show(:channels) if args.empty? - return channels_csv.map{|c| VoiceChannelModel.new(c, voice_connector)} + + return channels_csv.map{|c| VoiceChannelModel.new(c)} end else klass = self.new(:uuid=>meth) @@ -115,14 +120,17 @@ variables[:origination_caller_id_name] = cid_name variables[:origination_caller_id_number] = cid_number variables[:ignore_early_media] = "true" - +# variables[:system_domain] = SiteConfig['global']['domain'] variables = variables.map{|k,v| "#{k}=#{v}"}.join(',') if callback = opts[:callback] - port = opts[:port] || '8084' + #port = opts[:port] || '8084' #Remove http://blah/ if it exists callback.gsub!(/http:\/\/[\d\w\.:]+\//, '') - params = "&socket(${rails_server}:#{port}/#{callback} async full)" + callback.gsub!(/^\//, '') +# name_prefix = SiteConfig ? "#{SiteConfig['global']['domain']}_" : '' + name_prefix = '' + params = "&socket(${rails_#{name_prefix}server}/#{callback} async full)" else params = opts[:params] end Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_conference_model.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_conference_model.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_conference_model.rb Wed Aug 6 12:17:30 2008 @@ -17,11 +17,11 @@ end def start_recording(filename) - @connector.send_command('conference', "#{@name} record #{filename}") + @@connector.send_command('conference', "#{@name} record #{filename}") end def stop_recording(filename) - @connector.send_command('conference', "#{@name} norecord #{filename}") + @@connector.send_command('conference', "#{@name} norecord #{filename}") end def self.find(id) @@ -78,11 +78,8 @@ end def update_attributes(params) - puts "UPDATE" - pp params + params.each do |k,v| - puts "param" - puts k.to_sym if [:mute, :deaf].include?(k.to_sym) tru = (v and not v == "0") prefix = tru ? '' : 'un' @@ -92,7 +89,6 @@ end end elsif [:volume_in, :volume_out, :energy].include?(k.to_sym) - puts "in valume" if @connector.send_command('conference', "#{conf_name} #{k.to_s} #{id} #{v}") self.send("#{k}=", v) end Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_connector.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_connector.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_connector.rb Wed Aug 6 12:17:30 2008 @@ -22,7 +22,6 @@ def self.load_configuration_and_connect! config = Telegraph.config - Telegraph::FreeSWITCH::VoiceConnector.new.connect!(:server=>config['server'], :port=>config['model']['port'], :username=>config['model']['username'], :password=>config['model']['password'], :timeout=>10) end @@ -57,10 +56,10 @@ name_array = [] return_array = [] result.split("\n").each do |line| - if name_array.empty? + if line =~ /Content-Type/ or line.empty? or line =~ /\d+ total\./ + #Do nothing + elsif name_array.empty? name_array = line.split(',') - elsif line.empty? - break else item = Hash.new line.split(',').each_with_index{|v,i| item[name_array[i].to_sym]=v} Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_sip_model.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_sip_model.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_model/voice_sip_model.rb Wed Aug 6 12:17:30 2008 @@ -32,7 +32,7 @@ @@connector ||=VoiceConnector.new @@data_cache ||= Hash.new if @@data_cache[:set_at].nil? or @@data_cache[:set_at] < 3.second.ago.utc - data = @@connector.send_command("sofia", "status profile default") + data = @@connector.send_command("sofia", "status profile #{profile}") @@data_cache[:data] = data @@data_cache[:set_at] = Time.now.utc else Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_interface.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_interface.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_interface.rb Wed Aug 6 12:17:30 2008 @@ -93,6 +93,31 @@ msg "export", val end + def speak(txt, engine="flite", voice="kal") + msg "set", "tts_engine=#{engine}" + msg "set", "tts_voice=#{voice}" + msg "speak", txt + end + + def transfer(extension, dialplan='', context='') + msg "transfer", "#{extension} #{dialplan} #{context}" + end + def dtmf_read(max = 10, sound = nil, fs_var_name = "dtmf_inputs", timeout = 10000, terminators = '#,*') + sound ||= 'misc/8000/silence.wav' + msg "read", "1 #{max} #{sound} #{fs_var_name} #{timeout} #{terminators}" + end + + ############## + # For FORMS + ################## + def build_form_element(element) + dtmf_read(element[:max_digits], element[:sound], element[:param], element[:timeout], element[:terminators]) if element[:type]==:get_dtmf + end + + def create_redirect(url, method="GET") + set("http_method=#{method}") + transfer "'socket:${rails_server}#{url} async full'", "inline" + end private def msg(app, params='') @commands << {:type=>:msg, :app=>app, :params=>params} Modified: freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_server.rb ============================================================================== --- freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_server.rb (original) +++ freeswitch/trunk/scripts/contrib/jpalley/telegraph/trunk/lib/freeswitch/voice_view_server.rb Wed Aug 6 12:17:30 2008 @@ -61,14 +61,22 @@ def hashify data hsh = Hash.new data.split("\n").each do |line| - hsh[line.split(': ')[0].gsub('-', '_').downcase] = line.split(': ')[1] unless line.empty? + unless line.empty? + key,value = line.split(': ') + key = key.gsub('-', '_').downcase + + hsh[key] = value + non_variable_key = key.gsub(/^variable\_/, '') #remove variable_ from keys + hsh[non_variable_key] = value + end end - return hsh + return hsh.with_indifferent_access end def send_application app, params=nil msg = "SendMsg #{@connection_params['unique-id']}\ncall-command: execute\nexecute-app-name: #{app}" msg << "\nexecute-app-arg: #{params}" #if params + msg << "\nevent-lock: true" send msg end

1 0

[commit] r9228 - freeswitch/trunk/src/mod/say/mod_say_zh
by Freeswitch SVN 06 Aug '08

06 Aug '08

Author: coppice Date: Wed Aug 6 09:00:31 2008 New Revision: 9228 Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Log: Resolved a couple of wave file naming inconsistencies Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Wed Aug 6 09:00:31 2008 @@ -411,7 +411,7 @@ } else { if (hours || minutes) { say_file("digits/0.wav"); - say_file("time/seconds.wav"); + say_file("time/second.wav"); } } @@ -455,9 +455,9 @@ if (hour < 6) { say_file("time/morning.wav"); } else if (hour < 12) { - say_file("time/a-m.wav"); + say_file("time/am.wav"); } else if (tm.tm_hour < 18) { - say_file("time/p-m.wav"); + say_file("time/pm.wav"); } else { say_file("time/evening.wav"); }

1 0

[commit] r9225 - in freeswitch/trunk/src: . include
by Freeswitch SVN 05 Aug '08

05 Aug '08

Author: anthm Date: Tue Aug 5 17:50:48 2008 New Revision: 9225 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_play_say.c Log: _ | | ____ ____ ____| | ____ ____ ____ / _ ) _ |/ ___) |/ _ | _ \ / _ | ( (/ ( ( | | | | ( ( | | | | ( ( | | \____)_||_|_| |_|\_||_|_| |_|\_|| | (_____| Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Aug 5 17:50:48 2008 @@ -110,6 +110,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_READ_RESULT_VARIABLE "read_result" #define SWITCH_COPY_XML_CDR_VARIABLE "copy_xml_cdr" #define SWITCH_CURRENT_APPLICATION_VARIABLE "current_application" #define SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE "proto_specific_hangup_cause" Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Aug 5 17:50:48 2008 @@ -760,6 +760,7 @@ if (eff_timeout) { digit_elapsed = (uint32_t) ((switch_timestamp_now() - digit_started) / 1000); if (digit_elapsed >= eff_timeout) { + status = SWITCH_STATUS_TIMEOUT; break; } } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Aug 5 17:50:48 2008 @@ -1371,6 +1371,7 @@ switch_assert(session); channel = switch_core_session_get_channel(session); + switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, NULL); if (digit_buffer_length < min_digits || digit_buffer_length < max_digits) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Buffer too small!\n"); @@ -1400,6 +1401,14 @@ status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &terminator, timeout, 0, 0); } + if (status == SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, "success"); + } else if (status == SWITCH_STATUS_TIMEOUT) { + switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, "timeout"); + } else { + switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, "failure"); + } + end:

1 0