oversip 1.2.1 → 1.3.0.dev1

data/lib/oversip/sip/uac_request.rb

@@ -0,0 +1,82 @@
+module OverSIP::SIP
+
+  class UacRequest
+
+    DEFAULT_MAX_FORWARDS = "20"
+    DEFAULT_FROM = "\"OverSIP #{::OverSIP::VERSION}\" <sip:uac@oversip.net>"
+
+    attr_reader :sip_method, :ruri, :from, :from_tag, :to, :body, :call_id, :cseq
+    attr_reader :antiloop_id
+    attr_reader :routes  # Always nil (needed for OverSIP::SIP::Tags.create_antiloop_id().
+    attr_accessor :tvars  # Transaction variables (a hash).
+
+
+    def initialize data, extra_headers=[], body=nil
+      unless (@sip_method = data[:sip_method])
+        raise ::OverSIP::RuntimeError, "no data[:sip_method] given"
+      end
+      unless (@ruri = data[:ruri])
+        raise ::OverSIP::RuntimeError, "no data[:ruri] given"
+      end
+
+      @from = data[:from] || DEFAULT_FROM
+      @from_tag = data[:from_tag] || ::SecureRandom.hex(4)
+      @to = data[:to] || @ruri
+      @call_id = data[:call_id] || ::SecureRandom.hex(8)
+      @cseq = data[:cseq] || rand(1000)
+      @max_forwards = data[:max_forwards] || DEFAULT_MAX_FORWARDS
+
+      @headers = {}
+      @extra_headers = extra_headers
+
+      @body = body
+
+      @antiloop_id = ::OverSIP::SIP::Tags.create_antiloop_id(self)
+    end
+
+
+    def insert_header name, value
+      @headers[name] = value.to_s
+    end
+
+
+    def delete_header_top name
+      @headers.delete name
+    end
+
+
+    def to_s
+      # Let @ruri to be an String, an OverSIP::SIP::Uri or an OverSIP::SIP::NameAddr instance.
+      ruri = case @ruri
+        when ::String
+          @ruri
+        when ::OverSIP::SIP::Uri, ::OverSIP::SIP::NameAddr
+          @ruri.uri
+        end
+
+      msg = "#{@sip_method.to_s} #{ruri} SIP/2.0\r\n"
+
+      @headers.each do |name, value|
+        msg << name << ": #{value}\r\n"
+      end
+
+      msg << "From: #{@from.to_s};tag=#{@from_tag}\r\n"
+      msg << "To: #{@to.to_s}\r\n"
+      msg << "Call-ID: #{@call_id}\r\n"
+      msg << "CSeq: #{@cseq.to_s} #{@sip_method.to_s}\r\n"
+      msg << "Content-Length: #{@body ? @body.bytesize : "0"}\r\n"
+      msg << "Max-Forwards: #{@max_forwards.to_s}\r\n"
+      msg << HDR_USER_AGENT << CRLF
+
+      @extra_headers.each do |header|
+        msg << header << CRLF
+      end
+
+      msg << CRLF
+      msg << @body  if @body
+      msg
+    end
+
+  end  # class Request
+
+end

data/lib/oversip/sip/{grammar/uri.rb → uri.rb}

@@ -3,6 +3,24 @@ module OverSIP::SIP
   class Uri
     attr_reader :scheme, :user, :host, :host_type, :port, :params, :transport_param, :phone_context_param, :ovid_param, :headers
 
+    def initialize scheme=:sip, user=nil, host=nil, port=nil
+      @scheme = scheme.to_sym
+      @user = user
+      @host = host
+      @host_type = ::OverSIP::Utils.ip_type(host) || :domain  if host
+      @port = port
+
+      @uri_modified = true
+    end
+
+    def sip?
+      @scheme == :sip or @scheme == :sips
+    end
+
+    def tel?
+      @scheme == :tel
+    end
+
     def scheme= value
       return nil  if unknown_scheme?
       @scheme = value
@@ -45,6 +63,10 @@ module OverSIP::SIP
       @params ||= {}
     end
 
+    def get_param k
+      params[k.to_s.downcase]
+    end
+
     def set_param k, v
       return nil  if unknown_scheme?
       @params ||= {}

data/lib/oversip/version.rb

@@ -4,9 +4,9 @@ module OverSIP
 
   module Version
     MAJOR = 1
