oversip 1.1.0.beta5 → 1.1.0

data/lib/oversip/tls.rb

@@ -16,20 +16,10 @@ module OverSIP
       configuration = ::OverSIP.configuration
       if configuration[:tls][:public_cert] and configuration[:tls][:private_cert]
         log_system_info "TLS enabled"
-
-        ::OverSIP.tls = true
         ::OverSIP.tls_public_cert = configuration[:tls][:public_cert]
         ::OverSIP.tls_private_cert = configuration[:tls][:private_cert]
-
-        if (::OverSIP.tls_proxy_ipv4 = configuration[:tls][:tls_proxy_ipv4])
-          log_system_info "TLS proxy enabled from IPv4 #{::OverSIP.tls_proxy_ipv4}"
-        end
-        if (::OverSIP.tls_proxy_ipv6 = configuration[:tls][:tls_proxy_ipv6])
-          log_system_info "TLS proxy enabled from IPv6 #{::OverSIP.tls_proxy_ipv6}"
-        end
-
       else
-        log_system_info "TLS dissabled"
+        log_system_info "TLS disabled"
         return
       end
 
@@ -86,7 +76,7 @@ module OverSIP
         end
 
         if num_certs_added == 0
-          log_system_notice "zero public certificates found in '#{ca_dir}' directory, dissabling TLS validation"
+          log_system_notice "zero public certificates found in '#{ca_dir}' directory, disabling TLS validation"
           @store = nil
         end
         log_system_info "#{num_certs_added} public certificates available for TLS validation"
@@ -96,18 +86,21 @@ module OverSIP
 
 
     # Return an array with the result of the TLS certificate validation as follows:
-    #   validated, cert, tls_error, tls_error_string
+    #   cert, validated, tls_error, tls_error_string
     # where:
+    # - cert:      the ::OpenSSL::X509::Certificate instance of the first PEM provided by
+    #              the peer, nil otherwise.
     # - validated: true if the given certificate(s) have been validated, false otherwise
     #              and nil if no certificate is provided by peer or no CA's were configured
     #              for TLS validation.
-    # - cert:      the ::OpenSSL::X509::Certificate instance of the first PEM provided by
-    #              the peer, nil otherwise.
     # - tls_error: OpenSSL validation error code (Fixnum) in case of validation error.
     # - tls_error_string: OpenSSL validation error string in case of validation error.
-    def self.validate pem, intermediate_pems=nil
-      return nil, nil, nil, "no CAs provided, validation dissabled"  unless @store
-      return nil, nil, nil, "no certificate provided by peer"  unless pem
+    def self.validate pems
+      return nil, nil, nil, "no CAs provided, validation disabled"  unless @store
+      return nil, false, nil, "no certificate provided by peer"  unless pems.any?
+
+      pem = pems.pop
+      intermediate_pems = pems
 
       begin
         cert = ::OpenSSL::X509::Certificate.new pem
@@ -122,19 +115,21 @@ module OverSIP
         end
 
         if @store.verify cert, intermediate_certs
-          return true, cert
+          return cert, true
         else
-          return false, cert, @store.error, @store.error_string
+          return cert, false, @store.error, @store.error_string
         end
 
       rescue => e
         log_system_error "exception validating a certificate: #{e.class}: #{e.message}"
-        return false, nil, e.class, e.message
+        return nil, false, e.class, e.message
       end
     end  # def self.validate
 
 
     def self.get_sip_identities cert
+      return []  unless cert
+
       verify_subjectAltName_DNS = true
       verify_CN = true
       subjectAltName_URI_sip_entries = []
@@ -171,7 +166,8 @@ module OverSIP
         end
       end
 
-      return sip_identities
+      # Return an array with the SIP identities (domains) in the certificate.
+      return sip_identities.keys
     end
 
   end

data/lib/oversip/version.rb

@@ -6,7 +6,7 @@ module OverSIP
     MAJOR = 1
     MINOR = 1
     TINY  = 0
-    DEVEL = "beta5"  # Set to nil for stable releases.
+    DEVEL = nil  # Set to nil for stable releases.
   end
 
   PROGRAM_NAME     = "OverSIP"

data/lib/oversip/websocket/constants.rb

