trema 0.2.5 → 0.2.6

data/src/switch_manager/ofpmsg_send.h

@@ -49,4 +49,3 @@ int ofpmsg_send_deny_all( struct switch_info *sw_info );
  * indent-tabs-mode: nil
  * End:
  */
-

data/src/switch_manager/secure_channel_listener.c

@@ -93,7 +93,7 @@ int mock_dup2( int oldfd, int newfd );
 #undef open
 #endif
 #define open mock_open
-int mock_open(const char *pathname, int flags);
+int mock_open( const char *pathname, int flags );
 
 #ifdef execvp
 #undef execvp
@@ -222,7 +222,7 @@ secure_channel_accept( int fd, void *data ) {
   accept_fd = accept( fd, ( struct sockaddr * ) &addr, &addr_len );
   if ( accept_fd < 0 ) {
     // TODO: close listener socket
-    error( "Failed to accept from switch. :%s.", strerror( errno )  );
+    error( "Failed to accept from switch. :%s.", strerror( errno ) );
     return;
   }
   pid = fork();

data/src/switch_manager/secure_channel_receiver.c

@@ -31,7 +31,7 @@
 #include "secure_channel_receiver.h"
 
 
-static const size_t RECEIVE_BUFFFER_SIZE = UINT16_MAX + sizeof(struct ofp_packet_in) - 2;
+static const size_t RECEIVE_BUFFFER_SIZE = UINT16_MAX + sizeof( struct ofp_packet_in ) - 2;
 
 
 int
@@ -80,7 +80,7 @@ recv_from_secure_channel( struct switch_info *sw_info ) {
     buffer *message = alloc_buffer_with_length( message_length );
     char *p = append_back_buffer( message, message_length );
     memcpy( p, sw_info->fragment_buf->data, message_length );
-    remove_front_buffer( sw_info->fragment_buf, message_length ); 
+    remove_front_buffer( sw_info->fragment_buf, message_length );
     enqueue_message( sw_info->recv_queue, message );
     read_total += message_length;
   }

data/src/switch_manager/secure_channel_receiver.h

@@ -40,4 +40,3 @@ int handle_messages_from_secure_channel( struct switch_info *sw_info );
  * indent-tabs-mode: nil
  * End:
  */
-

data/src/switch_manager/secure_channel_sender.c

@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <openflow.h>
 #include <string.h>
 #include <unistd.h>
@@ -54,13 +55,19 @@ typedef struct {
 } writev_args;
 
 
-static void
+static bool
 append_to_writev_args( buffer *message, void *user_data ) {
   writev_args *args = user_data;
 
   args->iov[ args->iovcnt ].iov_base = message->data;
   args->iov[ args->iovcnt ].iov_len = message->length;
   args->iovcnt++;
+
+  if ( args->iovcnt >= IOV_MAX ) {
+    return false;
+  }
+
+  return true;
 }
 
 

data/src/switch_manager/service_interface.c

@@ -18,8 +18,8 @@
  */
 
 
-#include <string.h>
 #include <inttypes.h>
+#include <string.h>
 #include "ofpmsg_send.h"
 #include "openflow_service_interface.h"
 #include "service_interface.h"
@@ -40,7 +40,8 @@ create_openflow_application_message( uint64_t *datapath_id, buffer *data ) {
   message = append_back_buffer( buf, sizeof( openflow_service_header_t ) );
   if ( datapath_id == NULL ) {
     message->datapath_id = ~0U; // FIXME: defined invalid datapath_id
-  } else {
+  }
+  else {
     message->datapath_id = htonll( *datapath_id );
   }
   message->service_name_length = htons( 0 );
@@ -85,7 +86,7 @@ service_send_to_application( list_element *service_name_list, uint16_t message_t
   static const char *error_service_name = NULL;
   for ( list = service_name_list; list != NULL; list = list->next ) {
     service_name = list->data;
-    if ( !send_message( service_name, message_type, 
+    if ( !send_message( service_name, message_type,
                         buf->data, buf->length ) ) {
       if ( error_service_name != service_name ) {
         warn( "Failed to send message ( service_name = %s ).", service_name );
@@ -133,7 +134,7 @@ service_recv_from_application( uint16_t message_type, buffer *buf ) {
    char *service_name;
 
   if ( buf->length < sizeof( openflow_service_header_t ) + sizeof( struct ofp_header ) ) {
-    error( "Too short openflow application message(%u).", buf->length );
+    error( "Too short openflow application message(%zu).", buf->length );
     free_buffer( buf );
 
     return;

data/src/switch_manager/switch.c

@@ -73,9 +73,11 @@ static char short_options[] = "s:";
 
 struct switch_info switch_info;
 
-static const time_t COOKIE_TABLE_AGING_INTERVAL = 3600;
-static const time_t ECHO_REQUEST_INTERVAL = 60;
-static const time_t ECHO_REPLY_TIMEOUT = 2;
+static const time_t COOKIE_TABLE_AGING_INTERVAL = 3600; // sec.
+static const time_t ECHO_REQUEST_INTERVAL = 60; // sec.
+static const time_t ECHO_REPLY_TIMEOUT = 2; // ses.
+static const time_t WARNING_ECHO_RTT = 500; // msec. The value must is less than 1000.
+
 
 static bool age_cookie_table_enabled = false;
 
@@ -91,24 +93,26 @@ usage() {
     "OpenFlow Switch Manager.\n"
     "Usage: %s [OPTION]... [DESTINATION-RULE]...\n"
     "\n"
-    "  -s, --socket=fd             secure channnel socket\n"
-    "  -n, --name=SERVICE_NAME     service name\n"
-    "  -l, --logging_level=LEVEL   set logging level\n"
-    "      --no-flow-cleanup       do not cleanup flows on startup\n"
-    "      --no-cookie-translation do not translate cookie values\n"
-    "      --no-packet_in          do not allow packet-ins on startup\n"
-    "  -h, --help                  display this help and exit\n"
+    "  -s, --socket=fd                 secure channnel socket\n"
+    "  -n, --name=SERVICE_NAME         service name\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"
+    "      --no-flow-cleanup           do not cleanup flows on startup\n"
+    "      --no-cookie-translation     do not translate cookie values\n"
+    "      --no-packet_in              do not allow packet-ins on startup\n"
+    "  -h, --help                      display this help and exit\n"
     "\n"
     "DESTINATION-RULE:\n"
     "  openflow-message-type::destination-service-name\n"
     "\n"
     "openflow-message-type:\n"
-    "  packet_in                   packet-in openflow message type\n"
-    "  port_status                 port-status openflow message type\n"
-    "  vendor                      vendor openflow message type\n"
-    "  state_notify                connection status\n"
+    "  packet_in                       packet-in openflow message type\n"
+    "  port_status                     port-status openflow message type\n"
+    "  vendor                          vendor openflow message type\n"
+    "  state_notify                    connection status\n"
     "\n"
-    "destination-service-name      destination service name\n"
+    "destination-service-name          destination service name\n"
     , get_executable_name()
   );
 }
@@ -184,7 +188,7 @@ service_send_state( struct switch_info *sw_info, uint64_t *dpid, uint16_t tag )
 
 
 static void
-secure_channel_read( int fd, void* data ) {
+secure_channel_read( int fd, void *data ) {
   UNUSED( fd );
   UNUSED( data );
 
@@ -204,7 +208,7 @@ secure_channel_read( int fd, void* data ) {
 
 
 static void
-secure_channel_write( int fd, void* data ) {
+secure_channel_write( int fd, void *data ) {
   UNUSED( fd );
   UNUSED( data );
 
@@ -346,7 +350,10 @@ switch_event_recv_echoreply( struct switch_info *sw_info, buffer *buf ) {
 
   SUB_TIMESPEC( &now, &tim, &tim );
 
-  info( "echo round-trip time %u.%09u.", ( uint32_t ) tim.tv_sec, ( uint32_t ) tim.tv_nsec );
+  if ( tim.tv_sec > 0 || tim.tv_nsec > ( ( long ) WARNING_ECHO_RTT * 1000000 ) ) {
+    warn( "echo round-trip time is greater then %ld ms ( round-trip time = %" PRId64 ".%09ld ).",
+          ( long ) WARNING_ECHO_RTT, ( int64_t ) tim.tv_sec, tim.tv_nsec );
+  }
 
   return 0;
 }
@@ -404,6 +411,13 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
     // rename service_name of messenger
     rename_message_received_callback( get_trema_name(), new_service_name );
 
+    // rename management service name
+    char *management_service_name = xstrdup( get_management_service_name( get_trema_name() ) );
+    char *new_management_service_name = xstrdup( get_management_service_name( new_service_name ) );
+    rename_message_requested_callback( management_service_name, new_management_service_name );
+    xfree( management_service_name );
+    xfree( new_management_service_name );
+
     debug( "Rename service name from %s to %s.", get_trema_name(), new_service_name );
     if ( messenger_dump_enabled() ) {
       stop_messenger_dump();
@@ -528,39 +542,56 @@ switch_event_recv_error( struct switch_info *sw_info ) {
 
 
 static void
-management_recv( uint16_t tag, void *data, size_t data_len ) {
+management_recv( const messenger_context_handle *handle, uint32_t command, void *data, size_t data_len, void *user_data ) {
   UNUSED( data );
   UNUSED( data_len );
+  UNUSED( user_data );
 
-  switch ( tag ) {
-  case DUMP_XID_TABLE:
-    dump_xid_table();
+  switch ( command ) {
+    case DUMP_XID_TABLE:
+    {
+      dump_xid_table();
+    }
     break;
 
-  case DUMP_COOKIE_TABLE:
-    if ( !switch_info.cookie_translation ) {
-      break;
+    case DUMP_COOKIE_TABLE:
+    {
+      if ( !switch_info.cookie_translation ) {
+        break;
+      }
+      dump_cookie_table();
     }
-    dump_cookie_table();
     break;
 
-  case TOGGLE_COOKIE_AGING:
-    if ( !switch_info.cookie_translation ) {
-      break;
-    }
-    if ( age_cookie_table_enabled ) {
-      delete_timer_event( age_cookie_table, NULL );
-      age_cookie_table_enabled = false;
-    }
-    else {
-      add_periodic_event_callback( COOKIE_TABLE_AGING_INTERVAL, age_cookie_table, NULL );
-      age_cookie_table_enabled = true;
+    case TOGGLE_COOKIE_AGING:
+    {
+      if ( !switch_info.cookie_translation ) {
+        break;
+      }
+      if ( age_cookie_table_enabled ) {
+        delete_timer_event( age_cookie_table, NULL );
+        age_cookie_table_enabled = false;
+      }
+      else {
+        add_periodic_event_callback( COOKIE_TABLE_AGING_INTERVAL, age_cookie_table, NULL );
+        age_cookie_table_enabled = true;
+      }
     }
     break;
 
-  default:
-    error( "Undefined management message tag ( tag = %#x )", tag );
+    default:
+    {
+      error( "Undefined management command ( %#x )", command );
+      management_application_reply *reply = create_management_application_reply( MANAGEMENT_REQUEST_FAILED, command, NULL, 0 );
+      send_management_application_reply( handle, reply );
+      xfree( reply );
+      return;
+    }
   }
+
+  management_application_reply *reply = create_management_application_reply( MANAGEMENT_REQUEST_SUCCEEDED, command, NULL, 0 );
+  send_management_application_reply( handle, reply );
+  xfree( reply );
 }
 
 
@@ -585,7 +616,6 @@ main( int argc, char *argv[] ) {
   int ret;
   int i;
   char *service_name;
-  char management_service_name[ MESSENGER_SERVICE_NAME_LENGTH ];
 
   init_trema( &argc, &argv );
   option_parser( argc, argv );
@@ -601,20 +631,20 @@ main( int argc, char *argv[] ) {
 #define PORTSTATUS_PREFIX "port_status::"
 #define STATE_PREFIX "state_notify::"
   for ( i = optind; i < argc; i++ ) {
-    if ( strncmp( argv[i], VENDER_PREFIX, strlen( VENDER_PREFIX ) ) == 0 ) {
-      service_name = xstrdup( argv[i] + strlen( VENDER_PREFIX ) );
+    if ( strncmp( argv[ i ], VENDER_PREFIX, strlen( VENDER_PREFIX ) ) == 0 ) {
+      service_name = xstrdup( argv[ i ] + strlen( VENDER_PREFIX ) );
       insert_in_front( &switch_info.vendor_service_name_list, service_name );
     }
-    else if ( strncmp( argv[i], PACKET_IN_PREFIX, strlen( PACKET_IN_PREFIX ) ) == 0 ) {
-      service_name = xstrdup( argv[i] + strlen( PACKET_IN_PREFIX ) );
+    else if ( strncmp( argv[ i ], PACKET_IN_PREFIX, strlen( PACKET_IN_PREFIX ) ) == 0 ) {
+      service_name = xstrdup( argv[ i ] + strlen( PACKET_IN_PREFIX ) );
       insert_in_front( &switch_info.packetin_service_name_list, service_name );
     }
-    else if ( strncmp( argv[i], PORTSTATUS_PREFIX, strlen( PORTSTATUS_PREFIX ) ) == 0 ) {
-      service_name = xstrdup( argv[i] + strlen( PORTSTATUS_PREFIX ) );
+    else if ( strncmp( argv[ i ], PORTSTATUS_PREFIX, strlen( PORTSTATUS_PREFIX ) ) == 0 ) {
+      service_name = xstrdup( argv[ i ] + strlen( PORTSTATUS_PREFIX ) );
       insert_in_front( &switch_info.portstatus_service_name_list, service_name );
     }
-    else if ( strncmp( argv[i], STATE_PREFIX, strlen( STATE_PREFIX ) ) == 0 ) {
-      service_name = xstrdup( argv[i] + strlen( STATE_PREFIX ) );
+    else if ( strncmp( argv[ i ], STATE_PREFIX, strlen( STATE_PREFIX ) ) == 0 ) {
+      service_name = xstrdup( argv[ i ] + strlen( STATE_PREFIX ) );
       insert_in_front( &switch_info.state_service_name_list, service_name );
     }
   }
@@ -647,11 +677,7 @@ main( int argc, char *argv[] ) {
   }
 
   add_message_received_callback( get_trema_name(), service_recv );
-
-  snprintf( management_service_name , MESSENGER_SERVICE_NAME_LENGTH,
-            "%s.m", get_trema_name() );
-  management_service_name[ MESSENGER_SERVICE_NAME_LENGTH - 1 ] = '\0';
-  add_message_received_callback( management_service_name, management_recv );
+  set_management_application_request_handler( management_recv, NULL );
 
   ret = switch_event_connected( &switch_info );
   if ( ret < 0 ) {

data/src/switch_manager/switch_manager.c

@@ -18,17 +18,17 @@
  */
 
 
-#include <limits.h>
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
+#include <limits.h>
+#include <openflow.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <signal.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/wait.h>
-#include <openflow.h>
+#include <unistd.h>
 #include "trema.h"
 #include "secure_channel_listener.h"
 #include "switch_manager.h"
@@ -44,7 +44,7 @@
 #undef printf
 #endif
 #define printf( fmt, args... )  mock_printf2( fmt, ##args )
-int mock_printf2(const char *format, ...);
+int mock_printf2( const char *format, ... );
 
 #ifdef die
 #undef die
@@ -76,7 +76,7 @@ void mock_secure_channel_accept( struct listener_info *listener_info );
 #undef access
 #endif
 #define access mock_access
-int mock_access( const char *pathname, int mode);
+int mock_access( const char *pathname, int mode );
 
 #ifdef get_current_dir_name
 #undef get_current_dir_name
@@ -136,7 +136,7 @@ const char *mock_get_executable_name( void );
 #undef set_external_callback
 #endif
 #define set_external_callback mock_set_external_callback
-void mock_set_external_callback( void ( *callback ) ( void ) );
+void mock_set_external_callback( void ( *callback )( void ) );
 
 #endif // UNIT_TESTING
 
@@ -156,17 +156,19 @@ static char short_options[] = "p:s:";
 void
 usage() {
   printf(
-	 "OpenFlow Switch Manager.\n"
-	 "Usage: %s [OPTION]... [-- SWITCH_MANAGER_OPTION]...\n"
-	 "\n"
-	 "  -s, --switch=PATH           the command path of switch\n"
-	 "  -n, --name=SERVICE_NAME     service name\n"
-         "  -p, --port=PORT             server listen port (default %u)\n"
-	 "  -d, --daemonize             run in the background\n"
-	 "  -l, --logging_level=LEVEL   set logging level\n"
-	 "  -h, --help                  display this help and exit\n"
-	 , get_executable_name(), OFP_TCP_PORT
-	 );
+    "OpenFlow Switch Manager.\n"
+    "Usage: %s [OPTION]... [-- SWITCH_MANAGER_OPTION]...\n"
+    "\n"
+    "  -s, --switch=PATH               the command path of switch\n"
+    "  -n, --name=SERVICE_NAME         service name\n"
+    "  -p, --port=PORT                 server listen port (default %u)\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"
+    , get_executable_name(), OFP_TCP_PORT
+  );
 }
 
 
@@ -257,9 +259,9 @@ init_listener_info( struct listener_info *listener_info ) {
 
 
 static void
-finalize_listener_info(  struct listener_info *listener_info ) {
+finalize_listener_info( struct listener_info *listener_info ) {
   if ( listener_info->switch_daemon != NULL ) {
-    xfree( (void *)( uintptr_t )listener_info->switch_daemon );
+    xfree( ( void * ) ( uintptr_t ) listener_info->switch_daemon );
     listener_info->switch_daemon = NULL;
   }
   if ( listener_info->listen_fd >= 0 ) {
@@ -299,7 +301,7 @@ parse_argument( struct listener_info *listener_info, int argc, char *argv[] ) {
         }
         break;
       case 's':
-        xfree( (void *)( uintptr_t )listener_info->switch_daemon );
+        xfree( ( void * ) ( uintptr_t ) listener_info->switch_daemon );
         listener_info->switch_daemon = xstrdup( optarg );
         break;
       default:
@@ -413,7 +415,7 @@ main( int argc, char *argv[] ) {
 
   switch_daemon = listener_info.switch_daemon;
   listener_info.switch_daemon = absolute_path( startup_dir, switch_daemon );
-  xfree( ( void * )( uintptr_t )switch_daemon );
+  xfree( ( void * ) ( uintptr_t ) switch_daemon );
   // free returned buffer of get_current_dir_name()
   free( startup_dir );
 

data/src/switch_manager/xid_table.c

@@ -64,7 +64,7 @@ static xid_entry_t *
 allocate_xid_entry( uint32_t original_xid, char *service_name, int index ) {
   xid_entry_t *new_entry;
 
-  new_entry = xmalloc( sizeof ( xid_entry_t ) );
+  new_entry = xmalloc( sizeof( xid_entry_t ) );
   new_entry->xid = generate_xid();
   new_entry->original_xid = original_xid;
   new_entry->service_name = xstrdup( service_name );
@@ -91,7 +91,7 @@ init_xid_table( void ) {
 
 void
 finalize_xid_table( void ) {
-  for( int i = 0; i < XID_MAX_ENTRIES; i++ ) {
+  for ( int i = 0; i < XID_MAX_ENTRIES; i++ ) {
     if ( xid_table.entries[ i ] != NULL ) {
       free_xid_entry( xid_table.entries[ i ] );
       xid_table.entries[ i ] = NULL;
@@ -107,7 +107,7 @@ uint32_t
 insert_xid_entry( uint32_t original_xid, char *service_name ) {
   xid_entry_t *new_entry;
 
-  debug( "Inserting xid entry ( original_xid = %#lx, service_name = %s ).",
+  debug( "Inserting xid entry ( original_xid = %#" PRIx32 ", service_name = %s ).",
          original_xid, service_name );
 
   if ( xid_table.next_index >= XID_MAX_ENTRIES ) {
@@ -133,13 +133,13 @@ insert_xid_entry( uint32_t original_xid, char *service_name ) {
 
 void
 delete_xid_entry( xid_entry_t *delete_entry ) {
-  debug( "Deleting xid entry ( xid = %#lx, original_xid = %#lx, service_name = %s, index = %d ).",
+  debug( "Deleting xid entry ( xid = %#" PRIx32 ", original_xid = %#" PRIx32 ", service_name = %s, index = %d ).",
          delete_entry->xid, delete_entry->original_xid, delete_entry->service_name, delete_entry->index );
 
   xid_entry_t *deleted = delete_hash_entry( xid_table.hash, &delete_entry->xid );
 
   if ( deleted == NULL ) {
-    error( "Failed to delete xid entry ( xid = %#lx ).", delete_entry->xid );
+    error( "Failed to delete xid entry ( xid = %#" PRIx32 " ).", delete_entry->xid );
     free_xid_entry( ( xid_entry_t * ) delete_entry );
     return;
   }
@@ -157,7 +157,7 @@ lookup_xid_entry( uint32_t xid ) {
 
 static void
 dump_xid_entry( xid_entry_t *entry ) {
-  info( "xid = %#lx, original_xid = %#lx, service_name = %s, index = %d",
+  info( "xid = %#" PRIx32 ", original_xid = %#" PRIx32 ", service_name = %s, index = %d",
         entry->xid, entry->original_xid, entry->service_name, entry->index );
 }