oversip 1.1.0.beta5 → 1.1.0

data/lib/oversip/sip/listeners/tls_client.rb

@@ -5,7 +5,7 @@ module OverSIP::SIP
     TLS_HANDSHAKE_MAX_TIME = 4
 
 
-    attr_writer :tls_validation
+    attr_writer :callback_on_server_tls_handshake
 
 
     def initialize ip, port
@@ -19,7 +19,7 @@ module OverSIP::SIP
       @server_last_pem = false
 
       start_tls({
-        :verify_peer => @tls_validation,
+        :verify_peer => @callback_on_server_tls_handshake,
         :cert_chain_file => ::OverSIP.tls_public_cert,
         :private_key_file => ::OverSIP.tls_private_cert
       })
@@ -37,7 +37,7 @@ module OverSIP::SIP
 
 
     # Called for every certificate provided by the peer.
-    # This is just called in case @tls_validation is true.
+    # This is just called in case @callback_on_server_tls_handshake is true.
     def ssl_verify_peer pem
       # TODO: Dirty workaround for bug https://github.com/eventmachine/eventmachine/issues/194.
       return true  if @server_last_pem == pem
@@ -61,20 +61,23 @@ module OverSIP::SIP
       @connected = true
       @timer_tls_handshake.cancel  if @timer_tls_handshake
 
-      if @tls_validation
-        validated, cert, tls_error, tls_error_string = ::OverSIP::TLS.validate @server_pems.pop, @server_pems
-        if validated
-          log_system_info "server provides a valid TLS certificate"
-          sip_identities = ::OverSIP::TLS.get_sip_identities(cert)
-          log_system_debug "SIP identities in peer cert: #{sip_identities.keys}"  if $oversip_debug
-        else
-          log_system_notice "server's TLS certificate validation failed (TLS error: #{tls_error.inspect}, description: #{tls_error_string.inspect})"
+      if @callback_on_server_tls_handshake
+        begin
+          ::OverSIP::SipEvents.on_server_tls_handshake self, @server_pems
+        rescue ::Exception => e
+          log_system_error "error calling OverSIP::SipEvents.on_server_tls_handshake():"
+          log_system_error e
+          close_connection
+        end
+
+        # If the user has closed the connection in the on_server_tls_handshake() callback
+        # then @local_closed is true, so notify pending transactions.
+        if @local_closed
           @pending_client_transactions.each do |client_transaction|
             client_transaction.tls_validation_failed
           end
           @pending_client_transactions.clear
           @pending_messages.clear
-          close_connection
           @state = :ignore
           return
         end

data/lib/oversip/sip/listeners/tls_server.rb

@@ -2,7 +2,7 @@ module OverSIP::SIP
 
   class TlsServer < TcpServer
 
-    TLS_HANDSHAKE_MAX_TIME = 8
+    TLS_HANDSHAKE_MAX_TIME = 4
 
 
     def post_init
@@ -44,19 +44,20 @@ module OverSIP::SIP
     def ssl_handshake_completed
       log_system_info "TLS connection established from " << remote_desc
 
-      # TODO: What to do it falidation fails? always do validation?
-
-      validated, cert, tls_error, tls_error_string = ::OverSIP::TLS.validate @client_pems.pop, @client_pems
-      if validated
-        log_system_info "client provides a valid TLS certificate"
-      else
-        log_system_notice "client's TLS certificate validation failed (TLS error: #{tls_error.inspect}, description: #{tls_error_string.inspect})"
-      end
-
       # @connected in TlsServer means "TLS connection" rather than
       # just "TCP connection".
       @connected = true
       @timer_tls_handshake.cancel  if @timer_tls_handshake
+
+      if ::OverSIP::SIP.callback_on_client_tls_handshake
+        begin
+          ::OverSIP::SipEvents.on_client_tls_handshake self, @client_pems
+        rescue ::Exception => e
+          log_system_error "error calling OverSIP::SipEvents.on_client_tls_handshake():"
+          log_system_error e
+          close_connection
+        end
+      end
     end
 
 
@@ -67,4 +68,3 @@ module OverSIP::SIP
 
   end
 end
-

data/lib/oversip/sip/listeners/{tls_tunnel_reactor.rb → tls_tunnel_connection.rb}

@@ -1,6 +1,6 @@
 module OverSIP::SIP
 
