- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r9222 - in freeswitch/trunk/src/mod: applications/mod_conference endpoints/mod_sofia
by Freeswitch SVN 04 Aug '08

04 Aug '08

Author: anthm Date: Mon Aug 4 18:51:03 2008 New Revision: 9222 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Aug 4 18:51:03 2008 @@ -4718,8 +4718,11 @@ } #endif } + switch_safe_free(lbuf); - ci->chat_send(CONF_CHAT_PROTO, to, from, "", stream.data, NULL); + + ci->chat_send(CONF_CHAT_PROTO, to, hint && strchr(hint, '/') ? hint : from, "", stream.data, NULL); + //ci->chat_send(CONF_CHAT_PROTO, to, from, "", stream.data, NULL); switch_safe_free(stream.data); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Aug 4 18:51:03 2008 @@ -1653,7 +1653,7 @@ switch_copy_string(proto, to_user, sizeof(proto)); p = strchr(proto, '+'); *p++ = '\0'; - + if ((to_addr = strdup(p))) { if ((p = strchr(to_addr, '+'))) { *p = '@'; @@ -1665,18 +1665,21 @@ from_addr = switch_mprintf("%s@%s", from_user, from_host); + sofia_presence_set_hash_key(hash_key, sizeof(hash_key), sip); if ((tech_pvt = (private_object_t *) switch_core_hash_find(profile->chat_hash, hash_key))) { channel = switch_core_session_get_channel(tech_pvt->session); if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->url); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", tech_pvt->hash_key); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from_addr); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "hint", "%s", full_from); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to_addr); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE"); if (msg) { switch_event_add_body(event, "%s", msg); } + if (switch_core_session_queue_event(tech_pvt->session, &event) != SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); switch_event_fire(&event); @@ -1684,7 +1687,6 @@ } } else { switch_chat_interface_t *ci; - if ((ci = switch_loadable_module_get_chat_interface(proto))) { ci->chat_send(SOFIA_CHAT_PROTO, from_addr, to_addr, "", msg, full_from); } else {

1 0

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

04 Aug '08

Author: anthm Date: Mon Aug 4 15:20:33 2008 New Revision: 9221 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 Mon Aug 4 15:20:33 2008 @@ -1088,7 +1088,11 @@ } } else if (!strcasecmp(var, "apply-nat-acl")) { if (profile->acl_count < SOFIA_MAX_ACL) { - profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + if (!profile->extsipip && 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); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); } @@ -1645,7 +1649,11 @@ profile->context = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "apply-nat-acl")) { if (profile->acl_count < SOFIA_MAX_ACL) { - profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + if (!profile->extsipip && 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); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); }

1 0

[commit] r9220 - freeswitch/trunk/libs/win32/pcre
by Freeswitch SVN 03 Aug '08

03 Aug '08

Author: mikej Date: Sun Aug 3 14:47:45 2008 New Revision: 9220 Modified: freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj Log: build tweak Modified: freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj Sun Aug 3 14:47:45 2008 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="4"

1 0

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

01 Aug '08

Author: anthm Date: Fri Aug 1 14:18:35 2008 New Revision: 9219 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: make register-proxy preserve the url composed from proxy but target the packets to desired address MODENDP-121 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Aug 1 14:18:35 2008 @@ -274,6 +274,7 @@ char *register_contact; char *register_to; char *register_proxy; + char *register_sticky_proxy; char *register_context; char *expires_str; char *register_url; 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 Fri Aug 1 14:18:35 2008 @@ -886,8 +886,8 @@ from_domain = realm; } - if (switch_strlen_zero(register_proxy)) { - register_proxy = proxy; + if (!switch_strlen_zero(register_proxy)) { + gateway->register_sticky_proxy = switch_core_strdup(gateway->pool, register_proxy); } gateway->retry_seconds = atoi(retry_seconds); @@ -914,7 +914,7 @@ params = switch_core_sprintf(gateway->pool, ";transport=%s", register_transport); } - gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", register_proxy, register_transport); + gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", proxy, register_transport); gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", from_user, from_domain, register_transport); sipip = profile->extsipip ? profile->extsipip : profile->sipip; 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 Fri Aug 1 14:18:35 2008 @@ -150,6 +150,7 @@ if (now) { nua_register(gateway_ptr->nh, NUTAG_URL(gateway_ptr->register_url), + TAG_IF(gateway_ptr->register_sticky_proxy, NUTAG_PROXY(gateway_ptr->register_sticky_proxy)), SIPTAG_TO_STR(gateway_ptr->register_from), SIPTAG_FROM_STR(gateway_ptr->register_from), SIPTAG_CONTACT_STR(gateway_ptr->register_contact),

