oversip 1.2.1 → 1.3.0.dev1

data/lib/oversip/sip/launcher.rb

@@ -28,23 +28,23 @@ module OverSIP::SIP
       klass = case transport
         when :udp
           case ip_type
-            when :ipv4 ; OverSIP::SIP::IPv4UdpServer
-            when :ipv6 ; OverSIP::SIP::IPv6UdpServer
+            when :ipv4 ; ::OverSIP::SIP::IPv4UdpServer
+            when :ipv6 ; ::OverSIP::SIP::IPv6UdpServer
             end
         when :tcp
           case ip_type
-            when :ipv4 ; OverSIP::SIP::IPv4TcpServer
-            when :ipv6 ; OverSIP::SIP::IPv6TcpServer
+            when :ipv4 ; ::OverSIP::SIP::IPv4TcpServer
+            when :ipv6 ; ::OverSIP::SIP::IPv6TcpServer
             end
         when :tls
           case ip_type
-            when :ipv4 ; OverSIP::SIP::IPv4TlsServer
-            when :ipv6 ; OverSIP::SIP::IPv6TlsServer
+            when :ipv4 ; ::OverSIP::SIP::IPv4TlsServer
+            when :ipv6 ; ::OverSIP::SIP::IPv6TlsServer
             end
         when :tls_tunnel
           case ip_type
-            when :ipv4 ; OverSIP::SIP::IPv4TlsTunnelServer
-            when :ipv6 ; OverSIP::SIP::IPv6TlsTunnelServer
+            when :ipv4 ; ::OverSIP::SIP::IPv4TlsTunnelServer
+            when :ipv6 ; ::OverSIP::SIP::IPv6TlsTunnelServer
             end
         end
 
@@ -53,57 +53,57 @@ module OverSIP::SIP
 
       case
 
-        when klass == OverSIP::SIP::IPv4UdpServer
+        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 enabled
-            EM::open_datagram_socket(ip, port, klass) do |conn|
+            ::EM::open_datagram_socket(ip, port, klass) do |conn|
               klass.connections = conn
             end
           end
 
-        when klass == OverSIP::SIP::IPv6UdpServer
+        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 enabled
-            EM::open_datagram_socket(ip, port, klass) do |conn|
+            ::EM::open_datagram_socket(ip, port, klass) do |conn|
               klass.connections = conn
             end
           end
 
-        when klass == OverSIP::SIP::IPv4TcpServer
+        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 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::SIP::IPv6TcpServer
+        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 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::SIP::IPv4TlsServer
+        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}>"
@@ -111,13 +111,13 @@ module OverSIP::SIP
           klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=tls;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::SIP::IPv6TlsServer
+        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}>"
@@ -125,13 +125,13 @@ module OverSIP::SIP
           klass.outbound_path_fragment = "@#{rr_host}:#{port};transport=tls;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::SIP::IPv4TlsTunnelServer
+        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}>"
@@ -139,13 +139,13 @@ module OverSIP::SIP
           klass.outbound_path_fragment = "@#{rr_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|
+            ::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::SIP::IPv6TlsTunnelServer
+        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}>"
@@ -153,9 +153,9 @@ module OverSIP::SIP
           klass.outbound_path_fragment = "@#{rr_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|
+            ::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/sip/listeners/connection.rb

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

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

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

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

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

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

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

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

@@ -9,6 +9,7 @@ module OverSIP::SIP
     @non_invite_server_transactions = {}
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
+    @is_outbound_listener = true
 
     LOG_ID = "SIP UDP IPv4 server"
     def log_id

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

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

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

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

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

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

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

@@ -9,6 +9,7 @@ module OverSIP::SIP
     @non_invite_server_transactions = {}
     @invite_client_transactions = {}
     @non_invite_client_transactions = {}
+    @is_outbound_listener = true
 
     LOG_ID = "SIP UDP IPv6 server"
     def log_id

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

@@ -2,6 +2,10 @@ module OverSIP::SIP
 
   class TcpClient < TcpConnection
 
+    class << self
+      attr_reader :server_class
+    end
+
     attr_reader :connected
     attr_reader :pending_client_transactions
 
@@ -66,6 +70,28 @@ module OverSIP::SIP
       @connected = false
     end
 
