oversip 1.3.8 → 1.4.0

data/lib/oversip/config.rb

@@ -32,8 +32,10 @@ module OverSIP
         :sip_tls                  => false,
         :enable_ipv4              => true,
         :listen_ipv4              => nil,
+        :advertised_ipv4          => nil,
         :enable_ipv6              => true,
         :listen_ipv6              => nil,
+        :advertised_ipv6          => nil,
         :listen_port              => 5060,
         :listen_port_tls          => 5061,
         :use_tls_tunnel           => false,
@@ -49,8 +51,10 @@ module OverSIP
         :sip_wss                  => false,
         :enable_ipv4              => true,
         :listen_ipv4              => nil,
+        :advertised_ipv4          => nil,
         :enable_ipv6              => true,
         :listen_ipv6              => nil,
+        :advertised_ipv6          => nil,
         :listen_port              => 10080,
         :listen_port_tls          => 10443,
         :use_tls_tunnel           => false,
@@ -85,8 +89,10 @@ module OverSIP
         :sip_tls                         => :boolean,
         :enable_ipv4                     => :boolean,
         :listen_ipv4                     => :ipv4,
+        :advertised_ipv4                 => :ipv4,
         :enable_ipv6                     => :boolean,
         :listen_ipv6                     => :ipv6,
+        :advertised_ipv6                 => :ipv6,
         :listen_port                     => :port,
         :listen_port_tls                 => :port,
         :use_tls_tunnel                  => :boolean,
@@ -102,8 +108,10 @@ module OverSIP
         :sip_wss                         => :boolean,
         :enable_ipv4                     => :boolean,
         :listen_ipv4                     => :ipv4,
+        :advertised_ipv4                 => :ipv4,
         :enable_ipv6                     => :boolean,
         :listen_ipv6                     => :ipv6,
+        :advertised_ipv6                 => :ipv6,
         :listen_port                     => :port,
         :listen_port_tls                 => :port,
         :use_tls_tunnel                  => :boolean,
@@ -280,10 +288,14 @@ module OverSIP
 
       unless @configuration[:sip][:enable_ipv4]
         @configuration[:sip][:listen_ipv4] = nil
+        @configuration[:sip][:advertised_ipv4] = nil
+        @configuration[:sip][:record_route_hostname_tls_ipv4] = nil
       end
 
       unless @configuration[:sip][:enable_ipv6]
         @configuration[:sip][:listen_ipv6] = nil
+        @configuration[:sip][:advertised_ipv6] = nil
+        @configuration[:sip][:record_route_hostname_tls_ipv6] = nil
       end
 
       if @configuration[:websocket][:sip_ws]
@@ -307,10 +319,12 @@ module OverSIP
 
       unless @configuration[:websocket][:enable_ipv4]
         @configuration[:websocket][:listen_ipv4] = nil
+        @configuration[:websocket][:advertised_ipv4] = nil
       end
 
       unless @configuration[:websocket][:enable_ipv6]
         @configuration[:websocket][:listen_ipv6] = nil
+        @configuration[:websocket][:advertised_ipv6] = nil
       end
 
       if ( @use_sip_udp_or_tcp or @use_sip_tls ) and @configuration[:sip][:listen_ipv4] == nil and @configuration[:sip][:enable_ipv4]

data/lib/oversip/errors.rb

@@ -1,7 +1,10 @@
 module OverSIP
 
   class Error < ::StandardError ; end
+
   class ConfigurationError < Error ; end
   class RuntimeError < Error ; end
 
+  class ParsingError < RuntimeError ; end
+
 end

data/lib/oversip/modules/outbound_mangling.rb

@@ -6,15 +6,27 @@ module OverSIP::Modules
 
     @log_id = "OutboundMangling module"
 
-    def self.add_outbound_to_contact request
-      if request.contact and request.connection_outbound_flow_token
-        log_system_debug "performing Contact mangling (adding ;ov-ob Outbound param) for #{request.log_id}"  if $oversip_debug
+    def self.add_outbound_to_contact proxy
+      unless proxy.is_a? ::OverSIP::SIP::Proxy
+        raise ::OverSIP::RuntimeError, "proxy must be a OverSIP::SIP::Proxy instance"
+      end
 
