oversip 1.0.7.beta1 → 1.1.0.beta1

data/etc/{logic.rb → server.rb}

@@ -1,47 +1,87 @@
-# -*- encoding: utf-8 -*-
-
-#
-# OverSIP - Logic.
 #
+# OverSIP - Server Logic.
 #
 
 
-class OverSIP::SIP::Logic
 
-  ### Custom configuration options:
-  #
+
+### Custom Application Code:
+
+
+# Define here your custom code for the application running on top of OverSIP.
+# Here you can load thirdy-party libraries and so on.
+#
+# require "some-gem"
+#
+module MyExampleApp
+  extend ::OverSIP::Logger
+
+  # Custom configuration options:
+
   # Set this to _true_ if the SIP registrar behind OverSIP does not support Path.
-  USE_MODULE_REGISTRAR_WITHOUT_PATH = true
-  #
+  SIP_USE_MODULE_REGISTRAR_WITHOUT_PATH = true
+
   # Set this to _true_ if the SIP proxy/server behind OverSIP performing the authentication
   # is ready to accept a P-Asserted-Identity header from OverSIP indicating the already
   # asserted SIP user of the client's connection (this avoids authenticating all the requests
   # but the first one).
-  USE_MODULE_USER_ASSERTION = true
+  SIP_USE_MODULE_USER_ASSERTION = true
+end
+
+
+
+
+### OverSIP Events:
+
+
+module OverSIP
+
+  ### System Events:
+
+
+  # This method is called once the OverSIP reactor has been started.
+  #
+  # def SystemEvents.on_started
+  #   [...]
+  # end
+
+
+  # This method is called when a USR1 signal is received by OverSIP main
+  # process and allows the user to set custom code to be executed
+  # or reloaded.
+  #
+  # def SystemEvents.on_user_reload
+  #   [...]
+  # end
 
 
-  def run
 
-    log_info "#{@request.sip_method} from #{@request.from.uri} (UA: #{@request.header("User-Agent")}) to #{@request.ruri} via #{@request.transport.upcase} #{@request.source_ip} : #{@request.source_port}"
+
+  ### SIP Events:
+
+
+  # This method is called when a SIP request is received.
+  #
+  def SipEvents.on_request request
+
+    log_info "#{request.sip_method} from #{request.from.uri} (UA: #{request.header("User-Agent")}) to #{request.ruri} via #{request.transport.upcase} #{request.source_ip} : #{request.source_port}"
 
     # Check Max-Forwards value (max 10).
-    return unless @request.check_max_forwards 10
+    return unless request.check_max_forwards 10
 
     # Assume all the traffic is from clients and help them with NAT issues
     # by forcing rport usage and Outbound mechanism.
-    @request.fix_nat
-
+    request.fix_nat
 
-    ### In-dialog requests.
-
-    if @request.in_dialog?
-      if @request.loose_route
-        log_debug "proxying in-dialog #{@request.sip_method}"
-        @request.proxy(:proxy_in_dialog).route
+    # In-dialog requests.
+    if request.in_dialog?
+      if request.loose_route
+        log_debug "proxying in-dialog #{request.sip_method}"
+        request.proxy(:proxy_in_dialog).route
       else
-        unless @request.sip_method == :ACK
+        unless request.sip_method == :ACK
           log_notice "forbidden in-dialog request without top Route pointing to us => 403"
-          @request.reply 403, "forbidden in-dialog request without top Route pointing to us"
+          request.reply 403, "forbidden in-dialog request without top Route pointing to us"
         else
           log_notice "ignoring not loose routing ACK"
         end
@@ -49,32 +89,29 @@ class OverSIP::SIP::Logic
       return
     end
 
-
-    ### Initial requests.
+    # Initial requests.
 
     # Check that the request does not contain a top Route pointing to another server.
-    if @request.loose_route
-      unless @request.sip_method == :ACK
+    if request.loose_route
+      unless request.sip_method == :ACK
         log_notice "pre-loaded Route not allowed here => 403"
-        @request.reply 403, "Pre-loaded Route not allowed"
+        request.reply 403, "Pre-loaded Route not allowed"
       else
         log_notice "ignoring ACK initial request"
       end
       return
     end
 