-  class TlsTunnelReactor < TcpReactor
+  class TlsTunnelConnection < TcpConnection
 
     # Max size (bytes) of the buffered data when receiving message headers
     # (avoid DoS attacks).
@@ -25,8 +25,8 @@ module OverSIP::SIP
         when :haproxy_protocol
           parse_haproxy_protocol
 
-        when :client_pems
-          parse_client_pems
+        #when :client_pems
+        #  parse_client_pems
 
         when :headers
           parse_headers
@@ -88,23 +88,23 @@ module OverSIP::SIP
     end
 
     # TODO: Not terminated yet.
-    def parse_client_pems
-      # TODO: Wrong, it could occur that here the last PEMs byte arries.
-      return false if @buffer.size < 3  # 3 bytes = 0\r\n (minimum data).
-
-      @pems_str ||= ""
-      @pems_str << @buffer.read(2)
-
-      # No PEMS.
-      if @pems_str == "\r\n"
-        @state = :headers
-        return true
-      end
-
-      #@pem_size_str = 
-
-      @state = :headers
-    end
+#     def parse_client_pems
+#       # TODO: Wrong, it could occur that here the last PEMs byte arries.
+#       return false if @buffer.size < 3  # 3 bytes = 0\r\n (minimum data).
+# 
+#       @pems_str ||= ""
+#       @pems_str << @buffer.read(2)
+# 
+#       # No PEMS.
+#       if @pems_str == "\r\n"
+#         @state = :headers
+#         return true
+#       end
+# 
+#       #@pem_size_str = 
+# 
+#       @state = :headers
+#     end
 
   end
 

data/lib/oversip/sip/listeners/tls_tunnel_server.rb

@@ -1,6 +1,6 @@
 module OverSIP::SIP
 
-  class TlsTunnelServer < TlsTunnelReactor
+  class TlsTunnelServer < TlsTunnelConnection
 
     attr_reader :outbound_flow_token
 
@@ -15,13 +15,10 @@ module OverSIP::SIP
         return
       end
 
-      log_system_debug ("connection from the TLS tunnel " << remote_desc)  if $oversip_debug
-
       # Create an Outbound (RFC 5626) flow token for this connection.
       @outbound_flow_token = ::OverSIP::SIP::TransportManager.add_outbound_connection self
 
-      # Initialize @cvars.
-      @cvars = {}
+      log_system_debug ("connection from the TLS tunnel " << remote_desc)  if $oversip_debug
     end
 
     def remote_desc force=nil

data/lib/oversip/sip/listeners/{udp_reactor.rb → udp_connection.rb}

@@ -1,6 +1,6 @@
 module OverSIP::SIP
 
-  class UdpReactor < Reactor
+  class UdpConnection < Connection
 
     def receive_data data
       @buffer << data
@@ -63,7 +63,7 @@ module OverSIP::SIP
           @buffer.clear
           @state = :init
           return false
-        end          
+        end
 
       # Parse the currently buffered data. If parsing fails @parser_nbytes gets nil value.
       unless @parser_nbytes = @parser.execute(buffer_str, @parser_nbytes)
@@ -129,7 +129,7 @@ module OverSIP::SIP
       @msg.source_port = source_port
       @msg.source_ip_type = self.class.ip_type
 
-      unless valid_message?
+      unless valid_message? @parser
         @buffer.clear
         @state = :init
         return false
@@ -208,7 +208,7 @@ module OverSIP::SIP
       end
     end
 
-  end  # class UdpReactor
+  end
 
 end
 

data/lib/oversip/sip/listeners.rb

@@ -1,14 +1,14 @@
 # OverSIP files
 
-require "oversip/sip/listeners/reactor"
-
-require "oversip/sip/listeners/udp_reactor"
-require "oversip/sip/listeners/tcp_reactor"
-require "oversip/sip/listeners/tls_tunnel_reactor"
-
+require "oversip/sip/listeners/connection"
+require "oversip/sip/listeners/udp_connection"
+require "oversip/sip/listeners/tcp_connection"
+require "oversip/sip/listeners/tls_tunnel_connection"
 require "oversip/sip/listeners/tcp_server"
 require "oversip/sip/listeners/tls_server"
 require "oversip/sip/listeners/tls_tunnel_server"
+require "oversip/sip/listeners/tcp_client"
+require "oversip/sip/listeners/tls_client"
 
 require "oversip/sip/listeners/ipv4_udp_server"
 require "oversip/sip/listeners/ipv6_udp_server"