@@ -51,6 +51,5 @@ module OverSIP::WebSocket
   HDR_SERVER = "Server: #{::OverSIP::PROGRAM_NAME}/#{::OverSIP::VERSION}".freeze
 
   WS_SIP_PROTOCOL = "sip"
-  WS_AUTOBAHN_PROTOCOL = "autobahn"
 
 end

data/lib/oversip/websocket/http_request.rb

@@ -4,11 +4,6 @@ module OverSIP::WebSocket
 
     include ::OverSIP::Logger
 
-    # HTTP related attributes.
-    attr_accessor :transport
-    attr_accessor :source_ip
-    attr_accessor :source_ip_type
-    attr_accessor :source_port
     attr_accessor :connection
 
     # HTTP request attributes.
@@ -30,8 +25,9 @@ module OverSIP::WebSocket
     attr_reader :hdr_sec_websocket_protocol
 
 
+    LOG_ID = "HTTP WS Request"
     def log_id
-      @log_id ||= "HTTP Request #{@connection.connection_log_id}"
+      LOG_ID
     end
 
     def unknown_method?  ;  @is_unknown_method  end
@@ -50,7 +46,7 @@ module OverSIP::WebSocket
       log_system_debug "replying #{status_code} \"#{reason_phrase}\""  if $oversip_debug
 
       if @connection.error?
-        log_system_warn "cannot send response, TCP connection is closed"
+        log_system_warn "cannot send response, connection is closed"
         return false
       end
 
@@ -58,6 +54,6 @@ module OverSIP::WebSocket
       return true
     end
 
-  end  # class HttpRequest
+  end
 
 end

data/lib/oversip/websocket/launcher.rb

@@ -15,7 +15,7 @@ module OverSIP::WebSocket
     end
 
 
-    def self.run enabled, ip_type, ip, port, transport, ws_protocol, virtual_ip=nil, virtual_port=nil
+    def self.run enabled, ip_type, ip, port, transport, virtual_ip=nil, virtual_port=nil
       uri_ip = case ip_type
         when :ipv4 ; ip
         when :ipv6 ; "[#{ip}]"
@@ -29,167 +29,111 @@ module OverSIP::WebSocket
       end
 
       klass = case transport
-        when :tcp
+        when :ws
           case ip_type
-            when :ipv4 ; OverSIP::WebSocket::IPv4TcpServer
-            when :ipv6 ; OverSIP::WebSocket::IPv6TcpServer
+            when :ipv4 ; OverSIP::WebSocket::IPv4WsServer
+            when :ipv6 ; OverSIP::WebSocket::IPv6WsServer
             end
-        when :tls
+        when :wss
           case ip_type
-            when :ipv4 ; OverSIP::WebSocket::IPv4TlsServer
-            when :ipv6 ; OverSIP::WebSocket::IPv6TlsServer
+            when :ipv4 ; OverSIP::WebSocket::IPv4WssServer
+            when :ipv6 ; OverSIP::WebSocket::IPv6WssServer
             end
-        when :tls_tunnel
+        when :wss_tunnel
           case ip_type
-            when :ipv4 ; OverSIP::WebSocket::IPv4TlsTunnelServer
-            when :ipv6 ; OverSIP::WebSocket::IPv6TlsTunnelServer
+            when :ipv4 ; OverSIP::WebSocket::IPv4WssTunnelServer
+            when :ipv6 ; OverSIP::WebSocket::IPv6WssTunnelServer
             end
         end
 
-      case ws_protocol
-
-      when OverSIP::WebSocket::WS_SIP_PROTOCOL
-
-        ws_app_klass = case transport
-          when :tcp
-            case ip_type
-              when :ipv4 ; OverSIP::WebSocket::IPv4WsSipApp
-              when :ipv6 ; OverSIP::WebSocket::IPv6WsSipApp
-              end
-          when :tls, :tls_tunnel
-            case ip_type
-              when :ipv4 ; OverSIP::WebSocket::IPv4WssSipApp
-              when :ipv6 ; OverSIP::WebSocket::IPv6WssSipApp
-              end
-          end
-
-        ws_app_klass.ip = virtual_ip || ip
-        ws_app_klass.port = virtual_port || port
+      klass.ip = virtual_ip || ip
+      klass.port = virtual_port || port
 
