trema 0.4.4 → 0.4.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 56656657a56ff4e4bf6cfa8b906dfa401d954220
+  data.tar.gz: 3cedbb6a843395235cef1387b947251913c814dc
+SHA512:
+  metadata.gz: 03bc85f708bf3192783fa3b77e3ba6c59ddb910ba1919fa78e850cc0de36ddd80ff39c5255ea5a468a698b4663c826dece4aa877650ef80c4bff2533192083b3
+  data.tar.gz: 5766922aab5e81eaa24ebc4fcf1e6798e094de4a48410a853b9ce3f14dcc81cf3ebd3dd25a55a2a2d868c23221c5b0c973a31369e033d1a05dcfbb4d0630bab3

data/cruise.rb

@@ -358,6 +358,7 @@ $options.parse! ARGV
 
 
 def init_cruise
+  FileUtils.rm_f File.expand_path(File.join(File.dirname(__FILE__), 'Gemfile.lock'))
   sh "bundle install"
   sh "bundle update"
   sh "bundle exec rake clobber"

data/features/examples/message.vendor-action.feature

@@ -14,10 +14,12 @@ Feature: "Vendor Action" sample application
   Scenario: Run "Packet In" C example
   Given I run `trema run ../../objects/examples/openflow_message/vendor_action -c vendor_action.conf -d`
    And wait until "vendor_action" is up
+   And *** sleep 2 ***
   Then the file "../../tmp/log/openflowd.vendor_action.log" should contain "actions=note:54.72.65.6d.61.00"
 
   @slow_process
   Scenario: Run "Packet In" Ruby example
   Given I run `trema run ../../src/examples/openflow_message/vendor-action.rb -c vendor_action.conf -d`
    And wait until "VendorActionSampleController" is up
+   And *** sleep 2 ***
   Then the file "../../tmp/log/openflowd.vendor_action.log" should contain "actions=note:54.72.65.6d.61.00"

data/features/examples/packet_in.feature

@@ -21,6 +21,7 @@ Feature: "Packet In" sample application
     Given I run `trema run ../../objects/examples/packet_in/packet_in -c packet_in.conf -d`
      And wait until "packet_in" is up
     When I send 1 packet from host1 to host2
+     And *** sleep 1 ***
     Then the file "../../tmp/log/packet_in.log" should contain "received a packet_in"
 
   @slow_process
@@ -28,4 +29,5 @@ Feature: "Packet In" sample application
     Given I run `trema run ../../src/examples/packet_in/packet-in.rb -c packet_in.conf -d`
      And wait until "PacketInDumper" is up
     When I send 1 packet from host1 to host2
+     And *** sleep 1 ***
     Then the file "../../tmp/log/PacketInDumper.log" should contain "received a packet_in"

data/features/support/hooks.rb

@@ -19,7 +19,7 @@
 require "trema/path"
 
 
-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/ruby/trema/controller.c