+
+    # For the case in which OverSIP receives a SIP request from a connection open by OverSIP.
+    def record_route
+      @record_route and return @record_route
+
+      server_class = self.class.server_class
+      local_port, local_ip = ::Socket.unpack_sockaddr_in(get_sockname)
+
+      case
+        when server_class == ::OverSIP::SIP::IPv4TcpServer
+          uri_ip = local_ip
+        when server_class == ::OverSIP::SIP::IPv6TcpServer
+          uri_ip = "[#{local_ip}]"
+        when server_class == ::OverSIP::SIP::IPv4TlsServer
+          uri_ip = local_ip
+        when server_class == ::OverSIP::SIP::IPv6TlsServer
+          uri_ip = "[#{local_ip}]"
+        end
+
+      @record_route = "<sip:#{uri_ip}:#{local_port};transport=#{server_class.transport.to_s};lr;ovid=#{OverSIP::SIP::Tags.value_for_route_ovid}>"
+    end
+
   end
 
 end

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

@@ -21,6 +21,13 @@ module OverSIP::SIP
     def receive_data data
       @state == :ignore and return
       @buffer << data
+      @state == :waiting_for_on_client_tls_handshake and return
+
+      process_received_data
+    end
+
+    def process_received_data
+      @state == :ignore and return
 
       while (case @state
         when :init
@@ -52,7 +59,6 @@ module OverSIP::SIP
           false
         end)
       end  # while
-
     end
 
     def parse_headers

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

@@ -28,7 +28,7 @@ module OverSIP::SIP
         set_sock_opt Socket::SOL_TCP, Socket::TCP_KEEPINTVL, ::OverSIP::SIP.tcp_keepalive_interval  # Interval between TCP pings.
       end
 
-      log_system_info "connection opened from " << remote_desc
+      log_system_debug("connection opened from " << remote_desc)  if $oversip_debug
     end
 
     def remote_desc force=nil

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

@@ -55,40 +55,44 @@ module OverSIP::SIP
 
     # This is called after all the calls to ssl_verify_peer().
     def ssl_handshake_completed
-      log_system_info "TLS connection established to " << remote_desc
+      log_system_debug("TLS connection established to " << remote_desc)  if $oversip_debug
 
       # @connected in TlsClient means "TLS connection" rather than
       # just "TCP connection".
       @connected = true
       @timer_tls_handshake.cancel  if @timer_tls_handshake
 
-      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
+      # Run OverSIP::SipEvents.on_server_tls_handshake.
+      ::Fiber.new do
+        if @callback_on_server_tls_handshake
+          log_system_debug "running OverSIP::SipEvents.on_server_tls_handshake()..."  if $oversip_debug
+          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
+          # If the user or peer has closed the connection in the on_server_tls_handshake() callback
+          # then notify pending transactions.
+          if @local_closed or error?
+            log_system_debug "connection closed, aborting"  if $oversip_debug
+            @pending_client_transactions.each do |client_transaction|
+              client_transaction.tls_validation_failed
+            end
+            @pending_client_transactions.clear
+            @pending_messages.clear
+            @state = :ignore
           end
-          @pending_client_transactions.clear
-          @pending_messages.clear
-          @state = :ignore
-          return
         end
-      end
 
-      @pending_client_transactions.clear
-      @pending_messages.each do |msg|
-        send_data msg
-      end
-      @pending_messages.clear
+        @pending_client_transactions.clear
+        @pending_messages.each do |msg|
+          send_data msg
+        end
+        @pending_messages.clear
+      end.resume
     end
 
     def unbind cause=nil

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

@@ -51,20 +51,37 @@ module OverSIP::SIP
       @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
+        # 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::SipEvents.on_client_tls_handshake.
+        ::Fiber.new do
+          begin
+            log_system_debug "running OverSIP::SipEvents.on_client_tls_handshake()..."  if $oversip_debug
+            ::OverSIP::SipEvents.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, aborting"  if $oversip_debug
+            end
+
+          rescue ::Exception => e
+            log_system_error "error calling OverSIP::SipEvents.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/sip/listeners/tls_tunnel_connection.rb

@@ -6,9 +6,8 @@ module OverSIP::SIP
     # (avoid DoS attacks).
     HEADERS_MAX_SIZE = 16384
 
-    def receive_data data
+    def process_received_data
       @state == :ignore and return
