oversip 1.2.1 → 1.3.0.dev1

data/README.md

@@ -2,17 +2,41 @@
 
 [![Build Status](https://secure.travis-ci.org/versatica/OverSIP.png?branch=master)](http://travis-ci.org/versatica/OverSIP)
 
-### Website and documentation: [www.oversip.net](http://www.oversip.net)
+## Website
+
+* [www.oversip.net](http://www.oversip.net)
+
 
 ## Overview
 
-OverSIP is a powerful and flexible SIP proxy & server:
+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*):
 
 * 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
-* SIP over UDP, TCP, TLS and WebSocket (integrate true SIP within your web apps)
+* 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://www.jssip.net)
+
+
+## Documentation
+
+* [www.oversip.net/documentation](http://www.oversip.net/documentation/)
+
+
+## Authors
+
+### Main Author
+
+* Iñaki Baz Castillo (<ibc@aliax.net> | [github](https://github.com/ibc) | [twitter](https://twitter.com/ibc_tw))
+
+### Contributors
+
+* José Luis Millán (<jmillan@aliax.net> | [github](https://github.com/jmillan) | [twitter](https://twitter.com/jomivi))
+* Saúl Ibarra Corretgé (<saghul@gmail.com> | [github](https://github.com/saghul) | [twitter](https://twitter.com/saghul))
+* Jon Bonilla (<manwe@aholab.ehu.es> |  [github](https://github.com/manwe) | [twitter](https://twitter.com/jbmanwe))
+
+## License
 
-**Get it at [www.oversip.net](http://www.oversip.net) !**
+OverSIP is released under the [MIT license](http://www.oversip.net/license).

data/bin/oversip

@@ -137,7 +137,7 @@ module OverSIP
         end
       end
 
-      log_system_info "#{::OverSIP::PROGRAM_NAME} #{::OverSIP::VERSION} starting..."
+      log_system_notice "#{::OverSIP::PROGRAM_NAME} #{::OverSIP::VERSION} starting..."
 
       # Options checks.
 

data/etc/proxies.conf

@@ -28,6 +28,16 @@ default_proxy:
   #
   dns_cache_time: 300
 
+  # Enable destination blacklist. When a destination (target) fails due to timeout, connection error
+  # or TLS validation error, the target is added to a temporal blacklist and requests to same
+  # targets are not tryed again until the entry in the blacklist expires. By default _yes_.
+  #
+  use_blacklist: yes
+
+  # Blacklist expiration time (in seconds). The time of live of failed targets within the blacklist.
+  #
+  blacklist_time: 400
+
   # Use DNS NAPTR. If set, NAPTR query is performed when URI host is a domain, has no port nor
   # ;transport param.
   # Default value is _yes_.

data/etc/server.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 #
 # OverSIP - Server Logic.
 #
@@ -16,18 +18,20 @@
 module MyExampleApp
   extend ::OverSIP::Logger
 
-  # Custom configuration options:
+  class << self
+    attr_reader :do_outbound_mangling, :do_user_assertion
+  end
 
   # Set this to _true_ if the SIP registrar behind OverSIP does not support Path.
   # OverSIP::Modules::OutboundMangling methods will be used.
-  DO_OUTBOUND_MANGLING = true
+  @do_outbound_mangling = 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).
   # OverSIP::Modules::UserAssertion methods will be used.
-  DO_USER_ASSERTION = true
+  @do_user_assertion = true
 end
 
 
@@ -118,7 +122,7 @@ def (OverSIP::SipEvents).on_request request
     return
   end
 
-  if MyExampleApp::DO_OUTBOUND_MANGLING
+  if MyExampleApp.do_outbound_mangling
     # Extract the Outbound flow token from the RURI.
     ::OverSIP::Modules::OutboundMangling.extract_outbound_from_ruri request
   end
@@ -160,7 +164,7 @@ def (OverSIP::SipEvents).on_request request
 
   when :INVITE, :MESSAGE, :OPTIONS, :SUBSCRIBE, :PUBLISH, :REFER
 
-    if MyExampleApp::DO_USER_ASSERTION
+    if MyExampleApp.do_user_assertion
       ::OverSIP::Modules::UserAssertion.add_pai request
     end
 
@@ -191,7 +195,7 @@ def (OverSIP::SipEvents).on_request request
 
   when :REGISTER
 
-    if MyExampleApp::DO_OUTBOUND_MANGLING
+    if MyExampleApp.do_outbound_mangling
       # Contact mangling for the case in which the registrar does not support Path.
       ::OverSIP::Modules::OutboundMangling.add_outbound_to_contact request
     end
@@ -199,13 +203,13 @@ def (OverSIP::SipEvents).on_request request
     proxy = ::OverSIP::SIP::Proxy.new :proxy_out
 
     proxy.on_success_response do |response|
-      if MyExampleApp::DO_OUTBOUND_MANGLING
+      if MyExampleApp.do_outbound_mangling
         # 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::Modules::OutboundMangling.remove_outbound_from_contact response
       end
 
-      if MyExampleApp::DO_USER_ASSERTION
+      if MyExampleApp.do_user_assertion
         # The registrar replies 200 after a REGISTER with credentials so let's assert
         # the current SIP user to this connection.
         ::OverSIP::Modules::UserAssertion.assert_connection response
@@ -213,7 +217,7 @@ def (OverSIP::SipEvents).on_request request
     end
 
     proxy.on_failure_response do |response|
-      if MyExampleApp::DO_USER_ASSERTION
+      if MyExampleApp.do_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::Modules::UserAssertion.revoke_assertion response

data/ext/utils/haproxy_protocol.c

@@ -6152,15 +6152,12 @@ case 374:
 
 #line 77 "haproxy_protocol.rl"
 
-  /* if(finished && len == p-str) */
   if(finished)
     haproxy_protocol.valid = 1;
 
   /* Write the number of read bytes so the HAProxy Protocol line can be removed. */
   haproxy_protocol.total_len = (int)(p - str);
 
-  printf("**** haproxy_protocol.total_len = %i\n", haproxy_protocol.total_len);
-
   return haproxy_protocol;
 }
 

data/ext/utils/outbound_utils.c

@@ -25,7 +25,7 @@ static const int utils_outbound_udp_flow_token_parser_en_main = 1;
 
 /** exec **/
 /*
- * Expects a string like "1.2.3.4_5060" or "_1af:43::ab_9090" (no "_" at the beginning).
+ * Expects a string like "1.2.3.4_5060" or "1af:43::ab_9090" (no "_" at the beginning).
  */
 struct_outbound_udp_flow_token outbound_udp_flow_token_parser_execute(const char *str, size_t len)
 {

data/ext/utils/utils_ruby.c

@@ -306,7 +306,6 @@ VALUE Utils_parser_outbound_udp_flow_token(VALUE self, VALUE string)
   str = RSTRING_PTR(string);
   len = RSTRING_LEN(string);
 
-  /* Remove the leading "_" from the string. */
   outbound_udp_flow_token = outbound_udp_flow_token_parser_execute(str, len);
 
   if (outbound_udp_flow_token.valid == 0)