-    MINOR = 2
-    TINY  = 1
-    DEVEL = nil  # Set to nil for stable releases.
+    MINOR = 3
+    TINY  = 0
+    DEVEL = "dev1"  # Set to nil for stable releases.
   end
 
   PROGRAM_NAME     = "OverSIP"

data/lib/oversip/websocket/launcher.rb

@@ -2,7 +2,7 @@ module OverSIP::WebSocket
 
   module Launcher
 
-    extend OverSIP::Logger
+    extend ::OverSIP::Logger
 
     IP_TYPE = {
       :ipv4 => "IPv4",
@@ -29,18 +29,18 @@ module OverSIP::WebSocket
       klass = case transport
         when :ws
           case ip_type
-            when :ipv4 ; OverSIP::WebSocket::IPv4WsServer
-            when :ipv6 ; OverSIP::WebSocket::IPv6WsServer
+            when :ipv4 ; ::OverSIP::WebSocket::IPv4WsServer
+            when :ipv6 ; ::OverSIP::WebSocket::IPv6WsServer
             end
         when :wss
           case ip_type
-            when :ipv4 ; OverSIP::WebSocket::IPv4WssServer
-            when :ipv6 ; OverSIP::WebSocket::IPv6WssServer
+            when :ipv4 ; ::OverSIP::WebSocket::IPv4WssServer
+            when :ipv6 ; ::OverSIP::WebSocket::IPv6WssServer
             end
         when :wss_tunnel
           case ip_type
-            when :ipv4 ; OverSIP::WebSocket::IPv4WssTunnelServer
-            when :ipv6 ; OverSIP::WebSocket::IPv6WssTunnelServer
+            when :ipv4 ; ::OverSIP::WebSocket::IPv4WssTunnelServer
+            when :ipv6 ; ::OverSIP::WebSocket::IPv6WssTunnelServer
             end
         end
 
@@ -49,33 +49,33 @@ module OverSIP::WebSocket
 
       case
 
-        when klass == OverSIP::WebSocket::IPv4WsServer
+        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|
+            ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 3600  # TODO
+              conn.set_comm_inactivity_timeout 300
             end
           end
 
-        when klass == OverSIP::WebSocket::IPv6WsServer
+        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>"
 
           if enabled
-            EM.start_server(ip, port, klass) do |conn|
+            ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 3600  # TODO
+              conn.set_comm_inactivity_timeout 300
             end
           end
 
-        when klass == OverSIP::WebSocket::IPv4WssServer
+        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}>"
@@ -83,13 +83,13 @@ module OverSIP::WebSocket
           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|
+            ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 3600  # TODO
+              conn.set_comm_inactivity_timeout 300
             end
           end
 
-        when klass == OverSIP::WebSocket::IPv6WssServer
+        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}>"
@@ -97,13 +97,13 @@ module OverSIP::WebSocket
           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|
+            ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 3600  # TODO
+              conn.set_comm_inactivity_timeout 300
             end
           end
 
-        when klass == OverSIP::WebSocket::IPv4WssTunnelServer
+        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}>"
@@ -111,13 +111,13 @@ module OverSIP::WebSocket
           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|
+            ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 3600  # TODO
+              conn.set_comm_inactivity_timeout 300
             end
           end
 
-        when klass == OverSIP::WebSocket::IPv6WssTunnelServer
+        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}>"
@@ -125,9 +125,9 @@ module OverSIP::WebSocket
           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|
+            ::EM.start_server(ip, port, klass) do |conn|
               conn.post_connection
-              conn.set_comm_inactivity_timeout 3600  # TODO
+              conn.set_comm_inactivity_timeout 300
             end
           end
 

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

@@ -17,6 +17,10 @@ module OverSIP::WebSocket
       def reliable_transport_listener?
         @is_reliable_transport_listener
       end
+
+      def outbound_listener?
+        @is_outbound_listener
+      end
     end
 
 

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

@@ -10,6 +10,7 @@ module OverSIP::WebSocket
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
+    @is_outbound_listener = true
 
     LOG_ID = "SIP WS IPv4 server"
     def log_id

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

@@ -10,6 +10,7 @@ module OverSIP::WebSocket
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
+    @is_outbound_listener = true
 
     LOG_ID = "SIP WSS IPv4 server"
     def log_id

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