-
-    if USE_MODULE_REGISTRAR_WITHOUT_PATH
+    if MyExampleApp::SIP_USE_MODULE_REGISTRAR_WITHOUT_PATH
       # Extract the Outbound flow token from the RURI.
-      OverSIP::SIP::Modules::RegistrarWithoutPath.extract_outbound_from_ruri @request
+      OverSIP::SIP::Modules::RegistrarWithoutPath.extract_outbound_from_ruri request
     end
 
-
     # The request goes to a client using Outbound through OverSIP.
-    if @request.incoming_outbound_requested?
+    if request.incoming_outbound_requested?
       log_info "routing initial request to an Outbound client"
 
-      proxy = @request.proxy(:proxy_to_users)
+      proxy = request.proxy(:proxy_to_users)
 
       proxy.on_success_response do |response|
         log_info "incoming Outbound on_success_response: #{response.status_code} '#{response.reason_phrase}'"
@@ -95,25 +132,23 @@ class OverSIP::SIP::Logic
       return
     end
 
-
     # An initial request with us (OverSIP) as final destination, ok, received, bye...
-    if @request.destination_myself?
+    if request.destination_myself?
       log_info "request for myself => 404"
-      @request.reply 404, "Ok, I'm here"
+      request.reply 404, "Ok, I'm here"
       return
     end
 
-
     # An outgoing initial request.
-    case @request.sip_method
+    case request.sip_method
 
     when :INVITE, :MESSAGE, :OPTIONS, :SUBSCRIBE, :PUBLISH
 
-      if USE_MODULE_USER_ASSERTION
-        ::OverSIP::SIP::Modules::UserAssertion.add_pai @request
+      if MyExampleApp::SIP_USE_MODULE_USER_ASSERTION
+        ::OverSIP::SIP::Modules::UserAssertion.add_pai request
       end
 
-      proxy = @request.proxy(:proxy_out)
+      proxy = request.proxy(:proxy_out)
 
       proxy.on_provisional_response do |response|
         log_info "on_provisional_response: #{response.status_code} '#{response.reason_phrase}'"
@@ -136,21 +171,21 @@ class OverSIP::SIP::Logic
 
     when :REGISTER
 
-      if USE_MODULE_REGISTRAR_WITHOUT_PATH
+      if MyExampleApp::SIP_USE_MODULE_REGISTRAR_WITHOUT_PATH
         # Contact mangling for the case in which the registrar does not support Path.
-        ::OverSIP::SIP::Modules::RegistrarWithoutPath.add_outbound_to_contact @request
+        ::OverSIP::SIP::Modules::RegistrarWithoutPath.add_outbound_to_contact request
       end
 
-      proxy = @request.proxy(:proxy_out)
+      proxy = request.proxy(:proxy_out)
 
       proxy.on_success_response do |response|
-        if USE_MODULE_REGISTRAR_WITHOUT_PATH
+        if MyExampleApp::SIP_USE_MODULE_REGISTRAR_WITHOUT_PATH
           # Undo changes done to the Contact header provided by the client, so it receives
           # the same value in the 200 response from the registrar.
           ::OverSIP::SIP::Modules::RegistrarWithoutPath.remove_outbound_from_contact response
         end
 
-        if USE_MODULE_USER_ASSERTION
+        if MyExampleApp::SIP_USE_MODULE_USER_ASSERTION
           # The registrar replies 200 after a REGISTER with credentials so let's assert
           # the current SIP user to this connection.
           ::OverSIP::SIP::Modules::UserAssertion.assert_connection response
@@ -158,7 +193,7 @@ class OverSIP::SIP::Logic
       end
 
       proxy.on_failure_response do |response|
-        if USE_MODULE_USER_ASSERTION
+        if MyExampleApp::SIP_USE_MODULE_USER_ASSERTION
           # We don't add PAI for re-REGISTER, so 401 will be replied, and after it let's
           # revoke the current user assertion (will be re-added upon REGISTER with credentials).
           ::OverSIP::SIP::Modules::UserAssertion.revoke_assertion response
@@ -170,12 +205,39 @@ class OverSIP::SIP::Logic
 
     else
 
