oversip 1.3.3 → 1.3.5

data/bin/oversip

@@ -82,10 +82,10 @@ module OverSIP
             ::POSIX_MQ.unlink value
           rescue ::Errno::ENOENT
           rescue ::Errno::EACCES => e
-            fatal "cannot remove '#{value}' posix message queue due file permissions"
+            ::OverSIP::Launcher.fatal "cannot remove '#{value}' posix message queue due file permissions"
             exit 1
           rescue ::Errno::EINVAL => e
-            fatal "cannot remove '#{value}' posix message queue, invalid name"
+            ::OverSIP::Launcher.fatal "cannot remove '#{value}' posix message queue, invalid name"
             exit 1
           ensure
             exit
@@ -143,7 +143,7 @@ module OverSIP
 
       # PID file is required.
       unless options[:pid_file]
-        fatal "PID file is required (use -P or --pid option)"
+        ::OverSIP::Launcher.fatal "PID file is required (use -P or --pid option)"
       end
 
       # Ignore user/group if the launcher is not being running as root.
@@ -157,14 +157,14 @@ module OverSIP
           begin
             ::Etc.getpwnam options[:user]
           rescue ::ArgumentError
-            fatal "user '#{options[:user]}' does not exist in the system"
+            ::OverSIP::Launcher.fatal "user '#{options[:user]}' does not exist in the system"
           end
         end
         if options[:group]
           begin
             ::Etc.getgrnam options[:group]
           rescue ::ArgumentError
-            fatal "group '#{options[:group]}' does not exist in the system"
+            ::OverSIP::Launcher.fatal "group '#{options[:group]}' does not exist in the system"
           end
         end
       end

data/ext/utils/ip_utils.h

@@ -3,7 +3,8 @@
 
 #include <string.h>
 #include <netinet/in.h>
