oversip 1.4.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2ffc558d45b3c66904ddf72623d171b91d5e7b96
+  data.tar.gz: 489269bf59afa251db14f087ed07a38d7ff29dd5
+SHA512:
+  metadata.gz: 78d3f9a887a7d42ffdb8d2de56a26c27a213fa258df5ca8fcf5ec08b99a5769f6690dc3383d6bf1e12b4e88286181438f5901cbd15493328a2e12ed8df3da2b0
+  data.tar.gz: 6798f11724f21433d7fe722aa20acff3b73777b9aa8861e55791c9081acec0bef2620bc671b23cb7603e8fee8a5d6db81545a5f7223ac1eac9f2532797ca8a5c

data/LICENSE

@@ -1,6 +1,6 @@
 Name: OverSIP
 Maintainer: Iñaki Baz Castillo <ibc@aliax.net>
-Copyright (c) 2012-2013 Iñaki Baz Castillo - Versatica <http://www.versatica.com>
+Copyright (c) 2012-2014 Iñaki Baz Castillo
 
 
 License: The MIT License

data/README.md

@@ -17,7 +17,7 @@ OverSIP is a powerful and flexible SIP proxy & server by the authors of [draft-i
 * SIP over UDP, TCP, TLS and WebSocket (use true SIP in your web apps)
 * Full support for IPv4, IPv6 and DNS resolution (NAPTR, SRV, A, AAAA)
 * The perfect Outbound Edge Proxy
-* Written by the authors of [draft-ietf-sipcore-sip-websocket](http://tools.ietf.org/html/draft-ietf-sipcore-sip-websocket) and [JsSIP](http://jssip.net)
+* Written by the authors of [RFC 7118 "The WebSocket Protocol as a Transport for SIP"](http://tools.ietf.org/html/rfc7118) and [JsSIP](http://jssip.net)
 
 
 ## Documentation
@@ -39,4 +39,4 @@ OverSIP is a powerful and flexible SIP proxy & server by the authors of [draft-i
 
 ## License
 
-OverSIP is released under the [MIT license](http://www.oversip.net/license).
+OverSIP is released under the [MIT license](http://www.oversip.net/license).

data/Rakefile

@@ -3,25 +3,25 @@ require "rake/clean"
 
 
 OVERSIP_EXTENSIONS = [
-  { :dir => "ext/sip_parser", :so => "sip_parser.so", :dest => "lib/oversip/sip" },
-  { :dir => "ext/stun", :so => "stun.so", :dest => "lib/oversip" },
-  { :dir => "ext/utils", :so => "utils.so", :dest => "lib/oversip" },
-  { :dir => "ext/websocket_framing_utils", :so => "ws_framing_utils.so", :dest => "lib/oversip/websocket" },
-  { :dir => "ext/websocket_http_parser", :so => "ws_http_parser.so", :dest => "lib/oversip/websocket" },
+  { :dir => "ext/sip_parser", :lib => "sip_parser.#{RbConfig::CONFIG["DLEXT"]}", :dest => "lib/oversip/sip" },
+  { :dir => "ext/stun", :lib => "stun.#{RbConfig::CONFIG["DLEXT"]}", :dest => "lib/oversip" },
+  { :dir => "ext/utils", :lib => "utils.#{RbConfig::CONFIG["DLEXT"]}", :dest => "lib/oversip" },
+  { :dir => "ext/websocket_framing_utils", :lib => "ws_framing_utils.#{RbConfig::CONFIG["DLEXT"]}", :dest => "lib/oversip/websocket" },
+  { :dir => "ext/websocket_http_parser", :lib => "ws_http_parser.#{RbConfig::CONFIG["DLEXT"]}", :dest => "lib/oversip/websocket" },
 ]
 
 OVERSIP_EXTENSIONS.each do |ext|
-  file ext[:so] => Dir.glob(["#{ext[:dir]}/*{.c,.h}"]) do
+  file ext[:lib] => Dir.glob(["#{ext[:dir]}/*{.c,.h}"]) do
     Dir.chdir(ext[:dir]) do
       ruby "extconf.rb"
       sh "make"
     end
-    cp "#{ext[:dir]}/#{ext[:so]}", "#{ext[:dest]}/"
+    cp "#{ext[:dir]}/#{ext[:lib]}", "#{ext[:dest]}/"
   end
 
-  CLEAN.include("#{ext[:dir]}/*{.o,.log,.so,.a}")
+  CLEAN.include("#{ext[:dir]}/*{.o,.log,.so,.a,.bundle}")
   CLEAN.include("#{ext[:dir]}/Makefile")
-  CLEAN.include("#{ext[:dest]}/#{ext[:so]}")
+  CLEAN.include("#{ext[:dest]}/#{ext[:lib]}")
 end
 
 # Stud stuff.
@@ -37,8 +37,7 @@ CLEAN.include("thirdparty/stud/mkmf.log")
 CLEAN.include("bin/oversip_stud")
 
 
-OVERSIP_COMPILE_ITEMS = OVERSIP_EXTENSIONS.map {|e| e[:so]} << "bin/oversip_stud"
-
+OVERSIP_COMPILE_ITEMS = OVERSIP_EXTENSIONS.map {|e| e[:lib]} << "bin/oversip_stud"
 
 task :default => :compile
 

data/bin/oversip

@@ -49,7 +49,7 @@ module OverSIP
           options[:pid_file] = value
         end
 
-        opts.on("-p", "--process-name NAME", "Change the running process name, also affects to syslogger process and Posix Message Queue name (default 'oversip')") do |value|
+        opts.on("-p", "--process-name NAME", "Change the running process name (default 'oversip')") do |value|
           options[:process_name] = value
           $0 = options[:process_name]
           ::OverSIP::Logger.load_methods
@@ -75,23 +75,6 @@ module OverSIP
           options[:colorize] = false
         end
 
-        opts.on("--remove-mqueue MQUEUE", "Destroy the Posix Message Queue with the given name and exit") do |value|
-          require "posix_mq"
-
-          begin
-            ::POSIX_MQ.unlink value
-          rescue ::Errno::ENOENT
-          rescue ::Errno::EACCES => e
-            ::OverSIP::Launcher.fatal "cannot remove '#{value}' posix message queue due file permissions"
-            exit 1
-          rescue ::Errno::EINVAL => e
-            ::OverSIP::Launcher.fatal "cannot remove '#{value}' posix message queue, invalid name"
-            exit 1
-          ensure
-            exit
-          end
-        end
-
         opts.separator "\nRuby options:"
 
         opts.on("-d", "--debug", "Set debugging flags ($DEBUG = true)") do
@@ -148,7 +131,10 @@ module OverSIP
 
       # Ignore user/group if the launcher is not being running as root.
       unless ::Process.euid == 0
-        log_system_warn "ignoring user/group parameters when not running as root"
+        if options[:user] or options[:group]
+          log_system_warn "ignoring user/group parameters when not running as root"
+        end
+
         options.delete :user
         options.delete :group
       else
@@ -173,23 +159,20 @@ module OverSIP
       # or to the script filename otherwise.
       ::OverSIP.master_name = options[:process_name] || ::File.basename(__FILE__)
       $0 = ::OverSIP.master_name
-      log_system_info "master process name: #{::OverSIP.master_name}"
+      log_system_info "process name: #{::OverSIP.master_name}"
 
       ::OverSIP::Config.load options[:config_dir], options[:config_file]
       ::OverSIP::Config.print options[:colorize]
 
-      log_system_info "increasing rlimits for 'nofiles'"
+      ::OverSIP::Logger::load_methods
+
       begin
         ::Process.setrlimit Process::RLIMIT_NOFILE, 65536, 65536
       rescue => e
-        ::OverSIP::Launcher.fatal e
+        # ::OverSIP::Launcher.fatal e
+        log_system_error "error increasing rlimits for 'nofiles': #{e.message} (#{e.class})"
       end
 
-      log_system_info "creating Posix Message Queue for communicating master and syslogger processes"
-      ::OverSIP.syslogger_mq_name = "/#{OverSIP.master_name}_syslogger"
-      ::OverSIP::Logger.init_logger_mq options[:group]
-      ::OverSIP::Logger.load_methods
-
       ::OverSIP::Launcher.daemonize!(options)
       ::OverSIP::Launcher.run(options)