-      log_info "method #{@request.sip_method} not implemented => 501"
-      @request.reply 501, "Not Implemented"
+      log_info "method #{request.sip_method} not implemented => 501"
+      request.reply 501, "Not Implemented"
       return
 
     end
+  end
+
+
+
+
+  ### WebSocket Events:
+
+
+  # This method is called when a new WebSocket connection is being requested.
+  # Here you can inspect the connection and the HTTP GET request. If you
+  # decide not to accept this connection then call to:
+  #
+  #   connection.http_reject(status_code, reason_phrase=nil, extra_headers=nil)
+  #
+  # You can also set variables for this connection via the connection.cvars
+  # Hash. Later you can access to this Hash in SIP request from this connection
+  # by accessing to request.cvars attribute.
+  #
+  # def WebSocketEvents.on_connection connection, http_request
+  #   [...]
+  # end
+
+
+  # This method is called when a WebSocket connection is closed.
+  #
+  # def WebSocketEvents.on_connection_closed connection
+  #   [...]
+  # end
 
-  end  # def run
 
-end  # class OverSIP::SIP::Logic
+end  # module OverSIP

data/lib/oversip/config.rb

@@ -13,11 +13,7 @@ module OverSIP
     DEFAULT_TLS_CA_DIR = "tls/ca/"
     DEFAULT_CONFIG_FILE = "oversip.conf"
     PROXIES_FILE = "proxies.conf"
-    LOGIC_FILE = "logic.rb"
-    WEBSOCKET_POLICY_FILE = "websocket_policy.rb"
-    SYSTEM_EVENTS_FILE = "system_events.rb"
-    EVENTS_FILE = "events.rb"
-    CUSTOM_LIB_FILE = "custom_lib.rb"
+    SERVER_FILE = "server.rb"
 
     def self.log_id
       @log_id ||= "Config"
@@ -122,14 +118,10 @@ module OverSIP
 
 
     def self.load config_dir=nil, config_file=nil
-      @config_dir = (config_dir || DEFAULT_CONFIG_DIR)
+      @config_dir = (::File.expand_path(config_dir) || DEFAULT_CONFIG_DIR)
       @config_file = ::File.join(@config_dir, config_file || DEFAULT_CONFIG_FILE)
       @proxies_file = ::File.join(@config_dir, PROXIES_FILE)
-      @logic_file = ::File.join(@config_dir, LOGIC_FILE)
-      @websocket_policy_file = ::File.join(@config_dir, WEBSOCKET_POLICY_FILE)
-      @system_events_file = ::File.join(@config_dir, SYSTEM_EVENTS_FILE)
-      @events_file = ::File.join(@config_dir, EVENTS_FILE)
-      @custom_lib_file = ::File.join(@config_dir, CUSTOM_LIB_FILE)
+      @server_file = ::File.join(@config_dir, SERVER_FILE)
 
       begin
         conf_yaml = ::YAML.load_file @config_file
@@ -138,27 +130,6 @@ module OverSIP
         fatal e
       end
 
-      begin
-       ::Kernel.load @custom_lib_file
-      rescue ::Exception => e
-        log_system_crit "error loading Custom Library file '#{@custom_lib_file}':"
-        fatal e
-      end
-
-      begin
-       ::Kernel.load @system_events_file
-      rescue ::Exception => e
-        log_system_crit "error loading System Events file '#{@system_events_file}':"
-        fatal e
-      end
-
-      begin
-       ::Kernel.load @events_file
-      rescue ::Exception => e
-        log_system_crit "error loading Events file '#{@events_file}':"
-        fatal e
-      end
-
       begin
         proxies_yaml = ::YAML.load_file @proxies_file
       rescue ::Exception => e
@@ -167,16 +138,9 @@ module OverSIP
       end
 
       begin
-        ::Kernel.load @logic_file
+        ::Kernel.load @server_file
       rescue ::Exception => e
-        log_system_crit "error loading Logic file '#{@logic_file}':"
-        fatal e
-      end
-
-      begin
-       ::Kernel.load @websocket_policy_file
-      rescue ::Exception => e
-        log_system_crit "error loading WebSocket Policy file '#{@websocket_policy_file}':"
+        log_system_crit "error loading Server file '#{@server_file}':"
         fatal e
       end
 