1 0

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

01 Aug '08

Author: anthm Date: Fri Aug 1 12:21:51 2008 New Revision: 9218 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add sip_hangup_disposition var 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 Fri Aug 1 12:21:51 2008 @@ -315,6 +315,9 @@ } if (switch_test_flag(tech_pvt, TFLAG_ANS)) { + if (!tech_pvt->got_bye) { + switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel)); nua_bye(tech_pvt->nh, SIPTAG_REASON_STR(reason), @@ -323,6 +326,9 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel)); + if (!tech_pvt->got_bye) { + switch_channel_set_variable(channel, "sip_hangup_disposition", "send_cancel"); + } nua_cancel(tech_pvt->nh, SIPTAG_REASON_STR(reason), TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), @@ -330,6 +336,9 @@ TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause); + if (!tech_pvt->got_bye) { + switch_channel_set_variable(channel, "sip_hangup_disposition", "send_refuse"); + } nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), SIPTAG_REASON_STR(reason), TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Aug 1 12:21:51 2008 @@ -474,6 +474,7 @@ int q850_cause; char *remote_ip; int remote_port; + int got_bye; }; struct callback_t { 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 Fri Aug 1 12:21:51 2008 @@ -122,16 +122,16 @@ { const char *tmp; switch_channel_t *channel; + private_object_t *tech_pvt; if (!session) return; channel = switch_core_session_get_channel(session); - + tech_pvt = switch_core_session_get_private(session); if (sip->sip_reason && sip->sip_reason->re_protocol && (!strcasecmp(sip->sip_reason->re_protocol, "Q.850") || !strcasecmp(sip->sip_reason->re_protocol, "FreeSWITCH")) && sip->sip_reason->re_cause) { - private_object_t *tech_pvt = switch_core_session_get_private(session); tech_pvt->q850_cause = atoi(sip->sip_reason->re_cause); } @@ -150,7 +150,10 @@ if ((tmp = sofia_glue_get_unknown_header(sip, "P-RTP-Stat"))) { switch_channel_set_variable(channel, "sip_p_rtp_stat", tmp); } - + + tech_pvt->got_bye = 1; + switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_bye"); + return; }

1 0

[commit] r9217 - freeswitch/trunk/src/mod/applications/mod_expr
by Freeswitch SVN 01 Aug '08

01 Aug '08

Author: anthm Date: Fri Aug 1 12:00:55 2008 New Revision: 9217 Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Log: fix endless loop in mod_expr Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Fri Aug 1 12:00:55 2008 @@ -52,6 +52,7 @@ char val[512] = "", *p; char *m_cmd = NULL; size_t len; + int ec = 0; if (switch_strlen_zero(cmd)) { goto error; @@ -126,7 +127,16 @@ do { err = exprEval(e, &last_expr); - } while (err); + if (err) { + ec++; + } else { + ec = 0; + } + } while (err && ec < 3); + + if (err) { + goto error; + } switch_snprintf(val, sizeof(val), "%0.10f", last_expr); for (p = (val + strlen(val) - 1); p != val; p--) {

1 0