trema 0.2.2.1 → 0.2.3

data/src/switch_manager/switch.h

@@ -42,6 +42,7 @@
 int switch_event_connected( struct switch_info *switch_info );
 int switch_event_disconnected( struct switch_info *switch_info );
 int switch_event_recv_hello( struct switch_info *switch_info );
+int switch_event_recv_echoreply( struct switch_info *switch_info, buffer *buf );
 int switch_event_recv_featuresreply( struct switch_info *switch_info, uint64_t *datapath_id );
 int switch_event_recv_from_application( uint64_t *datapath_id, char *application_service_name, buffer *buf );
 int switch_event_disconnect_request( uint64_t *datapath_id );

data/src/switch_manager/switchinfo.h

@@ -42,7 +42,10 @@ struct switch_info {
   struct notify_info *notify_info;
 
   int secure_channel_fd;        // socket file descriptor of secure channel
+
   bool flow_cleanup;
+  bool cookie_translation;
+  bool deny_packet_in_on_startup;
 
   int state;                    // state of switch secure channel
   uint64_t datapath_id;
@@ -58,6 +61,8 @@ struct switch_info {
   message_queue *recv_queue;
 
   bool running_timer;
+
+  uint32_t echo_request_xid;
 };
 
 

data/src/tremashark/README

@@ -68,8 +68,8 @@ How to run?
 
 2. Send SIGUSR2 to processes to be monitored by tremashark. e.g.,
 
-  $ sudo kill -USR2 `cat tmp/learning_switch.pid`
-  $ sudo kill -USR2 `cat tmp/switch.1.pid`
+  $ sudo kill -USR2 `cat tmp/pid/learning_switch.pid`
+  $ sudo kill -USR2 `cat tmp/pid/switch.0x1.pid`
 
 Known issue
 ===========

data/src/tremashark/plugin/packet-trema/packet-trema.c

@@ -225,6 +225,7 @@ static const value_string names_service_tag[] = {
   { MESSENGER_OPENFLOW_CONNECTED, "Switch Connected" },
   { MESSENGER_OPENFLOW_READY, "Switch Ready" },
   { MESSENGER_OPENFLOW_DISCONNECTED, "Switch Disconnected" },
+  { MESSENGER_OPENFLOW_FAILD_TO_CONNECT, "Switch Failed to connect" },
   { 0, NULL },
 };
 

data/trema

@@ -45,7 +45,7 @@ end
 def method_for command
   case command
     when "version", "-V", "--version"
-      return :version
+      return :show_version
     when "ruby"
       return :ruby
     when "help", "-h", "--help", "/?", "-?"

data/unittests/lib/log_test.c

@@ -20,8 +20,10 @@
  */
 
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <syslog.h>
 #include "checks.h"
 #include "cmockery_trema.h"
 #include "log.h"
@@ -81,6 +83,35 @@ mock_fprintf( FILE *stream, const char *format, ... ) {
 }
 
 
+static bool syslog_initialized = false;
+
+static void
+mock_openlog( const char *ident, int option, int facility ) {
+  check_expected( ident );
+  check_expected( option );
+  check_expected( facility );
+
+  syslog_initialized = true;
+}
+
+
+static void
+mock_closelog( void ) {
+  syslog_initialized = false;
+}
+
+
+static void
+mock_vsyslog( int priority, const char *format, va_list ap ) {
+  check_expected( priority );
+
+  char output[ 256 ];
+  vsnprintf( output, sizeof( output ), format, ap );
+
+  check_expected( output );
+}
+
+
 /********************************************************************************
  * Setup and teardown function.
  ********************************************************************************/
@@ -104,20 +135,41 @@ setup() {
   trema_abort = mock_abort;
   trema_vprintf = mock_vprintf;
   trema_fprintf = mock_fprintf;
+  trema_openlog = mock_openlog;
+  trema_closelog = mock_closelog;
+  trema_vsyslog = mock_vsyslog;
+}
+
+
+static void
+setup_logger_stdout() {
+  setup();
+  init_log( "log_test.c", get_trema_tmp(), LOGGING_TYPE_STDOUT );
+}
+
+
+static void
+setup_logger_file() {
+  setup();
+  init_log( "log_test.c", get_trema_tmp(), LOGGING_TYPE_FILE );
 }
 
 
 static void
-setup_logger() {
+setup_logger_file_stdout() {
   setup();
-  init_log( "log_test.c", get_trema_tmp(), false );
+  init_log( "log_test.c", get_trema_tmp(), LOGGING_TYPE_FILE | LOGGING_TYPE_STDOUT );
 }
 
 
 static void
-setup_daemon_logger() {
+setup_logger_syslog() {
   setup();
-  init_log( "log_test.c", get_trema_tmp(), true );
+  const char *ident = "log_test.c";
+  expect_string( mock_openlog, ident, ident );
+  expect_value( mock_openlog, option, LOG_NDELAY );
+  expect_value( mock_openlog, facility, LOG_USER );
+  init_log( ident, get_trema_tmp(), LOGGING_TYPE_SYSLOG );
 }
 
 
@@ -132,6 +184,9 @@ teardown() {
   trema_abort = abort;
   trema_vprintf = vprintf;
   trema_fprintf = fprintf;
+  trema_openlog = openlog;
+  trema_closelog = closelog;
+  trema_vsyslog = vsyslog;
 }
 
 
@@ -142,8 +197,30 @@ teardown() {
 void
 test_init_log_reads_LOGING_LEVEL_environment_variable() {
   setenv( "LOGGING_LEVEL", "CRITICAL", 1 );
-  init_log( "tetris", get_trema_tmp(), false );
-  assert_int_equal( LOG_CRITICAL, get_logging_level() );
+  init_log( "tetris", get_trema_tmp(), LOGGING_TYPE_FILE );
+  assert_int_equal( LOG_CRIT, get_logging_level() );
+}
+
+
+void
+test_init_log_opens_syslog() {
+  const char *ident = "tetris";
+  expect_string( mock_openlog, ident, ident );
+  expect_value( mock_openlog, option, LOG_NDELAY );
+  expect_value( mock_openlog, facility, LOG_USER );
+  init_log( ident, get_trema_tmp(), LOGGING_TYPE_SYSLOG );
+  assert_true( syslog_initialized );
+}
+
+
+/********************************************************************************
+ * Finalization test.
+ ********************************************************************************/
+
+void
+test_finalize_log_closes_syslog() {
+  finalize_log();
+  assert_false( syslog_initialized );
 }
 
 
@@ -160,7 +237,7 @@ test_default_logging_level_is_INFO() {
 void
 test_set_logging_level_succeed() {
   set_logging_level( "critical" );
-  assert_int_equal( LOG_CRITICAL, get_logging_level() );
+  assert_int_equal( LOG_CRIT, get_logging_level() );
 }
 
 
@@ -170,6 +247,23 @@ test_set_logging_level_fail_with_invalid_value() {
 }
 
 
+void
+test_set_logging_level_is_called_before_init_log() {
+  set_logging_level( "critical" );
+  init_log( "tetris", get_trema_tmp(), LOGGING_TYPE_FILE );
+  assert_int_equal( LOG_CRIT, get_logging_level() );
+}
+
+
+void
+test_LOGGING_LEVEL_overrides_logging_level() {
+  setenv( "LOGGING_LEVEL", "DEBUG", 1 );
+  set_logging_level( "critical" );
+  init_log( "tetris", get_trema_tmp(), LOGGING_TYPE_FILE );
+  assert_int_equal( LOG_DEBUG, get_logging_level() );
+}
+
+
 /********************************************************************************
  * critical() tests.
  ********************************************************************************/
@@ -365,18 +459,35 @@ test_debug_fail_if_NULL() {
 
 
 /********************************************************************************
- * Misc.
+ * Output type tests.
  ********************************************************************************/
 
 void
 test_output_to_stdout() {
   expect_string( mock_vprintf, output, "Hello World\n" );
+
+  info( "Hello World" );
+}
+
+
+void
+test_output_to_file_stdout() {
+  expect_string( mock_vprintf, output, "Hello World\n" );
   expect_string( mock_fprintf, output, "Hello World\n" );
 
   info( "Hello World" );
 }
 
 
+void
+test_output_to_syslog() {
+  expect_value( mock_vsyslog, priority, LOG_INFO );
+  expect_string( mock_vsyslog, output, "Hello World" );
+
+  info( "Hello World" );
+}
+
+
 /********************************************************************************
  * Run tests.
  ********************************************************************************/
@@ -386,66 +497,79 @@ main() {
   const UnitTest tests[] = {
     unit_test_setup_teardown( test_init_log_reads_LOGING_LEVEL_environment_variable,
                               reset_LOGGING_LEVEL, reset_LOGGING_LEVEL ),
+    unit_test_setup_teardown( test_init_log_opens_syslog,
+                              setup, teardown ),
+
+    unit_test_setup_teardown( test_finalize_log_closes_syslog,
+                              setup_logger_syslog, teardown ),
 
     unit_test_setup_teardown( test_default_logging_level_is_INFO,
-                              setup_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_set_logging_level_succeed,
-                              setup_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_set_logging_level_fail_with_invalid_value,
-                              setup_logger, teardown ),
+                              setup_logger_file, teardown ),
+    unit_test_setup_teardown( test_set_logging_level_is_called_before_init_log,
+                              setup, teardown ),
+    unit_test_setup_teardown( test_LOGGING_LEVEL_overrides_logging_level,
+                              setup, teardown ),
 
     unit_test_setup_teardown( test_critical_logs_if_logging_level_is_CRITICAL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_critical_logs_if_logging_level_is_ERROR,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_critical_fail_if_NULL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
 
     unit_test_setup_teardown( test_error_donothing_if_logging_level_is_CRITICAL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_error_logs_if_logging_level_is_ERROR,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_error_logs_if_logging_level_is_WARNING,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_error_fail_if_NULL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
 
     unit_test_setup_teardown( test_warn_donothing_if_logging_level_is_ERROR,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_warn_logs_if_logging_level_is_WARNING,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_warn_logs_if_logging_level_is_NOTICE,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_warn_fail_if_NULL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
 
     unit_test_setup_teardown( test_notice_donothing_if_logging_level_is_WARNING,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_notice_logs_if_logging_level_is_NOTICE,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_notice_logs_if_logging_level_is_INFO,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_notice_fail_if_NULL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
 
     unit_test_setup_teardown( test_info_logs_if_logging_level_is_DEBUG,
-        		      setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_info_logs_if_logging_level_is_INFO,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_info_donothing_if_logging_level_is_NOTICE,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_info_fail_if_NULL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
 
     unit_test_setup_teardown( test_DEBUG_donothing_if_logging_level_is_INFO,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_DEBUG_logs_if_logging_level_is_DEBUG,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
     unit_test_setup_teardown( test_debug_fail_if_NULL,
-                              setup_daemon_logger, teardown ),
+                              setup_logger_file, teardown ),
 
     unit_test_setup_teardown( test_output_to_stdout,
-                              setup_logger, teardown ),
+                              setup_logger_stdout, teardown ),
+    unit_test_setup_teardown( test_output_to_file_stdout,
+                              setup_logger_file_stdout, teardown ),
+    unit_test_setup_teardown( test_output_to_syslog,
+                              setup_logger_syslog, teardown ),
   };
   return run_tests( tests );
 }

data/unittests/lib/openflow_application_interface_test.c

@@ -54,6 +54,7 @@ extern hash_table *stats;
 
 extern void assert_if_not_initialized();
 extern void handle_error( const uint64_t datapath_id, buffer *data );
+extern void handle_echo_reply( const uint64_t datapath_id, buffer *data );
 extern void handle_vendor( const uint64_t datapath_id, buffer *data );
 extern void handle_features_reply( const uint64_t datapath_id, buffer *data );
 extern void handle_get_config_reply( const uint64_t datapath_id, buffer *data );
@@ -77,26 +78,28 @@ extern void handle_list_switches_reply( uint16_t message_type, void *data, size_
 #define SWITCH_DISCONNECTED_USER_DATA ( ( void * ) 0x00020021 )
 #define ERROR_HANDLER ( ( void * ) 0x00010001 )
 #define ERROR_USER_DATA ( ( void * ) 0x00010011 )
-#define VENDOR_HANDLER ( ( void * ) 0x00010002 )
-#define VENDOR_USER_DATA ( ( void * ) 0x00010021 )
-#define FEATURES_REPLY_HANDLER ( ( void * ) 0x00010003 )
-#define FEATURES_REPLY_USER_DATA ( ( void * ) 0x00010031 )
-#define GET_CONFIG_REPLY_HANDLER ( ( void * ) 0x00010004 )
-#define GET_CONFIG_REPLY_USER_DATA ( ( void * ) 0x00010041 )
-#define PACKET_IN_HANDLER ( ( void * ) 0x00010005 )
-#define PACKET_IN_USER_DATA ( ( void * ) 0x00010051 )
-#define FLOW_REMOVED_HANDLER ( ( void * ) 0x00010006 )
-#define FLOW_REMOVED_USER_DATA ( ( void * ) 0x00010061 )
-#define PORT_STATUS_HANDLER ( ( void * ) 0x00010007 )
-#define PORT_STATUS_USER_DATA ( ( void * ) 0x00010071 )
-#define STATS_REPLY_HANDLER ( ( void * ) 0x00010008 )
-#define STATS_REPLY_USER_DATA ( ( void * ) 0x00010081 )
-#define BARRIER_REPLY_HANDLER ( ( void * ) 0x00010009 )
-#define BARRIER_REPLY_USER_DATA ( ( void * ) 0x00010091 )
-#define QUEUE_GET_CONFIG_REPLY_HANDLER ( ( void * ) 0x0001000a )
-#define QUEUE_GET_CONFIG_REPLY_USER_DATA ( ( void * ) 0x000100a1 )
-#define LIST_SWITCHES_REPLY_HANDLER ( ( void * ) 0x0001000b )
-#define LIST_SWITCHES_REPLY_USER_DATA ( ( void * ) 0x000100b1 )
+#define ECHO_REPLY_HANDLER ( ( void * ) 0x00010002 )
+#define ECHO_REPLY_USER_DATA ( ( void * ) 0x00010021 )
+#define VENDOR_HANDLER ( ( void * ) 0x00010003 )
+#define VENDOR_USER_DATA ( ( void * ) 0x00010031 )
+#define FEATURES_REPLY_HANDLER ( ( void * ) 0x00010004 )
+#define FEATURES_REPLY_USER_DATA ( ( void * ) 0x00010041 )
+#define GET_CONFIG_REPLY_HANDLER ( ( void * ) 0x00010005 )
+#define GET_CONFIG_REPLY_USER_DATA ( ( void * ) 0x00010051 )
+#define PACKET_IN_HANDLER ( ( void * ) 0x00010006 )
+#define PACKET_IN_USER_DATA ( ( void * ) 0x00010061 )
+#define FLOW_REMOVED_HANDLER ( ( void * ) 0x00010007 )
+#define FLOW_REMOVED_USER_DATA ( ( void * ) 0x00010071 )
+#define PORT_STATUS_HANDLER ( ( void * ) 0x00010008 )
+#define PORT_STATUS_USER_DATA ( ( void * ) 0x00010081 )
+#define STATS_REPLY_HANDLER ( ( void * ) 0x00010009 )
+#define STATS_REPLY_USER_DATA ( ( void * ) 0x00010091 )
+#define BARRIER_REPLY_HANDLER ( ( void * ) 0x0001000a )
+#define BARRIER_REPLY_USER_DATA ( ( void * ) 0x000100a1 )
+#define QUEUE_GET_CONFIG_REPLY_HANDLER ( ( void * ) 0x0001000b )
+#define QUEUE_GET_CONFIG_REPLY_USER_DATA ( ( void * ) 0x000100b1 )
+#define LIST_SWITCHES_REPLY_HANDLER ( ( void * ) 0x0001000c )
+#define LIST_SWITCHES_REPLY_USER_DATA ( ( void * ) 0x000100c1 )
 
 static const pid_t PID = 12345;
 static char SERVICE_NAME[] = "learning switch application 0";
@@ -112,11 +115,13 @@ static openflow_event_handlers_t NULL_EVENT_HANDLERS = { false, ( void * ) 0, (
                                                          ( void * ) 0, ( void * ) 0,
                                                          ( void * ) 0, ( void * ) 0,
                                                          ( void * ) 0, ( void * ) 0,
+                                                         ( void * ) 0, ( void * ) 0,
                                                          ( void * ) 0 };
 static openflow_event_handlers_t EVENT_HANDLERS = {
   false, SWITCH_READY_HANDLER, SWITCH_READY_USER_DATA,
   SWITCH_DISCONNECTED_HANDLER, SWITCH_DISCONNECTED_USER_DATA,
   ERROR_HANDLER, ERROR_USER_DATA,
+  ECHO_REPLY_HANDLER, ECHO_REPLY_USER_DATA,
   VENDOR_HANDLER, VENDOR_USER_DATA,
   FEATURES_REPLY_HANDLER, FEATURES_REPLY_USER_DATA,
   GET_CONFIG_REPLY_HANDLER, GET_CONFIG_REPLY_USER_DATA,
@@ -241,6 +246,14 @@ mock_delete_message_replied_callback( char *service_name,
 }
 
 
+bool
+mock_clear_send_queue( const char *service_name ) {
+  check_expected( service_name );
+
+  return ( bool ) mock();
+}
+
+
 bool
 mock_parse_packet( buffer *buf ) {
   calloc_packet_info( buf );
@@ -271,6 +284,25 @@ mock_error_handler( uint64_t datapath_id, uint32_t transaction_id, uint16_t type
 }
 
 
+static void
+mock_echo_reply_handler( uint64_t datapath_id, uint32_t transaction_id, const buffer *data,
+                         void *user_data ){
+  void *data_uc;
+
+  check_expected( &datapath_id );
+  check_expected( transaction_id );
+  if( data != NULL ) {
+    check_expected( data->length );
+    check_expected( data->data );
+  }
+  else {
+    data_uc = ( void * ) ( unsigned long ) data;
+    check_expected( data_uc );
+  }
+  check_expected( user_data );
+}
+
+
 static void
 mock_vendor_handler( uint64_t datapath_id, uint32_t transaction_id, uint32_t vendor,
                      const buffer *data, void *user_data ){
@@ -468,7 +500,7 @@ mock_critical( char *format, ... ) {
 }
 
 
-static logging_level
+static int
 mock_get_logging_level() {
   return LOG_DEBUG;
 }
@@ -774,6 +806,26 @@ test_set_error_handler_if_handler_is_NULL() {
 }
 
 
+/********************************************************************************
+ * set_echo_reply_handler() tests.
+ ********************************************************************************/
+
+static void
+test_set_echo_reply_handler() {
+  assert_true( set_echo_reply_handler( ECHO_REPLY_HANDLER, ECHO_REPLY_USER_DATA ) );
+  assert_int_equal( event_handlers.echo_reply_callback, ECHO_REPLY_HANDLER );
+  assert_int_equal( event_handlers.echo_reply_user_data, ECHO_REPLY_USER_DATA );
+}
+
+
+static void
+test_set_echo_reply_handler_if_handler_is_NULL() {
+  expect_string( mock_die, format, "Callback function ( echo_reply_handler ) must not be NULL." );
+  expect_assert_failure( set_echo_reply_handler( NULL, NULL ) );
+  assert_memory_equal( &event_handlers, &NULL_EVENT_HANDLERS, sizeof( event_handlers ) );
+}
+
+
 /********************************************************************************
  * set_vendor_handler() tests.
  ********************************************************************************/
@@ -1367,6 +1419,91 @@ test_handle_error_if_message_length_is_zero() {
 }
 
 
+/********************************************************************************
+ * handle_echo_request() tests.
+ ********************************************************************************/
+
+static void
+test_handle_echo_reply() {
+  buffer *buffer, *data;
+
+  data = alloc_buffer_with_length( 16 );
+  append_back_buffer( data, 16 );
+  memset( data->data, 'a', 16 );
+
+  buffer = create_echo_reply( TRANSACTION_ID, data );
+
+  expect_memory( mock_echo_reply_handler, &datapath_id, &DATAPATH_ID, sizeof( uint64_t ) );
+  expect_value( mock_echo_reply_handler, transaction_id, TRANSACTION_ID );
+  expect_value( mock_echo_reply_handler, data->length, data->length );
+  expect_memory( mock_echo_reply_handler, data->data, data->data, data->length );
+  expect_memory( mock_echo_reply_handler, user_data, USER_DATA, USER_DATA_LEN );
+
+  set_echo_reply_handler( mock_echo_reply_handler, USER_DATA );
+  handle_echo_reply( DATAPATH_ID, buffer );
+
+  free_buffer( data );
+  free_buffer( buffer );
+}
+
+
+static void
+test_handle_echo_reply_without_data() {
+  buffer *buffer;
+
+  buffer = create_echo_reply( TRANSACTION_ID, NULL );
+
+  expect_memory( mock_echo_reply_handler, &datapath_id, &DATAPATH_ID, sizeof( uint64_t ) );
+  expect_value( mock_echo_reply_handler, transaction_id, TRANSACTION_ID );
+  expect_value( mock_echo_reply_handler, data_uc, NULL );
+  expect_memory( mock_echo_reply_handler, user_data, USER_DATA, USER_DATA_LEN );
+
+  set_echo_reply_handler( mock_echo_reply_handler, USER_DATA );
+  handle_echo_reply( DATAPATH_ID, buffer );
+
+  free_buffer( buffer );
+}
+
+
+static void
+test_handle_echo_reply_if_handler_is_not_registered() {
+  buffer *buffer, *data;
+
+  data = alloc_buffer_with_length( 16 );
+  append_back_buffer( data, 16 );
+  memset( data->data, 'a', 16 );
+
+  buffer = create_echo_reply( TRANSACTION_ID, data );
+
+  // FIXME
+
+  handle_echo_reply( DATAPATH_ID, buffer );
+
+  free_buffer( data );
+  free_buffer( buffer );
+}
+
+
+static void
+test_handle_echo_reply_if_message_is_NULL() {
+  set_echo_reply_handler( mock_echo_reply_handler, USER_DATA );
+  expect_assert_failure( handle_echo_reply( DATAPATH_ID, NULL ) );
+}
+
+
+static void
+test_handle_echo_reply_if_message_length_is_zero() {
+  buffer *buffer;
+
+  buffer = alloc_buffer_with_length( 32 );
+
+  set_echo_reply_handler( mock_echo_reply_handler, USER_DATA );
+  expect_assert_failure( handle_echo_reply( DATAPATH_ID, buffer ) );
+
+  free_buffer( buffer );
+}
+
+
 /********************************************************************************
  * handle_vendor() tests.
  ********************************************************************************/
@@ -2665,6 +2802,9 @@ test_handle_switch_events_if_type_is_MESSENGER_OPENFLOW_DISCONNECTED() {
   expect_memory( mock_switch_disconnected_handler, &datapath_id, &DATAPATH_ID, sizeof( uint64_t ) );
   expect_value( mock_switch_disconnected_handler, user_data, SWITCH_DISCONNECTED_USER_DATA );
 
+  expect_string( mock_clear_send_queue, service_name, REMOTE_SERVICE_NAME );
+  will_return( mock_clear_send_queue, true );
+
   set_switch_disconnected_handler( mock_switch_disconnected_handler, SWITCH_DISCONNECTED_USER_DATA );
   handle_switch_events( MESSENGER_OPENFLOW_DISCONNECTED, data->data, data->length );
 
@@ -3272,6 +3412,9 @@ test_handle_message_if_type_is_MESSENGER_OPENFLOW_DISCONNECTED() {
   expect_memory( mock_switch_disconnected_handler, &datapath_id, &DATAPATH_ID, sizeof( uint64_t ) );
   expect_value( mock_switch_disconnected_handler, user_data, SWITCH_DISCONNECTED_USER_DATA );
 
+  expect_string( mock_clear_send_queue, service_name, REMOTE_SERVICE_NAME );
+  will_return( mock_clear_send_queue, true );
+
   set_switch_disconnected_handler( mock_switch_disconnected_handler, SWITCH_DISCONNECTED_USER_DATA );
   handle_message( MESSENGER_OPENFLOW_DISCONNECTED, data->data, data->length );
 
@@ -3319,6 +3462,28 @@ test_handle_message_if_unhandled_message_type() {
 }
 
 
+/********************************************************************************
+ * delete_openflow_messages() tests.
+ ********************************************************************************/
+
+static void
+test_delete_openflow_messages() {
+  expect_string( mock_clear_send_queue, service_name, REMOTE_SERVICE_NAME );
+  will_return( mock_clear_send_queue, true );
+
+  assert_true( delete_openflow_messages( DATAPATH_ID ) );
+}
+
+
+static void
+test_delete_openflow_messages_if_clear_send_queue_fails() {
+  expect_string( mock_clear_send_queue, service_name, REMOTE_SERVICE_NAME );
+  will_return( mock_clear_send_queue, false );
+
+  assert_false( delete_openflow_messages( DATAPATH_ID ) );
+}
+
+
 /********************************************************************************
  * Run tests.
  ********************************************************************************/
@@ -3326,6 +3491,7 @@ test_handle_message_if_unhandled_message_type() {
 int
 main() {
   const UnitTest tests[] = {
+    // initialization and finalization tests.
     unit_test_setup_teardown( test_init_openflow_application_interface_with_valid_custom_service_name, cleanup, cleanup ),
     unit_test_setup_teardown( test_init_openflow_application_interface_with_too_long_custom_service_name, cleanup, cleanup ),
     unit_test_setup_teardown( test_init_openflow_application_interface_if_already_initialized, init, cleanup ),
@@ -3342,78 +3508,57 @@ main() {
     unit_test_setup_teardown( test_handle_switch_ready, init, cleanup ),
     unit_test_setup_teardown( test_handle_switch_ready_with_simple_handler, init, cleanup ),
 
+    // switch disconnected handler tests.
     unit_test_setup_teardown( test_set_switch_disconnected_handler, init, cleanup ),
     unit_test_setup_teardown( test_set_switch_disconnected_handler_if_handler_is_NULL, init, cleanup ),
 
+    // error handler tests.
     unit_test_setup_teardown( test_set_error_handler, init, cleanup ),
     unit_test_setup_teardown( test_set_error_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_vendor_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_vendor_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_features_reply_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_features_reply_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_get_config_reply_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_get_config_reply_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_flow_removed_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_flow_removed_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_port_status_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_port_status_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_stats_reply_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_stats_reply_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_barrier_reply_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_barrier_reply_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_queue_get_config_reply_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_queue_get_config_reply_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_set_list_switches_reply_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_list_switches_reply_handler_if_handler_is_NULL, init, cleanup ),
-
-    unit_test_setup_teardown( test_send_openflow_message, init, cleanup ),
-    unit_test_setup_teardown( test_send_openflow_message_if_message_is_NULL, init, cleanup ),
-    unit_test_setup_teardown( test_send_openflow_message_if_message_length_is_zero, init, cleanup ),
-
     unit_test_setup_teardown( test_handle_error, init, cleanup ),
     unit_test_setup_teardown( test_handle_error_if_handler_is_not_registered, init, cleanup ),
     unit_test_setup_teardown( test_handle_error_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_error_if_message_length_is_zero, init, cleanup ),
 
+    // echo_reply handler tests.
+    unit_test_setup_teardown( test_set_echo_reply_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_echo_reply_handler_if_handler_is_NULL, init, cleanup ),
+    unit_test_setup_teardown( test_handle_echo_reply, init, cleanup ),
+    unit_test_setup_teardown( test_handle_echo_reply_without_data, init, cleanup ),
+    unit_test_setup_teardown( test_handle_echo_reply_if_handler_is_not_registered, init, cleanup ),
+    unit_test_setup_teardown( test_handle_echo_reply_if_message_is_NULL, init, cleanup ),
+    unit_test_setup_teardown( test_handle_echo_reply_if_message_length_is_zero, init, cleanup ),
+
+    // vendor handler tests.
+    unit_test_setup_teardown( test_set_vendor_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_vendor_handler_if_handler_is_NULL, init, cleanup ),
+
     unit_test_setup_teardown( test_handle_vendor, init, cleanup ),
     unit_test_setup_teardown( test_handle_vendor_without_data, init, cleanup ),
     unit_test_setup_teardown( test_handle_vendor_if_handler_is_not_registered, init, cleanup ),
     unit_test_setup_teardown( test_handle_vendor_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_vendor_if_message_length_is_zero, init, cleanup ),
 
+    // features reply handler tests.
+    unit_test_setup_teardown( test_set_features_reply_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_features_reply_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_features_reply, init, cleanup ),
     unit_test_setup_teardown( test_handle_features_reply_without_phy_port, init, cleanup ),
     unit_test_setup_teardown( test_handle_features_reply_if_handler_is_not_registered, init, cleanup ),
     unit_test_setup_teardown( test_handle_features_reply_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_features_reply_if_message_length_is_zero, init, cleanup ),
 
+    // get config reply handler tests.
+    unit_test_setup_teardown( test_set_get_config_reply_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_get_config_reply_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_get_config_reply, init, cleanup ),
     unit_test_setup_teardown( test_handle_get_config_reply_if_handler_is_not_registered, init, cleanup ),
     unit_test_setup_teardown( test_handle_get_config_reply_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_get_config_reply_if_message_length_is_zero, init, cleanup ),
 
-    // Packet in handler tests.
-    unit_test_setup_teardown( test_set_packet_in_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_simple_packet_in_handler, init, cleanup ),
-    unit_test_setup_teardown( test_set_packet_in_handler_should_die_if_handler_is_NULL, init, cleanup ),
-    unit_test_setup_teardown( test_handle_packet_in, init, cleanup ),
-    unit_test_setup_teardown( test_handle_packet_in_with_simple_handler, init, cleanup ),
-    unit_test_setup_teardown( test_handle_packet_in_with_malformed_packet, init, cleanup ),
-    unit_test_setup_teardown( test_handle_packet_in_without_data, init, cleanup ),
-    unit_test_setup_teardown( test_handle_packet_in_without_handler, init, cleanup ),
-    unit_test_setup_teardown( test_handle_packet_in_should_die_if_message_is_NULL, init, cleanup ),
-    unit_test_setup_teardown( test_handle_packet_in_should_die_if_message_length_is_zero, init, cleanup ),
-
-    // Flow removed handler tests.
+    // flow removed handler tests.
+    unit_test_setup_teardown( test_set_flow_removed_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_flow_removed_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_flow_removed, init, cleanup ),
     unit_test_setup_teardown( test_handle_flow_removed_with_simple_handler, init, cleanup ),
     unit_test_setup_teardown( test_set_simple_flow_removed_handler, init, cleanup ),
@@ -3421,11 +3566,17 @@ main() {
     unit_test_setup_teardown( test_handle_flow_removed_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_flow_removed_if_message_length_is_zero, init, cleanup ),
 
+    // port status handler tests.
+    unit_test_setup_teardown( test_set_port_status_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_port_status_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_port_status, init, cleanup ),
     unit_test_setup_teardown( test_handle_port_status_if_handler_is_not_registered, init, cleanup ),
     unit_test_setup_teardown( test_handle_port_status_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_port_status_if_message_length_is_zero, init, cleanup ),
 
+    // stats reply handler tests.
+    unit_test_setup_teardown( test_set_stats_reply_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_stats_reply_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_stats_reply_if_type_is_OFPST_DESC, init, cleanup ),
     unit_test_setup_teardown( test_handle_stats_reply_if_type_is_OFPST_FLOW, init, cleanup ),
     unit_test_setup_teardown( test_handle_stats_reply_if_type_is_OFPST_AGGREGATE, init, cleanup ),
@@ -3438,24 +3589,47 @@ main() {
     unit_test_setup_teardown( test_handle_stats_reply_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_stats_reply_if_message_length_is_zero, init, cleanup ),
 
+    // barrier reply handler tests.
+    unit_test_setup_teardown( test_set_barrier_reply_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_barrier_reply_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_barrier_reply, init, cleanup ),
     unit_test_setup_teardown( test_handle_barrier_reply_if_handler_is_not_registered, init, cleanup ),
     unit_test_setup_teardown( test_handle_barrier_reply_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_barrier_reply_if_message_length_is_zero, init, cleanup ),
 
+    // queue get config reply handler tests.
+    unit_test_setup_teardown( test_set_queue_get_config_reply_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_queue_get_config_reply_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_queue_get_config_reply, init, cleanup ),
     unit_test_setup_teardown( test_handle_queue_get_config_reply_without_queues, init, cleanup ),
     unit_test_setup_teardown( test_handle_queue_get_config_reply_if_handler_is_not_registered, init, cleanup ),
     unit_test_setup_teardown( test_handle_queue_get_config_reply_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_queue_get_config_reply_if_message_length_is_zero, init, cleanup ),
 
-    unit_test_setup_teardown( test_insert_dpid, init, cleanup ),
-    unit_test_setup_teardown( test_insert_dpid_if_head_is_NULL, init, cleanup ),
-    unit_test_setup_teardown( test_insert_dpid_if_dpid_is_NULL, init, cleanup ),
+    // list switches reply handler tests.
+    unit_test_setup_teardown( test_set_list_switches_reply_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_list_switches_reply_handler_if_handler_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_list_switches_reply, init, cleanup ),
     unit_test_setup_teardown( test_handle_list_switches_reply_if_data_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_list_switches_reply_if_length_is_zero, init, cleanup ),
 
+    // packet-in handler tests.
+    unit_test_setup_teardown( test_set_packet_in_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_simple_packet_in_handler, init, cleanup ),
+    unit_test_setup_teardown( test_set_packet_in_handler_should_die_if_handler_is_NULL, init, cleanup ),
+    unit_test_setup_teardown( test_handle_packet_in, init, cleanup ),
+    unit_test_setup_teardown( test_handle_packet_in_with_simple_handler, init, cleanup ),
+    unit_test_setup_teardown( test_handle_packet_in_with_malformed_packet, init, cleanup ),
+    unit_test_setup_teardown( test_handle_packet_in_without_data, init, cleanup ),
+    unit_test_setup_teardown( test_handle_packet_in_without_handler, init, cleanup ),
+    unit_test_setup_teardown( test_handle_packet_in_should_die_if_message_is_NULL, init, cleanup ),
+    unit_test_setup_teardown( test_handle_packet_in_should_die_if_message_length_is_zero, init, cleanup ),
+
+    // miscellaneous tests.
+    unit_test_setup_teardown( test_insert_dpid, init, cleanup ),
+    unit_test_setup_teardown( test_insert_dpid_if_head_is_NULL, init, cleanup ),
+    unit_test_setup_teardown( test_insert_dpid_if_dpid_is_NULL, init, cleanup ),
+
     unit_test_setup_teardown( test_handle_switch_events_if_type_is_MESSENGER_OPENFLOW_CONNECTED, init, cleanup ),
     unit_test_setup_teardown( test_handle_switch_events_if_type_is_MESSENGER_OPENFLOW_DISCONNECTED, init, cleanup ),
     unit_test_setup_teardown( test_handle_switch_events_if_message_is_NULL, init, cleanup ),
@@ -3475,6 +3649,15 @@ main() {
     unit_test_setup_teardown( test_handle_message_if_message_is_NULL, init, cleanup ),
     unit_test_setup_teardown( test_handle_message_if_message_length_is_zero, init, cleanup ),
     unit_test_setup_teardown( test_handle_message_if_unhandled_message_type, init, cleanup ),
+
+    // send_openflow_message() tests.
+    unit_test_setup_teardown( test_send_openflow_message, init, cleanup ),
+    unit_test_setup_teardown( test_send_openflow_message_if_message_is_NULL, init, cleanup ),
+    unit_test_setup_teardown( test_send_openflow_message_if_message_length_is_zero, init, cleanup ),
+
+    // delete_openflow_messages() tests.
+    unit_test_setup_teardown( test_delete_openflow_messages, init, cleanup ),
+    unit_test_setup_teardown( test_delete_openflow_messages_if_clear_send_queue_fails, init, cleanup ),
   };
   return run_tests( tests );
 }