-        case
+      case
 
-          when klass == OverSIP::WebSocket::IPv4TcpServer
-            ws_app_klass.via_core = "SIP/2.0/WS #{uri_ip}:#{port}"
-            ws_app_klass.record_route = "<sip:#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+        when klass == OverSIP::WebSocket::IPv4WsServer
+          klass.via_core = "SIP/2.0/WS #{uri_ip}:#{port}"
+          klass.record_route = "<sip:#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
-            if enabled
-              EM.start_server(ip, port, klass) do |conn|
-                conn.ws_protocol = ws_protocol
-                conn.ws_app_klass = ws_app_klass
-                conn.post_connection
-                conn.set_comm_inactivity_timeout 3600  # TODO
-              end
+          if enabled
+            EM.start_server(ip, port, klass) do |conn|
+              conn.post_connection
+              conn.set_comm_inactivity_timeout 3600  # TODO
             end
+          end
 
-          when klass == OverSIP::WebSocket::IPv6TcpServer
-            ws_app_klass.via_core = "SIP/2.0/WS #{uri_ip}:#{port}"
-            ws_app_klass.record_route = "<sip:#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
-            if enabled
-              EM.start_server(ip, port, klass) do |conn|
-                conn.ws_protocol = ws_protocol
-                conn.ws_app_klass = ws_app_klass
-                conn.post_connection
-                conn.set_comm_inactivity_timeout 3600  # TODO
-              end
-            end
+        when klass == OverSIP::WebSocket::IPv6WsServer
+          klass.via_core = "SIP/2.0/WS #{uri_ip}:#{port}"
+          klass.record_route = "<sip:#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{uri_ip}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
 
-          when klass == OverSIP::WebSocket::IPv4TlsServer
-            ws_app_klass.via_core = "SIP/2.0/WSS #{uri_ip}:#{port}"
-            rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4] || uri_ip
-            ws_app_klass.record_route = "<sip:#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
-            if enabled
-              EM.start_server(ip, port, klass) do |conn|
-                conn.ws_protocol = ws_protocol
-                conn.ws_app_klass = ws_app_klass
-                conn.post_connection
-                conn.set_comm_inactivity_timeout 3600  # TODO
-              end
+          if enabled
+            EM.start_server(ip, port, klass) do |conn|
+              conn.post_connection
+              conn.set_comm_inactivity_timeout 3600  # TODO
             end
+          end
 
-          when klass == OverSIP::WebSocket::IPv6TlsServer
-            ws_app_klass.via_core = "SIP/2.0/WSS #{uri_ip}:#{port}"
-            rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6] || uri_ip
-            ws_app_klass.record_route = "<sips:#{rr_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
-            if enabled
-              EM.start_server(ip, port, klass) do |conn|
-                conn.ws_protocol = ws_protocol
-                conn.ws_app_klass = ws_app_klass
-                conn.post_connection
-                conn.set_comm_inactivity_timeout 3600  # TODO
-              end
+        when klass == OverSIP::WebSocket::IPv4WssServer
+          klass.via_core = "SIP/2.0/WSS #{uri_ip}:#{port}"
+          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4] || uri_ip
+          klass.record_route = "<sip:#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+
+          if enabled
+            EM.start_server(ip, port, klass) do |conn|
+              conn.post_connection
+              conn.set_comm_inactivity_timeout 3600  # TODO
             end
+          end
 
-          when klass == OverSIP::WebSocket::IPv4TlsTunnelServer
-            ws_app_klass.via_core = "SIP/2.0/WSS #{uri_virtual_ip}:#{virtual_port}"
-            rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv4] || uri_virtual_ip
-            ws_app_klass.record_route = "<sip:#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
-            if enabled
-              EM.start_server(ip, port, klass) do |conn|
-                conn.ws_protocol = ws_protocol
-                conn.ws_app_klass = ws_app_klass
-                conn.post_connection
-                conn.set_comm_inactivity_timeout 3600  # TODO
-              end
+        when klass == OverSIP::WebSocket::IPv6WssServer
+          klass.via_core = "SIP/2.0/WSS #{uri_ip}:#{port}"
+          rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6] || uri_ip
+          klass.record_route = "<sips:#{rr_host}:#{port};transport=ws;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+
+          if enabled
+            EM.start_server(ip, port, klass) do |conn|
+              conn.post_connection
+              conn.set_comm_inactivity_timeout 3600  # TODO
             end
