trema 0.4.3 → 0.4.4

data/ruby/trema/packet-in.c

@@ -29,7 +29,7 @@ VALUE cPacketIn;
 #define PACKET_IN_RETURN_MAC( packet_member )                                          \
   {                                                                                    \
     VALUE ret = ULL2NUM( mac_to_uint64( get_packet_in_info( self )->packet_member ) ); \
-    return rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, ret );   \
+    return rb_funcall( rb_eval_string( "Pio::Mac" ), rb_intern( "new" ), 1, ret );   \
   }
 
 #define PACKET_IN_RETURN_IP( packet_member )                                        \
@@ -209,7 +209,7 @@ packet_in_reason( VALUE self ) {
 /*
  * The source MAC address.
  *
- * @return [Trema::Mac] the value of source MAC address as a Trema::MAC object.
+ * @return [Mac] the value of source MAC address as a Mac object.
  */
 static VALUE
 packet_in_macsa( VALUE self ) {
@@ -220,7 +220,7 @@ packet_in_macsa( VALUE self ) {
 /*
  * The destination MAC address.
  *
- * @return [Trema::Mac] the value of destination MAC address as a
+ * @return [Mac] the value of destination MAC address as a
  *   Trema::MAC object.
  */
 static VALUE
@@ -373,8 +373,8 @@ packet_in_arp_oper( VALUE self ) {
 /*
  * The ARP source hardware address of a packet.
  *
- * @return [Trema::Mac, nil]
- *   the value of the ARP source hardware address as a Trema::Mac object or nil
+ * @return [Mac, nil]
+ *   the value of the ARP source hardware address as a Mac object or nil
  *   if packet not an ARP.
  */
 static VALUE
@@ -409,8 +409,8 @@ packet_in_arp_spa( VALUE self ) {
 /*
  * The ARP target hardware address of a packet.
  *
- * @return [Trema::Mac]
- *   the value of ARP target hardware address as a Trema::Mac object or nil if
+ * @return [Mac]
+ *   the value of ARP target hardware address as a Mac object or nil if
  *   packet is not an ARP.
  */
 static VALUE
@@ -504,8 +504,8 @@ packet_in_rarp_oper( VALUE self ) {
 /*
  * The RARP source hardware address of a packet.
  *
- * @return [Trema::Mac, nil]
- *   the value of the RARP source hardware address as a Trema::Mac object or nil
+ * @return [Mac, nil]
+ *   the value of the RARP source hardware address as a Mac object or nil
  *   if packet not an RARP.
  */
 static VALUE
@@ -540,8 +540,8 @@ packet_in_rarp_spa( VALUE self ) {
 /*
  * The RARP target hardware address of a packet.
  *
- * @return [Trema::Mac]
- *   the value of RARP target hardware address as a Trema::Mac object or nil if
+ * @return [Mac]
+ *   the value of RARP target hardware address as a Mac object or nil if
  *   packet is not an RARP.
  */
 static VALUE
@@ -1230,7 +1230,7 @@ void
 Init_packet_in() {
   rb_require( "rubygems" );
   rb_require( "pio" );
-  rb_require( "trema/mac" );
+
   mTrema = rb_eval_string( "Trema" );
   cPacketIn = rb_define_class_under( mTrema, "PacketIn", rb_cObject );
   rb_define_alloc_func( cPacketIn, packet_in_alloc );

data/ruby/trema/port-mod.c

@@ -57,7 +57,7 @@ port_mod_alloc( VALUE kclass ) {
  *   @param [Number] :port_no
  *     an index into datapath's ports list.
  *
- *   @param [String,Number,Trema::Mac] :hw_addr
+ *   @param [String,Number,Mac] :hw_addr
  *     the hardware address of a port.
  *     Unique for each port. Obtained from +OFPT_FEATURES_REPLY+ message.
  *     Can be supplied as a string, number or as a Mac object.
@@ -92,9 +92,9 @@ port_mod_init( int argc, VALUE *argv, VALUE self ) {
       mac = hw_addr;
       if ( rb_obj_is_kind_of( hw_addr, rb_cString ) == Qtrue ||
         rb_obj_is_kind_of( hw_addr, rb_cInteger ) == Qtrue ) {
-        mac = rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, hw_addr );
+        mac = rb_funcall( rb_eval_string( "Pio::Mac" ), rb_intern( "new" ), 1, hw_addr );
       }
-      else if ( rb_obj_is_instance_of( hw_addr, rb_eval_string( "Trema::Mac" ) ) == Qfalse ) {
+      else if ( rb_obj_is_instance_of( hw_addr, rb_eval_string( "Pio::Mac" ) ) == Qfalse ) {
         rb_raise( rb_eArgError, "hw_addr must be a string or an integer or Mac object" );
       }
       ptr = ( uint8_t * ) dl_addr_to_a( mac, haddr );
@@ -159,7 +159,7 @@ port_mod_port_no( VALUE self ) {
 
 
 /*
- * Ethernet address converted and stored as a {Trema::Mac} object.
+ * Ethernet address converted and stored as a {Mac} object.
  *
  * @return [Mac] the value of hw_addr.
  */
@@ -208,6 +208,9 @@ port_mod_advertise( VALUE self ) {
  */
 void
 Init_port_mod() {
+  rb_require( "rubygems" );
+  rb_require( "pio" );
+
   mTrema = rb_eval_string( "Trema" );
   cPortMod = rb_define_class_under( mTrema, "PortMod", rb_cObject );
   rb_define_alloc_func( cPortMod, port_mod_alloc );

data/ruby/trema/port.c

@@ -301,6 +301,9 @@ port_compare( VALUE self, VALUE other ) {
  */
 void
 Init_port() {
+  rb_require( "rubygems" );
+  rb_require( "pio" );
+
   mTrema = rb_eval_string( "Trema" );
   cPort = rb_define_class_under( mTrema, "Port", rb_cObject );
 
@@ -354,7 +357,7 @@ VALUE
 port_from( const struct ofp_phy_port *phy_port ) {
   VALUE attributes = rb_hash_new();
   rb_hash_aset( attributes, ID2SYM( rb_intern( "number" ) ), UINT2NUM( phy_port->port_no ) );
-  VALUE hw_addr = rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( phy_port->hw_addr ) ) );
+  VALUE hw_addr = rb_funcall( rb_eval_string( "Pio::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( phy_port->hw_addr ) ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "hw_addr" ) ), hw_addr );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "name" ) ), rb_str_new2( phy_port->name ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "config" ) ), UINT2NUM( phy_port->config ) );

data/ruby/trema/set-eth-dst-addr.rb

@@ -32,14 +32,12 @@ module Trema
     # @example
     #   SetEthDstAddr.new("11:22:33:44:55:66")
     #   SetEthDstAddr.new(0x112233445566)
-    #   SetEthDstAddr.new(mac)
+    #   SetEthDstAddr.new(Mac.new("11:22:33:44:55:66"))
+    #   SetEthDstAddr.new(Mac.new(0x112233445566))
     #
-    # @param [String,Integer,Mac] mac_address
+    # @param mac_address [#to_str, #to_int]
     #   the Ethernet address to create this action with.
     #
-    # @raise [ArgumentError] if invalid format is detected.
-    # @raise [TypeError] if supplied argument is not a String or Integer or Mac.
-    #
   end
 
 

data/ruby/trema/set-eth-src-addr.rb

@@ -25,21 +25,20 @@ module Trema
   #
   class SetEthSrcAddr < SetEthAddr
     #
-    # Creates an action to modify the source Ethernet address of a packet.
+    # Creates an action to modify the source Ethernet address of a
+    # packet.
     #
     # @overload initialize(mac_address)
     #
     # @example
     #   SetEthSrcAddr.new("11:22:33:44:55:66")
     #   SetEthSrcAddr.new(0x112233445566)
-    #   SetEthSrcAddr.new(mac)
+    #   SetEthSrcAddr.new(Mac.new("11:22:33:44:55:66"))
+    #   SetEthSrcAddr.new(Mac.new(0x112233445566))
     #
-    # @param [String,Integer,Mac] mac_address
+    # @param mac_address [#to_str, #to_int]
     #   the Ethernet address to create this action with.
     #
-    # @raise [ArgumentError] if invalid format is detected.
-    # @raise [TypeError] if supplied argument is not a String or Integer or Mac.
-    #
   end
 
 

data/ruby/trema/stats-reply.c

@@ -213,7 +213,7 @@ get_action( const struct ofp_action_header *ah ) {
       VALUE mac_address;
       const struct ofp_action_dl_addr *action_dl_addr = ( const struct ofp_action_dl_addr * ) ah;
 
-      mac_address = rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( action_dl_addr->dl_addr ) ) );
+      mac_address = rb_funcall( rb_eval_string( "Pio::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( action_dl_addr->dl_addr ) ) );
       if ( ah->type == OFPAT_SET_DL_SRC ) {
         action = rb_funcall( rb_eval_string( "Trema::SetEthSrcAddr" ), rb_intern( "new" ), 1, mac_address );
       }

data/ruby/trema/switch-event.c

@@ -110,7 +110,7 @@ add_forward_entry_to_all_switches( VALUE self, VALUE type, VALUE service_name )
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = add_event_forward_entry_to_all_switches(
@@ -159,7 +159,7 @@ delete_forward_entry_from_all_switches( VALUE self, VALUE type,
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = delete_event_forward_entry_to_all_switches(
@@ -235,7 +235,7 @@ add_forward_entry_to_switch( VALUE self, VALUE dpid, VALUE type,
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = add_switch_event_forward_entry(
@@ -287,7 +287,7 @@ delete_forward_entry_from_switch( VALUE self, VALUE dpid, VALUE type,
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = delete_switch_event_forward_entry(
@@ -345,7 +345,7 @@ set_forward_entries_to_switch( VALUE self, VALUE dpid, VALUE type,
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = set_switch_event_forward_entries(
@@ -393,7 +393,7 @@ dump_forward_entries_from_switch( VALUE self, VALUE dpid, VALUE type ) {
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = dump_switch_event_forward_entries(
@@ -443,7 +443,7 @@ add_forward_entry_to_switch_manager( VALUE self, VALUE type,
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = add_switch_manager_event_forward_entry(
@@ -493,7 +493,7 @@ delete_forward_entry_from_switch_manager( VALUE self, VALUE type,
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = delete_switch_manager_event_forward_entry(
@@ -549,7 +549,7 @@ set_forward_entries_to_switch_manager( VALUE self, VALUE type,
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = set_switch_manager_event_forward_entries(
@@ -594,7 +594,7 @@ dump_forward_entries_from_switch_manager( VALUE self, VALUE type ) {
   callback_info *cb = xcalloc( 1, sizeof( callback_info ) );
   cb->self = self;
   cb->block = Qnil;
-  if ( rb_block_given_p() == Qtrue ) {
+  if ( rb_block_given_p() ) {
     cb->block = rb_block_proc();
   }
   bool succ = dump_switch_manager_event_forward_entries(

data/ruby/trema/trema.c

@@ -79,6 +79,9 @@ Init_trema() {
   rb_define_const( mTrema, "OFPAT_ENQUEUE", INT2NUM( OFPAT_ENQUEUE ) );
   rb_define_const( mTrema, "OFPAT_VENDOR", INT2NUM( OFPAT_VENDOR ) );
 
+  rb_require( "rubygems" );
+  rb_require( "pio" );
+  rb_require( "trema/mac" );
   rb_require( "trema/host" );
   rb_require( "trema/openflow-switch" );
   rb_require( "trema/path" );

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end
 
 

data/spec/spec_helper.rb

@@ -160,7 +160,7 @@ class Network
   end
 
 
-  def wait_until_all_pid_files_are_deleted timeout = 10
+  def wait_until_all_pid_files_are_deleted timeout = 12
     elapsed = 0
     loop do
       raise "Failed to clean up remaining processes." if elapsed > timeout

data/spec/trema/packet-in_spec.rb

@@ -78,9 +78,9 @@ describe Trema::PacketIn do
           expect( message.data ).to be_instance_of( String )
           expect( message.buffered? ).to be_false
 
-          expect( message.macsa ).to be_instance_of( Trema::Mac )
+          expect( message.macsa ).to be_instance_of( Pio::Mac )
           expect( message.macsa.to_s ).to eq( "00:00:00:00:00:01" )
-          expect( message.macda ).to be_instance_of( Trema::Mac )
+          expect( message.macda ).to be_instance_of( Pio::Mac )
           expect( message.macda.to_s ).to eq( "00:00:00:00:00:02" )
 
           expect( message.eth_type ).to eq( 0x0800 )

data/spec/trema/set-eth-addr_spec.rb

@@ -21,21 +21,16 @@ require "trema"
 
 
 [ SetEthSrcAddr, SetEthDstAddr ].each do | klass |
-  describe klass, "#new(mac_address)", :type => "actions" do
+  describe klass, ".new", :type => "actions" do
     subject { klass.new( mac_address ) }
 
 
-    context "with mac_address (52:54:00:a8:ad:8c)" do
-      let( :mac_address ) { "52:54:00:a8:ad:8c" }
-
-      its( "mac_address.to_s" ) { should eq( "52:54:00:a8:ad:8c" ) }
-      its( :to_s ) { should eq( "#{ klass.to_s }: mac_address=52:54:00:a8:ad:8c" ) }
-    end
-
-
-    context "with mac_address (11:22:33:44:55:66)" do
+    context %{with "11:22:33:44:55:66"} do
       let( :mac_address ) { "11:22:33:44:55:66" }
 
+      its( :mac_address ) { should eq "11:22:33:44:55:66" }
+      its( :to_s ) { should eq "#{ klass.to_s }: mac_address=11:22:33:44:55:66" }
+
       context "when set as FlowMod's action", :sudo => true do
         it "should insert a new flow with action (mod_dl_{src,dst}:11:22:33:44:55:66)" do
           class TestController < Controller; end
@@ -56,39 +51,6 @@ require "trema"
         end
       end
     end
-
-
-    context %q{with mac_address (Mac.new("52:54:00:a8:ad:8c"))} do
-      let( :mac_address ) { Mac.new("52:54:00:a8:ad:8c") }
-
-      its( "mac_address.to_s" ) { should eq( "52:54:00:a8:ad:8c" ) }
-      its( :to_s ) { should eq( "#{ klass.to_s }: mac_address=52:54:00:a8:ad:8c" ) }
-    end
-
-
-    context "with mac_address (0x525400a8ad8c)" do
-      let( :mac_address ) { 0x525400a8ad8c }
-
-      its( "mac_address.to_s" ) { should eq( "52:54:00:a8:ad:8c" ) }
-      its( :to_s ) { should eq( "#{ klass.to_s }: mac_address=52:54:00:a8:ad:8c" ) }
-    end
-
-
-    context %q{with invalid mac_address ("INVALID MAC STRING")} do
-      let( :mac_address ) { "INVALID MAC STRING" }
-
-      it { expect { subject }.to raise_error( ArgumentError ) }
-    end
-
-
-    context "with invalid mac_address ([1, 2, 3])" do
-      let( :mac_address ) { [ 1, 2, 3 ] }
-
-      it { expect { subject }.to raise_error( TypeError ) }
-    end
-
-
-    it_validates "option is within range", :mac_address, 0..0xffffffffffff
   end
 end
 

data/src/examples/learning_switch/learning-switch.rb

@@ -34,6 +34,8 @@ class LearningSwitch < Controller
 
 
   def packet_in datapath_id, message
+    return if message.macda.reserved?
+
     @fdb.learn message.macsa, message.in_port
     port_no = @fdb.port_no_of( message.macda )
     if port_no

data/src/lib/daemon.c

@@ -34,6 +34,8 @@
 
 #ifdef UNIT_TESTING
 
+#define static
+
 #ifdef die
 #undef die
 #endif
@@ -136,12 +138,6 @@ extern ssize_t mock_readlink( const char *path, char *buf, size_t bufsiz );
 #define basename mock_basename
 extern char *mock_basename( char *path );
 
-#ifdef rename
-#undef rename
-#endif // rename
-#define rename mock_rename
-extern int mock_rename( const char *oldpath, const char *newpath );
-
 #ifdef warn
 #undef warn
 #endif // warn
@@ -150,6 +146,9 @@ extern void mock_warn( const char *format, ... );
 
 #endif // UNIT_TESTING
 
+static const char SWITCH_DAEMON[] = "switch.";
+static const char SWITCH_DAEMON_EXE_NAME[] = "switch";
+
 
 void
 daemonize( const char *home ) {
@@ -185,6 +184,8 @@ daemonize( const char *home ) {
 
 static const int PID_STRING_LENGTH = 10;
 
+static int locked_fd = -1;
+
 void
 write_pid( const char *directory, const char *name ) {
   assert( directory != NULL );
@@ -194,22 +195,28 @@ write_pid( const char *directory, const char *name ) {
   snprintf( path, PATH_MAX, "%s/%s.pid", directory, name );
   path[ PATH_MAX - 1 ] = '\0';
 
-  int fd = open( path, O_RDWR | O_CREAT, 0600 );
-  if ( fd == -1 ) {
+  if ( locked_fd > -1 ) {
+    close(locked_fd);
+    locked_fd = -1;
+  }
+
+  locked_fd = open( path, O_RDWR | O_CREAT, 0600 );
+  if ( locked_fd == -1 ) {
     die( "Could not create a PID file: %s", path );
   }
 
-  if ( lockf( fd, F_TLOCK, 0 ) == -1 ) {
+  if ( lockf( locked_fd, F_TLOCK, 0 ) == -1 ) {
     die( "Could not acquire a lock on a PID file: %s", path );
   }
 
   char str[ PID_STRING_LENGTH ];
   snprintf( str, sizeof( str ), "%d\n", getpid() );
   str[ sizeof( str ) - 1 ] = '\0';
-  ssize_t ret = write( fd, str, strlen( str ) );
+  ssize_t ret = write( locked_fd, str, strlen( str ) );
   if ( ret == -1 ) {
     die( "Could not write a PID file: %s", path );
   }
+  debug( "Write pid file ( file = %s, pid = %d )", path, getpid() );
 }
 
 
@@ -224,8 +231,14 @@ unlink_pid( const char *directory, const char *name ) {
 
   int ret = unlink( path );
   if ( ret < 0 ) {
-    die( "Could not remove a PID file: %s", path );
+    if ( errno == ENOENT ) {
+      warn( "PID file %s does not exist", path );
+    }
+    else {
+      die( "Could not remove a PID file: %s", path );
+    }
   }
+  debug( "Unlink pid file ( file = %s, pid = %d )", path, getpid() );
 }
 
 
@@ -295,6 +308,11 @@ read_pid( const char *directory, const char *name ) {
     return pid;
   }
 
+  if ( strncmp( name, SWITCH_DAEMON, strlen( SWITCH_DAEMON ) ) == 0 &&
+       strcmp( exe_name, SWITCH_DAEMON_EXE_NAME ) == 0 ) {
+    return pid;
+  }
+
   // check if -n (service_name) option is used
   sprintf( proc_path, "/proc/%d/cmdline", pid );
   fd = open( proc_path, O_RDONLY, 0 );
@@ -379,18 +397,15 @@ rename_pid( const char *directory, const char *old, const char *new ) {
   assert( old != NULL );
   assert( new != NULL );
 
-  char old_path[ PATH_MAX ];
-  snprintf( old_path, PATH_MAX, "%s/%s.pid", directory, old );
-  old_path[ PATH_MAX - 1 ] = '\0';
-  char new_path[ PATH_MAX ];
-  snprintf( new_path, PATH_MAX, "%s/%s.pid", directory, new );
-  new_path[ PATH_MAX - 1 ] = '\0';
+  assert( locked_fd > -1 );
 
-  unlink( new_path );
-  int ret = rename( old_path, new_path );
-  if ( ret < 0 ) {
-    die( "Could not rename a PID file from %s to %s.", old_path, new_path );
-  }
+  int old_locked_fd = locked_fd;
+  locked_fd = -1;
+  write_pid( directory, new );
+  close( old_locked_fd );
+  unlink_pid( directory, old );
+
+  debug( "Rename pid file ( old name = %s, new name = %s, pid = %d )", old, new, getpid() );
 }