trema 0.3.21 → 0.4.0

data/features/switch_event/delete_forward_entry.feature

@@ -1,3 +1,4 @@
+@wip
 Feature: Ruby methods for deleting switch event forwarding entry
   
   There are three Ruby methods provided for deleting switch event forwarding entries.

data/features/switch_event/dump_forward_entries.feature

@@ -1,3 +1,4 @@
+@wip
 Feature: Ruby methods for dumping switch event forwarding entry
   
   There are two Ruby methods provided for dumping switch event forwarding entry.

data/features/switch_event/set_forward_entries.feature

@@ -1,3 +1,4 @@
+@wip
 Feature: Ruby methods for setting switch event forwarding entry
   
   There are two Ruby methods provided for setting switch event forwarding entry.

data/ruby/trema/compat.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2008-2013 NEC Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+
+#ifndef COMPAT_H
+#define COMPAT_H
+
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN( ary ) RARRAY( ary )->len
+#endif
+
+
+#endif // COMPAT_H
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 2
+ * indent-tabs-mode: nil
+ * End:
+ */

data/ruby/trema/controller.c

@@ -44,7 +44,7 @@ VALUE cController;
 
 static void
 handle_timer_event( void *self ) {
-  if ( rb_respond_to( ( VALUE ) self, rb_intern( "handle_timer_event" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) self, rb_intern( "handle_timer_event" ) ) ) {
     rb_funcall( ( VALUE ) self, rb_intern( "handle_timer_event" ), 0 );
   }
 }
@@ -195,8 +195,9 @@ controller_send_flow_mod( uint16_t command, int argc, VALUE *argv, VALUE self )
   struct ofp_match default_match;
   memset( &default_match, 0, sizeof( struct ofp_match ) );
   default_match.wildcards = OFPFW_ALL;
+  uint32_t transaction_id;
   struct ofp_match *match = &default_match;
-  uint64_t cookie = get_cookie();
+  uint64_t cookie;
   uint16_t idle_timeout = 0;
   uint16_t hard_timeout = 0;
   uint16_t priority = UINT16_MAX;
@@ -207,6 +208,14 @@ controller_send_flow_mod( uint16_t command, int argc, VALUE *argv, VALUE self )
 
   // Options
   if ( options != Qnil ) {
+    VALUE opt_transaction_id = rb_hash_aref( options, ID2SYM( rb_intern( "transaction_id" ) ) );
+    if ( opt_transaction_id != Qnil ) {
+      transaction_id = ( uint32_t ) NUM2ULONG( opt_transaction_id );
+    }
+    else {
+      transaction_id = get_transaction_id();
+    }
+
     VALUE opt_match = rb_hash_aref( options, ID2SYM( rb_intern( "match" ) ) );
     if ( opt_match != Qnil ) {
       Data_Get_Struct( opt_match, struct ofp_match, match );
@@ -216,6 +225,9 @@ controller_send_flow_mod( uint16_t command, int argc, VALUE *argv, VALUE self )
     if ( opt_cookie != Qnil ) {
       cookie = NUM2ULL( opt_cookie );
     }
+    else {
+      cookie = get_cookie();
+    }
 
     VALUE opt_idle_timeout = rb_hash_aref( options, ID2SYM( rb_intern( "idle_timeout" ) ) );
     if ( opt_idle_timeout != Qnil ) {
@@ -264,7 +276,7 @@ controller_send_flow_mod( uint16_t command, int argc, VALUE *argv, VALUE self )
   }
 
   buffer *flow_mod = create_flow_mod(
-    get_transaction_id(),
+    transaction_id,
     *match,
     cookie,
     command,
@@ -302,6 +314,10 @@ controller_send_flow_mod( uint16_t command, int argc, VALUE *argv, VALUE self )
  *     the options to create a message with.
  *
  *
+ *   @option options [Number, nil] :transaction_id (nil)
+ *     Transaction ids, message sequence numbers matching requests to replies.
+ *     nil means automatically generate transaction ID.
+ *
  *   @option options [Match, nil] :match (nil)
  *     A {Match} object describing the fields of the flow.
  *
@@ -536,16 +552,16 @@ controller_send_packet_out( int argc, VALUE *argv, VALUE self ) {
  */
 static VALUE
 controller_run( VALUE self ) {
-  setenv( "TREMA_HOME", STR2CSTR( rb_funcall( mTrema, rb_intern( "home" ), 0 ) ), 1 );
+  setenv( "TREMA_HOME", RSTRING_PTR( rb_funcall( mTrema, rb_intern( "home" ), 0 ) ), 1 );
 
   VALUE name = rb_funcall( self, rb_intern( "name" ), 0 );
   rb_gv_set( "$PROGRAM_NAME", name );
 
   int argc = 3;
   char **argv = xmalloc( sizeof( char * ) * ( uint32_t ) ( argc + 1 ) );
-  argv[ 0 ] = STR2CSTR( name );
+  argv[ 0 ] = RSTRING_PTR( name );
   argv[ 1 ] = ( char * ) ( uintptr_t ) "--name";
-  argv[ 2 ] = STR2CSTR( name );
+  argv[ 2 ] = RSTRING_PTR( name );
   argv[ 3 ] = NULL;
   init_trema( &argc, &argv );
   xfree( argv );
@@ -571,7 +587,7 @@ controller_run( VALUE self ) {
   interval.it_value.tv_nsec = 0;
   add_timer_event_callback( &interval, handle_timer_event, ( void * ) self );
 
-  if ( rb_respond_to( self, rb_intern( "start" ) ) == Qtrue ) {
+  if ( rb_respond_to( self, rb_intern( "start" ) ) ) {
     rb_funcall( self, rb_intern( "start" ), 0 );
   }
 

data/ruby/trema/default-logger.c

@@ -28,7 +28,7 @@ VALUE mDefaultLogger;
 static VALUE
 do_log( void ( *log_function )( const char *format, ... ), int argc, VALUE *argv ) {
   VALUE message = rb_f_sprintf( argc, argv );
-  log_function( STR2CSTR( message ) );
+  log_function( RSTRING_PTR( message ) );
   return message;
 }
 

data/ruby/trema/features-reply.c

@@ -245,7 +245,7 @@ Init_features_reply() {
 
 void
 handle_switch_ready( uint64_t datapath_id, void *controller ) {
-  if ( rb_respond_to( ( VALUE ) controller, rb_intern( "switch_ready" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) controller, rb_intern( "switch_ready" ) ) ) {
     rb_funcall( ( VALUE ) controller, rb_intern( "switch_ready" ), 1, ULL2NUM( datapath_id ) );
   }
 }

data/ruby/trema/switch-event.c

@@ -18,6 +18,7 @@
 #include <assert.h>
 #include "ruby.h"
 #include "switch-event.h"
+#include "compat.h"
 
 #include "trema.h"
 
@@ -100,7 +101,7 @@ add_forward_entry_to_all_switches( VALUE self, VALUE type, VALUE service_name )
     return Qfalse;
   }
 
-  const char *c_service_name = StringValuePtr( service_name );
+  const char *c_service_name = RSTRING_PTR( service_name );
   if ( strlen( c_service_name ) == 0 ) {
     warn( "service_name cannot be empty" );
     return Qfalse;
@@ -149,7 +150,7 @@ delete_forward_entry_from_all_switches( VALUE self, VALUE type,
     return Qfalse;
   }
 
-  const char *c_service_name = StringValuePtr( service_name );
+  const char *c_service_name = RSTRING_PTR( service_name );
   if ( strlen( c_service_name ) == 0 ) {
     warn( "service_name cannot be empty" );
     return Qfalse;
@@ -225,7 +226,7 @@ add_forward_entry_to_switch( VALUE self, VALUE dpid, VALUE type,
   }
 
   const uint64_t c_dpid = NUM2ULL( dpid );
-  const char *c_service_name = StringValuePtr( service_name );
+  const char *c_service_name = RSTRING_PTR( service_name );
   if ( strlen( c_service_name ) == 0 ) {
     warn( "service_name cannot be empty" );
     return Qfalse;
@@ -277,7 +278,7 @@ delete_forward_entry_from_switch( VALUE self, VALUE dpid, VALUE type,
   }
 
   const uint64_t c_dpid = NUM2ULL( dpid );
-  const char *c_service_name = StringValuePtr( service_name );
+  const char *c_service_name = RSTRING_PTR( service_name );
   if ( strlen( c_service_name ) == 0 ) {
     warn( "service_name cannot be empty" );
     return Qfalse;
@@ -331,9 +332,9 @@ set_forward_entries_to_switch( VALUE self, VALUE dpid, VALUE type,
   const uint64_t c_dpid = NUM2ULL( dpid );
   list_element *service_list = NULL;
   create_list( &service_list );
-  for ( long i = 0 ; i < RARRAY( service_names )->len ; ++i ) {
+  for ( long i = 0 ; i < RARRAY_LEN( service_names ) ; ++i ) {
     VALUE ruby_service_name = rb_ary_entry( service_names, i );
-    char *c_service_name = StringValuePtr( ruby_service_name );
+    char *c_service_name = RSTRING_PTR( ruby_service_name );
     if ( strlen( c_service_name ) == 0 ) {
       warn( "Ignoring empty service_name" );
       continue;
@@ -433,7 +434,7 @@ add_forward_entry_to_switch_manager( VALUE self, VALUE type,
     return Qfalse;
   }
 
-  const char *c_service_name = StringValuePtr( service_name );
+  const char *c_service_name = RSTRING_PTR( service_name );
   if ( strlen( c_service_name ) == 0 ) {
     warn( "service_name cannot be empty" );
     return Qfalse;
@@ -483,7 +484,7 @@ delete_forward_entry_from_switch_manager( VALUE self, VALUE type,
     return Qfalse;
   }
 
-  const char *c_service_name = StringValuePtr( service_name );
+  const char *c_service_name = RSTRING_PTR( service_name );
   if ( strlen( c_service_name ) == 0 ) {
     warn( "service_name cannot be empty" );
     return Qfalse;
@@ -535,9 +536,9 @@ set_forward_entries_to_switch_manager( VALUE self, VALUE type,
 
   list_element *service_list = NULL;
   create_list( &service_list );
-  for ( long i = 0 ; i < RARRAY( service_names )->len ; ++i ) {
+  for ( long i = 0 ; i < RARRAY_LEN( service_names ) ; ++i ) {
     VALUE ruby_service_name = rb_ary_entry( service_names, i );
-    char *c_service_name = StringValuePtr( ruby_service_name );
+    char *c_service_name = RSTRING_PTR( ruby_service_name );
     if ( strlen( c_service_name ) == 0 ) {
       warn( "Ignoring empty service_name" );
       continue;

data/ruby/trema/switch.c

@@ -40,7 +40,7 @@ switch_send_message( VALUE self, VALUE message ) {
 
 static void
 handle_controller_connected( void *rbswitch ) {
-  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "controller_connected" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "controller_connected" ) ) ) {
     rb_funcall( ( VALUE ) rbswitch, rb_intern( "controller_connected" ), 0 );
   }
 }
@@ -48,7 +48,7 @@ handle_controller_connected( void *rbswitch ) {
 
 static void
 handle_hello( uint32_t transaction_id, uint8_t version, void *rbswitch ) {
-  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "hello" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "hello" ) ) ) {
     rb_funcall( ( VALUE ) rbswitch, rb_intern( "hello" ), 2, UINT2NUM( transaction_id ), UINT2NUM( version ) );
   }
 }
@@ -56,7 +56,7 @@ handle_hello( uint32_t transaction_id, uint8_t version, void *rbswitch ) {
 
 static void
 handle_features_request( uint32_t transaction_id, void *rbswitch ) {
-  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "features_request" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "features_request" ) ) ) {
     rb_funcall( ( VALUE ) rbswitch, rb_intern( "features_request" ), 1, UINT2NUM( transaction_id ) );
   }
 }
@@ -64,7 +64,7 @@ handle_features_request( uint32_t transaction_id, void *rbswitch ) {
 
 static void
 handle_set_config( uint32_t transaction_id, uint16_t flags, uint16_t miss_send_len, void *rbswitch ) {
-  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "set_config" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "set_config" ) ) ) {
     rb_funcall( ( VALUE ) rbswitch, rb_intern( "set_config" ), 3, UINT2NUM( transaction_id ), UINT2NUM( flags ), UINT2NUM( miss_send_len ) );
   }
 }
@@ -92,7 +92,7 @@ handle_flow_mod(
   UNUSED( out_port );
   UNUSED( flags );
   UNUSED( actions );
-  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "flow_mod" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "flow_mod" ) ) ) {
     VALUE options = rb_hash_new();
     rb_hash_aset( options, ID2SYM( rb_intern( "transaction_id" ) ), UINT2NUM( transaction_id ) );
     rb_hash_aset( options, ID2SYM( rb_intern( "command" ) ), UINT2NUM( command ) );
@@ -106,7 +106,7 @@ handle_flow_mod(
 
 static void
 handle_echo_request( uint32_t transaction_id, const buffer *body, void *rbswitch ) {
-  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "echo_request" ) ) == Qtrue ) {
+  if ( rb_respond_to( ( VALUE ) rbswitch, rb_intern( "echo_request" ) ) ) {
     VALUE rbody = rb_str_new( body->data, ( long ) body->length );
     rb_funcall( ( VALUE ) rbswitch, rb_intern( "echo_request" ), 2, UINT2NUM( transaction_id ), rbody );
   }
@@ -115,18 +115,18 @@ handle_echo_request( uint32_t transaction_id, const buffer *body, void *rbswitch
 
 static VALUE
 switch_run( VALUE self ) {
-  setenv( "CHIBACH_HOME", STR2CSTR( rb_funcall( mTrema, rb_intern( "home" ), 0 ) ), 1 );
+  setenv( "CHIBACH_HOME", RSTRING_PTR( rb_funcall( mTrema, rb_intern( "home" ), 0 ) ), 1 );
 
   VALUE name = rb_funcall( self, rb_intern( "name" ), 0 );
   rb_gv_set( "$PROGRAM_NAME", name );
 
   int argc = 6;
   char **argv = xmalloc( sizeof( char * ) * ( uint32_t ) ( argc + 1 ) );
-  argv[ 0 ] = STR2CSTR( name );
+  argv[ 0 ] = RSTRING_PTR( name );
   argv[ 1 ] = ( char * ) ( uintptr_t ) "--name";
-  argv[ 2 ] = STR2CSTR( name );
+  argv[ 2 ] = RSTRING_PTR( name );
   argv[ 3 ] = ( char * ) ( uintptr_t ) "--datapath_id";
-  argv[ 4 ] = STR2CSTR( rb_funcall( rb_iv_get( self, "@dpid" ), rb_intern( "to_hex" ), 0 ) );
+  argv[ 4 ] = RSTRING_PTR( rb_funcall( rb_iv_get( self, "@dpid" ), rb_intern( "to_hex" ), 0 ) );
   argv[ 5 ] = ( char * ) ( uintptr_t ) "--daemonize";
   argv[ 6 ] = NULL;
   init_chibach( &argc, &argv );
@@ -139,7 +139,7 @@ switch_run( VALUE self ) {
   set_flow_mod_handler( handle_flow_mod, ( void * ) self );
   set_echo_request_handler( handle_echo_request, ( void * ) self );
 
-  if ( rb_respond_to( self, rb_intern( "start" ) ) == Qtrue ) {
+  if ( rb_respond_to( self, rb_intern( "start" ) ) ) {
     rb_funcall( self, rb_intern( "start" ), 0 );
   }
 

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.21"
+  VERSION = "0.4.0"
 end
 
 

data/spec/support/matchers/constant.rb

@@ -0,0 +1,25 @@
+RSpec::Matchers.define :have_constant do | const, klass |
+  match do | owner |
+    const_defined = owner.const_defined?( const )
+    klass_match = owner.const_get( const ).class == klass unless klass.nil?
+    klass.nil? ? const_defined : ( const_defined && klass_match )
+  end
+
+  failure_message_for_should do | actual |
+    msg = "constant #{ expected[ 0 ] } not defined in #{ actual }"
+    msg += " as a #{ expected[ 1 ] }" unless expected[ 1 ].nil?
+    msg
+  end
+
+  failure_message_for_should_not do | actual |
+    msg = "constant #{ expected[ 0 ] } is defined in #{ actual }"
+    msg += " as a #{ expected[ 1 ] }" unless expected[ 1 ].nil?
+    msg
+  end
+
+  description do
+    msg = "have constant #{ const }"
+    msg += " defined with class #{ klass }" unless klass.nil?
+    msg
+  end
+end

data/spec/trema/barrier-request_spec.rb

@@ -28,6 +28,7 @@ shared_examples_for "barrier request message" do
       vswitch( "barrier-request" ) { datapath_id 0xabc }
     }.run( BarrierRequestController ) {
       controller( "BarrierRequestController" ).send_message( 0xabc, subject )
+      sleep 2 # FIXME: wait to send_message
       expect( IO.read( File.join( Trema.log, "openflowd.barrier-request.log" ) ) ).to include( "OFPT_BARRIER_REQUEST" )
     }
   end

data/spec/trema/controller_spec.rb

@@ -22,22 +22,20 @@ require "trema"
 
 module Trema
   describe Controller do
-    context "when using OpenFlow constants" do
-      subject { Controller.constants }
+    subject { Controller }
 
-      it { should include "OFPP_MAX" }
-      it { should include "OFPP_IN_PORT" }
-      it { should include "OFPP_TABLE" }
-      it { should include "OFPP_NORMAL" }
-      it { should include "OFPP_FLOOD" }
-      it { should include "OFPP_ALL" }
-      it { should include "OFPP_CONTROLLER" }
-      it { should include "OFPP_LOCAL" }
-      it { should include "OFPP_NONE" }
-    end
+    it { should have_constant :OFPP_MAX }
+    it { should have_constant :OFPP_IN_PORT }
+    it { should have_constant :OFPP_TABLE }
+    it { should have_constant :OFPP_NORMAL }
+    it { should have_constant :OFPP_FLOOD }
+    it { should have_constant :OFPP_ALL }
+    it { should have_constant :OFPP_CONTROLLER }
+    it { should have_constant :OFPP_LOCAL }
+    it { should have_constant :OFPP_NONE }
 
 
-    context "when logging" do
+    context ".new" do
       subject { Controller.new }
 
       it { should respond_to :critical }
@@ -47,21 +45,6 @@ module Trema
       it { should respond_to :info }
       it { should respond_to :debug }
     end
-
-
-    context "when sending flow_mod messages" do
-      it "should send a flow_mod_add message" do
-        class FlowModAddController < Controller; end
-
-        network {
-          vswitch { datapath_id 0xabc }
-        }.run( FlowModAddController ) {
-          controller( "FlowModAddController" ).send_flow_mod_add( 0xabc )
-          sleep 20 # FIXME: wait to send_flow_mod_add
-          expect( vswitch( "0xabc" ) ).to have( 1 ).flows
-        }
-      end
-    end
   end
 end
 

data/spec/trema/error_spec.rb

@@ -21,52 +21,6 @@ require "trema"
 
 
 module Trema
-  describe Trema, ".constants", :nosudo => true do
-    subject { Trema.constants }
-    it { should include "OFPET_HELLO_FAILED" }
-    it { should include "OFPHFC_INCOMPATIBLE" }
-    it { should include "OFPHFC_EPERM" }
-
-    it { should include "OFPET_BAD_REQUEST" }
-    it { should include "OFPBRC_BAD_VERSION" }
-    it { should include "OFPBRC_BAD_TYPE" }
-    it { should include "OFPBRC_BAD_STAT" }
-    it { should include "OFPBRC_BAD_VENDOR" }
-    it { should include "OFPBRC_BAD_SUBTYPE" }
-    it { should include "OFPBRC_EPERM" }
-    it { should include "OFPBRC_BAD_LEN" }
-    it { should include "OFPBRC_BUFFER_EMPTY" }
-    it { should include "OFPBRC_BUFFER_UNKNOWN" }
-
-    it { should include "OFPET_BAD_ACTION" }
-    it { should include "OFPBAC_BAD_TYPE" }
-    it { should include "OFPBAC_BAD_LEN" }
-    it { should include "OFPBAC_BAD_VENDOR" }
-    it { should include "OFPBAC_BAD_VENDOR_TYPE" }
-    it { should include "OFPBAC_BAD_OUT_PORT" }
-    it { should include "OFPBAC_BAD_ARGUMENT" }
-    it { should include "OFPBAC_EPERM" }
-    it { should include "OFPBAC_TOO_MANY" }
-    it { should include "OFPBAC_BAD_QUEUE" }
-
-    it { should include "OFPET_FLOW_MOD_FAILED" }
-    it { should include "OFPFMFC_ALL_TABLES_FULL" }
-    it { should include "OFPFMFC_OVERLAP" }
-    it { should include "OFPFMFC_BAD_EMERG_TIMEOUT" }
-    it { should include "OFPFMFC_BAD_COMMAND" }
-    it { should include "OFPFMFC_UNSUPPORTED" }
-
-    it { should include "OFPET_PORT_MOD_FAILED" }
-    it { should include "OFPPMFC_BAD_PORT" }
-    it { should include "OFPPMFC_BAD_HW_ADDR" }
-
-    it { should include "OFPET_QUEUE_OP_FAILED" }
-    it { should include "OFPQOFC_BAD_PORT" }
-    it { should include "OFPQOFC_BAD_QUEUE" }
-    it { should include "OFPQOFC_EPERM" }
-  end
-
-
   describe Error, ".new", :nosudo => true do
     it { expect { subject }.to raise_error( ArgumentError, "Type and code are mandatory options" ) }
   end

data/spec/trema/packet-out_spec.rb

@@ -46,7 +46,7 @@ describe "packet-out" do
 
   context "when invoked with no datapath_id" do
     it "should raise an error" do
-      expect { PacketOutController.new.send_packet_out }.to raise_error("wrong number of arguments (0 for 1)")
+      expect { PacketOutController.new.send_packet_out }.to raise_error
     end
   end
 

data/spec/trema/port-status_spec.rb

@@ -20,11 +20,14 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe Trema::PortStatus do
-  subject { Trema::PortStatus }
-  its( :constants ) { should include "OFPPR_ADD" }
-  its( :constants ) { should include "OFPPR_DELETE" }
-  its( :constants ) { should include "OFPPR_MODIFY" }
+module Trema
+  describe PortStatus do
+    subject { PortStatus }
+
+    it { should have_constant :OFPPR_ADD }
+    it { should have_constant :OFPPR_DELETE }
+    it { should have_constant :OFPPR_MODIFY }
+  end
 end
 
 

data/spec/trema_spec.rb

@@ -20,30 +20,70 @@ require File.join( File.dirname( __FILE__ ), "spec_helper" )
 require "trema"
 
 
-describe Trema, ".constants" do
-  subject { Trema.constants }
-
-  it { should include "OFPC_FLOW_STATS" }
-  it { should include "OFPC_TABLE_STATS" }
-  it { should include "OFPC_PORT_STATS" }
-  it { should include "OFPC_STP" }
-  it { should include "OFPC_RESERVED" }
-  it { should include "OFPC_IP_REASM" }
-  it { should include "OFPC_QUEUE_STATS" }
-  it { should include "OFPC_ARP_MATCH_IP" }
-
-  it { should include "OFPAT_OUTPUT" }
-  it { should include "OFPAT_SET_VLAN_VID" }
-  it { should include "OFPAT_SET_VLAN_PCP" }
-  it { should include "OFPAT_STRIP_VLAN" }
-  it { should include "OFPAT_SET_DL_SRC" }
-  it { should include "OFPAT_SET_DL_DST" }
-  it { should include "OFPAT_SET_NW_SRC" }
-  it { should include "OFPAT_SET_NW_DST" }
-  it { should include "OFPAT_SET_NW_TOS" }
-  it { should include "OFPAT_SET_TP_DST" }
-  it { should include "OFPAT_ENQUEUE" }
-  it { should include "OFPAT_VENDOR" }
+describe Trema do
+  it { should have_constant :OFPC_FLOW_STATS }
+  it { should have_constant :OFPC_TABLE_STATS }
+  it { should have_constant :OFPC_PORT_STATS }
+  it { should have_constant :OFPC_STP }
+  it { should have_constant :OFPC_RESERVED }
+  it { should have_constant :OFPC_IP_REASM }
+  it { should have_constant :OFPC_QUEUE_STATS }
+  it { should have_constant :OFPC_ARP_MATCH_IP }
+
+  it { should have_constant :OFPAT_OUTPUT }
+  it { should have_constant :OFPAT_SET_VLAN_VID }
+  it { should have_constant :OFPAT_SET_VLAN_PCP }
+  it { should have_constant :OFPAT_STRIP_VLAN }
+  it { should have_constant :OFPAT_SET_DL_SRC }
+  it { should have_constant :OFPAT_SET_DL_DST }
+  it { should have_constant :OFPAT_SET_NW_SRC }
+  it { should have_constant :OFPAT_SET_NW_DST }
+  it { should have_constant :OFPAT_SET_NW_TOS }
+  it { should have_constant :OFPAT_SET_TP_DST }
+  it { should have_constant :OFPAT_ENQUEUE }
+  it { should have_constant :OFPAT_VENDOR }
+
+  it { should have_constant :OFPET_HELLO_FAILED }
+  it { should have_constant :OFPHFC_INCOMPATIBLE }
+  it { should have_constant :OFPHFC_EPERM }
+
+  it { should have_constant :OFPET_BAD_REQUEST }
+  it { should have_constant :OFPBRC_BAD_VERSION }
+  it { should have_constant :OFPBRC_BAD_TYPE }
+  it { should have_constant :OFPBRC_BAD_STAT }
+  it { should have_constant :OFPBRC_BAD_VENDOR }
+  it { should have_constant :OFPBRC_BAD_SUBTYPE }
+  it { should have_constant :OFPBRC_EPERM }
+  it { should have_constant :OFPBRC_BAD_LEN }
+  it { should have_constant :OFPBRC_BUFFER_EMPTY }
+  it { should have_constant :OFPBRC_BUFFER_UNKNOWN }
+
+  it { should have_constant :OFPET_BAD_ACTION }
+  it { should have_constant :OFPBAC_BAD_TYPE }
+  it { should have_constant :OFPBAC_BAD_LEN }
+  it { should have_constant :OFPBAC_BAD_VENDOR }
+  it { should have_constant :OFPBAC_BAD_VENDOR_TYPE }
+  it { should have_constant :OFPBAC_BAD_OUT_PORT }
+  it { should have_constant :OFPBAC_BAD_ARGUMENT }
+  it { should have_constant :OFPBAC_EPERM }
+  it { should have_constant :OFPBAC_TOO_MANY }
+  it { should have_constant :OFPBAC_BAD_QUEUE }
+
+  it { should have_constant :OFPET_FLOW_MOD_FAILED }
+  it { should have_constant :OFPFMFC_ALL_TABLES_FULL }
+  it { should have_constant :OFPFMFC_OVERLAP }
+  it { should have_constant :OFPFMFC_BAD_EMERG_TIMEOUT }
+  it { should have_constant :OFPFMFC_BAD_COMMAND }
+  it { should have_constant :OFPFMFC_UNSUPPORTED }
+
+  it { should have_constant :OFPET_PORT_MOD_FAILED }
+  it { should have_constant :OFPPMFC_BAD_PORT }
+  it { should have_constant :OFPPMFC_BAD_HW_ADDR }
+
+  it { should have_constant :OFPET_QUEUE_OP_FAILED }
+  it { should have_constant :OFPQOFC_BAD_PORT }
+  it { should have_constant :OFPQOFC_BAD_QUEUE }
+  it { should have_constant :OFPQOFC_EPERM }
 end
 
 

data/src/lib/checks.h

@@ -20,9 +20,9 @@
 #define CHECKS_H
 
 
-#define DEPRECATED __attribute__ ( ( deprecated ) )
+#define DEPRECATED_FUNCTION __attribute__ ( ( deprecated ) )
 #define UNUSED( x ) ( void ) ( x )
-#define UNREACHABLE() die( "unreachable code" )
+#define UNREACHABLE_CODE() die( "unreachable code" )
 #define die_if_NULL( data )                                     \
   if ( data == NULL ) {                                         \
     die( "Argument of %s must not be NULL.", __func__ );        \

data/src/lib/messenger.c

@@ -269,9 +269,9 @@ init_messenger( const char *working_directory ) {
 
   strcpy( socket_directory, working_directory );
 
-  receive_queues = create_hash( compare_string, hash_string );
-  send_queues = create_hash( compare_string, hash_string );
-  context_db = create_hash( compare_uint32, hash_uint32 );
+  receive_queues = create_hash_with_size( compare_string, hash_string, 8 );
+  send_queues = create_hash_with_size( compare_string, hash_string, 8 );
+  context_db = create_hash_with_size( compare_uint32, hash_uint32, 128 );
 
   initialized = true;
   finalized = false;