@@ -575,30 +539,6 @@ module OverSIP
     def self.system_reload
       log_system_notice "reloading OverSIP..."
 
-      begin
-       ::Kernel.load @custom_lib_file
-       log_system_notice "Custom Library file '#{@custom_lib_file}' reloaded"
-      rescue ::Exception => e
-        log_system_crit "error reloading Custom Library file '#{@custom_lib_file}':"
-        log_system_crit e
-      end
-
-      begin
-       ::Kernel.load @system_events_file
-       log_system_notice "System Events file '#{@system_events_file}' reloaded"
-      rescue ::Exception => e
-        log_system_crit "error reloading System Events file '#{@system_events_file}':"
-        log_system_crit e
-      end
-
-      begin
-       ::Kernel.load @events_file
-       log_system_notice "Events file '#{@events_file}' reloaded"
-      rescue ::Exception => e
-        log_system_crit "error reloading Events file '#{@events_file}':"
-        log_system_crit e
-      end
-
       begin
         proxies_yaml = ::YAML.load_file @proxies_file
         ::OverSIP::ProxiesConfig.load proxies_yaml, reload=true
@@ -611,14 +551,14 @@ module OverSIP
       end
 
       begin
-        ::Kernel.load @logic_file
-        log_system_notice "Logic file '#{@logic_file}' reloaded"
+        ::Kernel.load @server_file
+        log_system_notice "Server file '#{@server_file}' reloaded"
       rescue ::Exception => e
-        log_system_crit "error reloading Logic file '#{@logic_file}':"
+        log_system_crit "error reloading Server file '#{@server_file}':"
         log_system_crit e
       end
     end
 
   end
 
-end
+end

data/lib/oversip/default_server.rb

@@ -0,0 +1,41 @@
+module OverSIP
+
+  module SystemEvents
+
+    extend ::OverSIP::Logger
+
+    def self.on_started
+      log_system_notice "on_started() event is not defined"
+    end
+
+    def self.on_user_reload
+      log_system_notice "on_user_reload() event is not defined"
+    end
+
+  end
+
+  module SipEvents
+
+    extend ::OverSIP::Logger
+
+    def self.on_request request
+      log_system_notice "on_request() event is not defined"
+    end
+
+  end
+
+  module WebSocketEvents
+
+    extend ::OverSIP::Logger
+
+    def self.on_connection connection, http_request
+      log_system_notice "on_connection() event is not defined"
+    end
+
+    def self.on_connection_closed connection
+      log_system_notice "on_connection_closed() event is not defined"
+    end
+
+  end
+
+end

data/lib/oversip/launcher.rb

@@ -300,11 +300,11 @@ module OverSIP::Launcher
         log_system_info "reactor running"
 
         # Run the user provided on_started callback.
-        log_system_info "calling user provided OverSIP::SystemEvents.on_started() callback..."
+        log_system_info "calling OverSIP::SystemEvents.on_started()..."
         begin
           ::OverSIP::SystemEvents.on_started
         rescue ::Exception => e
-          log_system_crit "error calling user provided OverSIP::SystemEvents.on_started() callback:"
+          log_system_crit "error calling OverSIP::SystemEvents.on_started():"
           fatal e
         end
 
@@ -441,12 +441,12 @@ module OverSIP::Launcher
 
     # Signal USR1 reloads custom code provided by the user.
     trap :USR1 do
-      log_system_notice "USR1 signal received, calling user provided OverSIP::SystemEvents.on_user_reload() callback..."
+      log_system_notice "USR1 signal received, calling OverSIP::SystemEvents.on_user_reload()..."
       # Run the user provided on_started callback.
       begin
         ::OverSIP::SystemEvents.on_user_reload
       rescue ::Exception => e
-        log_system_crit "error calling user provided OverSIP::SystemEvents.on_user_reload() callback:"
+        log_system_crit "error calling OverSIP::SystemEvents.on_user_reload():"
         log_system_crit e
       end
     end

data/lib/oversip/logger.rb

@@ -160,7 +160,7 @@ module OverSIP
     # Default logging identifier is the class name. If log_id() method is redefined by the
     # class including this module, or it sets @log_id, then such a value takes preference.
     def log_id