-        # Add the ;ov-ob param to the Contact URI.
-        request.contact.set_param "ov-ob", request.connection_outbound_flow_token
-        return true
-      else
-        return false
+      proxy.on_target do |target|
+        request = proxy.request
+        # Just act in case the request has a single Contact, its connection uses Outbound
+        # and  no ;ov-ob param exists in Contact URI.
+        if request.contact and request.connection_outbound_flow_token and not request.contact.has_param? "ov-ob"
+          log_system_debug "performing Contact mangling (adding ;ov-ob Outbound param) for #{request.log_id}"  if $oversip_debug
+
+          request.contact.set_param "ov-ob", request.connection_outbound_flow_token
+
+          proxy.on_success_response do |response|
+            if (contacts = response.headers["Contact"])
+              log_system_debug "reverting original Contact value (removing ;ov-ob Outbound param) from response"  if $oversip_debug
+              contacts.each { |contact| contact.gsub! /;ov-ob=[_\-0-9A-Za-z]+/, "" }
+            end
+          end
+        end
       end
     end
 
@@ -39,22 +51,6 @@ module OverSIP::Modules
       end
     end
 
-    def self.remove_outbound_from_contact message
-      unless message.is_a? ::OverSIP::SIP::Message
-        raise ::OverSIP::RuntimeError, "message must be a OverSIP::SIP::Request or OverSIP::SIP::Response"
-      end
-
-      if (contacts = message.headers["Contact"])
-        log_system_debug "reverting original Contact value (removing ;ov-ob Outbound param) for response"  if $oversip_debug
-        contacts.each do |contact|
-          contact.gsub! /;ov-ob=[_\-0-9A-Za-z]+/, ""
-        end
-        return true
-      else
-        return false
-      end
-    end
-
   end  # module OutboundMangling
 
 end

data/lib/oversip/sip/client.rb

@@ -4,40 +4,86 @@ module OverSIP::SIP
 
     include ::OverSIP::Logger
 
-    attr_reader :current_target
+    attr_reader :request, :current_target
 
     def initialize proxy_profile=:default_proxy
       unless (@conf = ::OverSIP.proxies[proxy_profile.to_sym])
         raise ::OverSIP::RuntimeError, "proxy profile '#{proxy_profile}' is not defined"
       end
+
+      @on_provisional_response_cbs = []
+      @on_success_response_cbs = []
+      @on_failure_response_cbs = []
+      @on_canceled_cbs = []
+      @on_invite_timeout_cbs = []
+      @on_error_cbs = []
+      @on_target_cbs = []
     end
 
     def on_provisional_response &block
-      @on_provisional_response_block = block
+      @on_provisional_response_cbs << block
     end
 
     def on_success_response &block
-      @on_success_response_block = block
+      @on_success_response_cbs << block
     end
 
     def on_failure_response &block
-      @on_failure_response_block = block
+      @on_failure_response_cbs << block
     end
 
     def on_canceled &block
-      @on_canceled_block = block
+      @on_canceled_cbs << block
     end
 
     def on_invite_timeout &block
-      @on_invite_timeout_block = block
+      @on_invite_timeout_cbs << block
     end
 
     def on_error &block
-      @on_error_block = block
+      @on_error_cbs << block
     end
 
     def on_target &block
-      @on_target_block = block
+      @on_target_cbs << block
+    end
+
+    def clear_on_provisional_response
+      @on_provisional_response_cbs.clear
+    end
+
+    def clear_on_success_response
+      @on_success_response_cbs.clear
+    end
+
+    def clear_on_failure_response
+      @on_failure_response_cbs.clear
+    end
+
+    def clear_on_canceled
+      @on_canceled_cbs.clear
+    end
+
+    def clear_on_invite_timeout
+      @on_invite_timeout_cbs.clear
+    end
+
+    def clear_on_error
+      @on_error_cbs.clear
+    end
+
+    def clear_on_target
+      @on_target_cbs.clear
+    end
+
+    def clear_callbacks
+      @on_provisional_response_cbs.clear
+      @on_success_response_cbs.clear
+      @on_failure_response_cbs.clear
+      @on_canceled_cbs.clear
+      @on_invite_timeout_cbs.clear
+      @on_error_cbs.clear
+      @on_target_cbs.clear
     end
 
     # By calling this method the request routing is aborted, no more DNS targets are tryed,