@@ -10,6 +10,7 @@ module OverSIP::WebSocket
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
+    @is_outbound_listener = true
 
     LOG_ID = "SIP WSS-Tunnel IPv4 server"
     def log_id

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

@@ -10,6 +10,7 @@ module OverSIP::WebSocket
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
+    @is_outbound_listener = true
 
     LOG_ID = "SIP WS IPv6 server"
     def log_id

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

@@ -10,6 +10,7 @@ module OverSIP::WebSocket
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
+    @is_outbound_listener = true
 
     LOG_ID = "SIP WSS IPv6 server"
     def log_id

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

@@ -10,6 +10,7 @@ module OverSIP::WebSocket
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
     @is_reliable_transport_listener = true
+    @is_outbound_listener = true
 
     LOG_ID = "SIP WSS-Tunnel IPv6 server"
     def log_id

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

@@ -85,12 +85,15 @@ module OverSIP::WebSocket
       end unless $!
 
       if @ws_established
-        begin
-          ::OverSIP::WebSocketEvents.on_disconnection self, !@local_closed
-        rescue ::Exception => e
-          log_system_error "error calling OverSIP::WebSocketEvents.on_disconnection():"
-          log_system_error e
-        end
+        # Run OverSIP::WebSocketEvents.on_disconnection
+        ::Fiber.new do
+          begin
+            ::OverSIP::WebSocketEvents.on_disconnection self, !@local_closed
+          rescue ::Exception => e
+            log_system_error "error calling OverSIP::WebSocketEvents.on_disconnection():"
+            log_system_error e
+          end
+        end.resume
       end unless $!
     end
 
@@ -98,6 +101,14 @@ module OverSIP::WebSocket
     def receive_data data
       @state == :ignore and return
       @buffer << data