+          end
 
-          when klass == OverSIP::WebSocket::IPv6TlsTunnelServer
-            ws_app_klass.via_core = "SIP/2.0/WSS #{uri_virtual_ip}:#{virtual_port}"
-            rr_host = ::OverSIP.configuration[:sip][:record_route_hostname_tls_ipv6] || uri_virtual_ip
-            ws_app_klass.record_route = "<sip:#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
-            ws_app_klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
-
-            if enabled
-              EM.start_server(ip, port, klass) do |conn|
-                conn.ws_protocol = ws_protocol
-                conn.ws_app_klass = ws_app_klass
-                conn.post_connection
-                conn.set_comm_inactivity_timeout 3600  # TODO
-              end
+        when klass == OverSIP::WebSocket::IPv4WssTunnelServer
+          klass.via_core = "SIP/2.0/WSS #{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=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+
+          if enabled
+            EM.start_server(ip, port, klass) do |conn|
+              conn.post_connection
+              conn.set_comm_inactivity_timeout 3600  # TODO
             end
-
-          end  # case
-
-
-      when OverSIP::WebSocket::WS_AUTOBAHN_PROTOCOL
-
-        ws_app_klass = case transport
-          when :tcp
-            case ip_type
-              when :ipv4 ; OverSIP::WebSocket::WsAutobahnApp
-              end
-          when :tls
-            case ip_type
-              when :ipv4 ; OverSIP::WebSocket::WsAutobahnApp
-              end
           end
 
-        EM.start_server(ip, port, klass) do |conn|
-          conn.ws_protocol = ws_protocol
-          conn.ws_app_klass = ws_app_klass
-          conn.post_connection
-          conn.set_comm_inactivity_timeout 60
-        end
-
-
-      else
-        fatal "unknown WebSocket protocol: #{ws_protocol}"
+        when klass == OverSIP::WebSocket::IPv6WssTunnelServer
+          klass.via_core = "SIP/2.0/WSS #{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=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_record_route_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+          klass.outbound_path_fragment = "@#{rr_host}:#{virtual_port};transport=wss;lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid};ob>"
+
+          if enabled
+            EM.start_server(ip, port, klass) do |conn|
+              conn.post_connection
+              conn.set_comm_inactivity_timeout 3600  # TODO
+            end
+          end
 
-      end  # case
+        end  # case
 
       transport_str = case transport
         when :tls_tunnel ; "TLS-Tunnel"
@@ -197,7 +141,7 @@ module OverSIP::WebSocket
         end
 
       if enabled
-        log_system_info "WebSocket #{transport_str} server listening on #{IP_TYPE[ip_type]} #{uri_ip}:#{port} provides '#{ws_protocol}' WS subprotocol"
+        log_system_info "WebSocket #{transport_str} server listening on #{IP_TYPE[ip_type]} #{uri_ip}:#{port} provides '#{::OverSIP::WebSocket::WS_SIP_PROTOCOL}' WS subprotocol"
       end
 
     end  # def self.run

data/lib/oversip/websocket/listeners/connection.rb

@@ -0,0 +1,47 @@
+module OverSIP::WebSocket
+
+  class Connection < ::EM::Connection
+
+    include ::OverSIP::Logger
+    include ::OverSIP::SIP::MessageProcessor
+
+    class << self
+      attr_accessor :ip_type, :ip, :port, :transport,
+                    :via_core,
+                    :record_route,
+                    :outbound_record_route_fragment, :outbound_path_fragment,
+                    :connections,
+                    :invite_server_transactions, :non_invite_server_transactions,
+                    :invite_client_transactions, :non_invite_client_transactions
+
+      def reliable_transport_listener?
+        @is_reliable_transport_listener
+      end
+    end
+
+
+    attr_reader :cvars
+
+    def initialize
+      @buffer = ::IO::Buffer.new
+      @state = :init
+      @cvars = {}
+    end
+
+    def open?
+      ! error?
+    end
+
+    def close status=nil, reason=nil
+      # When in WebSocket protocol send a close control frame before closing
+      # the connection.
+      if @state == :websocket
+        @ws_framing.send_close_frame status, reason
+      end
+
+      close_connection_after_writing
+      @state = :ignore
+    end
+  end
+
+end