@@ -104,7 +150,7 @@ module OverSIP::SIP
 
     # Timer C for INVITE.
     def invite_timeout
-      @on_invite_timeout_block && @on_invite_timeout_block.call
+      run_on_invite_timeout_cbs
     end
 
 
@@ -112,6 +158,84 @@ module OverSIP::SIP
     private
 
 
+    def run_on_provisional_response_cbs response
+      @on_provisional_response_cbs.each do |cb|
+        begin
+          cb.call response
+        rescue => e
+          log_system_error "error executing on_provisional_response callback:"
+          log_system_error e
+        end
+      end
+    end
+
+    def run_on_success_response_cbs response
+      @on_success_response_cbs.each do |cb|
+        begin
+          cb.call response
+        rescue => e
+          log_system_error "error executing on_success_response callback:"
+          log_system_error e
+        end
+      end
+    end
+
+    def run_on_failure_response_cbs response
+      @on_failure_response_cbs.each do |cb|
+        begin
+          cb.call response
+        rescue => e
+          log_system_error "error executing on_failure_response callback:"
+          log_system_error e
+        end
+      end
+    end
+
+    def run_on_canceled_cbs
+      @on_canceled_cbs.each do |cb|
+        begin
+          cb.call
+        rescue => e
+          log_system_error "error executing on_canceled callback:"
+          log_system_error e
+        end
+      end
+    end
+
+    def run_on_invite_timeout_cbs
+      @on_invite_timeout_cbs.each do |cb|
+        begin
+          cb.call
+        rescue => e
+          log_system_error "error executing on_invite_timeout callback:"
+          log_system_error e
+        end
+      end
+    end
+
+    def run_on_error_cbs status, reason, code
+      @on_error_cbs.each do |cb|
+        begin
+          cb.call status, reason, code
+        rescue => e
+          log_system_error "error executing on_error callback:"
+          log_system_error e
+        end
+      end
+    end
+
+    def run_on_target_cbs target
+      @on_target_cbs.each do |cb|
+        begin
+          cb.call target
+        rescue => e
+          log_system_error "error executing on_target callback:"
+          log_system_error e
+        end
+      end
+    end
+
+
     def add_routing_headers
     end
 
@@ -236,7 +360,7 @@ module OverSIP::SIP
       end
 
       # Call the on_target() callback if set by the user.
-      @on_target_block && @on_target_block.call(target)
+      run_on_target_cbs target
 
       # If the user has called to proxy.abort_routing() then stop next targets
       # and call to on_error() callback.
@@ -296,7 +420,7 @@ module OverSIP::SIP
 
 
     def do_dns_fail status, reason, code
-      @on_error_block && @on_error_block.call(status, reason, code)
+      run_on_error_cbs status, reason, code
     end
 
   end  # class Client

data/lib/oversip/sip/launcher.rb

@@ -54,10 +54,15 @@ module OverSIP::SIP
       case
 
         when klass == ::OverSIP::SIP::IPv4UdpServer
-          klass.via_core = "SIP/2.0/UDP #{uri_ip}:#{port}"
-          klass.record_route = "<sip:#{uri_ip}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:advertised_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:advertised_ipv4]
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/UDP #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM::open_datagram_socket(ip, port, klass) do |conn|
@@ -66,10 +71,15 @@ module OverSIP::SIP
           end
 
         when klass == ::OverSIP::SIP::IPv6UdpServer
-          klass.via_core = "SIP/2.0/UDP #{uri_ip}:#{port}"
-          klass.record_route = "<sip:#{uri_ip}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:advertised_ipv6]
+            used_uri_host = "[#{::OverSIP.configuration[:sip][:advertised_ipv6]}]"
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/UDP #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=udp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM::open_datagram_socket(ip, port, klass) do |conn|
@@ -78,10 +88,15 @@ module OverSIP::SIP
           end
 
         when klass == ::OverSIP::SIP::IPv4TcpServer
