oversip 1.3.8 → 1.4.0

data/ext/sip_parser/sip_parser.h

@@ -156,7 +156,7 @@ typedef struct sip_message_parser {
   char *              error_start;
   size_t              error_len;
   int                 error_pos;
-  
+
   size_t              mark;
   size_t              hdr_field_start;
   size_t              hdr_field_len;
@@ -203,7 +203,7 @@ typedef struct sip_message_parser {
   enum uri_scheme     uri_scheme;
   /* URI display name is quoted. */
   size_t              uri_display_name_quoted;
-  
+
   header_cb           header;
   struct_message      message;
   struct_uri          uri;
@@ -216,6 +216,27 @@ typedef struct sip_message_parser {
   VALUE               ruby_sip_parser;
 } sip_message_parser;
 
+typedef struct sip_uri_parser {
+  /* Parser stuf. */
+  size_t              mark;
+  size_t              uri_start;
+  /* URI parameters. */
+  size_t              uri_param_key_start;
+  size_t              uri_param_key_len;
+  size_t              uri_param_value_start;
+  size_t              uri_param_value_len;
+  /* URI scheme type. */
+  enum uri_scheme     uri_scheme;
+  /* URI display name is quoted. */
+  size_t              uri_display_name_quoted;
+
+  struct_uri          uri;
+
+  /* Will be set to OverSIP::SIP::Uri. */
+  VALUE               parsed;
+} sip_uri_parser;
+
+
 
 int sip_message_parser_init(sip_message_parser *parser);
 int sip_message_parser_finish(sip_message_parser *parser);
@@ -223,6 +244,7 @@ size_t sip_message_parser_execute(sip_message_parser *parser, const char *buffer
 int sip_message_parser_has_error(sip_message_parser *parser);
 int sip_message_parser_is_finished(sip_message_parser *parser);
 #define sip_message_parser_nread(parser) (parser)->nread
+int sip_uri_parser_execute(sip_uri_parser *parser, const char *buffer, size_t len, VALUE parsed, int allow_name_addr);
 
 
 #endif

data/ext/sip_parser/sip_parser_ruby.c

@@ -116,7 +116,8 @@ static VALUE string_Call_ID;
 static VALUE string_Max_Forwards;
 static VALUE string_Content_Length;
 
-
+/* A single and global SIP URI parser. */
+static sip_uri_parser *global_sip_uri_parser;
 
 
 static void data_type(void *parser, enum data_type data_type)
@@ -124,7 +125,7 @@ static void data_type(void *parser, enum data_type data_type)
   TRACE();
   VALUE parsed;
   sip_message_parser *sp = (sip_message_parser*)parser;
-  
+
   switch(data_type) {
     case sip_request:
       parsed = rb_obj_alloc(cSIPRequest);
@@ -171,7 +172,7 @@ static void header(VALUE parsed, const char *hdr_field, size_t hdr_field_len, co
 
   /* Header name. */
   f = headerize(hdr_field, hdr_field_len);
-  
+
   /* Header value. */
   v = RB_STR_UTF8_NEW(hdr_value, hdr_value_len);
 
@@ -209,7 +210,7 @@ static void msg_method(VALUE parsed, const char *at, size_t length, enum method
 {
   TRACE();
   VALUE v;
-  
+
   switch(method) {
     /* If the method is known store it as a symbol (i.e. :INVITE). */
     case method_INVITE:
@@ -308,7 +309,7 @@ static void msg_via_sent_by_host(VALUE parsed, const char *at, size_t length)
 {
   TRACE();
   VALUE v;
-  
+
   v = RB_STR_UTF8_NEW(at, length);
   rb_ivar_set(parsed, id_via_sent_by_host, v);
 }
@@ -318,7 +319,7 @@ static void msg_via_sent_by_port(VALUE parsed, const char *at, size_t length)
 {
   TRACE();
   VALUE v;
-  
+
   v = INT2FIX(str_to_int(at, length));
   rb_ivar_set(parsed, id_via_sent_by_port, v);
 }
@@ -337,7 +338,7 @@ static void msg_via_branch(VALUE parsed, const char *at, size_t length)
 static void msg_via_branch_rfc3261(VALUE parsed, const char *at, size_t length)
 {
   TRACE();
-   
+
   rb_ivar_set(parsed, id_via_branch_rfc3261, Qtrue);
 }
 
@@ -392,7 +393,7 @@ static void msg_max_forwards(VALUE parsed, const char *at, size_t length)
 {
   TRACE();
   VALUE v;
-  
+
   v = INT2FIX(str_to_int(at, length));
   rb_ivar_set(parsed, id_max_forwards, v);
 }
@@ -443,6 +444,9 @@ static VALUE get_uri_object(VALUE parsed, enum uri_owner owner)
       return RARRAY_PTR(routes_array)[RARRAY_LEN(routes_array)-1];
       break;
     case uri_owner_contact:  return rb_ivar_get(parsed, id_contact);  break;
+    /* Otherwise return the parsed object itself (useful for OverSIP::SIP::MessageParser.parse_uri method). */
+    default:
+      return parsed;
   }
   return Qnil;
 }
@@ -579,7 +583,7 @@ static void uri_known_param(VALUE parsed, enum uri_owner owner, enum uri_param_n
       v = my_rb_str_downcase(at, length);
       break;
   }
-  
+
   rb_ivar_set(get_uri_object(parsed, owner), p, v);
 }
 
@@ -594,7 +598,7 @@ static void uri_has_param(VALUE parsed, enum uri_owner owner, enum uri_param_nam
     case uri_param_lr:  p = id_uri_lr_param;  break;
     case uri_param_ob:  p = id_uri_ob_param;  break;
   }
-  
+
   rb_ivar_set(get_uri_object(parsed, owner), p, Qtrue);
 }
 
@@ -616,7 +620,7 @@ static void uri_display_name(VALUE parsed, enum uri_owner owner, const char *at,
 
   if (length == 0)
     return;
-  
+
   v = RB_STR_UTF8_NEW(at, length);
   rb_ivar_set(get_uri_object(parsed, owner), id_display_name, v);
 }
@@ -698,7 +702,7 @@ static void option_tag(VALUE parsed, enum header_field header_field, const char
   VALUE v;
   VALUE id_option_tag_owner;
   VALUE option_tag_owner;
-  
+
   switch(header_field) {
     case header_field_require:        id_option_tag_owner = id_require;        break;
     case header_field_proxy_require:  id_option_tag_owner = id_proxy_require;  break;
@@ -800,7 +804,7 @@ VALUE SipMessageParser_alloc(VALUE klass)
   parser->message.header_param        = header_param;
   parser->message.option_tag          = option_tag;
   parser->message.init_component      = init_component;
-  
+
   parser->uri.full                    = uri_full;
   parser->uri.scheme                  = uri_scheme;
   parser->uri.user                    = uri_user;
@@ -811,7 +815,7 @@ VALUE SipMessageParser_alloc(VALUE klass)
   parser->uri.has_param               = uri_has_param;
   parser->uri.headers                 = uri_headers;
   parser->uri.display_name            = uri_display_name;
-  
+
   sip_message_parser_init(parser);
 
   obj = Data_Wrap_Struct(klass, NULL, SipMessageParser_free, parser);
@@ -887,7 +891,7 @@ VALUE SipMessageParser_execute(VALUE self, VALUE buffer, VALUE start)
   int from = 0;
   char *dptr = NULL;
   long dlen = 0;
-  
+
   REQUIRE_TYPE(buffer, T_STRING);
   REQUIRE_TYPE(start, T_FIXNUM);
 
@@ -903,7 +907,7 @@ VALUE SipMessageParser_execute(VALUE self, VALUE buffer, VALUE start)
 
   sip_message_parser_execute(parser, dptr, dlen, from);
 
-  if(sip_message_parser_has_error(parser))
+  if (sip_message_parser_has_error(parser))
     return Qfalse;
   else
     return INT2FIX(sip_message_parser_nread(parser));
@@ -1072,7 +1076,7 @@ VALUE SipMessageParser_has_duplicated_core_header(VALUE self)
 
   /* NOTE: Good moment for counting the num of Via values and store it. */
   rb_ivar_set(parser->parsed, id_num_vias, INT2FIX(parser->num_via));
-  
+
   if (parser->num_from > 1)
     return string_From;
   else if (parser->num_to > 1)
@@ -1113,7 +1117,7 @@ VALUE SipMessageParser_has_missing_core_header(VALUE self)
     return string_CSeq;
   else if (parser->num_call_id == 0)
     return string_Call_ID;
-  
+
   return Qfalse;
 }
 
@@ -1125,11 +1129,8 @@ VALUE SipMessageParser_post_parsing(VALUE self)
   DATA_GET(self, sip_message_parser, parser);
 
   /* We just parse Contact if it's a single header with a single Name Addr within it. */
-  if (! (parser->contact_is_valid == 1 && parser->num_contact == 1)) {
-    /*printf("--- if (! (parser->contact_is_valid == 1 && parser->num_contact == 1))  returns false\n");
-    printf("--- parser->num_contact = %d\n", parser->num_contact);*/
+  if (! (parser->contact_is_valid == 1 && parser->num_contact == 1))
     rb_ivar_set(parser->parsed, id_contact, Qnil);
-  }
 
   return Qnil;
 }
@@ -1149,7 +1150,7 @@ VALUE SipMessageParser_Class_headerize(VALUE self, VALUE string)
   TRACE();
   if (TYPE(string) != T_STRING)
     rb_raise(rb_eTypeError, "Argument must be a String");
-  
+
   if ((RSTRING_LEN(string)) == 0)
     rb_str_new(RSTRING_PTR(string), RSTRING_LEN(string));
 
@@ -1157,15 +1158,67 @@ VALUE SipMessageParser_Class_headerize(VALUE self, VALUE string)
 }
 
 
+/**
+ * call-seq:
+ *    OverSIP::SIP::MessageParser.parse_uri(string) -> OverSIP::SIP::Uri
+ */
+VALUE SipMessageParser_Class_parse_uri(VALUE self, VALUE string, VALUE allow_name_addr)
+{
+  TRACE();
+  char *dptr = NULL;
+  long dlen = 0;
+  sip_uri_parser *parser;
+  VALUE parsed;
+  int int_allow_name_addr;
+
+  /* Initialize the global SIP URI parser if not set yet. */
+  if (global_sip_uri_parser == NULL) {
+    /* Asign functions to the pointers of global_sip_uri_parser struct. */
+    global_sip_uri_parser = ALLOC(sip_uri_parser);
+    global_sip_uri_parser->uri.full                    = uri_full;
+    global_sip_uri_parser->uri.scheme                  = uri_scheme;
+    global_sip_uri_parser->uri.user                    = uri_user;
+    global_sip_uri_parser->uri.host                    = uri_host;
+    global_sip_uri_parser->uri.port                    = uri_port;
+    global_sip_uri_parser->uri.param                   = uri_param;
+    global_sip_uri_parser->uri.known_param             = uri_known_param;
+    global_sip_uri_parser->uri.has_param               = uri_has_param;
+    global_sip_uri_parser->uri.headers                 = uri_headers;
+    global_sip_uri_parser->uri.display_name            = uri_display_name;
+  }
+
+  REQUIRE_TYPE(string, T_STRING);
+
+  /* NOTE: We need to pass a \0 terminated string to the URI parser. StringValueCStr() gives
+   * exactly that. So also increment dlen in 1. */
+  dptr = StringValueCStr(string);
+  dlen = RSTRING_LEN(string) + 1;
+
+  if (TYPE(allow_name_addr) == T_TRUE) {
+    parsed = rb_obj_alloc(cNameAddr);
+    int_allow_name_addr = 1;
+  }
+  else {
+    parsed = rb_obj_alloc(cUri);
+    int_allow_name_addr = 0;
+  }
+
+  if (sip_uri_parser_execute(global_sip_uri_parser, dptr, dlen, parsed, int_allow_name_addr) == 0)
+    return parsed;
+  else
+    return Qfalse;
+}
+
+
 
 
 void Init_sip_parser()
 {
   TRACE();
-  
+
   mOverSIP = rb_define_module("OverSIP");
   eOverSIPError = rb_define_class_under(mOverSIP, "Error", rb_eStandardError);
-  
+
   mSIP = rb_define_module_under(mOverSIP, "SIP");
   cSIPMessageParser = rb_define_class_under(mSIP, "MessageParser", rb_cObject);
   cSIPMessage = rb_define_class_under(mSIP, "Message", rb_cObject);
@@ -1190,6 +1243,7 @@ void Init_sip_parser()
   rb_define_method(cSIPMessageParser, "post_parsing", SipMessageParser_post_parsing,0);
 
   rb_define_module_function(cSIPMessageParser, "headerize", SipMessageParser_Class_headerize,1);
+  rb_define_module_function(cSIPMessageParser, "parse_uri", SipMessageParser_Class_parse_uri,2);
 
   init_common_headers();
   init_short_headers();
@@ -1231,7 +1285,7 @@ void Init_sip_parser()
   id_hdr_from = rb_intern("@hdr_from");
   id_hdr_to = rb_intern("@hdr_to");
   id_hdr_route = rb_intern("@hdr_route");
-  
+
   id_display_name = rb_intern("@display_name");
   id_uri = rb_intern("@uri");
   id_uri_scheme = rb_intern("@scheme");
@@ -1278,7 +1332,7 @@ void Init_sip_parser()
   symbol_ipv4 = ID2SYM(rb_intern("ipv4"));
   symbol_ipv6 = ID2SYM(rb_intern("ipv6"));
   symbol_ipv6_reference = ID2SYM(rb_intern("ipv6_reference"));
-  
+
   string_Via = rb_str_new2("Via");
   string_Via = rb_obj_freeze(string_Via);
   rb_global_variable(&string_Via);
@@ -1300,4 +1354,7 @@ void Init_sip_parser()
   string_Content_Length = rb_str_new2("Content-Length");
   string_Content_Length = rb_obj_freeze(string_Content_Length);
   rb_global_variable(&string_Content_Length);
+
+  /* Initialize global_sip_uri_parser struct to NULL. */
+  global_sip_uri_parser = NULL;
 }