-
+#include <sys/types.h>
+#include <sys/socket.h>
 
 enum enum_ip_type {
   ip_type_ipv4 = 1,

data/lib/oversip/sip/constants.rb

@@ -4,7 +4,7 @@ module OverSIP::SIP
   DOUBLE_CRLF = "\r\n\r\n"
 
   # DOC: http://www.iana.org/assignments/sip-parameters
-  REASON_PHARSE = {
+  REASON_PHRASE = {
     100 => "Trying",
     180 => "Ringing",
     181 => "Call Is Being Forwarded",
@@ -78,7 +78,7 @@ module OverSIP::SIP
     606 => "Not Acceptable"
   }
 
-  REASON_PHARSE_NOT_SET = "Reason Phrase Not Set"
+  REASON_PHRASE_NOT_SET = "Reason Phrase Not Set"
 
   HDR_SERVER                  = "Server: #{::OverSIP::PROGRAM_NAME}/#{::OverSIP::VERSION}".freeze
   HDR_USER_AGENT              = "User-Agent: #{::OverSIP::PROGRAM_NAME}/#{::OverSIP::VERSION}".freeze

data/lib/oversip/sip/core.rb

@@ -139,10 +139,8 @@ module OverSIP::SIP
       return false if @destination_myself == false
 
       if local_uri? @ruri
-        log_system_debug "RURI destination is myself"  if $oversip_debug
         return @destination_myself = true
       else
-        log_system_debug "RURI destination is not myself"  if $oversip_debug
         return @destination_myself = false
       end
     end

data/lib/oversip/sip/name_addr.rb

@@ -13,6 +13,7 @@ module OverSIP::SIP
       @port = port
 
       @name_addr_modified = true
+      @uri_modified = true
     end
 
     def display_name= value

data/lib/oversip/sip/request.rb

@@ -44,7 +44,7 @@ module OverSIP::SIP
       end
       return false  unless @server_transaction.receive_response(status_code)  if @server_transaction
 
-      reason_phrase ||= REASON_PHARSE[status_code] || REASON_PHARSE_NOT_SET
+      reason_phrase ||= REASON_PHRASE[status_code] || REASON_PHRASE_NOT_SET
 
       if status_code > 100
         @internal_to_tag ||= @to_tag || ( @server_transaction ? ::SecureRandom.hex(6) : ::OverSIP::SIP::Tags.totag_for_sl_reply )

data/lib/oversip/sip/uac_request.rb

@@ -6,7 +6,7 @@ module OverSIP::SIP
     DEFAULT_FROM = "\"OverSIP #{::OverSIP::VERSION}\" <sip:uac@oversip.net>"
 
     attr_reader :sip_method, :ruri, :from, :from_tag, :to, :body, :call_id, :cseq
-    attr_reader :antiloop_id
+    attr_reader :antiloop_id, :via_branch_id
     attr_reader :routes  # Always nil (needed for OverSIP::SIP::Tags.create_antiloop_id().
     attr_accessor :tvars  # Transaction variables (a hash).
 
@@ -32,6 +32,7 @@ module OverSIP::SIP
       @body = body
 
       @antiloop_id = ::OverSIP::SIP::Tags.create_antiloop_id(self)
+      @via_branch_id = ::SecureRandom.hex(4)
     end
 
 

data/lib/oversip/version.rb

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

data/lib/oversip/websocket/constants.rb

@@ -2,7 +2,7 @@ module OverSIP::WebSocket
 
   CRLF = "\r\n"
 
-  REASON_PHARSE = {
+  REASON_PHRASE = {
     100 => "Continue",
     101 => "Switching Protocols",
     200 => "OK",
@@ -46,7 +46,7 @@ module OverSIP::WebSocket
     505 => "HTTP Version Not Supported"
   }
 
-  REASON_PHARSE_NOT_SET = "Reason Phrase Not Set"
+  REASON_PHRASE_NOT_SET = "Reason Phrase Not Set"
 
   HDR_SERVER = "Server: #{::OverSIP::PROGRAM_NAME}/#{::OverSIP::VERSION}".freeze
 

data/lib/oversip/websocket/http_request.rb

@@ -34,7 +34,7 @@ module OverSIP::WebSocket
 
 
     def reply status_code, reason_phrase=nil, extra_headers={}
-      reason_phrase ||= REASON_PHARSE[status_code] || REASON_PHARSE_NOT_SET
+      reason_phrase ||= REASON_PHRASE[status_code] || REASON_PHRASE_NOT_SET
       extra_headers ||= {}
 
       response = "#{@http_version} #{status_code} #{reason_phrase}\r\n"

data/lib/oversip.rb

@@ -11,11 +11,12 @@ require "tempfile"
 # Ruby external gems.
 
 require "term/ansicolor"
+gem "posix_mq", ">= 2.0.0"
 require "posix_mq"
 require "syslog"
 # Load EventMachine-LE here to avoid som EM based gem in server.rb to be loaded first
 # (and load eventmachine instead of eventmachine-le).
-gem "eventmachine-le", ">= 1.1.3"
+gem "eventmachine-le", ">= 1.1.4"
 require "eventmachine-le"
 
 

data/test/test_name_addr.rb

@@ -0,0 +1,27 @@
+# coding: utf-8
+
+require "oversip_test_helper"
+
+
+class TestNameAddr < OverSIPTest
+
+  def test_name_addr
+    full_name_addr = '"Iñaki Baz Castillo" <sips:i%C3%B1aki@aliax.net:5060;transport=tcp;foo=123;baz?X-Header-1=qwe&X-Header-2=asd>'
+    aor = "sip:i%C3%B1aki@aliax.net"
+
+    name_addr = ::OverSIP::SIP::NameAddr.new "Iñaki Baz Castillo", :sips, "iñaki", "aliax.net", 5060
+    name_addr.transport_param = :tcp
+    name_addr.set_param "FOO", "123"
+    name_addr.set_param "baz", nil
+    name_addr.headers = "?X-Header-1=qwe&X-Header-2=asd"
+
+    assert_true name_addr.sip?
+    assert_false name_addr.tel?
+    assert_false name_addr.unknown_scheme?
+    assert_equal "iñaki", name_addr.user
+    assert_equal "123", name_addr.get_param("Foo")
+    assert_equal aor, name_addr.aor
+    assert_equal full_name_addr, name_addr.to_s
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: iobuffer
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: posix_mq
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: em-posixmq
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +334,7 @@ files:
 - test/oversip_test_helper.rb
 - test/test_sip_parser.rb
 - test/test_http_parser.rb
+- test/test_name_addr.rb
 - test/test_uri.rb
 - bin/oversip
 homepage: http://www.oversip.net
@@ -348,5 +365,6 @@ test_files:
 - test/oversip_test_helper.rb
 - test/test_sip_parser.rb
 - test/test_http_parser.rb
+- test/test_name_addr.rb
 - test/test_uri.rb
 has_rdoc: false