-          klass.via_core = "SIP/2.0/TCP #{uri_ip}:#{port}"
-          klass.record_route = "<sip:#{uri_ip}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:advertised_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:advertised_ipv4]
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/TCP #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -91,10 +106,15 @@ module OverSIP::SIP
           end
 
         when klass == ::OverSIP::SIP::IPv6TcpServer
-          klass.via_core = "SIP/2.0/TCP #{uri_ip}:#{port}"
-          klass.record_route = "<sip:#{uri_ip}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:advertised_ipv6]
+            used_uri_host = "[#{::OverSIP.configuration[:sip][:advertised_ipv6]}]"
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/TCP #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=tcp;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -104,11 +124,17 @@ module OverSIP::SIP
           end
 
         when klass == ::OverSIP::SIP::IPv4TlsServer
-          klass.via_core = "SIP/2.0/TLS #{uri_ip}:#{port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4] || uri_ip
-          klass.record_route = "<sip:#{rr_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+          elsif ::OverSIP.configuration[:sip][:advertised_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:advertised_ipv4]
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/TLS #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -118,11 +144,17 @@ module OverSIP::SIP
           end
 
         when klass == ::OverSIP::SIP::IPv6TlsServer
-          klass.via_core = "SIP/2.0/TLS #{uri_ip}:#{port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6] || uri_ip
-          klass.record_route = "<sip:#{rr_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+          elsif ::OverSIP.configuration[:sip][:advertised_ipv6]
+            used_uri_host = "[#{::OverSIP.configuration[:sip][:advertised_ipv6]}]"
+          else
+            used_uri_host = uri_ip
+          end
+          klass.via_core = "SIP/2.0/TLS #{used_uri_host}:#{port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
@@ -132,12 +164,18 @@ module OverSIP::SIP
           end
 
         when klass == ::OverSIP::SIP::IPv4TlsTunnelServer
-          klass.via_core = "SIP/2.0/TLS #{uri_virtual_ip}:#{virtual_port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4] || uri_virtual_ip
-          klass.record_route = "<sip:#{rr_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4]
+          elsif ::OverSIP.configuration[:sip][:advertised_ipv4]
+            used_uri_host = ::OverSIP.configuration[:sip][:advertised_ipv4]
+          else
+            used_uri_host = uri_virtual_ip
+          end
+          klass.via_core = "SIP/2.0/TLS #{used_uri_host}:#{virtual_port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
@@ -146,12 +184,18 @@ module OverSIP::SIP
           end
 
         when klass == ::OverSIP::SIP::IPv6TlsTunnelServer
-          klass.via_core = "SIP/2.0/TLS #{uri_virtual_ip}:#{virtual_port}"
-          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6] || uri_virtual_ip
-          klass.record_route = "<sip:#{rr_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-          klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
+          if ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+            used_uri_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6]
+          elsif ::OverSIP.configuration[:sip][:advertised_ipv6]
+            used_uri_host = "[#{::OverSIP.configuration[:sip][:advertised_ipv6]}]"
+          else
+            used_uri_host = uri_virtual_ip
+          end
+          klass.via_core = "SIP/2.0/TLS #{used_uri_host}:#{virtual_port}"
+          klass.record_route = "<sip:#{used_uri_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{used_uri_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{used_uri_host}:#{virtual_port};transport=tls;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+          
           if enabled
             ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection

data/lib/oversip/sip/name_addr.rb

@@ -4,6 +4,14 @@ module OverSIP::SIP
 
     attr_reader :display_name
 
+
+    def self.parse value
+      name_addr = ::OverSIP::SIP::MessageParser.parse_uri value, true
+      raise ::OverSIP::ParsingError, "invalid NameAddr #{value.inspect}"  unless name_addr.is_a? (::OverSIP::SIP::NameAddr)
+      name_addr
+    end
+
+
     def initialize display_name=nil, scheme=:sip, user=nil, host=nil, port=nil
       @display_name = display_name
       @scheme = scheme.to_sym