@@ -18,10 +18,6 @@ require "oversip/sip/listeners/ipv4_tls_server"
 require "oversip/sip/listeners/ipv6_tls_server"
 require "oversip/sip/listeners/ipv4_tls_tunnel_server"
 require "oversip/sip/listeners/ipv6_tls_tunnel_server"
-
-require "oversip/sip/listeners/tcp_client"
-require "oversip/sip/listeners/tls_client"
-
 require "oversip/sip/listeners/ipv4_tcp_client"
 require "oversip/sip/listeners/ipv6_tcp_client"
 require "oversip/sip/listeners/ipv4_tls_client"

data/lib/oversip/sip/message.rb

@@ -59,13 +59,12 @@ module OverSIP::SIP
 
     # Other attributes.
     attr_accessor :tvars  # Transaction variables (a hash).
-    attr_accessor :cvars  # Connection variables (a hash).
 
     def udp?               ; @transport == :udp          end
     def tcp?               ; @transport == :tcp          end
     def tls?               ; @transport == :tls          end
     def ws?                ; @transport == :ws           end
-    def tls?               ; @transport == :wss          end
+    def wss?               ; @transport == :wss          end
 
     def websocket?         ; @transport == :ws || @transport == :wss  end
 
@@ -75,6 +74,8 @@ module OverSIP::SIP
 
     def via_alias?         ; @via_has_alias              end
 
+    def contact_reg_id?    ; @contact_has_reg_id         end
+
     def dialog_forming?
       DIALOG_FORMING_METHODS[@sip_method]
     end
@@ -167,7 +168,7 @@ module OverSIP::SIP
     # received.
     def close_connection
       return false  if @transport == :udp
-      @connection.close_connection
+      @connection.close
       true
     end
 

data/lib/oversip/sip/message_processor.rb

@@ -10,11 +10,11 @@ module OverSIP::SIP
     }
 
 
-    def valid_message?
-      if header = @parser.missing_core_header?
+    def valid_message? parser
+      if header = parser.missing_core_header?
         log_system_notice "ignoring #{MSG_TYPE[@msg.class]} missing #{header} header"
         return false
-      elsif header = @parser.duplicated_core_header?
+      elsif header = parser.duplicated_core_header?
         log_system_notice "ignoring #{MSG_TYPE[@msg.class]} with duplicated #{header} header"
         return false
       end
@@ -76,20 +76,20 @@ module OverSIP::SIP
       # Run the user provided OverSIP::SipEvents.on_request() callback (unless the request
       # it's a retransmission, a CANCEL or an ACK for a final non-2XX response).
       unless check_transaction
-        begin
-          # Create the antiloop identifier for this request.
-          @msg.antiloop_id = ::OverSIP::SIP::Tags.create_antiloop_id(@msg)
+        # Create the antiloop identifier for this request.
+        @msg.antiloop_id = ::OverSIP::SIP::Tags.create_antiloop_id(@msg)
 
-          # Check loops.
-          if @msg.antiloop_id == @msg.via_branch_id[-32..-1]
-            @msg.reply 482, "Loop Detected"
-            return
-          end
+        # Check loops.
+        if @msg.antiloop_id == @msg.via_branch_id[-32..-1]
+          @msg.reply 482, "Loop Detected"
+          return
+        end
 
-          # Initialize some attributes for the request.
-          @msg.tvars = {}
-          @msg.cvars = @cvars
+        # Initialize some attributes for the request.
+        @msg.tvars = {}
+        @msg.cvars = @msg.connection.cvars
 
+        begin
           # Run the callback.
           ::OverSIP::SipEvents.on_request @msg
         rescue ::Exception => e
@@ -109,18 +109,18 @@ module OverSIP::SIP
         ### TODO: Esto va a petar cuando tenga una clase que hereda de, p.ej, IPv4TcpServer que se llame xxxClient,
         # ya que en ella no existirá @invite_client_transactions. Tengo que hacer que su @invite_client_transactions
         # se rellene al de la clase padre al hacer el load de las clases.
-        if client_transaction = self.class.invite_client_transactions[@msg.via_branch_id]
+        if client_transaction = @msg.connection.class.invite_client_transactions[@msg.via_branch_id]
           client_transaction.receive_response(@msg)
           return
         end
       when :ACK
       when :CANCEL