@@ -439,9 +439,8 @@ controller_send_flow_mod_delete( int argc, VALUE *argv, VALUE self ) {
  *     set automatically according to the value of :packet_in.
  *
  *   @option options [Number] :in_port (OFPP_NONE)
- *     The port from which the frame is to be sent. OFPP_NONE if
- *     none. OFPP_TABLE to perform the actions defined in the flow
- *     table.
+ *     The port to use in flow table lookup when :actions send the packet
+ *     to the special OFPP_TABLE port.
  *
  *   @option options [Number] :buffer_id (0xffffffff)
  *     The buffer ID assigned by the datapath. If 0xffffffff, the

data/ruby/trema/features-reply.c

@@ -255,7 +255,7 @@ handle_switch_ready( uint64_t datapath_id, void *controller ) {
  * Extract and map {Port} to +ofp_phy_port+ structure.
  */
 static VALUE
-ports_from( const list_element *c_ports ) {
+ports_from( const list_element *c_ports, uint64_t datapath_id ) {
   VALUE ports = rb_ary_new();
 
   if ( c_ports == NULL ) {
@@ -266,7 +266,7 @@ ports_from( const list_element *c_ports ) {
   memcpy( port_head, c_ports, sizeof( list_element ) );
   list_element *port = NULL;
   for ( port = port_head; port != NULL; port = port->next ) {
-    rb_ary_push( ports, port_from( ( struct ofp_phy_port * ) port->data ) );
+    rb_ary_push( ports, port_from( ( struct ofp_phy_port * ) port->data, datapath_id ) );
   }
   xfree( port_head );
   return ports;
@@ -303,7 +303,7 @@ handle_features_reply(
   rb_hash_aset( attributes, ID2SYM( rb_intern( "n_tables" ) ), UINT2NUM( n_tables ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "capabilities" ) ), UINT2NUM( capabilities ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "actions" ) ), UINT2NUM( actions ) );
-  rb_hash_aset( attributes, ID2SYM( rb_intern( "ports" ) ), ports_from( ports ) );
+  rb_hash_aset( attributes, ID2SYM( rb_intern( "ports" ) ), ports_from( ports, datapath_id ) );
 
   list_element *physical_ports = xmalloc( sizeof( list_element ) );
   create_list( &physical_ports );
@@ -314,7 +314,7 @@ handle_features_reply(
     iterate_list( tmp_ports, append_physical_port, &physical_ports );
     xfree( tmp_ports );
   }
-  rb_hash_aset( attributes, ID2SYM( rb_intern( "physical_ports" ) ), ports_from( physical_ports ) );
+  rb_hash_aset( attributes, ID2SYM( rb_intern( "physical_ports" ) ), ports_from( physical_ports, datapath_id ) );
   xfree( physical_ports );
 
   VALUE features_reply = rb_funcall( cFeaturesReply, rb_intern( "new" ), 1, attributes );

data/ruby/trema/port-status.c

@@ -165,7 +165,7 @@ handle_port_status(
   VALUE attributes = rb_hash_new();
   rb_hash_aset( attributes, ID2SYM( rb_intern( "datapath_id" ) ), ULL2NUM( datapath_id ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "transaction_id" ) ), UINT2NUM( transaction_id ) );
-  rb_hash_aset( attributes, ID2SYM( rb_intern( "phy_port" ) ), port_from( &phy_port ) );
+  rb_hash_aset( attributes, ID2SYM( rb_intern( "phy_port" ) ), port_from( &phy_port, datapath_id ) );
 
   VALUE port_status = Qnil;
   if ( reason == OFPPR_ADD ) {

data/ruby/trema/port.c

@@ -33,6 +33,7 @@ VALUE cPort;
  *   @example
  *     Port.new(
  *       :number => 1,
+ *       :datapath_id => 0x123,
  *       :hw_addr => Mac.new( "4e:1e:9a:7a:44:be" ),
  *       :name => "trema0-0",
  *       :config => 0,
@@ -44,6 +45,9 @@ VALUE cPort;
  *     )
  *
  *   @param [Hash] options the options hash.
+ *  
+ *   @option options [Number] :datapath_id
+ *     the switch's datapath ID.
  *
  *   @option options [Number] :number
  *     the port's unique number.
@@ -80,6 +84,9 @@ port_init( VALUE self, VALUE options ) {
   VALUE number = rb_hash_aref( options, ID2SYM( rb_intern( "number" ) ) );
   rb_iv_set( self, "@number", number );
 
+  VALUE datapath_id = rb_hash_aref( options, ID2SYM( rb_intern( "datapath_id" ) ) );
+  rb_iv_set( self, "@datapath_id", datapath_id );
+
   VALUE hw_addr = rb_hash_aref( options, ID2SYM( rb_intern( "hw_addr" ) ) );
   rb_iv_set( self, "@hw_addr", hw_addr );
 
@@ -118,6 +125,17 @@ port_number( VALUE self ) {
 }
 
 
+/*
+ * The switch's datapath ID.
+ *
+ * @return [Number] the value of number.
+ */
+static VALUE
+port_datapath_id( VALUE self ) {
+  return rb_iv_get( self, "@datapath_id" );
+}
+
+
 /*
  * The port's Ethernet address expressed as a {Mac} object.
  *
@@ -335,6 +353,8 @@ Init_port() {
 
   rb_define_method( cPort, "initialize", port_init, 1 );
   rb_define_method( cPort, "number", port_number, 0 );
+  rb_define_method( cPort, "datapath_id", port_datapath_id, 0 );
+  rb_define_method( cPort, "dpid", port_datapath_id, 0 );
   rb_define_method( cPort, "hw_addr", port_hw_addr, 0 );
   rb_define_method( cPort, "name", port_name, 0 );
   rb_define_method( cPort, "config", port_config, 0 );
@@ -354,8 +374,9 @@ Init_port() {
 
 
 VALUE
-port_from( const struct ofp_phy_port *phy_port ) {
+port_from( const struct ofp_phy_port *phy_port, uint64_t datapath_id ) {
   VALUE attributes = rb_hash_new();
+  rb_hash_aset( attributes, ID2SYM( rb_intern( "datapath_id" ) ), ULL2NUM( datapath_id ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "number" ) ), UINT2NUM( phy_port->port_no ) );
   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 );

data/ruby/trema/port.h

@@ -31,7 +31,7 @@ extern VALUE cPort;
 void Init_port( void );
 
 
-VALUE port_from( const struct ofp_phy_port *phy_port );
+VALUE port_from( const struct ofp_phy_port *phy_port, uint64_t datapath_id );
 
 
 #endif // PORT_H

data/ruby/trema/process.rb

@@ -39,7 +39,7 @@ module Trema
     # @return [Process] the object that encapsulates the process details.
     #
     def self.read pid_file, name = nil
-      name = File.basename( pid_file, ".pid" ) if name.nil?
+      name = File.basename( pid_file.to_s, ".pid" ) if name.nil?
       return new( pid_file, name )
     end
 

data/ruby/trema/vendor-stats-reply.rb

@@ -30,7 +30,7 @@ module Trema
     # be created as a result of parsing the +OFPT_STATS_REPLY(OFPST_VENDOR)+
     # openflow message.
     #
-    # @overload initialize(otions={})
+    # @overload initialize(options={})
     #
     #   @example
     #     VendorStatsReply.new(

data/ruby/trema/version.rb

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

data/src/lib/daemon.c

@@ -229,6 +229,17 @@ unlink_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, 0 );
+  if ( fd < 0 ) {
+    debug( "Failed to open %s ( %s [%d] ).", path, strerror( errno ), errno );
+    return;
+  }
+  if ( lockf( fd, F_TLOCK, 0 ) == -1 ) {
+    warn( "PID file is locked by another process ( %s ).", path );
+    close( fd );
+    return;
+  }
+
   int ret = unlink( path );
   if ( ret < 0 ) {
     if ( errno == ENOENT ) {
@@ -239,6 +250,7 @@ unlink_pid( const char *directory, const char *name ) {
     }
   }
   debug( "Unlink pid file ( file = %s, pid = %d )", path, getpid() );
+  close( fd );
 }
 
 
@@ -402,8 +414,8 @@ rename_pid( const char *directory, const char *old, const char *new ) {
   int old_locked_fd = locked_fd;
   locked_fd = -1;
   write_pid( directory, new );
-  close( old_locked_fd );
   unlink_pid( directory, old );
+  close( old_locked_fd );
 
   debug( "Rename pid file ( old name = %s, new name = %s, pid = %d )", old, new, getpid() );
 }

data/src/lib/match_table.c

@@ -30,7 +30,7 @@
 
 #define VLAN_VID_MASK 0x0fff // 12 bits
 #define VLAN_PCP_MASK 0x07 // 3 bits
-#define NW_TOS_MASK 0x3f // 6 bits
+#define NW_TOS_MASK 0xfc // upper 6 bits
 
 #define MATCH_STRING_LENGTH 1024
 

data/src/lib/openflow_message.c

@@ -1717,6 +1717,15 @@ validate_hello( const buffer *message ) {
 int
 validate_error( const buffer *message ) {
   int ret;
+  struct ofp_error_msg *error_msg;
+  const unsigned max_valid_code[OFPET_QUEUE_OP_FAILED + 1] = {
+    [ OFPET_HELLO_FAILED ] = OFPHFC_EPERM,
+    [ OFPET_BAD_REQUEST ] = OFPBRC_BUFFER_UNKNOWN,
+    [ OFPET_BAD_ACTION ] = OFPBAC_BAD_QUEUE,
+    [ OFPET_FLOW_MOD_FAILED ] = OFPFMFC_UNSUPPORTED,
+    [ OFPET_PORT_MOD_FAILED ] = OFPPMFC_BAD_HW_ADDR,
+    [ OFPET_QUEUE_OP_FAILED ] = OFPQOFC_EPERM,
+  };
 
   assert( message != NULL );
 
@@ -1725,6 +1734,14 @@ validate_error( const buffer *message ) {
     return ret;
   }
 
+  error_msg = ( struct ofp_error_msg * ) message->data;
+  if ( ntohs( error_msg->type ) > OFPET_QUEUE_OP_FAILED ) {
+    return ERROR_INVALID_ERROR_TYPE;
+  }
+  if ( ntohs( error_msg->code ) > max_valid_code[ ntohs( error_msg->type ) ] ) {
+    return ERROR_INVALID_ERROR_CODE;
+  }
+
   return 0;
 }
 
@@ -3602,6 +3619,8 @@ static struct error_map {
       { ERROR_TOO_LONG_MESSAGE, OFPET_BAD_REQUEST, OFPBRC_BAD_LEN },
       { ERROR_UNDEFINED_TYPE, OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE },
       { ERROR_INVALID_TYPE, OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE },
+      { ERROR_INVALID_ERROR_TYPE, OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE },
+      { ERROR_INVALID_ERROR_CODE, OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE },
       { 0, 0, 0 },
     }
   },

data/src/lib/openflow_message.h

@@ -150,7 +150,7 @@ bool append_action_vendor( openflow_actions *actions, const uint32_t vendor,
 // Return code definitions indicating the result of OpenFlow message validation.
 enum {
   SUCCESS = 0,
-  ERROR_UNSUPPORTED_VERSION = -60,
+  ERROR_UNSUPPORTED_VERSION = -63,
   ERROR_INVALID_LENGTH,
   ERROR_TOO_SHORT_MESSAGE,
   ERROR_TOO_LONG_MESSAGE,
@@ -211,6 +211,8 @@ enum {
   ERROR_INVALID_STATS_TYPE,
   ERROR_INVALID_STATS_REQUEST_FLAGS,
   ERROR_UNDEFINED_FLOW_MOD_COMMAND,
+  ERROR_INVALID_ERROR_TYPE,
+  ERROR_INVALID_ERROR_CODE,
   ERROR_UNEXPECTED_ERROR = -255
 };
 

data/src/switch_manager/ofpmsg_recv.c

@@ -406,14 +406,17 @@ ofpmsg_recv( struct switch_info *sw_info, buffer *buf ) {
   if ( ret != 0 ) {
     notice( "Invalid openflow message. type:%d, errno:%d", header->type, ret );
 
-    error_type = OFPET_BAD_REQUEST;
-    error_code = OFPBRC_BAD_TYPE;
-    get_error_type_and_code( header->type, ret, &error_type, &error_code );
-    debug( "Validation error. type %u, errno %d, error type %u, error code %u",
-           header->type, ret, error_type, error_code );
-
-    ofpmsg_send_error_msg( sw_info, error_type, error_code, buf );
-    free_buffer( buf );
+    if ( header->type != OFPT_ERROR ) {
+      // Do not send an error of error
+      error_type = OFPET_BAD_REQUEST;
+      error_code = OFPBRC_BAD_TYPE;
+      get_error_type_and_code( header->type, ret, &error_type, &error_code );
+      debug( "Validation error. type %u, errno %d, error type %u, error code %u",
+	     header->type, ret, error_type, error_code );
+
+      ofpmsg_send_error_msg( sw_info, error_type, error_code, buf );
+      free_buffer( buf );
+    }
 
     return -1;
   }

data/src/switch_manager/switch.c

@@ -386,7 +386,7 @@ registration_timeout( void *user_data ) {
 
 
 static void
-confirm_self_dpid_is_registered( uint64_t* dpids, size_t n_dpids, void *user_data );
+confirm_self_dpid_is_registered( const list_element *switches, void *user_data );
 
 
 int
@@ -459,7 +459,8 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
     // Check switch_manager registration
     debug( "Checking switch manager's switch list." );
     sw_info->retry_count = REGISTRATION_RETRY_COUNT;
-    if ( send_efi_switch_list_request( confirm_self_dpid_is_registered, sw_info ) ) {
+    set_list_switches_reply_handler( confirm_self_dpid_is_registered );
+    if ( send_list_switches_request( sw_info ) ) {
       switch_set_timeout( REGISTRATION_TIMEOUT, registration_timeout, sw_info );
     }
     else {
@@ -495,7 +496,8 @@ registration_retry( void *user_data ) {
   sw_info->retry_count--;
   sw_info->running_timer = false;
   debug( "Checking switch manager's switch list." );
-  if ( send_efi_switch_list_request( confirm_self_dpid_is_registered, sw_info ) ) {
+  set_list_switches_reply_handler( confirm_self_dpid_is_registered );
+  if ( send_list_switches_request( sw_info ) ) {
     switch_set_timeout( REGISTRATION_TIMEOUT, registration_timeout, sw_info );
   }
   else {
@@ -506,15 +508,15 @@ registration_retry( void *user_data ) {
 
 
 static void
-confirm_self_dpid_is_registered( uint64_t* dpids, size_t n_dpids, void *user_data ) {
+confirm_self_dpid_is_registered( const list_element *switches, void *user_data ) {
   struct switch_info *sw_info = user_data;
 
   switch_unset_timeout( registration_timeout, sw_info );
 
   debug( "Received switch manager's switch list." );
   bool found = false;
-  for ( size_t i = 0 ; i < n_dpids ; ++i ) {
-    if ( sw_info->datapath_id == dpids[ i ] ) {
+  for ( const list_element *e = switches; e != NULL; e = e->next ) {
+    if ( sw_info->datapath_id == *( uint64_t * ) e->data ) {
       // self dpid registered
       debug( "Self dpid found" );
       found = true;
@@ -581,13 +583,19 @@ unregistration_timeout( void *user_data ) {
 
 
 static void
-confirm_self_dpid_is_unregistered( uint64_t* dpids, size_t n_dpids, void *user_data );
+confirm_self_dpid_is_unregistered( const list_element *switches, void *user_data );
 
 
 int
 switch_event_disconnected( struct switch_info *sw_info ) {
   int old_state = sw_info->state;
 
+  if ( sw_info->state == SWITCH_STATE_DISCONNECTED ||
+       sw_info->state == SWITCH_STATE_CONNECTION_FAILED ) {
+    debug( "already disconnected" );
+    return -1;
+  }
+
   if ( sw_info->state == SWITCH_STATE_COMPLETED ) {
     sw_info->state = SWITCH_STATE_DISCONNECTED;
   }
@@ -635,7 +643,8 @@ switch_event_disconnected( struct switch_info *sw_info ) {
   // Check switch_manager registration
   debug( "Checking switch manager's switch list." );
   sw_info->retry_count = UNREGISTRATION_RETRY_COUNT;
-  if ( send_efi_switch_list_request( confirm_self_dpid_is_unregistered, sw_info ) ) {
+  set_list_switches_reply_handler( confirm_self_dpid_is_unregistered );
+  if ( send_list_switches_request( sw_info ) ) {
     switch_set_timeout( UNREGISTRATION_TIMEOUT, unregistration_timeout, sw_info );
   }
   else {
@@ -658,7 +667,8 @@ unregistration_retry( void *user_data ) {
   sw_info->retry_count--;
   sw_info->running_timer = false;
   debug( "Checking switch manager's switch list." );
-  if ( send_efi_switch_list_request( confirm_self_dpid_is_unregistered, sw_info ) ) {
+  set_list_switches_reply_handler( confirm_self_dpid_is_unregistered );
+  if ( send_list_switches_request( sw_info ) ) {
     switch_set_timeout( UNREGISTRATION_TIMEOUT, unregistration_timeout, sw_info );
   }
   else {
@@ -669,15 +679,15 @@ unregistration_retry( void *user_data ) {
 
 
 static void
-confirm_self_dpid_is_unregistered( uint64_t* dpids, size_t n_dpids, void *user_data ) {
+confirm_self_dpid_is_unregistered( const list_element *switches, void *user_data ) {
   struct switch_info *sw_info = user_data;
 
   switch_unset_timeout( unregistration_timeout, sw_info );
 
   debug( "Received switch manager's switch list." );
   bool found = false;
-  for ( size_t i = 0 ; i < n_dpids ; ++i ) {
-    if ( sw_info->datapath_id == dpids[ i ] ) {
+  for ( const list_element *e = switches; e != NULL; e = e->next ) {
+    if ( sw_info->datapath_id == *( uint64_t * ) e->data ) {
       // self dpid registered
       debug( "Self dpid found" );
       found = true;

data/unittests/lib/daemon_test.c

@@ -249,25 +249,25 @@ test_daemonize_fail_if_setsid_fail() {
 static void
 test_write_pid_succeed() {
   extern int locked_fd;
-
   locked_fd = -1;
-  will_return( mock_open, 1111 );
-  will_return( mock_lockf, 0 );
 
   // Test if correctly opened.
   char path[] = "/home/yasuhito/trema/tmp/chess.pid";
   char buffer[] = "1234\n";
+  int pid_file_fd = 1111;
   expect_string( mock_open, pathname, path );
   expect_value( mock_open, flags, ( O_RDWR | O_CREAT ) );
   expect_value( mock_open, mode, 0600 );
+  will_return( mock_open, pid_file_fd );
 
   // Test if correctly locked.
-  expect_value( mock_lockf, fd, 1111 );
+  expect_value( mock_lockf, fd, pid_file_fd );
   expect_value( mock_lockf, cmd, F_TLOCK );
   expect_value( mock_lockf, len, 0 );
+  will_return( mock_lockf, 0 );
 
   // Test if correctly written.
-  expect_value( mock_write, fd, 1111 );
+  expect_value( mock_write, fd, pid_file_fd );
   expect_string( mock_write, buf, buffer );
   expect_value( mock_write, count, strlen( buffer ) );
 
@@ -278,15 +278,14 @@ test_write_pid_succeed() {
 static void
 test_write_pid_fail_if_open_fail() {
   extern int locked_fd;
-
   locked_fd = -1;
-  will_return( mock_open, -1 );
 
   // Test if correctly opened.
   char path[] = "/home/yasuhito/trema/tmp/chess.pid";
   expect_string( mock_open, pathname, path );
   expect_value( mock_open, flags, ( O_RDWR | O_CREAT ) );
   expect_value( mock_open, mode, 0600 );
+  will_return( mock_open, -1 );
 
   expect_string( mock_die, message, "Could not create a PID file: /home/yasuhito/trema/tmp/chess.pid" );
 
@@ -297,21 +296,21 @@ test_write_pid_fail_if_open_fail() {
 static void
 test_write_pid_fail_if_lockf_fail() {
   extern int locked_fd;
-
   locked_fd = -1;
-  will_return( mock_open, 1111 );
-  will_return( mock_lockf, -1 );
 
-  // Test if correctly locked.
+  // Test if correctly opened.
   char path[] = "/home/yasuhito/trema/tmp/chess.pid";
+  int pid_file_fd = 1111;
   expect_string( mock_open, pathname, path );
   expect_value( mock_open, flags, ( O_RDWR | O_CREAT ) );
   expect_value( mock_open, mode, 0600 );
+  will_return( mock_open, pid_file_fd );
 
   // Test if correctly locked.
-  expect_value( mock_lockf, fd, 1111 );
+  expect_value( mock_lockf, fd, pid_file_fd );
   expect_value( mock_lockf, cmd, F_TLOCK );
   expect_value( mock_lockf, len, 0 );
+  will_return( mock_lockf, -1 );
 
   // lockf_return_value = -1;
   expect_string( mock_die, message, "Could not acquire a lock on a PID file: /home/yasuhito/trema/tmp/chess.pid" );
@@ -322,11 +321,24 @@ test_write_pid_fail_if_lockf_fail() {
 
 static void
 test_unlink_pid_succeed() {
-  will_return( mock_unlink, 0 );
+  // Test if correctly opened.
+  char path[] = "/home/yasuhito/trema/tmp/chess.pid";
+  int pid_file_fd = 1111;
+  expect_string( mock_open, pathname, path );
+  expect_value( mock_open, flags, O_RDWR );
+  expect_value( mock_open, mode, 0 );
+  will_return( mock_open, pid_file_fd );
+
+  // Test if correctly locked.
+  expect_value( mock_lockf, fd, pid_file_fd );
+  expect_value( mock_lockf, cmd, F_TLOCK );
+  expect_value( mock_lockf, len, 0 );
+  will_return( mock_lockf, 0 );
 
   // Test if correctly unlinked.
-  char path[] = "/home/yasuhito/trema/tmp/chess.pid";
   expect_string( mock_unlink, pathname, path );
+  will_return( mock_unlink, 0 );
+  expect_value( mock_close, fd, pid_file_fd );
 
   unlink_pid( "/home/yasuhito/trema/tmp", "chess" );
 }
@@ -334,10 +346,25 @@ test_unlink_pid_succeed() {
 
 static void
 test_unlink_pid_fail_if_unlink_fail() {
-  will_return( mock_unlink, -1 );
-
+  // Test if correctly opened.
   char path[] = "/home/yasuhito/trema/tmp/chess.pid";
+  int pid_file_fd = 1111;
+  expect_string( mock_open, pathname, path );
+  expect_value( mock_open, flags, O_RDWR );
+  expect_value( mock_open, mode, 0 );
+  will_return( mock_open, pid_file_fd );
+
+  // Test if correctly locked.
+  expect_value( mock_lockf, fd, pid_file_fd );
+  expect_value( mock_lockf, cmd, F_TLOCK );
+  expect_value( mock_lockf, len, 0 );
+  will_return( mock_lockf, 0 );
+
+  // Test if correctly unlinked.
   expect_string( mock_unlink, pathname, path );
+  errno = EACCES;
+  will_return( mock_unlink, -1 );
+  //expect_value( mock_close, fd, pid_file_fd );
 
   expect_string( mock_die, message, "Could not remove a PID file: /home/yasuhito/trema/tmp/chess.pid" );
 
@@ -345,6 +372,27 @@ test_unlink_pid_fail_if_unlink_fail() {
 }
 
 
+static void
+test_unlink_pid_fail_if_lockf_fail() {
+  // Test if correctly opened.
+  char path[] = "/home/yasuhito/trema/tmp/chess.pid";
+  int pid_file_fd = 1111;
+  expect_string( mock_open, pathname, path );
+  expect_value( mock_open, flags, O_RDWR );
+  expect_value( mock_open, mode, 0 );
+  will_return( mock_open, pid_file_fd );
+
+  // Test if correctly locked.
+  expect_value( mock_lockf, fd, pid_file_fd );
+  expect_value( mock_lockf, cmd, F_TLOCK );
+  expect_value( mock_lockf, len, 0 );
+  will_return( mock_lockf, -1 );
+  expect_value( mock_close, fd, pid_file_fd );
+
+  unlink_pid( "/home/yasuhito/trema/tmp", "chess" );
+}
+
+
 static void
 test_read_pid_successed() {
   // Test if correctly access.
@@ -662,35 +710,44 @@ test_read_pid_fail_if_readlink_fail() {
 static void
 test_rename_pid_successed() {
   extern int locked_fd;
-
   locked_fd = 2222;
-  will_return( mock_open, 1111 );
-  will_return( mock_lockf, 0 );
 
   // Test if correctly opened.
   char new_path[] = "/home/yasuhito/trema/tmp/hello.pid";
   char buffer[] = "1234\n";
+  int new_pid_file_fd = 3333;
   expect_string( mock_open, pathname, new_path );
   expect_value( mock_open, flags, ( O_RDWR | O_CREAT ) );
   expect_value( mock_open, mode, 0600 );
-
+  will_return( mock_open, new_pid_file_fd );
   // Test if correctly locked.
-  expect_value( mock_lockf, fd, 1111 );
+  expect_value( mock_lockf, fd, new_pid_file_fd );
   expect_value( mock_lockf, cmd, F_TLOCK );
   expect_value( mock_lockf, len, 0 );
-
+  will_return( mock_lockf, 0 );
   // Test if correctly written.
-  expect_value( mock_write, fd, 1111 );
+  expect_value( mock_write, fd, new_pid_file_fd );
   expect_string( mock_write, buf, buffer );
   expect_value( mock_write, count, strlen( buffer ) );
 
-  expect_value( mock_close, fd, 2222 );
-
-  will_return( mock_unlink, 0 );
-
-  // Test if correctly unlinked.
+  // Test if correctly opened.
   char old_path[] = "/home/yasuhito/trema/tmp/bye.pid";
+  int old_pid_file_fd = 4444;
+  expect_string( mock_open, pathname, old_path );
+  expect_value( mock_open, flags, O_RDWR );
+  expect_value( mock_open, mode, 0 );
+  will_return( mock_open, old_pid_file_fd );
+  // Test if correctly locked.
+  expect_value( mock_lockf, fd, old_pid_file_fd );
+  expect_value( mock_lockf, cmd, F_TLOCK );
+  expect_value( mock_lockf, len, 0 );
+  will_return( mock_lockf, 0 );
+  // Test if correctly unlinked.
   expect_string( mock_unlink, pathname, old_path );
+  will_return( mock_unlink, 0 );
+  expect_value( mock_close, fd, old_pid_file_fd );
+
+  expect_value( mock_close, fd, 2222 );
 
   // Go
   rename_pid( "/home/yasuhito/trema/tmp", "bye", "hello" );
@@ -718,6 +775,7 @@ main() {
     // unlink_pid() tsets.
     unit_test( test_unlink_pid_succeed ),
     unit_test( test_unlink_pid_fail_if_unlink_fail ),
+    unit_test( test_unlink_pid_fail_if_lockf_fail ),
 
     // read_pid() tests.
     unit_test( test_read_pid_successed ),

metadata

@@ -1,127 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trema
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 4
-  version: 0.4.4
+version: !ruby/object:Gem::Version
+  version: 0.4.5
 platform: ruby
-authors: 
+authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2013-11-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 2
-        - 8
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.8.1
-  name: gli
-  prerelease: false
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
   name: paper_house
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 2
-        - 6
-        version: 0.2.6
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
   name: pio
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.6
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 75
-        segments: 
-        - 10
-        - 1
-        - 0
-        version: 10.1.0
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 4
-        - 0
-        - 1
-        version: 4.0.1
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
   type: :runtime
-  requirement: *id006
-description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
+  controllers in Ruby and C.
+email:
 - yasuhito@gmail.com
-executables: 
+executables:
 - trema
 - trema-config
-extensions: 
+extensions:
 - Rakefile
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .gitignore
 - .ruby-version
 - .travis.yml
@@ -811,40 +795,28 @@ files:
 - vendor/ruby-ifconfig-1.2/test/unit/tc_openbsd.rb
 - vendor/ruby-ifconfig-1.2/test/unit/tc_sunos.rb
 homepage: http://github.com/trema/trema
-licenses: 
+licenses:
 - GPL2
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - ruby
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Full-stack OpenFlow framework.
 test_files: []
-
 has_rdoc: