broccoli 1.4.0 → 1.4.2

data/examples/broping.rb

@@ -41,7 +41,7 @@ class BropingApp < Logger::Application
         now = Bro::current_time_f
         printf "pong event from %s: seq=%i, time=%6f/%6f s\n", opt.host,
                                                                seq,
-                                                               dst_time-src_time,
+                                                               dst_time.to_f-src_time.to_f,
                                                                now-src_time;
         
       end

data/ext/broccoli/Makefile

@@ -3,7 +3,7 @@ SHELL = /bin/sh
 
 #### Start of system configuration section. ####
 
-srcdir = .
+srcdir = /Users/seth/Dev/rbroccoli/trunk/ext/broccoli
 topdir = /opt/local/lib/ruby/1.8/i686-darwin8.10.1
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
@@ -45,7 +45,7 @@ LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
 CFLAGS   =  -fno-common -O2  -fno-common -pipe -fno-common -I/usr/local/bro/include -I/usr/local/bro/include -DBROCCOLI 
-INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin8.10.1 -I.
+INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin8.10.1 -I/Users/seth/Dev/rbroccoli/trunk/ext/broccoli
 CPPFLAGS = -DHAVE_BROCCOLI_H -I/opt/local/include
 CXXFLAGS = $(CFLAGS) 
 DLDFLAGS = -L. -L/opt/local/lib -L/usr/local/bro/lib -lbroccoli  

data/ext/broccoli/broccoli.i

@@ -21,62 +21,62 @@ BroString to_brostring(VALUE obj){
 }
 
 static void
-wrap_BroCompactEventFunc(BroConn *bc, void *data, int num_args, BroEvArg *args)
+wrap_BroCompactEventFunc(BroConn *bc, void *user_data, BroEvMeta *meta)
 {
   int i;
   int callback_arity = 0;
-  VALUE proc = (VALUE)data;
+  VALUE proc = (VALUE)user_data;
   VALUE out[15] = {Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,
                    Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil};
     
   callback_arity = NUM2INT(rb_funcall(proc, rb_intern("arity"), 0));
-  if ( callback_arity != num_args ) 
+  if ( callback_arity != meta->ev_numargs ) 
   {
     printf("ERROR: callback has %d arguments when it should have %d arguments.\n", 
            callback_arity,
-           num_args);
+           meta->ev_numargs);
   }
-  for(i=0 ; i < num_args ; i++) 
+  for(i=0 ; i < meta->ev_numargs ; i++) 
   {
     //printf("Loop #%i\n", i);
-    switch (args[i].arg_type)
+    switch (meta->ev_args[i].arg_type)
     {
       case BRO_TYPE_RECORD:
         //printf("Found a BroRecord in the callback wrapper\n");
-        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(args[i].arg_data), SWIGTYPE_p_bro_record, 0 |  0 );
+        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(meta->ev_args[i].arg_data), SWIGTYPE_p_bro_record, 0 |  0 );
         break;
       case BRO_TYPE_PORT:
-        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(args[i].arg_data), SWIGTYPE_p_bro_port, 0 |  0 );
+        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(meta->ev_args[i].arg_data), SWIGTYPE_p_bro_port, 0 |  0 );
         break;
       case BRO_TYPE_INT:
       case BRO_TYPE_ENUM:
         //printf("Found an integer in the callback wrapper\n");
-        out[i] = INT2NUM( *((int *) args[i].arg_data) );
+        out[i] = INT2NUM( *((int *) meta->ev_args[i].arg_data) );
         break;
       case BRO_TYPE_BOOL:
         //printf("Found a boolean in the callback wrapper\n");
-        out[i] = *((int *) args[i].arg_data) ? Qtrue : Qfalse;
+        out[i] = *((int *) meta->ev_args[i].arg_data) ? Qtrue : Qfalse;
         break;
       case BRO_TYPE_STRING:
         //printf("Found a BroString in the callback wrapper\n");
-        out[i] = rb_str_new( (char*) bro_string_get_data( (BroString*) args[i].arg_data ), 
-                                     bro_string_get_length( (BroString*) args[i].arg_data ) );    
+        out[i] = rb_str_new( (char*) bro_string_get_data( (BroString*) meta->ev_args[i].arg_data ), 
+                                     bro_string_get_length( (BroString*) meta->ev_args[i].arg_data ) );    
         break;
       case BRO_TYPE_TIME:
       case BRO_TYPE_DOUBLE:
       case BRO_TYPE_INTERVAL:
         //printf("Found a double in the callback wrapper\n");
-        out[i] = rb_float_new( *((double *) args[i].arg_data) );
+        out[i] = rb_float_new( *((double *) meta->ev_args[i].arg_data) );
         break;
       case BRO_TYPE_COUNT:
       case BRO_TYPE_NET:
         //printf("Found a 32bit unsigned integer in the callback wrapper\n");
-        out[i] = UINT2NUM( *((uint32 *) args[i].arg_data) );
+        out[i] = UINT2NUM( *((uint32 *) meta->ev_args[i].arg_data) );
         break;
       case BRO_TYPE_IPADDR:
         //printf("Found an ip address... making it a string\n");
         //output ip addresses as strings that can be unpacked from ruby.
-        out[i] = rb_str_new2((char *) args[i].arg_data);
+        out[i] = rb_str_new2((char *) meta->ev_args[i].arg_data);
         break;
 	  case BRO_TYPE_COUNTER:
 	  case BRO_TYPE_TIMER:
@@ -103,7 +103,7 @@ wrap_BroCompactEventFunc(BroConn *bc, void *data, int num_args, BroEvArg *args)
   rb_funcall2(proc, rb_intern("call"), callback_arity, out);
   
   bc = NULL;
-  data = NULL;
+  user_data = NULL;
 }
 
 %}

data/ext/broccoli/broccoli_wrap.c

@@ -1608,62 +1608,62 @@ BroString to_brostring(VALUE obj){
 }
 
 static void
-wrap_BroCompactEventFunc(BroConn *bc, void *data, int num_args, BroEvArg *args)
+wrap_BroCompactEventFunc(BroConn *bc, void *user_data, BroEvMeta *meta)
 {
   int i;
   int callback_arity = 0;
-  VALUE proc = (VALUE)data;
+  VALUE proc = (VALUE)user_data;
   VALUE out[15] = {Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,
                    Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil};
     
   callback_arity = NUM2INT(rb_funcall(proc, rb_intern("arity"), 0));
-  if ( callback_arity != num_args ) 
+  if ( callback_arity != meta->ev_numargs ) 
   {
     printf("ERROR: callback has %d arguments when it should have %d arguments.\n", 
            callback_arity,
-           num_args);
+           meta->ev_numargs);
   }
-  for(i=0 ; i < num_args ; i++) 
+  for(i=0 ; i < meta->ev_numargs ; i++) 
   {
     //printf("Loop #%i\n", i);
-    switch (args[i].arg_type)
+    switch (meta->ev_args[i].arg_type)
     {
       case BRO_TYPE_RECORD:
         //printf("Found a BroRecord in the callback wrapper\n");
-        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(args[i].arg_data), SWIGTYPE_p_bro_record, 0 |  0 );
+        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(meta->ev_args[i].arg_data), SWIGTYPE_p_bro_record, 0 |  0 );
         break;
       case BRO_TYPE_PORT:
-        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(args[i].arg_data), SWIGTYPE_p_bro_port, 0 |  0 );
+        out[i] = SWIG_NewPointerObj(SWIG_as_voidptr(meta->ev_args[i].arg_data), SWIGTYPE_p_bro_port, 0 |  0 );
         break;
       case BRO_TYPE_INT:
       case BRO_TYPE_ENUM:
         //printf("Found an integer in the callback wrapper\n");
-        out[i] = INT2NUM( *((int *) args[i].arg_data) );
+        out[i] = INT2NUM( *((int *) meta->ev_args[i].arg_data) );
         break;
       case BRO_TYPE_BOOL:
         //printf("Found a boolean in the callback wrapper\n");
-        out[i] = *((int *) args[i].arg_data) ? Qtrue : Qfalse;
+        out[i] = *((int *) meta->ev_args[i].arg_data) ? Qtrue : Qfalse;
         break;
       case BRO_TYPE_STRING:
         //printf("Found a BroString in the callback wrapper\n");
-        out[i] = rb_str_new( (char*) bro_string_get_data( (BroString*) args[i].arg_data ), 
-                                     bro_string_get_length( (BroString*) args[i].arg_data ) );    
+        out[i] = rb_str_new( (char*) bro_string_get_data( (BroString*) meta->ev_args[i].arg_data ), 
+                                     bro_string_get_length( (BroString*) meta->ev_args[i].arg_data ) );    
         break;
       case BRO_TYPE_TIME:
       case BRO_TYPE_DOUBLE:
       case BRO_TYPE_INTERVAL:
         //printf("Found a double in the callback wrapper\n");