-        if client_transaction = self.class.invite_client_transactions[@msg.via_branch_id]
+        if client_transaction = @msg.connection.class.invite_client_transactions[@msg.via_branch_id]
           client_transaction.receive_response_to_cancel(@msg)
           return
         end
       else
-        if client_transaction = self.class.non_invite_client_transactions[@msg.via_branch_id]
+        if client_transaction = @msg.connection.class.non_invite_client_transactions[@msg.via_branch_id]
           client_transaction.receive_response(@msg)
           return
         end

data/lib/oversip/sip/modules/core.rb

@@ -5,13 +5,19 @@ module OverSIP::SIP
 
       # Create a server transaction for the incoming request.
       def create_transaction
+        return false  if @server_transaction
+
         case @sip_method
         when :INVITE
           ::OverSIP::SIP::InviteServerTransaction.new self
+          return true
         when :ACK
+          return nil
         when :CANCEL
+          return nil
         else
           ::OverSIP::SIP::NonInviteServerTransaction.new self
+          return true
         end
       end
 
@@ -44,7 +50,6 @@ module OverSIP::SIP
               num_removes += 1
             else
               if local_uri? route
-                log_system_debug "removing pre-loaded Route pointing to this server"  if $oversip_debug
                 has_preloaded_route_with_ob_param = true  if route.ob_param?
                 num_removes += 1
               else
@@ -63,14 +68,15 @@ module OverSIP::SIP
         # - Has a preloaded top Route with ;ob param pointing to us, or has Contact with ;ob, or
         #   it's a REGISTER with ;+sip.instance.
         #
