oversip 1.4.1 → 2.0.0

data/ext/sip_parser/common_headers.h

@@ -3,6 +3,7 @@
 
 #include "../common/c_util.h"
 #include "ruby.h"
+#include <ctype.h>  // toupper()
 
 
 /* There are 20 headers with sort representation. */

data/ext/sip_parser/sip_message_parser.c

@@ -16,7 +16,7 @@
 
 /** machine **/
 
-#line 571 "sip_message_parser.rl"
+#line 572 "sip_message_parser.rl"
 
 
 
@@ -13038,11 +13038,11 @@ static const short _sip_message_parser_trans_keys[] = {
 	97, 102, 13, 127, -64, -33, -32, -17, 
 	-16, -9, -8, -5, -4, -3, -2, 8, 
 	10, 31, 48, 57, 65, 70, 97, 102, 
-	13, 33, 35, 37, 44, 58, 59, 61, 
-	63, 64, 91, 93, 95, 126, 127, -64, 
-	-33, -32, -17, -16, -9, -8, -5, -4, 
-	-3, -2, 8, 10, 31, 36, 57, 65, 
-	90, 97, 122, 13, 33, 35, 37, 44, 
+	9, 13, 32, 34, 35, 37, 44, 58, 
+	60, 62, 64, 92, 94, 96, 127, -128, 
+	-65, -64, -33, -32, -17, -16, -9, -8, 
+	-5, -4, -3, -2, 31, 59, 63, 91, 
+	93, 123, 125, 13, 33, 35, 37, 44, 
 	58, 59, 61, 62, 63, 64, 82, 91, 
 	93, 95, 114, 126, 127, -64, -33, -32, 
 	-17, -16, -9, -8, -5, -4, -3, -2, 
@@ -25095,10 +25095,10 @@ static const short _sip_message_parser_indicies[] = {
 	74, 75, 76, 77, 78, 1, 1, 7538, 
 	7538, 7538, 73, 79, 1, 74, 75, 76, 
 	77, 78, 1, 1, 7528, 7528, 7528, 73, 
-	79, 7517, 137, 7518, 137, 7511, 137, 137, 
-	137, 140, 184, 184, 7517, 7517, 1, 74, 
-	75, 76, 77, 78, 1, 1, 7517, 7517, 
-	7517, 73, 79, 7501, 137, 7502, 137, 7503, 
+	73, 79, 73, 73, 137, 7518, 137, 7511, 
+	73, 73, 140, 73, 73, 73, 1, 73, 
+	74, 75, 76, 77, 78, 1, 137, 184, 
+	73, 7517, 79, 7501, 137, 7502, 137, 7503, 
 	7504, 7505, 181, 7506, 140, 7539, 177, 177, 
 	7501, 7539, 7501, 1, 74, 75, 76, 77, 
 	78, 1, 1, 7501, 7501, 7501, 73, 73, 
@@ -28749,7 +28749,7 @@ static const int sip_message_parser_error = 0;
 static const int sip_message_parser_en_main = 1;
 
 
-#line 577 "sip_message_parser.rl"
+#line 578 "sip_message_parser.rl"
 
 int sip_message_parser_init(sip_message_parser *parser)
 {
@@ -28761,7 +28761,7 @@ int sip_message_parser_init(sip_message_parser *parser)
 	cs = sip_message_parser_start;
 	}
 
-#line 583 "sip_message_parser.rl"
+#line 584 "sip_message_parser.rl"
   parser->cs = cs;
   parser->nread = 0;
   parser->error_start = NULL;
@@ -29487,28 +29487,29 @@ _match:
 	case 81:
 #line 427 "sip_message_parser.rl"
 	{
-    if (parser->do_uri)
+    if (parser->do_uri) {
       if (!parser->uri_display_name_quoted)
         parser->uri.display_name(parser->parsed, parser->uri_owner, PTR_TO(mark), LEN(mark, p), parser->uri_scheme);
       else
         parser->uri.display_name(parser->parsed, parser->uri_owner, PTR_TO(mark)+1, LEN(mark, p)-2, parser->uri_scheme);
+    }
   }
 	break;
 	case 82:
-#line 436 "sip_message_parser.rl"
+#line 437 "sip_message_parser.rl"
 	{
     parser->uri_display_name_quoted=1;
   }
 	break;
 	case 83:
-#line 440 "sip_message_parser.rl"
+#line 441 "sip_message_parser.rl"
 	{
     if (parser->do_uri)
       MARK(uri_start, p);
   }
 	break;
 	case 84:
-#line 445 "sip_message_parser.rl"
+#line 446 "sip_message_parser.rl"
 	{
     if (parser->do_uri)
       parser->uri.full(parser->parsed, parser->uri_owner, PTR_TO(uri_start), LEN(uri_start, p), parser->uri_scheme);
@@ -29520,29 +29521,29 @@ _match:
   }
 	break;
 	case 85:
-#line 455 "sip_message_parser.rl"
+#line 456 "sip_message_parser.rl"
 	{ parser->message.init_component(parser->parsed, component_ruri); }
 	break;
 	case 86:
-#line 457 "sip_message_parser.rl"
+#line 458 "sip_message_parser.rl"
 	{
     parser->do_uri = 1;
     parser->uri_owner = uri_owner_ruri;
   }
 	break;
 	case 87:
-#line 462 "sip_message_parser.rl"
+#line 463 "sip_message_parser.rl"
 	{
     parser->message.init_component(parser->parsed, component_from);
     parser->hdr_field_name = header_field_from;
   }
 	break;
 	case 88:
-#line 467 "sip_message_parser.rl"
+#line 468 "sip_message_parser.rl"
 	{ parser->num_from++; }
 	break;
 	case 89:
-#line 469 "sip_message_parser.rl"
+#line 470 "sip_message_parser.rl"
 	{
     if (parser->num_from == 1) {
       parser->do_uri = 1;
@@ -29551,18 +29552,18 @@ _match:
   }
 	break;
 	case 90:
-#line 476 "sip_message_parser.rl"
+#line 477 "sip_message_parser.rl"
 	{
     parser->message.init_component(parser->parsed, component_to);
     parser->hdr_field_name = header_field_to;
   }
 	break;
 	case 91:
-#line 481 "sip_message_parser.rl"
+#line 482 "sip_message_parser.rl"
 	{ parser->num_to++; }
 	break;
 	case 92:
-#line 483 "sip_message_parser.rl"
+#line 484 "sip_message_parser.rl"
 	{
     if (parser->num_to == 1) {
       parser->do_uri = 1;
@@ -29571,19 +29572,19 @@ _match:
   }
 	break;
 	case 93:
-#line 491 "sip_message_parser.rl"
+#line 492 "sip_message_parser.rl"
 	{
     parser->message.from_tag(parser->parsed, PTR_TO(mark), LEN(mark, p));
   }
 	break;
 	case 94:
-#line 495 "sip_message_parser.rl"
+#line 496 "sip_message_parser.rl"
 	{
     parser->message.to_tag(parser->parsed, PTR_TO(mark), LEN(mark, p));
   }
 	break;
 	case 95:
-#line 500 "sip_message_parser.rl"
+#line 501 "sip_message_parser.rl"
 	{
     if (parser->route_found == 0) {
       parser->message.init_component(parser->parsed, component_route);
@@ -29593,30 +29594,30 @@ _match:
   }
 	break;
 	case 96:
-#line 508 "sip_message_parser.rl"
+#line 509 "sip_message_parser.rl"
 	{
     parser->message.init_component(parser->parsed, component_route_uri); }
 	break;
 	case 97:
-#line 511 "sip_message_parser.rl"
+#line 512 "sip_message_parser.rl"
 	{
     parser->do_uri = 1;
     parser->uri_owner = uri_owner_route;
   }
 	break;
 	case 98:
-#line 517 "sip_message_parser.rl"
+#line 518 "sip_message_parser.rl"
 	{
     parser->message.init_component(parser->parsed, component_contact);
     parser->hdr_field_name = header_field_contact;
   }
 	break;
 	case 99:
-#line 522 "sip_message_parser.rl"
+#line 523 "sip_message_parser.rl"
 	{ parser->num_contact++; }
 	break;
 	case 100:
-#line 524 "sip_message_parser.rl"
+#line 525 "sip_message_parser.rl"
 	{
     if (parser->num_contact == 1) {
       parser->do_uri = 1;
@@ -29625,54 +29626,54 @@ _match:
   }
 	break;
 	case 101:
-#line 536 "sip_message_parser.rl"
+#line 537 "sip_message_parser.rl"
 	{
     if (parser->num_contact == 1)
       parser->message.contact_params(parser->parsed, PTR_TO(mark), LEN(mark, p));
   }
 	break;
 	case 102:
-#line 541 "sip_message_parser.rl"
+#line 542 "sip_message_parser.rl"
 	{
     if (parser->num_contact == 1)
       parser->message.contact_has_reg_id(parser->parsed);
   }
 	break;
 	case 103:
-#line 546 "sip_message_parser.rl"
+#line 547 "sip_message_parser.rl"
 	{
     parser->contact_is_valid = 1;
   }
 	break;
 	case 104:
-#line 550 "sip_message_parser.rl"
+#line 551 "sip_message_parser.rl"
 	{
     parser->contact_is_valid = 0;
   }
 	break;
 	case 105:
-#line 555 "sip_message_parser.rl"
+#line 556 "sip_message_parser.rl"
 	{
     parser->message.option_tag(parser->parsed, header_field_require, PTR_TO(mark), LEN(mark, p));
   }
 	break;
 	case 106:
-#line 559 "sip_message_parser.rl"
+#line 560 "sip_message_parser.rl"
 	{
     parser->message.option_tag(parser->parsed, header_field_proxy_require, PTR_TO(mark), LEN(mark, p));
   }
 	break;
 	case 107:
-#line 563 "sip_message_parser.rl"
+#line 564 "sip_message_parser.rl"
 	{
     parser->message.option_tag(parser->parsed, header_field_supported, PTR_TO(mark), LEN(mark, p));
   }
 	break;
 	case 108:
-#line 568 "sip_message_parser.rl"
+#line 569 "sip_message_parser.rl"
 	{ {p++; goto _out; } }
 	break;
-#line 29676 "sip_message_parser.c"
+#line 29677 "sip_message_parser.c"
 		}
 	}
 
@@ -29685,7 +29686,7 @@ _again:
 	_out: {}
 	}
 
-#line 640 "sip_message_parser.rl"
+#line 641 "sip_message_parser.rl"
 
   parser->cs = cs;
   parser->nread += p - (buffer + off);

data/ext/sip_parser/sip_parser_ruby.c

@@ -201,6 +201,8 @@ static void header(VALUE parsed, const char *hdr_field, size_t hdr_field_len, co
         case header_field_route:
           rb_ivar_set(parsed, id_hdr_route, array);
           break;
+        default:
+          break;
       }
   }
 }
@@ -567,6 +569,7 @@ static void uri_known_param(VALUE parsed, enum uri_owner owner, enum uri_param_n
         case transport_ws:   v = symbol_ws;    break;
         case transport_wss:  v = symbol_wss;   break;
         case transport_unknown:  v = my_rb_str_downcase(at, length);  break;
+        default:  break;
       }
       break;
     case uri_param_ovid:
@@ -582,6 +585,8 @@ static void uri_known_param(VALUE parsed, enum uri_owner owner, enum uri_param_n
       p = id_uri_phone_context_param;
       v = my_rb_str_downcase(at, length);
       break;
+    default:
+      break;
   }
 
   rb_ivar_set(get_uri_object(parsed, owner), p, v);
@@ -597,6 +602,7 @@ static void uri_has_param(VALUE parsed, enum uri_owner owner, enum uri_param_nam
   switch(param_name) {
     case uri_param_lr:  p = id_uri_lr_param;  break;
     case uri_param_ob:  p = id_uri_ob_param;  break;
+    default:  break;
   }
 
   rb_ivar_set(get_uri_object(parsed, owner), p, Qtrue);
@@ -638,6 +644,7 @@ static void header_core_value(VALUE parsed, enum header_field header_field, cons
 
   switch(header_field) {
     case header_field_via:   rb_ivar_set(parsed, id_via_core_value, v);  break;
+    default:  break;
   }
 }
 
@@ -671,6 +678,8 @@ static void header_param(VALUE parsed, enum header_field header_field, const cha
         v = Qnil;
       rb_hash_aset(header_params, my_rb_str_downcase(key, key_len), v);
       break; */
+    default:
+      break;
   }
 }
 
@@ -707,6 +716,7 @@ static void option_tag(VALUE parsed, enum header_field header_field, const char
     case header_field_require:        id_option_tag_owner = id_require;        break;
     case header_field_proxy_require:  id_option_tag_owner = id_proxy_require;  break;
     case header_field_supported:      id_option_tag_owner = id_supported;      break;
+    default:  break;
   }
 
   if ((option_tag_owner = rb_ivar_get(parsed, id_option_tag_owner)) == Qnil) {

data/ext/utils/ip_utils.h

@@ -5,6 +5,8 @@
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <arpa/inet.h>  // inet_pton()
+
 
 enum enum_ip_type {
   ip_type_ipv4 = 1,

data/ext/utils/utils_ruby.h

@@ -10,6 +10,7 @@
 #include "ip_utils.h"
 #include "outbound_utils.h"
 #include "haproxy_protocol.h"
+#include <arpa/inet.h>  // inet_ntop()
 
 
 /* Export the Ruby C functions so other C libraries within OverSIP can use them. */
@@ -72,4 +73,4 @@ VALUE utils_normalize_ipv6(VALUE string, int force_pure_ipv6)
 }
 
 
-#endif
+#endif

data/ext/websocket_framing_utils/ws_framing_utils.h

@@ -28,7 +28,8 @@ static const uint8_t utf8d[] = {
   1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1  /* s7..s8 */
 };
 
-uint32_t inline utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte) {
+static inline
+uint32_t utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte) {
   uint32_t type = utf8d[byte];
 
   *codep = (*state != UTF8_ACCEPT) ? (byte & 0x3fu) | (*codep << 6) : (0xff >> type) & (byte);

data/ext/websocket_framing_utils/ws_framing_utils_ruby.c

@@ -101,7 +101,7 @@ VALUE Utf8Validator_validate(VALUE self, VALUE string)
   int i;
 
   REQUIRE_TYPE(string, T_STRING);
-  str = RSTRING_PTR(string);
+  str = (uint8_t *)RSTRING_PTR(string);
 
   DATA_GET(self, utf8_validator, validator);
 

data/lib/oversip/config.rb

@@ -329,7 +329,7 @@ module OverSIP
 
       if ( @use_sip_udp_or_tcp or @use_sip_tls ) and @configuration[:sip][:listen_ipv4] == nil and @configuration[:sip][:enable_ipv4]
         unless (@configuration[:sip][:listen_ipv4] = discover_local_ip(:ipv4))
-          log_system_warn "disabling IPv4 for SIP"
+          # log_system_notice "disabling IPv4 for SIP"
           @configuration[:sip][:listen_ipv4] = nil
           @configuration[:sip][:enable_ipv4] = false
         end
@@ -337,7 +337,7 @@ module OverSIP
 
       if ( @use_sip_udp_or_tcp or @use_sip_tls ) and @configuration[:sip][:listen_ipv6] == nil and @configuration[:sip][:enable_ipv6]
         unless (@configuration[:sip][:listen_ipv6] = discover_local_ip(:ipv6))
-          log_system_warn "disabling IPv6 for SIP"
+          # log_system_notice "disabling IPv6 for SIP"
           @configuration[:sip][:listen_ipv6] = nil
           @configuration[:sip][:enable_ipv6] = false
         end
@@ -345,7 +345,7 @@ module OverSIP
 
       if ( @use_sip_ws or @use_sip_wss ) and @configuration[:websocket][:listen_ipv4] == nil and @configuration[:websocket][:enable_ipv4]
         unless (@configuration[:websocket][:listen_ipv4] = discover_local_ip(:ipv4))
-          log_system_warn "disabling IPv4 for WebSocket"
+          # log_system_notice "disabling IPv4 for WebSocket"
           @configuration[:websocket][:listen_ipv4] = nil
           @configuration[:websocket][:enable_ipv4] = false
         end
@@ -353,7 +353,7 @@ module OverSIP
 
       if ( @use_sip_ws or @use_sip_wss ) and @configuration[:websocket][:listen_ipv6] == nil and @configuration[:websocket][:enable_ipv6]
         unless (@configuration[:websocket][:listen_ipv6] = discover_local_ip(:ipv6))
-          log_system_warn "disabling IPv6 for WebSocket"
+          # log_system_notice "disabling IPv6 for WebSocket"
           @configuration[:websocket][:listen_ipv6] = nil
           @configuration[:websocket][:enable_ipv6] = false
         end
@@ -554,7 +554,7 @@ module OverSIP
         begin
           socket.bind ip, 0
         rescue => e
-          log_system_warn "cannot bind in autodiscovered local #{type == :ipv4 ? "IPv4" : "IPv6"} '#{ip}': #{e.message} (#{e.class})"
+          # log_system_debug "cannot bind in autodiscovered local #{type == :ipv4 ? "IPv4" : "IPv6"} '#{ip}': #{e.message} (#{e.class})"
           return false
         ensure
           socket.close
@@ -562,7 +562,7 @@ module OverSIP
         # Valid IP, return it.
         return ip
       rescue => e
-        log_system_warn "cannot autodiscover local #{type == :ipv4 ? "IPv4" : "IPv6"}: #{e.message} (#{e.class})"
+        # log_system_debug "cannot autodiscover local #{type == :ipv4 ? "IPv4" : "IPv6"}: #{e.message} (#{e.class})"
         return false
       end
     end

data/lib/oversip/default_server.rb

@@ -5,19 +5,15 @@ module OverSIP
     extend ::OverSIP::Logger
 
     def self.on_initialize
-      log_system_notice "on_initialize() method is not defined"
     end
 
     def self.on_started
-      log_system_notice "on_started() method is not defined"
     end
 
     def self.on_user_reload
-      log_system_notice "on_user_reload() method is not defined"
     end
 
     def self.on_terminated error
-      log_system_notice "on_terminated() method is not defined"
     end
 
 
@@ -28,15 +24,12 @@ module OverSIP
     extend ::OverSIP::Logger
 
     def self.on_request request
-      log_system_notice "on_request() method is not defined"
     end
 
     def self.on_client_tls_handshake connection, pems
-      log_system_notice "on_client_tls_handshake() method is not defined"
     end
 
     def self.on_server_tls_handshake connection, pems
-      log_system_notice "on_server_tls_handshake() method is not defined"
     end
 
   end
@@ -46,15 +39,12 @@ module OverSIP
     extend ::OverSIP::Logger
 
     def self.on_connection connection, http_request
-      log_system_notice "on_connection() method is not defined"
     end
 
     def self.on_disconnection connection, client_closed
-      log_system_notice "on_disconnection() method is not defined"
     end
 
     def self.on_client_tls_handshake connection, pems
-      log_system_notice "on_client_tls_handshake() method is not defined"
     end
 
   end