-      @log_id ||= self.class.name
+      @log_id ||= (self.is_a?(::Module) ? self.name.split("::").last : self.class.name)
     end
 
   end  # module Logger

data/lib/oversip/master_process.rb

@@ -24,8 +24,6 @@ require "posix-spawn"
 
 # OverSIP files.
 
-require "oversip/ruby_ext/eventmachine.rb"
-
 require "oversip/sip/sip.rb"
 require "oversip/sip/sip_parser.so"
 require "oversip/sip/constants.rb"
@@ -43,7 +41,6 @@ require "oversip/sip/transport_manager.rb"
 require "oversip/sip/timers.rb"
 require "oversip/sip/tags.rb"
 require "oversip/sip/rfc3263.rb"
-require "oversip/sip/logic.rb"
 require "oversip/sip/proxy.rb"
 
 require "oversip/websocket/ws_http_parser.so"
@@ -56,10 +53,13 @@ require "oversip/websocket/ws_framing.rb"
 require "oversip/websocket/ws_app.rb"
 require "oversip/websocket/ws_apps.rb"
 
+require "oversip/sip/modules/core.rb"
+require "oversip/sip/modules/user_assertion.rb"
+require "oversip/sip/modules/registrar_without_path.rb"
+
+require "oversip/default_server.rb"
 require "oversip/fiber_pool.rb"
 require "oversip/tls.rb"
 require "oversip/stun.so"
 
-require "oversip/sip/modules/core.rb"
-require "oversip/sip/modules/user_assertion.rb"
-require "oversip/sip/modules/registrar_without_path.rb"
+require "oversip/ruby_ext/eventmachine.rb"

data/lib/oversip/sip/message_processor.rb

@@ -90,11 +90,12 @@ module OverSIP::SIP
           @msg.tvars = {}
           @msg.cvars = @cvars
 
-          # Create the Logic instance and run it!
-          ::OverSIP::SIP::Logic.new(@msg).run
-        rescue => e
+          # Run the user provided OverSIP::SipEvents.on_request() callback.
+          ::OverSIP::SipEvents.on_request @msg
+        rescue ::Exception => e
+          log_system_error "error calling OverSIP::WebSocketEvents.on_request() => 500:"
           log_system_error e
-          @msg.reply 503, "Internal Error", ["Content-Type: text/plain"], "#{e.class }: #{e.message}"
+          @msg.reply 500, "Internal Error", ["Content-Type: text/plain"], "#{e.class}: #{e.message}"
         end
       end
     end

data/lib/oversip/version.rb

@@ -4,8 +4,8 @@ module OverSIP
 
   module Version
     MAJOR = 1
-    MINOR = 0
-    TINY  = 7
+    MINOR = 1
+    TINY  = 0
     DEVEL = "beta1"  # Set to nil for stable releases.
   end
 

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

@@ -72,9 +72,9 @@ module OverSIP::WebSocket
 
       if @ws_handshake_done
         begin
-          ::OverSIP::Events.on_websocket_connection_closed self
+          ::OverSIP::WebSocketEvents.on_connection_closed self
         rescue ::Exception => e
-          log_system_error "error calling user provided OverSIP::Events.on_websocket_connection_closed():"
+          log_system_error "error calling OverSIP::WebSocketEvents.on_connection_closed():"
           log_system_error e
         end
       end
@@ -99,8 +99,8 @@ module OverSIP::WebSocket
         when :check_http_request
           check_http_request
 
-        when :new_websocket_connection_callback
-          check_new_websocket_connection_callback
+        when :ws_connection_callback
+          check_ws_connection_callback
 
         when :accept_ws_handshake
           accept_ws_handshake
@@ -206,36 +206,16 @@ module OverSIP::WebSocket
         end
       end
 