-        # TODO: and (has_preloaded_route_with_ob_param or @request.contact.ob_param?).
-        # TODO: For REGISTER check also ;+sip.instance Contact param.
         if (
-              @force_outgoing_outbound or (
-                initial? and
-                @num_vias == 1 and
-                outbound_aware? and
-                has_preloaded_route_with_ob_param
+              initial? and (
+                @force_outgoing_outbound or (
+                  @num_vias == 1 and
+                  outbound_aware? and (
+                    ( has_preloaded_route_with_ob_param or (@contact and @contact.ob_param?) ) or
+                    ( @sip_method == :REGISTER and contact_reg_id?)
+                  )
+                )
               )
             )
           @outgoing_outbound_requested = true
@@ -107,7 +113,7 @@ module OverSIP::SIP
         end
         @routes.empty? and @routes = nil
 
-        # Return true if it is an in-dialog request and at least one top Route pointed to us.
+        # Return true if it is an in-dialog request and the top Route pointed to us.
         # False otherwise as we shouldn't receive an in-dialog request with a top Route non
         # pointing to us.
         if in_dialog?
@@ -122,8 +128,9 @@ module OverSIP::SIP
       end
 
 
-      # Mira si el RURI es local. Se supone que antes se ha validado el Route y que el script
-      # no permite pre-loaded Route a otro destino..
+      # Checks whether the RURI points to a local domain or address.
+      # Typically, prior to using this method the user has verified the return value of loose_route()
+      # in case it's an initial request (if it's _true_ then the request has pre-loaded Route).
       def destination_myself?
         return true if @destination_myself
         return false if @destination_myself == false
@@ -149,8 +156,6 @@ module OverSIP::SIP
       end
 
 
-      # TODO: It must be true if top Route or Contact has ;ob param, or also if the Contact
-      # has +sip.instance.
       def outgoing_outbound_requested?       ; @outgoing_outbound_requested  end
 
       def incoming_outbound_requested?       ; @incoming_outbound_requested  end

data/lib/oversip/sip/modules/user_assertion.rb

@@ -22,13 +22,13 @@ module OverSIP::SIP
         # Don't do this stuf for UDP or for outbound connections.
         return false  unless request.connection.class.reliable_transport_listener?
         # Return if already set.
-        return request.connection.asserted_user  if request.connection.asserted_user
+        return request.cvars[:asserted_user]  if request.cvars[:asserted_user]
         # Don't do this stuf in case of P-Preferred-Identity header is present.
         return false  if request.headers["P-Preferred-Identity"]
 
         log_system_debug "user #{request.from.uri} asserted to connection"  if $oversip_debug
         # Store the request From URI as "asserted_user" for this connection.
-        request.connection.asserted_user = request.from.uri
+        request.cvars[:asserted_user] = request.from.uri
       end
 
       def self.revoke_assertion message
@@ -41,7 +41,7 @@ module OverSIP::SIP
           raise ::OverSIP::RuntimeError, "message must be a OverSIP::SIP::Request or OverSIP::SIP::Response"
         end
 
-        request.connection.asserted_user = false
+        request.cvars.delete :asserted_user
         true
       end
 
@@ -50,16 +50,17 @@ module OverSIP::SIP
         # in case it matches request From URI !
         # NOTE: If the connection is not asserted (it's null) then it will not match this
         # comparisson, so OK.
-        if request.connection.asserted_user == request.from.uri
+        if request.cvars[:asserted_user] == request.from.uri
           # Don't add P-Asserted-Identity if the request contains P-Preferred-Identity header.
           unless request.headers["P-Preferred-Identity"]
             log_system_debug "user asserted, adding P-Asserted-Identity for #{request.log_id}"  if $oversip_debug
-            request.set_header "P-Asserted-Identity", "<" << request.connection.asserted_user << ">"
+            request.set_header "P-Asserted-Identity", "<" << request.cvars[:asserted_user] << ">"
             return true
           else
             # Remove posible P-Asserted-Identity header!
             log_system_debug "user asserted but P-Preferred-Identity header present, P-Asserted-Identity not added for #{request.log_id}"  if $oversip_debug
             request.headers.delete "P-Asserted-Identity"
+            return nil
           end
 
         # Otherwise ensure the request has no spoofed P-Asserted-Identity headers!
@@ -73,51 +74,4 @@ module OverSIP::SIP
     end  # module UserAssertion
   end  # module Modules
 
-end  # module OverSIP::SIP
-
-
-module OverSIP::SIP
-  class Request
-    def asserted_user?
-      true  if self.connection.asserted_user
-    end
-
-    def asserted_user
-      self.connection.asserted_user
-    end
-  end
-
-  class Response
-    def asserted_user?
-      true  if self.request.connection.asserted_user
-    end
-
-    def asserted_user
-      self.request.connection.asserted_user
-    end
-  end
-
-  class TcpServer
-    attr_accessor :asserted_user
-  end
-
-  class TlsServer
-    attr_accessor :asserted_user
-  end
-
-  class TlsTunnelServer
-    attr_accessor :asserted_user
-  end
-
-  # This is never used since it's not a reliable connection, but it's required not to fail.
-  class UdpReactor
-    attr_accessor :asserted_user
-  end
-end  # OverSIP::SIP
-
-
-module OverSIP::WebSocket
-  class WsSipApp
-    attr_accessor :asserted_user
-  end
-end  # OverSIP::WebSocket
+end

data/lib/oversip/sip/proxy.rb

@@ -4,9 +4,9 @@ module OverSIP::SIP
 
     include ::OverSIP::Logger
 
-    def initialize proxy_name=:default_proxy
-      unless (@proxy_conf = ::OverSIP.proxies[proxy_name.to_sym])
-        raise ::OverSIP::RuntimeError, "proxy '#{proxy_name}' is not defined in Proxies Configuration file"
+    def initialize proxy_profile=:default_proxy
+      unless (@proxy_conf = ::OverSIP.proxies[proxy_profile.to_sym])
+        raise ::OverSIP::RuntimeError, "proxy '#{proxy_profile}' is not defined in Proxies Configuration file"
       end
     end
 

data/lib/oversip/sip/request.rb

@@ -17,6 +17,8 @@ module OverSIP::SIP
     # or Path.
     attr_accessor :in_rr
 
+    attr_accessor :cvars  # Connection variables (a hash).
+
 
     def log_id
       @log_id ||= "SIP Request #{@via_branch_id}"

data/lib/oversip/sip/rfc3263.rb

@@ -285,7 +285,7 @@ module OverSIP::SIP
 
             # If @use_srv is false then perform A/AAAA queries.
             else
-              log_system_debug "SRV is dissabled, performing A/AAAA queries"  if $oversip_debug
+              log_system_debug "SRV is disabled, performing A/AAAA queries"  if $oversip_debug
 
               port = 5061 if dns_transport == :tls
               port ||= case @uri_scheme
@@ -311,12 +311,12 @@ module OverSIP::SIP
             # If @use_naptr is false then NAPTR must not be performed.
             if ! @use_naptr
               if @use_srv
-                log_system_debug "NAPTR is dissabled, performing SRV queries"  if $oversip_debug
+                log_system_debug "NAPTR is disabled, performing SRV queries"  if $oversip_debug
                 continue_with_SRV
 
               # If @use_srv is false then perform A/AAAA queries.
               else
-                log_system_debug "NAPTR and SRV are dissabled, performing A/AAAA queries"  if $oversip_debug
+                log_system_debug "NAPTR and SRV are disabled, performing A/AAAA queries"  if $oversip_debug
                 case @uri_scheme
                 when :sip
                   if @has_sip_udp

data/lib/oversip/sip/sip.rb

@@ -49,6 +49,8 @@ module OverSIP::SIP
     ws_local_ips.each do |ip|
       @local_aliases[ip] = true  if conf[:websocket][:listen_port] == 80 or conf[:websocket][:listen_port_tls] == 443
     end
+
+    @callback_on_client_tls_handshake = conf[:sip][:callback_on_client_tls_handshake]
   end
 
   def self.local_aliases
@@ -67,4 +69,8 @@ module OverSIP::SIP
     @local_ipv6
   end
 
+  def self.callback_on_client_tls_handshake
+    @callback_on_client_tls_handshake
+  end
+
 end

data/lib/oversip/sip/transport_manager.rb

@@ -15,7 +15,7 @@ module OverSIP::SIP
     # the client transaction is stored in the @pending_client_transactions of the client
     # connection.
     # This method always returns a connection object, never nil or false.
-    def self.get_connection klass, ip, port, client_transaction=nil, tls_validation=false
+    def self.get_connection klass, ip, port, client_transaction=nil, callback_on_server_tls_handshake=false
       # A normal connection (so we arrive here after RFC 3263 procedures).
       case klass.transport
 
@@ -28,13 +28,13 @@ module OverSIP::SIP
       when :tcp
         case klass.ip_type
           when :ipv4
-            conn = klass.connections["#{ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv4, ip, port, IPv4TcpClient, ip, port)
+            conn = klass.connections["#{ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv4, ip, port, ::OverSIP::SIP::IPv4TcpClient, ip, port)
 
             if conn.is_a? ::OverSIP::SIP::IPv4TcpClient and not conn.connected
               conn.pending_client_transactions << client_transaction
             end
           when :ipv6
-            conn = klass.connections["#{::OverSIP::Utils.normalize_ipv6 ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv6, ip, port, IPv6TcpClient, ip, port)
+            conn = klass.connections["#{::OverSIP::Utils.normalize_ipv6 ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv6, ip, port, ::OverSIP::SIP::IPv6TcpClient, ip, port)
 
             if conn.is_a? ::OverSIP::SIP::IPv6TcpClient and not conn.connected
               conn.pending_client_transactions << client_transaction
@@ -44,17 +44,17 @@ module OverSIP::SIP
       when :tls
         case klass.ip_type
           when :ipv4
-            conn = klass.connections["#{ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv4, ip, port, IPv4TlsClient, ip, port)
+            conn = klass.connections["#{ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv4, ip, port, ::OverSIP::SIP::IPv4TlsClient, ip, port)
 
             if conn.is_a? ::OverSIP::SIP::IPv4TlsClient and not conn.connected
-              conn.tls_validation = tls_validation
+              conn.callback_on_server_tls_handshake = callback_on_server_tls_handshake
               conn.pending_client_transactions << client_transaction
             end
           when :ipv6
-            conn = klass.connections["#{::OverSIP::Utils.normalize_ipv6 ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv6, ip, port, IPv6TlsClient, ip, port)
+            conn = klass.connections["#{::OverSIP::Utils.normalize_ipv6 ip}_#{port}"] || ::EM.oversip_connect_tcp_server(::OverSIP::SIP.local_ipv6, ip, port, ::OverSIP::SIP::IPv6TlsClient, ip, port)
 
             if conn.is_a? ::OverSIP::SIP::IPv6TlsClient and not conn.connected
-              conn.tls_validation = tls_validation
+              conn.callback_on_server_tls_handshake = callback_on_server_tls_handshake
               conn.pending_client_transactions << client_transaction
             end
           end
@@ -105,7 +105,7 @@ module OverSIP::SIP
             return false
           end
 
-      # It not, the flow token has been generated for a TCP/TLS/WS connection so let's lookup
+      # It not, the flow token has been generated for a TCP/TLS/WS/WSS connection so let's lookup
       # it into the Outbound connection collection and return nil for IP and port.
       else
         @outbound_connections[flow_token]