+      @state == :waiting_for_on_client_tls_handshake and return
+      @state == :waiting_for_on_connection and return
+
+      process_received_data
+    end
+
+    def process_received_data
+      @state == :ignore and return
 
       while (case @state
         when :init
@@ -113,8 +124,9 @@ module OverSIP::WebSocket
         when :check_http_request
           check_http_request
 
-        when :ws_connection_callback
-          ws_connection_callback
+        when :on_connection_callback
+          do_on_connection_callback
+          false
 
         when :accept_ws_handshake
           accept_ws_handshake
@@ -164,6 +176,16 @@ module OverSIP::WebSocket
 
 
     def check_http_request
+      # Check OverSIP status.
+      unless ::OverSIP.status == :running
+        case ::OverSIP.status
+        when :loading
+          http_reject 500, "Server Still Loading", [ "Retry-After: 5" ]
+        when :terminating
+          http_reject 500, "Server is Being Stopped"
+        end
+        return false
+      end
 
       # HTTP method must be GET.
       if @http_request.http_method != :GET
@@ -215,29 +237,36 @@ module OverSIP::WebSocket
         end
       end
 
-      @state = :ws_connection_callback
+      @state = :on_connection_callback
       true
     end
 
 
-    def ws_connection_callback
-      begin
-        ::OverSIP::WebSocketEvents.on_connection self, @http_request
-      rescue ::Exception => e
-        log_system_error "error calling OverSIP::WebSocketEvents.on_connection() => 500:"
-        log_system_error e
-        http_reject 500
-        return false
-      end
+    def do_on_connection_callback
+      # Set the state to :waiting_for_on_connection so data received before
+      # user callback validation is just stored.
+      @state = :waiting_for_on_connection
 
-      # The user provided callback could have reject the WS connection, so
-      # check it not to reply a 101 after the reply sent by the user.
-      if @state == :ws_connection_callback
-        @state = :accept_ws_handshake
-        true
-      else
-        false
-      end
+      # Run OverSIP::WebSocketEvents.on_connection.
+      ::Fiber.new do
+        begin
+          log_system_debug "running OverSIP::WebSocketEvents.on_connection()..."  if $oversip_debug
+          ::OverSIP::WebSocketEvents.on_connection self, @http_request
+          # If the user of the peer has not closed the connection then continue.
+          unless @local_closed or error?
+            @state = :accept_ws_handshake
+            # Call process_received_data() to process possible data received in the meanwhile.
+            process_received_data
+          else
+            log_system_debug "connection closed during OverSIP::WebSocketEvents.on_connection(), aborting"  if $oversip_debug
+          end
+
+        rescue ::Exception => e
+          log_system_error "error calling OverSIP::WebSocketEvents.on_connection() => 500:"
+          log_system_error e
+          http_reject 500
+        end
+      end.resume
     end
 
 

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

@@ -43,7 +43,7 @@ module OverSIP::WebSocket
 
 
     def ssl_handshake_completed
-      log_system_info "TLS connection established from " << remote_desc
+      log_system_debug ("TLS connection established from " << remote_desc)  if $oversip_debug
 
       # @connected in WssServer means "TLS connection" rather than
       # just "TCP connection".
@@ -51,20 +51,37 @@ module OverSIP::WebSocket
       @timer_tls_handshake.cancel  if @timer_tls_handshake
 
       if ::OverSIP::WebSocket.callback_on_client_tls_handshake
-        begin
-          ::OverSIP::WebSocketEvents.on_client_tls_handshake self, @client_pems
-        rescue ::Exception => e
-          log_system_error "error calling OverSIP::WebSocketEvents.on_client_tls_handshake():"
-          log_system_error e
-          close_connection
-        end
+        # Set the state to :waiting_for_on_client_tls_handshake so data received after TLS handshake but before
+        # user callback validation is just stored.
+        @state = :waiting_for_on_client_tls_handshake
+
+        # Run OverSIP::WebSocketEvents.on_client_tls_handshake.
+        ::Fiber.new do
+          begin
+            log_system_debug "running OverSIP::SipWebSocketEvents.on_client_tls_handshake()..."  if $oversip_debug
+            ::OverSIP::WebSocketEvents.on_client_tls_handshake self, @client_pems
+            # If the user of the peer has not closed the connection then continue.
+            unless @local_closed or error?
+              @state = :init
+              # Call process_received_data() to process possible data received in the meanwhile.
+              process_received_data
+            else
+              log_system_debug "connection closed during OverSIP::SipWebSocketEvents.on_client_tls_handshake(), aborting"  if $oversip_debug
+            end
+
+          rescue ::Exception => e
+            log_system_error "error calling OverSIP::WebSocketEvents.on_client_tls_handshake():"
+            log_system_error e
+            close_connection
+          end
+        end.resume
       end
     end
 
 
     def unbind cause=nil
-      super
       @timer_tls_handshake.cancel  if @timer_tls_handshake
+      super
     end
 
   end

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

@@ -40,19 +40,21 @@ module OverSIP::WebSocket
       end unless $!
 
       if @ws_established
-        begin
-          ::OverSIP::WebSocketEvents.on_disconnection self, !@local_closed
-        rescue ::Exception => e
-          log_system_error "error calling OverSIP::WebSocketEvents.on_disconnection():"
-          log_system_error e
-        end
+        # Run OverSIP::WebSocketEvents.on_disconnection
+        ::Fiber.new do
+          begin
+            ::OverSIP::WebSocketEvents.on_disconnection self, !@local_closed
+          rescue ::Exception => e
+            log_system_error "error calling OverSIP::WebSocketEvents.on_disconnection():"
+            log_system_error e
+          end
+        end.resume
       end unless $!
     end
 
 
-    def receive_data data
+    def process_received_data
       @state == :ignore and return
-      @buffer << data
 
       while (case @state
         when :init
@@ -78,13 +80,14 @@ module OverSIP::WebSocket
         when :check_http_request
           check_http_request
 
-        when :ws_connection_callback
-          ws_connection_callback
+        when :on_connection_callback
+          do_on_connection_callback
+          false
 
         when :accept_ws_handshake
           accept_ws_handshake
 
-        when :websocket_frames
+        when :websocket
           @ws_established = true
           return false  if @buffer.size.zero?
           @ws_framing.receive_data

data/lib/oversip/websocket/ws_framing.rb

@@ -44,8 +44,12 @@ module OverSIP::WebSocket
 
     def do_keep_alive interval
       @keep_alive_timer = ::EM::PeriodicTimer.new(interval) do
-        log_system_debug "sending keep-alive ping frame"  if $oversip_debug
-        @connection.send_data KEEPALIVE_PING_FRAME
+        unless @connection.error?  # Ensure it.
+          log_system_debug "sending keep-alive ping frame"  if $oversip_debug
+          @connection.send_data KEEPALIVE_PING_FRAME
+        else
+          @keep_alive_timer.cancel
+        end
       end
     end
 

data/lib/oversip.rb

@@ -46,7 +46,9 @@ module OverSIP
                   :configuration,
                   :proxies,
                   :tls_public_cert, :tls_private_cert,
-                  :stud_pids
+                  :stud_pids,
+                  :is_ready,  # true, false
+                  :status  # :loading, :running, :terminating
 
     def master?
       @master_pid == $$

data/test/test_http_parser.rb

@@ -34,7 +34,7 @@ class TestHttpParser < OverSIPTest
 
   def test_parse_http_get
     parser, request = parse <<-END
-GET http://server.example.coM./chat?qwe=QWE&asd=#fragment HTTP/1.1\r
+GET /chat?qwe=QWE&asd=#fragment HTTP/1.1\r
 Host: server.example.Com.\r
 Upgrade: WebSocket\r
 Connection: keep-Alive ,  Upgrade\r
@@ -51,11 +51,11 @@ END
     assert_equal request.http_method, :GET
     assert_equal request.http_version, "HTTP/1.1"
 
-    assert_equal "/chat?qwe=QWE&asd=", request.uri
+    assert_equal "/chat?qwe=QWE&asd=#fragment", request.uri
     assert_equal "/chat", request.uri_path
     assert_equal "qwe=QWE&asd=", request.uri_query
     assert_equal "fragment", request.uri_fragment
-    assert_equal request.uri_scheme, :http
+    assert_equal request.uri_scheme, nil
     assert_equal "server.example.com", request.host
     assert_nil request.port
 

data/test/test_uri.rb

@@ -9,17 +9,17 @@ class TestUri < OverSIPTest
     full_uri = "sips:i%C3%B1aki@aliax.net:5060;transport=tcp;foo=123;baz?X-Header-1=qwe&X-Header-2=asd"
     aor = "sip:i%C3%B1aki@aliax.net"
 
-    uri = ::OverSIP::SIP::Uri.new
-    uri.instance_variable_set :@scheme, :sips
-    uri.user = "iñaki"
-    uri.host = "aliax.net"
-    uri.host_type = :domain
-    uri.port = 5060
+    uri = ::OverSIP::SIP::Uri.new :sips, "iñaki", "aliax.net", 5060
     uri.transport_param = :tcp
-    uri.instance_variable_set :@params, {"transport"=>"tcp", "foo"=>"123", "baz"=>nil}
+    uri.set_param "FOO", "123"
+    uri.set_param "baz", nil
     uri.headers = "?X-Header-1=qwe&X-Header-2=asd"
 
+    assert_true uri.sip?
+    assert_false uri.tel?
+    assert_false uri.unknown_scheme?
     assert_equal "iñaki", uri.user
+    assert_equal "123", uri.get_param("Foo")
     assert_equal aor, uri.aor
     assert_equal full_uri, uri.to_s
   end
@@ -28,12 +28,15 @@ class TestUri < OverSIPTest
     full_uri = "tel:944991212;foo=bar;phone-context=+34"
     aor = "tel:944991212"
 
-    uri = ::OverSIP::SIP::Uri.new
-    uri.instance_variable_set :@scheme, :tel
-    uri.user = "944991212"
-    uri.instance_variable_set :@params, {"foo"=>"bar"}
+    uri = ::OverSIP::SIP::Uri.new :tel, "944991212"
+    uri.set_param "FOO", "bar"
     uri.phone_context_param = "+34"
 
+    assert_false uri.sip?
+    assert_true uri.tel?
+    assert_false uri.unknown_scheme?
+    assert_equal "944991212", uri.number
+    assert_equal "bar", uri.get_param("Foo")
     assert_equal aor, uri.aor
     assert_equal full_uri, uri.to_s
   end
@@ -42,9 +45,12 @@ class TestUri < OverSIPTest
     full_uri = "http://oversip.net/authors/"
     aor = nil
 
-    uri = ::OverSIP::SIP::Uri.new
+    uri = ::OverSIP::SIP::Uri.allocate
     uri.instance_variable_set :@uri, full_uri
 
+    assert_false uri.sip?
+    assert_false uri.tel?
+    assert_true uri.unknown_scheme?
     assert_nil uri.aor
     assert_equal full_uri, uri.to_s
   end