oversip 1.3.2 → 1.3.3

data/bin/oversip

@@ -178,6 +178,13 @@ module OverSIP
       ::OverSIP::Config.load options[:config_dir], options[:config_file]
       ::OverSIP::Config.print options[:colorize]
 
+      log_system_info "increasing rlimits for 'nofiles'"
+      begin
+        ::Process.setrlimit Process::RLIMIT_NOFILE, 65536, 65536
+      rescue => e
+        ::OverSIP::Launcher.fatal e
+      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]

data/ext/stun/stun_ruby.c

@@ -114,7 +114,7 @@ VALUE Stun_parse_request(VALUE self, VALUE rb_stun_request, VALUE rb_source_ip,
    *
    * So let's check the second byte which must be 0x1.
    */
-  if ( request[1] != 0b00000001 ) {
+  if ( request[1] != 0x1 ) {
     LOG("ERROR: not a valid STUN Binding Request, maybe an STUN Indication (so ignore it)\n");
     return Qfalse;
   }

data/lib/oversip/posix_mq.rb

@@ -56,15 +56,17 @@ module OverSIP
 
       # Set RLIMIT_MSGQUEUE (ulimit) in order to create the queue with required
       # ammount of memory.
-      if ( current_rlimit = ::Process.getrlimit(12)[1] ) < mq_size
-        log_system_info "incrementing rlimits for Posix Message Queues (currently #{current_rlimit} bytes) to #{mq_size} bytes (ulimit -q)"
+      if ( current_rlimit = ::Process.getrlimit(::Process::RLIMIT_MSGQUEUE)[1] ) < mq_size
+        log_system_info "incrementing rlimits for 'msgqueue' Posix Message Queues (currently #{current_rlimit} bytes) to #{mq_size} bytes (ulimit -q)"
         begin
-          ::Process.setrlimit(12, mq_size)
+          ::Process.setrlimit(::Process::RLIMIT_MSGQUEUE, mq_size, mq_size)
         rescue ::Errno::EPERM
-          ::OverSIP::Launcher.fatal "current user has no permissions to increase rlimits to #{mq_size} bytes (ulimit -q)"
+          ::OverSIP::Launcher.fatal "current user has no permissions to increase 'msgqueue' rlimits to #{mq_size} bytes"
+        rescue => e
+          ::OverSIP::Launcher.fatal e
         end
       else
-        log_system_info "rlimits for Posix Message Queues is #{current_rlimit} bytes (>= #{mq_size}), no need to increase it"
+        log_system_info "rlimits for 'msgqueue' is #{current_rlimit} bytes (>= #{mq_size}), no need to increase it"
       end
 
       # Create the Posix message queue to write into it.
@@ -79,7 +81,7 @@ module OverSIP
 
       # Kernel has no support for posix message queues.
       rescue ::Errno::ENOSYS => e
-        ::OverSIP::Launcher.fatal "the kernel has no support for posix messages queues, enable it (#{e.class}: #{e.message})"
+        ::OverSIP::Launcher.fatal "the kernel has no support for Posix Messages Queues, enable it (#{e.class}: #{e.message})"
 
       # http://linux.die.net/man/3/mq_open
       #
@@ -99,7 +101,7 @@ module OverSIP
       rescue Errno::ENFILE => e
         ::OverSIP::Launcher.fatal "the system limit on the total number of open files and message queues has been reached (#{e.class}: #{e.message})"
       rescue ::Errno::ENOSPC => e
-        ::OverSIP::Launcher.fatal "insufficient space for the creation of a new message queue, probably occurred because the queues_max limit was encountered (#{e.class}: #{e.message})"
+        ::OverSIP::Launcher.fatal "insufficient space for the creation of a new message queue, probably occurred because the 'queues_max' limit was encountered (#{e.class}: #{e.message})"
 
       end
 

data/lib/oversip/ruby_ext/process.rb

@@ -0,0 +1,9 @@
+module Process
+
+  # Ruby 1.9.2 has not defined the constant Process::RLIMIT_MSGQUEUE (Ruby 1.9.3 has it).
+  # Gives it value 12 if not defined.
+  unless defined? ::Process::RLIMIT_MSGQUEUE
+    Process.const_set :RLIMIT_MSGQUEUE, 12
+  end
+
+end

data/lib/oversip/version.rb

@@ -5,7 +5,7 @@ module OverSIP
   module Version
     MAJOR = 1
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
     DEVEL = nil  # Set to nil for stable releases.
   end
 

data/lib/oversip.rb

@@ -34,7 +34,7 @@ require "oversip/utils.rb"
 require "oversip/posix_mq.rb"
 require "oversip/default_server.rb"
 require "oversip/system_callbacks.rb"
-
+require "oversip/ruby_ext/process.rb"  # Required here as the Posix message queue is created before loading master_process.rb.
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
@@ -208,6 +208,7 @@ files:
 - lib/oversip/config.rb
 - lib/oversip/launcher.rb
 - lib/oversip/ruby_ext/eventmachine.rb
+- lib/oversip/ruby_ext/process.rb
 - lib/oversip/sip/rfc3263.rb
 - lib/oversip/sip/uac.rb
 - lib/oversip/sip/uri.rb