oversip 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ffc558d45b3c66904ddf72623d171b91d5e7b96
-  data.tar.gz: 489269bf59afa251db14f087ed07a38d7ff29dd5
+  metadata.gz: f65916dfa8153aa9a92e78a49c4442add2d021a0
+  data.tar.gz: 314cc666d20d6b82ba7a20f1db73bf3e73f0ed1f
 SHA512:
-  metadata.gz: 78d3f9a887a7d42ffdb8d2de56a26c27a213fa258df5ca8fcf5ec08b99a5769f6690dc3383d6bf1e12b4e88286181438f5901cbd15493328a2e12ed8df3da2b0
-  data.tar.gz: 6798f11724f21433d7fe722aa20acff3b73777b9aa8861e55791c9081acec0bef2620bc671b23cb7603e8fee8a5d6db81545a5f7223ac1eac9f2532797ca8a5c
+  metadata.gz: f9bb28e786e012b2a9886cdb3fe2612c2cd42b0eb424931f7c2d9d9d9bb47847fb6888a6a92d01878f7eaa45e1d557bc8e017ad462b480c9a332df3edca19d29
+  data.tar.gz: 211f86a78662b22ffab3f4de10324a7993331a12c0376d81a672b13819fe8bace58c55a46b51ba9aa7b18440e211be8be07ceab9ec2a7aaa5221c2f372c0ee36

data/README.md

@@ -1,4 +1,4 @@
-<a href="http://www.oversip.net"><img src="http://www.oversip.net/images/oversip-banner.png"/></a>
+<p align="center"><a href="http://oversip.net"><img src="http://oversip.net/images/oversip-banner.png"/></a></p>
 
 [![Build Status](https://secure.travis-ci.org/versatica/OverSIP.png?branch=master)](http://travis-ci.org/versatica/OverSIP)
 
@@ -9,8 +9,9 @@
 
 ## Overview
 
-OverSIP is a powerful and flexible SIP proxy & server by the authors of [draft-ietf-sipcore-sip-websocket](http://tools.ietf.org/html/draft-ietf-sipcore-sip-websocket) (*The WebSocket Protocol as a Transport for SIP*):
+OverSIP is a powerful and flexible SIP proxy & server by the authors of [RFC 7118](http://tools.ietf.org/html/rfc7118) (*The WebSocket Protocol as a Transport for SIP*):
 
+* Works on Linux/BSD/OSX
 * Fully asynchronous event-based design, never block!
 * Enjoy coding your SIP logic in Ruby language, feel free to code whatever you need!
 * Fast: core and message parsers written in C language

data/lib/oversip/proxies_config.rb

@@ -11,6 +11,7 @@ module OverSIP
 
     @proxy_configuration = {
       :do_record_routing          => true,
+      :record_route_all           => false,
       :use_dns                    => true,
       :use_dns_cache              => true,
       :dns_cache_time             => 300,
@@ -30,6 +31,7 @@ module OverSIP
 
     PROXY_CONFIG_VALIDATIONS = {
       :do_record_routing          => :boolean,
+      :record_route_all           => :boolean,
       :use_dns                    => :boolean, 
       :use_dns_cache              => :boolean,
       :dns_cache_time             => [ :fixnum, [ :greater_equal_than, 300 ] ],
@@ -176,9 +178,12 @@ module OverSIP
 
         # Add a hash for the blacklist.
         @proxies[proxy][:blacklist] = {}
+        
+        # Only allow record routing for all requsts if record routing is enabled
+        @proxies[proxy][:record_route_all] = false  unless @proxies[proxy][:do_record_routing]
       end
     end
 
   end
 
-end 
+end 

data/lib/oversip/sip/proxy.rb

@@ -187,7 +187,7 @@ module OverSIP::SIP
       add_rr_path = false
 
       # NOTE: As per RFC 6665 the proxy MUST add Record-Route to in-dialog NOTIFY's.
-      if (@request.initial? and @request.record_routing_aware?) or @request.sip_method == :NOTIFY
+      if (@request.initial? and @request.record_routing_aware?) or @request.sip_method == :NOTIFY or @conf[:record_route_all]
         do_record_routing = @conf[:do_record_routing]
 
         # Request has no previous RR/Path and current proxy performs record-routing.
@@ -270,7 +270,7 @@ module OverSIP::SIP
             @request.in_rr = :rr
             # The request comes via UDP or via a connection made by the client.
             if @request.connection.class.outbound_listener?
-              @request.insert_header "Record-Route", @request.connection.class.record_route
+              @request.insert_header "Record-Route", "<sip:" << @request.connection_outbound_flow_token << @request.connection.class.outbound_record_route_fragment
             # The request comes via a TCP/TLS connection made by OverSIP.
             else
               @request.insert_header "Record-Route", @request.connection.record_route
@@ -321,4 +321,4 @@ module OverSIP::SIP
 
   end  # class Proxy
 
-end
+end

data/lib/oversip/version.rb

@@ -5,7 +5,7 @@ module OverSIP
   module Version
     MAJOR = 2
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
     DEVEL = nil  # Set to nil for stable releases.
   end
 
@@ -14,7 +14,7 @@ module OverSIP
   VERSION << ".#{Version::DEVEL}"  if Version::DEVEL
   AUTHOR = "Inaki Baz Castillo"
   AUTHOR_EMAIL = "ibc@aliax.net"
-  HOMEPAGE = "http://www.oversip.net"
+  HOMEPAGE = "http://oversip.net"
   year = "2012-2014"
   DESCRIPTION = "#{PROGRAM_NAME} #{VERSION}\n#{HOMEPAGE}\n#{year}, #{AUTHOR} <#{AUTHOR_EMAIL}>"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Inaki Baz Castillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
@@ -280,7 +280,7 @@ files:
 - test/test_sip_uri_parser.rb
 - test/test_uri.rb
 - thirdparty/stud/stud.tar.gz
-homepage: http://www.oversip.net
+homepage: http://oversip.net
 licenses:
 - MIT
 metadata: {}