-      @buffer << data
 
       while (case @state
         when :init
@@ -25,9 +24,6 @@ module OverSIP::SIP
         when :haproxy_protocol
           parse_haproxy_protocol
 
-        #when :client_pems
-        #  parse_client_pems
-
         when :headers
           parse_headers
 
@@ -87,25 +83,6 @@ module OverSIP::SIP
       end
     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
-
   end
 
 end

data/lib/oversip/sip/message.rb

@@ -110,7 +110,7 @@ module OverSIP::SIP
     def set_header name, value
       @headers[MessageParser.headerize(name)] =
         case value
-        when Array
+        when ::Array
           value
         else
           [ value.to_s ]
@@ -135,7 +135,7 @@ module OverSIP::SIP
     # _value_ must be a string.
     def insert_header name, value
       if hdr = @headers[k=MessageParser.headerize(name)]
-        hdr.insert 0, value.to_s
+        hdr.unshift value.to_s
       else
         #@headers[k] = [ value.to_s ]
         # NOTE: If the header name doesn't already exist in the mesage, insert

data/lib/oversip/sip/message_processor.rb

@@ -76,6 +76,17 @@ 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
+        # Check OverSIP status.
+        unless ::OverSIP.status == :running
+          case ::OverSIP.status
+          when :loading
+            @msg.reply 500, "Server Still Loading", [ "Retry-After: 5" ]
+          when :terminating
+            @msg.reply 500, "Server is Being Stopped"
+          end
+          return
+        end
+
         # Create the antiloop identifier for this request.
         @msg.antiloop_id = ::OverSIP::SIP::Tags.create_antiloop_id(@msg)
 
@@ -89,14 +100,16 @@ module OverSIP::SIP
         @msg.tvars = {}
         @msg.cvars = @msg.connection.cvars
 
-        begin
-          # Run the callback.
-          ::OverSIP::SipEvents.on_request @msg
-        rescue ::Exception => e
-          log_system_error "error calling OverSIP::SipEvents.on_request() => 500:"
-          log_system_error e
-          @msg.reply 500, "Internal Error", ["Content-Type: text/plain"], "#{e.class}: #{e.message}"
-        end
+        # Run OverSIP::SipEvents.on_request within a fiber.
+        ::Fiber.new do
+          begin
+            ::OverSIP::SipEvents.on_request @msg
+          rescue ::Exception => e
+            log_system_error "error calling OverSIP::SipEvents.on_request() => 500:"
+            log_system_error e
+            @msg.reply 500, "Internal Error", ["Content-Type: text/plain"], "#{e.class}: #{e.message}"
+          end
+        end.resume
       end
     end
     private :process_request
@@ -106,9 +119,6 @@ module OverSIP::SIP
     def process_response
       case @msg.sip_method
       when :INVITE
-        ### 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 = @msg.connection.class.invite_client_transactions[@msg.via_branch_id]
           client_transaction.receive_response(@msg)
           return
@@ -136,7 +146,7 @@ module OverSIP::SIP
 
       when :INVITE
         if server_transaction = @msg.connection.class.invite_server_transactions[@msg.via_branch_id]
-          # If the retranmission arrives via a different connection (for TCP/TLS) then use
+          # If the retranmission arrives via a different connection (for TCP/TLS/WS/WSS) then use
           # the new one.
           if @msg.connection == server_transaction.request.connection
             log_system_debug "INVITE retransmission received"  if $oversip_debug
@@ -155,7 +165,7 @@ module OverSIP::SIP
           server_transaction.receive_ack
           return true
         # Absorb ACK for statelessly generated final responses by us.
-        elsif OverSIP::SIP::Tags.check_totag_for_sl_reply(@msg.to_tag)
+        elsif ::OverSIP::SIP::Tags.check_totag_for_sl_reply(@msg.to_tag)
           log_system_debug "absorving ACK for a stateless final response"  if $oversip_debug
           return true
         else

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

@@ -4,6 +4,17 @@ module OverSIP::SIP
 
     attr_reader :display_name
 
+    def initialize display_name=nil, scheme=:sip, user=nil, host=nil, port=nil
+      @display_name = display_name
+      @scheme = scheme.to_sym
+      @user = user
+      @host = host
+      @host_type = ::OverSIP::Utils.ip_type(host) || :domain  if host
+      @port = port
+
+      @name_addr_modified = true
+    end
+
     def display_name= value
       @display_name = value
       @name_addr_modified = true