oversip 1.1.0.beta5 → 1.1.0

data/ext/sip_parser/sip_parser.h

@@ -128,6 +128,7 @@ typedef struct struct_message {
   msg_element_cb              from_tag;
   msg_element_cb              to_tag;
   msg_element_cb              contact_params;
+  msg_has_param_cb            contact_has_reg_id;
   /* Header value without header params. */
   header_core_value_cb        header_core_value;
   header_param_cb             header_param;

data/ext/sip_parser/sip_parser_ruby.c

@@ -50,6 +50,7 @@ static ID id_to_tag;
 static ID id_routes;
 static ID id_contact;
 static ID id_contact_params;
+static ID id_contact_has_reg_id;
 static ID id_require;
 static ID id_proxy_require;
 static ID id_supported;
@@ -362,7 +363,7 @@ static void msg_via_has_rport(VALUE parsed)
 static void msg_via_has_alias(VALUE parsed)
 {
   TRACE();
-  
+
   rb_ivar_set(parsed, id_via_has_alias, Qtrue);
 }
 
@@ -588,7 +589,7 @@ static void uri_has_param(VALUE parsed, enum uri_owner owner, enum uri_param_nam
   TRACE();
 
   VALUE p;
-  
+
   switch(param_name) {
     case uri_param_lr:  p = id_uri_lr_param;  break;
     case uri_param_ob:  p = id_uri_ob_param;  break;
@@ -683,6 +684,14 @@ static void msg_contact_params(VALUE parsed, const char *at, size_t length)
 }
 
 
+static void msg_contact_has_reg_id(VALUE parsed)
+{
+  TRACE();
+
+  rb_ivar_set(parsed, id_contact_has_reg_id, Qtrue);
+}
+
+
 static void option_tag(VALUE parsed, enum header_field header_field, const char *at, size_t length)
 {
   TRACE();
@@ -786,6 +795,7 @@ VALUE SipMessageParser_alloc(VALUE klass)
   parser->message.from_tag            = msg_from_tag;
   parser->message.to_tag              = msg_to_tag;
   parser->message.contact_params      = msg_contact_params;
+  parser->message.contact_has_reg_id  = msg_contact_has_reg_id;
   parser->message.header_core_value   = header_core_value;
   parser->message.header_param        = header_param;
   parser->message.option_tag          = option_tag;
@@ -1178,9 +1188,9 @@ void Init_sip_parser()
   rb_define_method(cSIPMessageParser, "duplicated_core_header?", SipMessageParser_has_duplicated_core_header,0);
   rb_define_method(cSIPMessageParser, "missing_core_header?", SipMessageParser_has_missing_core_header,0);
   rb_define_method(cSIPMessageParser, "post_parsing", SipMessageParser_post_parsing,0);
-  
+
   rb_define_module_function(cSIPMessageParser, "headerize", SipMessageParser_Class_headerize,1);
-  
+
   init_common_headers();
   init_short_headers();
 
@@ -1213,6 +1223,7 @@ void Init_sip_parser()
   id_routes = rb_intern("@routes");
   id_contact = rb_intern("@contact");
   id_contact_params = rb_intern("@contact_params");
+  id_contact_has_reg_id = rb_intern("@contact_has_reg_id");
   id_require = rb_intern("@require");
   id_proxy_require = rb_intern("@proxy_require");
   id_supported = rb_intern("@supported");

data/ext/utils/haproxy_protocol.c

@@ -6152,12 +6152,15 @@ case 374:
 
 #line 77 "haproxy_protocol.rl"
 
-  if(finished && len == p-str)
+  /* if(finished && len == p-str) */
+  if(finished)
     haproxy_protocol.valid = 1;
 
   /* Write the number of read bytes so the HAProxy Protocol line can be removed. */
   haproxy_protocol.total_len = (int)(p - str);
 
+  printf("**** haproxy_protocol.total_len = %i\n", haproxy_protocol.total_len);
+
   return haproxy_protocol;
 }
 

data/ext/websocket_framing_utils/ws_framing_utils_ruby.c

@@ -14,7 +14,7 @@ static VALUE cUtf8Validator;
  * Ruby functions.
  */
 
-VALUE WsFrammingUtils_unmask(VALUE self, VALUE payload, VALUE mask)
+VALUE WsFramingUtils_unmask(VALUE self, VALUE payload, VALUE mask)
 {
   char *payload_str, *mask_str;
   long payload_len;  /* mask length is always 4 bytes. */
@@ -127,7 +127,7 @@ void Init_ws_framing_utils()
   mFramingUtils = rb_define_module_under(mWebSocket, "FramingUtils");
   cUtf8Validator = rb_define_class_under(mFramingUtils, "Utf8Validator", rb_cObject);
 
-  rb_define_module_function(mFramingUtils, "unmask", WsFrammingUtils_unmask,2);
+  rb_define_module_function(mFramingUtils, "unmask", WsFramingUtils_unmask,2);
 
   rb_define_alloc_func(cUtf8Validator, Utf8Validator_alloc);
   rb_define_method(cUtf8Validator, "reset", Utf8Validator_reset,0);

data/lib/oversip/config.rb

@@ -38,6 +38,7 @@ module OverSIP
         :listen_port_tls          => 5061,
         :use_tls_tunnel           => false,
         :listen_port_tls_tunnel   => 5062,
+        :callback_on_client_tls_handshake => true,
         :local_domains            => nil,
         :tcp_keepalive_interval   => nil,
         :record_route_hostname_tls_ipv4 => nil,
@@ -54,6 +55,7 @@ module OverSIP
         :listen_port_tls          => 10443,
         :use_tls_tunnel           => false,
         :listen_port_tls_tunnel   => 10444,
+        :callback_on_client_tls_handshake => true,
         :max_ws_message_size      => 65536,
         :max_ws_frame_size        => 65536,
         :ws_keepalive_interval    => nil
@@ -67,52 +69,54 @@ module OverSIP
 
     CONFIG_VALIDATIONS = {
       :core => {
-        :nameservers              => [ :ipv4, :multi_value ],
-        :syslog_facility          => [
+        :nameservers                     => [ :ipv4, :multi_value ],
+        :syslog_facility                 => [
           [ :choices,
             %w{ kern user daemon local0 local1 local2 local3 local4 local5 local6 local7 } ]
         ],
-        :syslog_level             => [
+        :syslog_level                    => [
           [ :choices,
             %w{ debug info notice warn error crit } ]
         ],
       },
       :sip => {
-        :sip_udp                  => :boolean,
-        :sip_tcp                  => :boolean,
-        :sip_tls                  => :boolean,
-        :enable_ipv4              => :boolean,
-        :listen_ipv4              => :ipv4,
-        :enable_ipv6              => :boolean,
-        :listen_ipv6              => :ipv6,
-        :listen_port              => :port,
-        :listen_port_tls          => :port,
-        :use_tls_tunnel           => :boolean,
-        :listen_port_tls_tunnel   => :port,
-        :local_domains            => [ :domain, :multi_value ],
-        :tcp_keepalive_interval        => [ :fixnum, [ :greater_equal_than, 180 ] ],
-        :record_route_hostname_tls_ipv4 => :domain,
-        :record_route_hostname_tls_ipv6 => :domain,
+        :sip_udp                         => :boolean,
+        :sip_tcp                         => :boolean,
+        :sip_tls                         => :boolean,
+        :enable_ipv4                     => :boolean,
+        :listen_ipv4                     => :ipv4,
+        :enable_ipv6                     => :boolean,
+        :listen_ipv6                     => :ipv6,
+        :listen_port                     => :port,
+        :listen_port_tls                 => :port,
+        :use_tls_tunnel                  => :boolean,
+        :listen_port_tls_tunnel          => :port,
+        :callback_on_client_tls_handshake => :boolean,
+        :local_domains                   => [ :domain, :multi_value ],
+        :tcp_keepalive_interval          => [ :fixnum, [ :greater_equal_than, 180 ] ],
+        :record_route_hostname_tls_ipv4  => :domain,
+        :record_route_hostname_tls_ipv6  => :domain,
       },
       :websocket => {
-        :sip_ws                   => :boolean,
-        :sip_wss                  => :boolean,
-        :enable_ipv4              => :boolean,
-        :listen_ipv4              => :ipv4,
-        :enable_ipv6              => :boolean,
-        :listen_ipv6              => :ipv6,
-        :listen_port              => :port,
-        :listen_port_tls          => :port,
-        :use_tls_tunnel           => :boolean,
-        :listen_port_tls_tunnel   => :port,
-        :max_ws_message_size      => [ :fixnum, [ :minor_than, 1048576 ] ],
-        :max_ws_frame_size        => [ :fixnum, [ :minor_than, 1048576 ] ],
-        :ws_keepalive_interval    => [ :fixnum, [ :greater_equal_than, 180 ] ]
+        :sip_ws                          => :boolean,
+        :sip_wss                         => :boolean,
+        :enable_ipv4                     => :boolean,
+        :listen_ipv4                     => :ipv4,
+        :enable_ipv6                     => :boolean,
+        :listen_ipv6                     => :ipv6,
+        :listen_port                     => :port,
+        :listen_port_tls                 => :port,
+        :use_tls_tunnel                  => :boolean,
+        :listen_port_tls_tunnel          => :port,
+        :callback_on_client_tls_handshake => :boolean,
+        :max_ws_message_size             => [ :fixnum, [ :minor_than, 1048576 ] ],
+        :max_ws_frame_size               => [ :fixnum, [ :minor_than, 1048576 ] ],
+        :ws_keepalive_interval           => [ :fixnum, [ :greater_equal_than, 180 ] ]
       },
       :tls => {
-        :public_cert              => [ :readable_file, :tls_pem_chain ],
-        :private_cert             => [ :readable_file, :tls_pem_private ],
-        :ca_dir                   => :readable_dir
+        :public_cert                     => [ :readable_file, :tls_pem_chain ],
+        :private_cert                    => [ :readable_file, :tls_pem_private ],
+        :ca_dir                          => :readable_dir
       }
     }
 
@@ -306,7 +310,7 @@ module OverSIP
 
       if ( @use_sip_udp_or_tcp or @use_sip_tls ) and @configuration[:sip][:listen_ipv4] == nil and @configuration[:sip][:enable_ipv4]
         unless (@configuration[:sip][:listen_ipv4] = discover_local_ip(:ipv4))
-          log_system_warn "dissabling IPv4 for SIP"
+          log_system_warn "disabling IPv4 for SIP"
           @configuration[:sip][:listen_ipv4] = nil
           @configuration[:sip][:enable_ipv4] = false
         end
@@ -314,7 +318,7 @@ module OverSIP
 
       if ( @use_sip_udp_or_tcp or @use_sip_tls ) and @configuration[:sip][:listen_ipv6] == nil and @configuration[:sip][:enable_ipv6]
         unless (@configuration[:sip][:listen_ipv6] = discover_local_ip(:ipv6))
-          log_system_warn "dissabling IPv6 for SIP"
+          log_system_warn "disabling IPv6 for SIP"
           @configuration[:sip][:listen_ipv6] = nil
           @configuration[:sip][:enable_ipv6] = false
         end
@@ -322,7 +326,7 @@ module OverSIP
 
       if ( @use_sip_ws or @use_sip_wss ) and @configuration[:websocket][:listen_ipv4] == nil and @configuration[:websocket][:enable_ipv4]
         unless (@configuration[:websocket][:listen_ipv4] = discover_local_ip(:ipv4))
-          log_system_warn "dissabling IPv4 for WebSocket"
+          log_system_warn "disabling IPv4 for WebSocket"
           @configuration[:websocket][:listen_ipv4] = nil
           @configuration[:websocket][:enable_ipv4] = false
         end
@@ -330,7 +334,7 @@ module OverSIP
 
       if ( @use_sip_ws or @use_sip_wss ) and @configuration[:websocket][:listen_ipv6] == nil and @configuration[:websocket][:enable_ipv6]
         unless (@configuration[:websocket][:listen_ipv6] = discover_local_ip(:ipv6))
-          log_system_warn "dissabling IPv6 for WebSocket"
+          log_system_warn "disabling IPv6 for WebSocket"
           @configuration[:websocket][:listen_ipv6] = nil
           @configuration[:websocket][:enable_ipv6] = false
         end
@@ -420,6 +424,14 @@ module OverSIP
         end
       end
 
+      unless @configuration[:sip][:use_tls_tunnel]
+        @configuration[:sip][:listen_port_tls_tunnel] = nil
+      end
+
+      unless @configuration[:websocket][:use_tls_tunnel]
+        @configuration[:websocket][:listen_port_tls_tunnel] = nil
+      end
+
       [:udp, :tcp].each do |transport|
         transport_str = transport.to_s.upcase
         binds[transport].each do |ip, port|

data/lib/oversip/default_server.rb

@@ -27,6 +27,14 @@ module OverSIP
       log_system_notice "on_request() callback is not defined"
     end
 
+    def self.on_client_tls_handshake connection, pems
+      log_system_notice "on_client_tls_handshake() callback is not defined"
+    end
+
+    def self.on_server_tls_handshake connection, pems
+      log_system_notice "on_server_tls_handshake() callback is not defined"
+    end
+
   end
 
   module WebSocketEvents
@@ -41,6 +49,10 @@ module OverSIP
       log_system_notice "on_disconnection() callback is not defined"
     end
 
+    def self.on_client_tls_handshake connection, pems
+      log_system_notice "on_client_tls_handshake() callback is not defined"
+    end
+
   end
 
 end

data/lib/oversip/launcher.rb

@@ -106,8 +106,9 @@ module OverSIP::Launcher
         ::OverSIP::TLS.module_init
         ::OverSIP::SIP.module_init
         ::OverSIP::SIP::RFC3263.module_init
+        ::OverSIP::WebSocket.module_init
         ::OverSIP::WebSocket::WsFraming.class_init
-        ::OverSIP::WebSocket::WsApp.class_init
+        ::OverSIP::WebSocket::WsSipApp.class_init
 
       # I'm the syslogger process.
       else
@@ -211,15 +212,13 @@ module OverSIP::Launcher
           # WebSocket IPv4 TCP SIP server.
           if configuration[:websocket][:enable_ipv4]
             ::OverSIP::WebSocket::Launcher.run true, :ipv4, configuration[:websocket][:listen_ipv4],
-                                                      configuration[:websocket][:listen_port], :tcp,
-                                                      ::OverSIP::WebSocket::WS_SIP_PROTOCOL
+                                                      configuration[:websocket][:listen_port], :ws
           end
 
           # WebSocket IPv6 TCP SIP server.
           if configuration[:websocket][:enable_ipv6]
             ::OverSIP::WebSocket::Launcher.run true, :ipv6, configuration[:websocket][:listen_ipv6],
-                                                      configuration[:websocket][:listen_port], :tcp,
-                                                      ::OverSIP::WebSocket::WS_SIP_PROTOCOL
+                                                      configuration[:websocket][:listen_port], :ws
           end
         end
 
@@ -228,27 +227,23 @@ module OverSIP::Launcher
             # WebSocket IPv4 TLS SIP server (native).
             if configuration[:websocket][:enable_ipv4]
               ::OverSIP::WebSocket::Launcher.run true, :ipv4, configuration[:websocket][:listen_ipv4],
-                                            configuration[:websocket][:listen_port_tls], :tls,
-                                            ::OverSIP::WebSocket::WS_SIP_PROTOCOL
+                                            configuration[:websocket][:listen_port_tls], :wss
             end
 
             # WebSocket IPv6 TLS SIP server (native).
             if configuration[:websocket][:enable_ipv6]
               ::OverSIP::WebSocket::Launcher.run true, :ipv6, configuration[:websocket][:listen_ipv6],
-                                            configuration[:websocket][:listen_port_tls], :tls,
-                                            ::OverSIP::WebSocket::WS_SIP_PROTOCOL
+                                            configuration[:websocket][:listen_port_tls], :wss
             end
           else
             # WebSocket IPv4 TLS SIP server (Stud).
             if configuration[:websocket][:enable_ipv4]
               ::OverSIP::WebSocket::Launcher.run true, :ipv4, "127.0.0.1",
-                                            configuration[:websocket][:listen_port_tls_tunnel], :tls_tunnel,
-                                            ::OverSIP::WebSocket::WS_SIP_PROTOCOL,
+                                            configuration[:websocket][:listen_port_tls_tunnel], :wss_tunnel,
                                             configuration[:websocket][:listen_ipv4],
                                             configuration[:websocket][:listen_port_tls]
               ::OverSIP::WebSocket::Launcher.run false, :ipv4, configuration[:websocket][:listen_ipv4],
-                                            configuration[:websocket][:listen_port_tls], :tls,
-                                            ::OverSIP::WebSocket::WS_SIP_PROTOCOL
+                                            configuration[:websocket][:listen_port_tls], :wss
 
               # Spawn a Stud process.
               spawn_stud_process options,
@@ -260,13 +255,11 @@ module OverSIP::Launcher
             # WebSocket IPv6 TLS SIP server (Stud).
             if configuration[:sip][:enable_ipv6]
               ::OverSIP::WebSocket::Launcher.run true, :ipv6, "::1",
-                                            configuration[:websocket][:listen_port_tls_tunnel], :tls_tunnel,
-                                            ::OverSIP::WebSocket::WS_SIP_PROTOCOL,
+                                            configuration[:websocket][:listen_port_tls_tunnel], :wss_tunnel,
                                             configuration[:websocket][:listen_ipv6],
                                             configuration[:websocket][:listen_port_tls]
               ::OverSIP::WebSocket::Launcher.run false, :ipv6, configuration[:websocket][:listen_ipv6],
-                                            configuration[:websocket][:listen_port_tls], :tls,
-                                            ::OverSIP::WebSocket::WS_SIP_PROTOCOL
+                                            configuration[:websocket][:listen_port_tls], :wss
 
               # Spawn a Stud process.
               spawn_stud_process options,
@@ -278,24 +271,6 @@ module OverSIP::Launcher
         end
 
 
-        # TEST: WebSocket Autobahn server.
-        #if configuration[:websocket][:sip_ws]
-        #  if configuration[:websocket][:enable_ipv4]
-        #    ::OverSIP::WebSocket::Launcher.run true, :ipv4, configuration[:websocket][:listen_ipv4],
-        #                                        9001, :tcp,
-        #                                        ::OverSIP::WebSocket::WS_AUTOBAHN_PROTOCOL
-        #  end
-        #end
-        #
-        #if configuration[:websocket][:sip_wss]
-        #  if configuration[:websocket][:enable_ipv4]
-        #    ::OverSIP::WebSocket::Launcher.run true, :ipv4, configuration[:websocket][:listen_ipv4],
-        #                                        9002, :tls,
-        #                                        ::OverSIP::WebSocket::WS_AUTOBAHN_PROTOCOL
-        #  end
-        #end
-
-
         # Change process permissions if requested.
         set_user_group(options[:user], options[:group])
 

data/lib/oversip/master_process.rb

@@ -43,6 +43,7 @@ require "oversip/sip/tags.rb"
 require "oversip/sip/rfc3263.rb"
 require "oversip/sip/proxy.rb"
 
+require "oversip/websocket/websocket.rb"
 require "oversip/websocket/ws_http_parser.so"
 require "oversip/websocket/constants.rb"
 require "oversip/websocket/http_request.rb"
@@ -50,8 +51,7 @@ require "oversip/websocket/listeners.rb"
 require "oversip/websocket/launcher.rb"
 require "oversip/websocket/ws_framing_utils.so"
 require "oversip/websocket/ws_framing.rb"
-require "oversip/websocket/ws_app.rb"
-require "oversip/websocket/ws_apps.rb"
+require "oversip/websocket/ws_sip_app.rb"
 
 require "oversip/sip/modules/core.rb"
 require "oversip/sip/modules/user_assertion.rb"

data/lib/oversip/proxies_config.rb

@@ -23,7 +23,7 @@ module OverSIP
       :timer_B                    => 32,
       :timer_C                    => 120,
       :timer_F                    => 32,
-      :tls_validation             => false
+      :callback_on_server_tls_handshake => true
     }
 
     PROXY_CONFIG_VALIDATIONS = {
@@ -40,7 +40,7 @@ module OverSIP
       :timer_B                    => [ :fixnum, [ :greater_equal_than, 2 ], [ :minor_equal_than, 64 ] ],
       :timer_C                    => [ :fixnum, [ :greater_equal_than, 8 ], [ :minor_equal_than, 180 ] ],
       :timer_F                    => [ :fixnum, [ :greater_equal_than, 2 ], [ :minor_equal_than, 64 ] ],
-      :tls_validation             => :boolean
+      :callback_on_server_tls_handshake => :boolean
     }
 
     def self.load proxies_yaml, reload=false

data/lib/oversip/sip/client_transaction.rb

@@ -55,7 +55,7 @@ module OverSIP::SIP
             end
           end
 
-        @connection = ::OverSIP::SIP::TransportManager.get_connection @server_klass, @ip, @port, self, transaction_conf[:tls_validation]
+        @connection = ::OverSIP::SIP::TransportManager.get_connection @server_klass, @ip, @port, self, transaction_conf[:callback_on_server_tls_handshake]
       end
 
       # Ensure the request has Content-Length. Add it otherwise.
@@ -187,9 +187,6 @@ module OverSIP::SIP
       # Set server transaction variables to the response.
       response.tvars = @request.tvars
 
-      # Set original request's connection variables to the response.
-      response.cvars = @request.cvars
-
       # Provisional response
       if response.status_code < 200
         case @state
@@ -506,9 +503,6 @@ module OverSIP::SIP
       # Set server transaction variables to the response.
       response.tvars = @request.tvars
 
-      # Set original request's connection variables to the response.
-      response.cvars = @request.cvars
-
       # Provisional response
       if response.status_code < 200
         case @state

data/lib/oversip/sip/grammar/uri.rb

@@ -1,7 +1,7 @@
 module OverSIP::SIP
 
   class Uri
-    attr_reader :scheme, :user, :host, :host_type, :port, :params, :transport_param, :ovid_param, :phone_context_param, :headers
+    attr_reader :scheme, :user, :host, :host_type, :port, :params, :transport_param, :phone_context_param, :ovid_param, :headers
     attr_accessor :uri_modified
 
     def scheme= value
@@ -63,6 +63,28 @@ module OverSIP::SIP
       false
     end
 
+    def transport_param= value
+      return nil  unless @scheme == :sip or @scheme == :sips
+      if value
+        @transport_param = value.to_sym
+        set_param "transport", value.to_s
+      else
+        @transport_param = nil
+        del_param "transport"
+      end
+    end
+
+    def phone_context_param= value
+      return nil  unless @scheme == :tel
+      if value
+        @phone_context_param = value.to_sym
+        set_param "phone-context", value.to_s
+      else
+        @phone_context_param = nil
+        del_param "phone-context"
+      end
+    end
+
     def lr_param?
       @lr_param ? true : false
     end

data/lib/oversip/sip/listeners/{reactor.rb → connection.rb}

@@ -1,6 +1,6 @@
 module OverSIP::SIP
 
-  class Reactor < ::EM::Connection
+  class Connection < ::EM::Connection
 
     include ::OverSIP::Logger
     include ::OverSIP::SIP::MessageProcessor
@@ -19,10 +19,14 @@ module OverSIP::SIP
       end
     end
 
+
+    attr_reader :cvars
+
     def initialize
       @parser = ::OverSIP::SIP::MessageParser.new
       @buffer = ::IO::Buffer.new
       @state = :init
+      @cvars = {}
 
       # Set the socket sending error handling to report the error:
       # :ERRORHANDLING_KILL, :ERRORHANDLING_IGNORE, :ERRORHANDLING_REPORT
@@ -33,7 +37,17 @@ module OverSIP::SIP
       log_system_error "Socket sending error: #{error.inspect}, #{data.inspect}"
     end
 
-  end  # class Reactor
+    def transport
+      self.class.transport
+    end
+
+    def open?
+      ! error?
+    end
+
+    # close() method causes @local_closed = true.
+    alias close close_connection_after_writing
+  end
 
 end
 

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

@@ -1,6 +1,6 @@
 module OverSIP::SIP
 
-  class IPv4UdpServer < UdpReactor
+  class IPv4UdpServer < UdpConnection
 
     @ip_type = :ipv4
     @transport = :udp

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

@@ -1,6 +1,6 @@
 module OverSIP::SIP
 
-  class IPv6UdpServer < UdpReactor
+  class IPv6UdpServer < UdpConnection
 
     @ip_type = :ipv6
     @transport = :udp

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

@@ -1,12 +1,12 @@
 module OverSIP::SIP
 
-  class TcpClient < TcpReactor
+  class TcpClient < TcpConnection
 
     attr_reader :connected
     attr_reader :pending_client_transactions
 
     def initialize ip, port
-      # NOTE: The parent class implementing "initialize" method is Reactor, and allows no arguments.
+      # NOTE: The parent class implementing "initialize" method is Connection, and allows no arguments.
       # If we call just "super" from here it will fail since "ip" and "port" will be passed as
       # arguments. So we must use "super()" and we are done (no arguments are passed to parent).
       super()
@@ -19,7 +19,6 @@ module OverSIP::SIP
 
       ### TODO: make it configurable.
       set_pending_connect_timeout 2.0
-
     end
 
 

data/lib/oversip/sip/listeners/{tcp_reactor.rb → tcp_connection.rb}

@@ -1,11 +1,23 @@
 module OverSIP::SIP
 
-  class TcpReactor < Reactor
+  class TcpConnection < Connection
 
     # Max size (bytes) of the buffered data when receiving message headers
     # (avoid DoS attacks).
     HEADERS_MAX_SIZE = 16384
 
+    def remote_ip_type
+      @remote_ip_type || self.class.ip_type
+    end
+
+    def remote_ip
+      @remote_ip
+    end
+
+    def remote_port
+      @remote_port
+    end
+
     def receive_data data
       @state == :ignore and return
       @buffer << data
@@ -104,7 +116,7 @@ module OverSIP::SIP
       @msg.source_port = @remote_port
       @msg.source_ip_type = @remote_ip_type || self.class.ip_type
 
-      unless valid_message?
+      unless valid_message? @parser
         close_connection_after_writing
         @state = :ignore
         return false

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

@@ -1,6 +1,6 @@
 module OverSIP::SIP
 
-  class TcpServer < TcpReactor
+  class TcpServer < TcpConnection
 
     attr_reader :outbound_flow_token
 
@@ -14,8 +14,6 @@ module OverSIP::SIP
         return
       end
 
-      log_system_info "connection opened from " << remote_desc
-
       @connection_id = ::OverSIP::SIP::TransportManager.add_connection self, self.class, self.class.ip_type, @remote_ip, @remote_port
 
       # Create an Outbound (RFC 5626) flow token for this connection.
@@ -30,8 +28,7 @@ module OverSIP::SIP
         set_sock_opt Socket::SOL_TCP, Socket::TCP_KEEPINTVL, ::OverSIP::SIP.tcp_keepalive_interval  # Interval between TCP pings.
       end
 
-      # Initialize @cvars.
-      @cvars = {}
+      log_system_info "connection opened from " << remote_desc
     end
 
     def remote_desc force=nil