-      # Check WebSocket policy.
-
-      unless ::OverSIP::WebSocket::Policy.check_hostport(@http_request.host, @http_request.port)
-        log_system_notice "host/port policy not satisfied (host=#{@http_request.host.inspect}, port=#{@http_request.port.inspect}) => 403"
-        http_reject 403, "request host/port not satisfied"
-        return false
-      end
-
-      unless ::OverSIP::WebSocket::Policy.check_origin(@http_request.hdr_origin)
-        log_system_notice "'Origin' policy not satisfied (origin=#{@http_request.hdr_origin.inspect}) => 403"
-        http_reject 403, "request 'Origin' not satisfied"
-        return false
-      end
-
-      unless ::OverSIP::WebSocket::Policy.check_request_uri(@http_request.uri_path, @http_request.uri_query)
-        log_system_notice "request URI path/query not satisfied (path=#{@http_request.uri_path.inspect}, query=#{@http_request.uri_query.inspect}) => 403"
-        http_reject 403, "request URI path/query not satisfied"
-        return false
-      end
-
-      @state = :new_websocket_connection_callback
+      @state = :ws_connection_callback
       true
     end
 
 
-    def check_new_websocket_connection_callback
+    def check_ws_connection_callback
       begin
-        ::OverSIP::Events.on_new_websocket_connection self, @http_request
+        ::OverSIP::WebSocketEvents.on_connection self, @http_request
       rescue ::Exception => e
-        log_system_error "error calling user provided OverSIP::Events.on_new_websocket_connection() callback => 500:"
+        log_system_error "error calling OverSIP::WebSocketEvents.on_connection() => 500:"
         log_system_error e
         http_reject 500
         return false
@@ -243,7 +223,7 @@ module OverSIP::WebSocket
 
       # 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 == :new_websocket_connection_callback
+      if @state == :ws_connection_callback
         @state = :accept_ws_handshake
         true
       else

data/lib/oversip/websocket/ws_app.rb

@@ -71,6 +71,6 @@ module OverSIP::WebSocket
     end
 
 
-  end  # WsApplication
+  end  # WsApp
 
 end

data/lib/oversip/websocket/ws_apps/ws_sip_app.rb

@@ -151,6 +151,6 @@ module OverSIP::WebSocket
     end
 
 
-  end  # WsSipApplication
+  end  # WsSipApp
 
 end

data/lib/oversip.rb

@@ -26,6 +26,7 @@ require "oversip/launcher.rb"
 require "oversip/utils.so"
 require "oversip/utils.rb"
 require "oversip/posix_mq.rb"
+require "oversip/default_server.rb"
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 1.0.7.beta1
+  version: 1.1.0.beta1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
-  requirement: &19620160 !ruby/object:Gem::Requirement
+  requirement: &15245840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *19620160
+  version_requirements: *15245840
 - !ruby/object:Gem::Dependency
   name: iobuffer
-  requirement: &19619700 !ruby/object:Gem::Requirement
+  requirement: &15245380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *19619700
+  version_requirements: *15245380
 - !ruby/object:Gem::Dependency
   name: em-posixmq
-  requirement: &19619240 !ruby/object:Gem::Requirement
+  requirement: &15244920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *19619240
+  version_requirements: *15244920
 - !ruby/object:Gem::Dependency
   name: em-udns
-  requirement: &19618780 !ruby/object:Gem::Requirement
+  requirement: &15244460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *19618780
+  version_requirements: *15244460
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &19618320 !ruby/object:Gem::Requirement
+  requirement: &15244000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *19618320
+  version_requirements: *15244000
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &19617940 !ruby/object:Gem::Requirement
+  requirement: &15243620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19617940
+  version_requirements: *15243620
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &19617400 !ruby/object:Gem::Requirement
+  requirement: &15243080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *19617400
+  version_requirements: *15243080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19616900 !ruby/object:Gem::Requirement
+  requirement: &15242580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *19616900
+  version_requirements: *15242580
 description: ! "OverSIP is an async SIP server. Built on top of Ruby EventMachine\n
   \   library it follows the Reactor Pattern, allowing thousands of concurrent connections
   and requests\n    handled by a single processor in a never-blocking fashion. It
@@ -122,6 +122,7 @@ files:
 - lib/oversip/utils.rb
 - lib/oversip/errors.rb
 - lib/oversip/master_process.rb
+- lib/oversip/default_server.rb
 - lib/oversip/tls.rb
 - lib/oversip/config_validators.rb
 - lib/oversip/version.rb
