trema 0.2.5 → 0.2.6

data/unittests/lib/trema_private_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for trema_private.[ch]
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -303,7 +303,7 @@ main() {
     unit_test_setup_teardown( test_set_trema_tmp_when_TREMA_TMP_is_NOT_set_and_TREMA_HOME_is_NOT_ROOT, reset, reset ),
     unit_test_setup_teardown( test_set_trema_tmp_falls_back_to_default_if_TREMA_TMP_is_invalid, reset, reset ),
     unit_test_setup_teardown( test_set_trema_tmp_when_TREMA_HOME_and_TREMA_TMP_are_set, reset, reset ),
- 
+
     // get_trema_tmp() tests.
     unit_test_setup_teardown( test_get_trema_tmp, reset, reset ),
     unit_test_setup_teardown( test_get_trema_tmp_if_not_initialized, reset, reset ),

data/unittests/lib/trema_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for trema.[ch]
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -66,6 +66,7 @@ static bool messenger_started;
 static bool messenger_flushed;
 static bool messenger_dump_started;
 static bool stat_initialized;
+static bool management_interface_initialized;
 
 
 bool
@@ -329,7 +330,7 @@ mock_clock_gettime( clockid_t clk_id, struct timespec *tp ) {
 
 
 bool
-mock_set_external_callback( void ( *callback ) ( void ) ) {
+mock_set_external_callback( void ( *callback )( void ) ) {
   UNUSED( callback );
   return true;
 }
@@ -362,6 +363,27 @@ mock_finalize_packetin_filter_interface() {
 }
 
 
+bool
+mock_init_management_interface() {
+  assert_false( management_interface_initialized );
+
+  management_interface_initialized = true;
+
+  return true;
+}
+
+
+bool
+mock_finalize_management_interface() {
+  assert_true( management_interface_initialized );
+
+  management_interface_initialized = false;
+
+  return true;
+}
+
+
+
 /********************************************************************************
  * Setup and teardown.
  ********************************************************************************/
@@ -390,6 +412,8 @@ reset_trema() {
 
   stat_initialized = false;
 
+  management_interface_initialized = false;
+
   errno = 0;
 }
 
@@ -408,6 +432,7 @@ test_init_trema_initializes_submodules_in_right_order() {
   assert_true( messenger_initialized );
   assert_true( initialized );
   assert_true( stat_initialized );
+  assert_true( management_interface_initialized );
   assert_string_equal( _get_trema_home(), "/" );
   assert_string_equal( _get_trema_tmp(), "/tmp" );
 
@@ -531,6 +556,7 @@ test_finalize_trema_finalizes_submodules_in_right_order() {
   assert_false( messenger_initialized );
   assert_false( initialized );
   assert_false( stat_initialized );
+  assert_false( management_interface_initialized );
   assert_true( _get_trema_home() == NULL );
   assert_true( _get_trema_tmp() == NULL );
 }
@@ -716,11 +742,12 @@ test_parse_help_option() {
     format,
     "Usage: %s [OPTION]...\n"
     "\n"
-    "  -n, --name=SERVICE_NAME     service name\n"
-    "  -d, --daemonize             run in the background\n"
-    "  -l, --logging_level=LEVEL   set logging level\n"
-    "  -g, --syslog                output log messages to syslog\n"
-    "  -h, --help                  display this help and exit\n"
+    "  -n, --name=SERVICE_NAME         service name\n"
+    "  -d, --daemonize                 run in the background\n"
+    "  -l, --logging_level=LEVEL       set logging level\n"
+    "  -g, --syslog                    output log messages to syslog\n"
+    "  -f, --logging_facility=FACILITY set syslog facility\n"
+    "  -h, --help                      display this help and exit\n"
   );
   expect_value( mock_exit, status, EXIT_SUCCESS );
 
@@ -740,11 +767,12 @@ test_parse_h_option() {
     format,
     "Usage: %s [OPTION]...\n"
     "\n"
-    "  -n, --name=SERVICE_NAME     service name\n"
-    "  -d, --daemonize             run in the background\n"
-    "  -l, --logging_level=LEVEL   set logging level\n"
-    "  -g, --syslog                output log messages to syslog\n"
-    "  -h, --help                  display this help and exit\n"
+    "  -n, --name=SERVICE_NAME         service name\n"
+    "  -d, --daemonize                 run in the background\n"
+    "  -l, --logging_level=LEVEL       set logging level\n"
+    "  -g, --syslog                    output log messages to syslog\n"
+    "  -f, --logging_facility=FACILITY set syslog facility\n"
+    "  -h, --help                      display this help and exit\n"
   );
   expect_value( mock_exit, status, EXIT_SUCCESS );
 

data/unittests/lib/utility_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for utility functions.
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -20,6 +20,7 @@
  */
 
 
+#include <arpa/inet.h>
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
@@ -27,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <arpa/inet.h>
 #include "cmockery_trema.h"
 #include "log.h"
 #include "ipv4.h"
@@ -258,7 +258,7 @@ test_wildcards_to_string_fails_with_insufficient_buffer() {
 static void
 test_match_to_string() {
   char match_str[ 256 ];
-  char expected_match_str[] = "wildcards = 0(none), in_port = 1, dl_src = 01:02:03:04:05:07, dl_dst = 08:09:0a:0b:0c:0d, dl_vlan = 1, dl_vlan_pcp = 1, dl_type = 0x800, nw_tos = 1, nw_proto = 6, nw_src = 10.9.8.7/32, nw_dst = 6.5.4.3/32, tp_src = 1024, tp_dst = 2048";
+  char expected_match_str[] = "wildcards = 0(none), in_port = 1, dl_src = 01:02:03:04:05:07, dl_dst = 08:09:0a:0b:0c:0d, dl_vlan = 0x1, dl_vlan_pcp = 0x1, dl_type = 0x800, nw_tos = 1, nw_proto = 6, nw_src = 10.9.8.7/32, nw_dst = 6.5.4.3/32, tp_src = 1024, tp_dst = 2048";
   struct ofp_match match = { 0, 1,
                              { 0x01, 0x02, 0x03, 0x04, 0x05, 0x07 },
                              { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d },

data/unittests/lib/wrapper_test.c

@@ -1,6 +1,6 @@
 /*
  * Unit tests for x-wrappers.
- * 
+ *
  * Author: Yasuhito Takamiya <yasuhito@gmail.com>
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -157,9 +157,9 @@ test_xstrdup_fail() {
 static char *
 test_xvasprintf_helper( const char *fmt, ... ) {
   va_list ap;
-  va_start(ap, fmt);
+  va_start(ap, fmt );
   char *str = xvasprintf( fmt, ap );
-  va_end(ap);
+  va_end( ap );
   return str;
 }
 

data/unittests/packetin_filter/packetin_filter_test.c

@@ -27,6 +27,7 @@
 #include "trema.h"
 #include "match_table.h"
 
+
 void usage();
 void handle_packet_in( uint64_t datapath_id, uint32_t transaction_id,
   uint32_t buffer_id, uint16_t total_len,
@@ -40,7 +41,7 @@ int packetin_filter_main( int argc, char *argv[] );
 
 
 /*************************************************************************
- * Setup and teardown function.                                          
+ * Setup and teardown function.
  *************************************************************************/
 
 
@@ -80,7 +81,7 @@ mock_error( const char *format, ... ) {
   va_list args;
   va_start( args, format );
   vsnprintf( buffer, sizeof( buffer ) - 1, format, args );
-  va_end( args );   
+  va_end( args );
 
   check_expected( buffer );
   ( void ) mock();
@@ -231,8 +232,8 @@ test_handle_packet_in_successed() {
   will_return_void( mock_set_match_from_packet );
 
   memset( &match_entry, 0, sizeof( match_entry ) );
-  match_entry.service_name = ( char * )( uintptr_t )( "service_name" );
-  match_entry.entry_name = ( char * )( uintptr_t )( "entry_name" );
+  match_entry.service_name = ( char * ) ( uintptr_t ) ( "service_name" );
+  match_entry.entry_name = ( char * ) ( uintptr_t ) ( "entry_name" );
   expect_not_value( mock_lookup_match_entry, match, NULL );
   will_return( mock_lookup_match_entry, &match_entry );
 
@@ -317,8 +318,8 @@ test_handle_packet_in_send_failed() {
   will_return_void( mock_set_match_from_packet );
 
   memset( &match_entry, 0, sizeof( match_entry ) );
-  match_entry.service_name = ( char * )( uintptr_t )( "service_name" );
-  match_entry.entry_name = ( char * )( uintptr_t )( "entry_name" );
+  match_entry.service_name = ( char * ) ( uintptr_t ) ( "service_name" );
+  match_entry.entry_name = ( char * ) ( uintptr_t ) ( "entry_name" );
   expect_not_value( mock_lookup_match_entry, match, NULL );
   will_return( mock_lookup_match_entry, &match_entry );
 
@@ -391,9 +392,9 @@ test_packetin_filter_main_successed() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"packetin_filter",
-      ( char * )( uintptr_t )"lldp::topo",
-      ( char * )( uintptr_t )"packet_in::hub",
+      ( char * ) ( uintptr_t ) "packetin_filter",
+      ( char * ) ( uintptr_t ) "lldp::topo",
+      ( char * ) ( uintptr_t ) "packet_in::hub",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;
@@ -429,8 +430,8 @@ test_packetin_filter_main_invalid_match_type() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"packetin_filter",
-      ( char * )( uintptr_t )"INVALID_MATCH_TYPE::dummy_service_name",
+      ( char * ) ( uintptr_t ) "packetin_filter",
+      ( char * ) ( uintptr_t ) "INVALID_MATCH_TYPE::dummy_service_name",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;

data/unittests/switch_manager/switch_manager_test.c

@@ -20,13 +20,13 @@
  */
 
 
+#include <errno.h>
 #include <fcntl.h>
+#include <netinet/tcp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <sys/wait.h>
-#include <netinet/tcp.h>
 #include "unittest.h"
 #include "trema.h"
 #include "switch_manager.h"
@@ -44,7 +44,7 @@ void wait_child( void );
 
 
 /*************************************************************************
- * Setup and teardown function.                                          
+ * Setup and teardown function.
  *************************************************************************/
 
 static void
@@ -59,7 +59,7 @@ teardown() {
 
 
 /******************************************************************************
- * Mock                                                                       
+ * Mock
  ******************************************************************************/
 
 void
@@ -101,19 +101,22 @@ mock_secure_channel_accept( struct listener_info *listener_info ) {
   ( void ) mock();
 }
 
+
 int
-mock_access( const char *pathname, int mode) {
+mock_access( const char *pathname, int mode ) {
   UNUSED( pathname );
   UNUSED( mode );
 
   return ( int ) mock();
 }
 
+
 char *
 mock_get_current_dir_name( void ) {
   return ( char * ) mock();
 }
 
+
 void
 mock_init_trema( int *argc, char ***argv ) {
   UNUSED( argc );
@@ -122,6 +125,7 @@ mock_init_trema( int *argc, char ***argv ) {
   ( void ) mock();
 }
 
+
 void
 mock_set_fd_set_callback( void ( *callback )( fd_set *read_set, fd_set *write_set ) ) {
   UNUSED( callback );
@@ -129,6 +133,7 @@ mock_set_fd_set_callback( void ( *callback )( fd_set *read_set, fd_set *write_se
   ( void ) mock();
 }
 
+
 void
 mock_set_check_fd_isset_callback( void ( *callback )( fd_set *read_set, fd_set *write_set ) ) {
   UNUSED( callback );
@@ -136,6 +141,7 @@ mock_set_check_fd_isset_callback( void ( *callback )( fd_set *read_set, fd_set *
   ( void ) mock();
 }
 
+
 bool
 mock_secure_channel_listen_start( struct listener_info *listener_info ) {
   UNUSED( listener_info );
@@ -143,6 +149,7 @@ mock_secure_channel_listen_start( struct listener_info *listener_info ) {
   return ( bool ) mock();
 }
 
+
 char *
 mock_get_trema_home( void ) {
   return ( char * ) mock();
@@ -162,7 +169,7 @@ mock_get_executable_name( void ) {
 
 
 void
-mock_set_external_callback( void ( *callback ) ( void ) ) {
+mock_set_external_callback( void ( *callback )( void ) ) {
   check_expected( callback );
 }
 
@@ -375,7 +382,7 @@ test_wait_child_wait3_zero_return() {
 static void
 test_wait_child_wait3_exit() {
   setup();
-  
+
   expect_not_value( mock_wait3, status, NULL );
   expect_value( mock_wait3, options, WNOHANG );
   expect_value( mock_wait3, rusage, NULL );
@@ -587,8 +594,8 @@ test_switch_manager_main_succeeded() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"switch_manager",
-      ( char * )( uintptr_t )"--switch_manager=switch_manager",
+      ( char * ) ( uintptr_t ) "switch_manager",
+      ( char * ) ( uintptr_t ) "--switch_manager=switch_manager",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;
@@ -619,8 +626,8 @@ test_switch_manager_main_and_port_option_succeeded() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"switch_manager",
-      ( char * )( uintptr_t )"--port=6633",
+      ( char * ) ( uintptr_t ) "switch_manager",
+      ( char * ) ( uintptr_t ) "--port=6633",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;
@@ -651,8 +658,8 @@ test_switch_manager_main_and_port_option_failed() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"switch_manager",
-      ( char * )( uintptr_t )"--port=0",
+      ( char * ) ( uintptr_t ) "switch_manager",
+      ( char * ) ( uintptr_t ) "--port=0",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;
@@ -676,8 +683,8 @@ test_switch_manager_main_help_and_exit() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"switch_manager",
-      ( char * )( uintptr_t )"-x",
+      ( char * ) ( uintptr_t ) "switch_manager",
+      ( char * ) ( uintptr_t ) "-x",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;
@@ -704,7 +711,7 @@ test_switch_manager_main_get_current_dir_name_failed() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"switch_manager",
+      ( char * ) ( uintptr_t ) "switch_manager",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;
@@ -726,7 +733,7 @@ test_switch_manager_main_secure_channel_listen_start_failed() {
   setup();
 
   char *argv[] = {
-      ( char * )( uintptr_t )"switch_manager",
+      ( char * ) ( uintptr_t ) "switch_manager",
       NULL,
     };
   int argc = ARRAY_SIZE( argv ) - 1;
@@ -924,7 +931,7 @@ test_secure_channel_accept_parent_succeeded() {
 
   int listen_fd = 0;
   int accept_fd = 1;
-  int pid = 1;	/* parent */
+  int pid = 1; /* parent */
 
   listener_info.listen_fd = listen_fd;
 
@@ -993,7 +1000,7 @@ test_secure_channel_accept_child_succeeded() {
 
   int listen_fd = 0;
   int accept_fd = 3;
-  int pid = 0;	/* child */
+  int pid = 0; /* child */
 
   listener_info.switch_manager = "switch_manager";
   listener_info.switch_manager_argc = 0;
@@ -1058,15 +1065,15 @@ test_secure_channel_accept_child_succeeded() {
 static void
 test_secure_channel_accept_child_and_args_succeeded() {
   setup();
-  
+
   int listen_fd = 0;
   int accept_fd = 3;
-  int pid = 0;	/* child */
+  int pid = 0; /* child */
   static char const *argv[] = { "a", "b" };
 
   listener_info.switch_manager = "switch_manager";
   listener_info.switch_manager_argc = 2;
-  listener_info.switch_manager_argv = ( char ** )( uintptr_t )argv;
+  listener_info.switch_manager_argv = ( char ** ) ( uintptr_t ) argv;
   listener_info.listen_fd = listen_fd;
 
   expect_value( mock_accept, sockfd, listen_fd );