data/lib/oversip/sip/proxy.rb

@@ -2,9 +2,18 @@ module OverSIP::SIP
 
   class Proxy < Client
 
-    # If called, current response within the called callback won't be forwarded.
-    def drop_response
+    # If a SIP response is given then this method may offer other features such as replying 199.
+    def drop_response response=nil
       @drop_response = true
+
+      # RFC 6228 (199 response).
+      # http://tools.ietf.org/html/rfc6228#section-6
+      if response and response.status_code >= 300 and
+         @request.sip_method == :INVITE and
+         @request.supported and @request.supported.include?("199")
+
+        @request.send :reply_199, response
+      end
     end
 
 
@@ -45,7 +54,7 @@ module OverSIP::SIP
           unless @request.sip_method == :ACK
             log_system_debug "flow failed"  if $oversip_debug
 
-            @on_error_block && @on_error_block.call(430, "Flow Failed", :flow_failed)
+            run_on_error_cbs 430, "Flow Failed", :flow_failed
             unless @drop_response
               @request.reply 430, "Flow Failed"
             else
@@ -116,9 +125,9 @@ module OverSIP::SIP
 
       if @request.server_transaction.valid_response? response.status_code
         if response.status_code < 200 && ! @canceled
-          @on_provisional_response_block && @on_provisional_response_block.call(response)
+          run_on_provisional_response_cbs response
         elsif response.status_code >= 200 && response.status_code <= 299
-          @on_success_response_block && @on_success_response_block.call(response)
+          run_on_success_response_cbs response
         elsif response.status_code >= 300 && ! @canceled
           if response.status_code == 503
             if @conf[:dns_failover_on_503]
@@ -127,10 +136,10 @@ module OverSIP::SIP
             else
               # If the response is 503 convert it into 500 (RFC 3261 16.7).
               response.status_code = 500
-              @on_failure_response_block && @on_failure_response_block.call(response)
+              run_on_failure_response_cbs response
             end
           else
-            @on_failure_response_block && @on_failure_response_block.call(response)
+            run_on_failure_response_cbs response
           end
         end
       end
@@ -148,7 +157,7 @@ module OverSIP::SIP
       log_system_debug "server transaction canceled, cancelling pending client transaction"  if $oversip_debug
 
       @canceled = true
-      @on_canceled_block && @on_canceled_block.call
+      run_on_canceled_cbs
 
       @client_transaction.do_cancel cancel
     end
@@ -156,7 +165,7 @@ module OverSIP::SIP
 
     # Timer C for INVITE (method called by the client transaction).
     def invite_timeout
-      @on_invite_timeout_block && @on_invite_timeout_block.call
+      run_on_invite_timeout_cbs
 
       unless @drop_response
         @request.reply 408, "INVITE Timeout"
@@ -275,9 +284,9 @@ module OverSIP::SIP
 
 
     def no_more_targets status, reason, full_response, code
-      # If we have received a [3456]XX response from downstream then run @on_failure_block.
+      # If we have received a [3456]XX response from downstream then run @on_failure_response_cbs.
       if full_response
-        @on_failure_response_block && @on_failure_response_block.call(full_response)
+        run_on_failure_response_cbs full_response
         unless @drop_response
           # If the response is 503 convert it into 500 (RFC 3261 16.7).
           full_response.status_code = 500  if full_response.status_code == 503
@@ -288,7 +297,7 @@ module OverSIP::SIP
 
       # If not, generate the response according to the given status and reason.
       else
-        @on_error_block && @on_error_block.call(status, reason, code)
+        run_on_error_cbs status, reason, code
         unless @drop_response
           @request.reply status, reason
         else
@@ -300,7 +309,7 @@ module OverSIP::SIP
 
 
     def do_dns_fail status, reason, code
-      @on_error_block && @on_error_block.call(status, reason, code)
+      run_on_error_cbs status, reason, code
 
       unless @drop_response
         @request.reply status, reason  unless @request.sip_method == :ACK