@@ -136,7 +137,6 @@ files:
 - lib/oversip/sip/listeners.rb
 - lib/oversip/sip/proxy.rb
 - lib/oversip/sip/server_transaction.rb
-- lib/oversip/sip/logic.rb
 - lib/oversip/sip/tags.rb
 - lib/oversip/sip/request.rb
 - lib/oversip/sip/timers.rb
@@ -228,12 +228,8 @@ files:
 - ext/stud/extconf.rb
 - thirdparty/stud/stud.tar.gz
 - etc/oversip.conf
-- etc/system_events.rb
-- etc/events.rb
-- etc/custom_lib.rb
-- etc/logic.rb
 - etc/proxies.conf
-- etc/websocket_policy.rb
+- etc/server.rb
 - etc/tls/demo-tls.oversip.net.crt
 - etc/tls/demo-tls.oversip.net.key
 - etc/tls/upgrade-cacert.sh

data/etc/custom_lib.rb

@@ -1,15 +0,0 @@
-#
-# OverSIP - Custom Library.
-#
-#
-# Add your custom code for your application running on top of OverSIP.
-# Here you can load thirdy-party libraries and so on.
-
-
-module MyOverSIP
-
-  extend ::OverSIP::Logger
-
-  # Add here your code.
-
-end

data/etc/events.rb

@@ -1,34 +0,0 @@
-#
-# OverSIP - Events.
-#
-#
-# OverSIP common callbacks. Fill them according to your needs.
-
-
-module OverSIP::Events
-
-  extend ::OverSIP::Logger
-  @log_id = "Events"
-
-  # This method is called once a WebSocket connection has been accepted
-  # but before the HTTP 101 has been replied to the client.
-  # Here you can inspect the HTTP request (WebSocket handshake) and,
-  # based on your service, reject the connection by calling:
-  #
-  #   connection.http_reject(status_code, reason_phrase=nil, extra_headers=nil)
-  #
-  # You can also set variables for this connection via the connection.cvars
-  # hash. You can later inspect such a hash within the logic.rb file by
-  # accessing to @request.cvars.
-  # 
-  def self.on_new_websocket_connection connection, http_request
-    # Do something.
-  end
-
-  # This method is called once a WebSocket connection has been closed.
-  #
-  def self.on_websocket_connection_closed connection
-    # Do something.
-  end
-
-end

data/etc/system_events.rb

@@ -1,25 +0,0 @@
-#
-# OverSIP - System Events.
-#
-#
-# OverSIP system callbacks. Fill them according to your needs.
-
-
-module OverSIP::SystemEvents
-
-  extend ::OverSIP::Logger
-  @log_id = "SystemEvents"
-
-  # This method is called once the OverSIP reactor has been started.
-  def self.on_started
-    # Do something.
-  end
-
-  # This method is called when a USR1 signal is received by the main
-  # process and allows the user to set custom code to be executed
-  # or reloaded.
-  def self.on_user_reload
-    # Do something.
-  end
-
-end

data/etc/websocket_policy.rb

@@ -1,30 +0,0 @@
-#
-# OverSIP - WebSocket Access Policy.
-#
-#
-# Fill these functions with your own access policy for allowing or
-# disallowing WebSocket connections from clients.
-#
-# If any of the following methods return _false_ then the WebSocket
-# connection is rejected.
-
-
-module OverSIP::WebSocket::Policy
-
-  # Check the value of the Host header, by splitting it into
-  # host (a String) and port (Fixnum). Both could be _nil_.
-  def self.check_hostport host=nil, port=nil
-    return true
-  end
-
-  # Check the value of the Origin header (a String with original value).
-  def self.check_origin origin=nil
-    return true
-  end
-
-  # Check the request URI path (String) and query (String). Both can be _nil_.
-  def self.check_request_uri path=nil, query=nil
-    return true
-  end
-
-end

data/lib/oversip/sip/logic.rb

@@ -1,14 +0,0 @@
-module OverSIP::SIP
-
-  class Logic
-
-    include ::OverSIP::Logger
-
-    def initialize request
-      @log_id = "Logic " << request.via_branch_id
-      @request = request
-    end
-
-  end  # class Logic
-
-end