data/lib/oversip/websocket/{ws_apps/ipv4_ws_sip_app.rb → listeners/ipv4_ws_server.rb}

@@ -1,6 +1,6 @@
 module OverSIP::WebSocket
 
-  class IPv4WsSipApp < WsSipApp
+  class IPv4WsServer < WsServer
 
     @ip_type = :ipv4
     @transport = :ws
@@ -11,11 +11,11 @@ module OverSIP::WebSocket
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
 
-    LOG_ID = "WS IPv4 SIP app"
+    LOG_ID = "SIP WS IPv4 server"
     def log_id
       LOG_ID
     end
 
   end
 
-end
+end

data/lib/oversip/websocket/{ws_apps/ipv4_wss_sip_app.rb → listeners/ipv4_wss_server.rb}

@@ -1,6 +1,6 @@
 module OverSIP::WebSocket
 
-  class IPv4WssSipApp < WsSipApp
+  class IPv4WssServer < WssServer
 
     @ip_type = :ipv4
     @transport = :wss
@@ -11,7 +11,7 @@ module OverSIP::WebSocket
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
 
-    LOG_ID = "WSS IPv4 SIP app"
+    LOG_ID = "SIP WSS IPv4 server"
     def log_id
       LOG_ID
     end

data/lib/oversip/websocket/listeners/ipv4_wss_tunnel_server.rb

@@ -0,0 +1,21 @@
+module OverSIP::WebSocket
+
+  class IPv4WssTunnelServer < WssTunnelServer
+
+    @ip_type = :ipv4
+    @transport = :wss
+    @connections = {}
+    @invite_server_transactions = {}
+    @non_invite_server_transactions = {}
+    @invite_client_transactions = {}
+    @non_invite_client_transactions = {}
+    @is_reliable_transport_listener = true
+
+    LOG_ID = "SIP WSS-Tunnel IPv4 server"
+    def log_id
+      LOG_ID
+    end
+
+  end
+
+end

data/lib/oversip/websocket/{ws_apps/ipv6_ws_sip_app.rb → listeners/ipv6_ws_server.rb}

@@ -1,6 +1,6 @@
 module OverSIP::WebSocket
 
-  class IPv6WsSipApp < WsSipApp
+  class IPv6WsServer < WsServer
 
     @ip_type = :ipv6
     @transport = :ws
@@ -11,11 +11,11 @@ module OverSIP::WebSocket
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
 
-    LOG_ID = "WS IPv6 SIP app"
+    LOG_ID = "SIP WS IPv6 server"
     def log_id
       LOG_ID
     end
 
   end
 
-end
+end

data/lib/oversip/websocket/{ws_apps/ipv6_wss_sip_app.rb → listeners/ipv6_wss_server.rb}

@@ -1,6 +1,6 @@
 module OverSIP::WebSocket
 
-  class IPv6WssSipApp < WsSipApp
+  class IPv6WssServer < WssServer
 
     @ip_type = :ipv6
     @transport = :wss
@@ -11,7 +11,7 @@ module OverSIP::WebSocket
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
 
-    LOG_ID = "WSS IPv6 SIP app"
+    LOG_ID = "SIP WSS IPv6 server"
     def log_id
       LOG_ID
     end
@@ -19,4 +19,3 @@ module OverSIP::WebSocket
   end
 
 end
-

data/lib/oversip/websocket/listeners/ipv6_wss_tunnel_server.rb

@@ -0,0 +1,21 @@
+module OverSIP::WebSocket
+
+  class IPv6WssTunnelServer < WssTunnelServer
+
+    @ip_type = :ipv6
+    @transport = :wss
+    @connections = {}
+    @invite_server_transactions = {}
+    @non_invite_server_transactions = {}
+    @invite_client_transactions = {}
+    @non_invite_client_transactions = {}
+    @is_reliable_transport_listener = true
+
+    LOG_ID = "SIP WSS-Tunnel IPv6 server"
+    def log_id
+      LOG_ID
+    end
+
+  end
+
+end