-        out[i] = rb_float_new( *((double *) args[i].arg_data) );
+        out[i] = rb_float_new( *((double *) meta->ev_args[i].arg_data) );
         break;
       case BRO_TYPE_COUNT:
       case BRO_TYPE_NET:
         //printf("Found a 32bit unsigned integer in the callback wrapper\n");
-        out[i] = UINT2NUM( *((uint32 *) args[i].arg_data) );
+        out[i] = UINT2NUM( *((uint32 *) meta->ev_args[i].arg_data) );
         break;
       case BRO_TYPE_IPADDR:
         //printf("Found an ip address... making it a string\n");
         //output ip addresses as strings that can be unpacked from ruby.
-        out[i] = rb_str_new2((char *) args[i].arg_data);
+        out[i] = rb_str_new2((char *) meta->ev_args[i].arg_data);
         break;
 	  case BRO_TYPE_COUNTER:
 	  case BRO_TYPE_TIMER:
@@ -1690,7 +1690,7 @@ wrap_BroCompactEventFunc(BroConn *bc, void *data, int num_args, BroEvArg *args)
   rb_funcall2(proc, rb_intern("call"), callback_arity, out);
   
   bc = NULL;
-  data = NULL;
+  user_data = NULL;
 }
 
 
@@ -5285,6 +5285,38 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_bro_record_get_nth_name(int argc, VALUE *argv, VALUE self) {
+  BroRecord *arg1 = (BroRecord *) 0 ;
+  int arg2 ;
+  char *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_bro_record, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bro_record_get_nth_name" "', argument " "1"" of type '" "BroRecord *""'"); 
+  }
+  arg1 = (BroRecord *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "bro_record_get_nth_name" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = (int)(val2);
+  result = (char *)bro_record_get_nth_name(arg1,arg2);
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_bro_record_get_named_val(int argc, VALUE *argv, VALUE self) {
   BroRecord *arg1 = (BroRecord *) 0 ;
@@ -6665,6 +6697,7 @@ SWIGEXPORT void Init_broccoli(void) {
   rb_define_const(mBroccoli, "BRO_CFLAG_SHAREABLE", SWIG_From_int((int)((1 << 2))));
   rb_define_const(mBroccoli, "BRO_CFLAG_DONTCACHE", SWIG_From_int((int)((1 << 3))));
   rb_define_const(mBroccoli, "BRO_CFLAG_YIELD", SWIG_From_int((int)((1 << 4))));
+  rb_define_const(mBroccoli, "BRO_CFLAG_CACHE", SWIG_From_int((int)((1 << 5))));
   
   cBroString.klass = rb_define_class_under(mBroccoli, "BroString", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_bro_string, (void *) &cBroString);
@@ -6810,6 +6843,7 @@ SWIGEXPORT void Init_broccoli(void) {
   rb_define_module_function(mBroccoli, "bro_record_get_length", _wrap_bro_record_get_length, -1);
   rb_define_module_function(mBroccoli, "bro_record_add_val", _wrap_bro_record_add_val, -1);
   rb_define_module_function(mBroccoli, "bro_record_get_nth_val", _wrap_bro_record_get_nth_val, -1);
+  rb_define_module_function(mBroccoli, "bro_record_get_nth_name", _wrap_bro_record_get_nth_name, -1);
   rb_define_module_function(mBroccoli, "bro_record_get_named_val", _wrap_bro_record_get_named_val, -1);
   rb_define_module_function(mBroccoli, "bro_record_set_nth_val", _wrap_bro_record_set_nth_val, -1);
   rb_define_module_function(mBroccoli, "bro_record_set_named_val", _wrap_bro_record_set_named_val, -1);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: broccoli
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors: 
 - Seth Hall
@@ -9,7 +9,7 @@ autorequire: bro
 bindir: bin
 cert_chain: []
 
-date: 2008-08-30 00:00:00 -04:00
+date: 2009-06-20 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,8 +29,10 @@ files:
 - README
 - ext/broccoli
 - ext/broccoli/autogen.sh
+- ext/broccoli/broccoli.bundle
 - ext/broccoli/broccoli.i
 - ext/broccoli/broccoli_wrap.c
+- ext/broccoli/broccoli_wrap.o
 - ext/broccoli/extconf.rb
 - ext/broccoli/Makefile
 - ext/broccoli/post-clean.rb
@@ -71,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rbroccoli
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Interface for the Bro Intrusion Detection System.