trema 0.2.2.1 → 0.2.3

data/src/lib/log.h

@@ -36,28 +36,23 @@
 
 
 #include "bool.h"
+#include <syslog.h>
 
 
-/**
- * Constants specifying the level of log messages.
- */
 typedef enum {
-  LOG_CRITICAL,
-  LOG_ERROR,
-  LOG_WARN,
-  LOG_NOTICE,
-  LOG_INFO,
-  LOG_DEBUG,
-} logging_level;
-
-
-bool init_log( const char *ident, const char *log_directory, bool run_as_daemon );
-void restart_log( const char *ident, const char *log_directory );
-void rename_log( const char *old_ident, const char *new_ident, const char *directory );
+  LOGGING_TYPE_FILE = 0x1,
+  LOGGING_TYPE_SYSLOG = 0x2,
+  LOGGING_TYPE_STDOUT = 0x4,
+} logging_type;
+
+
+bool init_log( const char *ident, const char *log_directory, logging_type type );
+void restart_log( const char *new_ident );
+void rename_log( const char *new_ident );
 bool finalize_log( void );
 
 bool set_logging_level( const char *level );
-extern logging_level ( *get_logging_level )( void );
+extern int ( *get_logging_level )( void );
 
 extern void ( *critical )( const char *format, ... );
 extern void ( *error )( const char *format, ... );

data/src/lib/messenger.c

@@ -1052,7 +1052,7 @@ push_message_to_send_queue( const char *service_name, const uint8_t message_type
   }
 
   set_writable( sq->server_socket, true );
-  if ( sq->buffer->data_length  > messenger_send_length_for_flush ) {
+  if ( sq->buffer->data_length > messenger_send_length_for_flush ) {
     on_send_write( sq->server_socket, sq );
   }
   return true;
@@ -1152,6 +1152,41 @@ _send_reply_message( const messenger_context_handle *handle, const uint16_t tag,
 bool ( *send_reply_message )( const messenger_context_handle *handle, const uint16_t tag, const void *data, size_t len ) = _send_reply_message;
 
 
+static bool
+_clear_send_queue( const char *service_name ) {
+  assert( service_name != NULL );
+
+  debug( "Deleting all messages from send queue ( service_name = %s ).", service_name );
+
+  if ( send_queues == NULL ) {
+    error( "All send queues are already deleted or not created yet." );
+    return false;
+  }
+
+  send_queue *sq = lookup_hash_entry( send_queues, service_name );
+
+  if ( NULL == sq ) {
+    error( "Send queue is already deleted or not created yet ( service_name = %s ).", service_name );
+    return false;
+  }
+  if ( NULL == sq->buffer ) {
+    error( "Message buffer is already deleted or not created yet ( send_queue = %p, service_name = %s ).",
+           sq, service_name );
+    return false;
+  }
+
+  if ( sq->buffer->data_length > 0 ) {
+    set_writable( sq->server_socket, false );
+  }
+
+  sq->buffer->head_offset = 0;
+  sq->buffer->data_length = 0;
+
+  return true;
+}
+bool ( *clear_send_queue )( const char *service_name ) = _clear_send_queue;
+
+
 static void
 number_of_send_queue( int *connected_count, int *sending_count, int *reconnecting_count, int *closed_count ) {
   assert( connected_count != NULL );

data/src/lib/messenger.h

@@ -121,6 +121,7 @@ extern bool ( *delete_message_replied_callback )( const char *service_name, void
 extern bool ( *send_message )( const char *service_name, const uint16_t tag, const void *data, size_t len );
 extern bool ( *send_request_message )( const char *to_service_name, const char *from_service_name, const uint16_t tag, const void *data, size_t len, void *user_data );
 extern bool ( *send_reply_message )( const messenger_context_handle *handle, const uint16_t tag, const void *data, size_t len );
+extern bool ( *clear_send_queue ) ( const char *service_name );
 
 bool init_messenger( const char *working_directory );
 bool finalize_messenger( void );

data/src/lib/openflow_application_interface.c

@@ -89,6 +89,12 @@ bool mock_delete_message_received_callback( char *service_name,
 bool mock_delete_message_replied_callback( char *service_name,
                                            void ( *callback )( uint16_t tag, void *data, size_t len, void *user_data ) );
 
+#ifdef clear_send_queue
+#undef clear_send_queue
+#endif
+#define clear_send_queue mock_clear_send_queue
+bool mock_clear_send_queue( const char *service_name );
+
 #ifdef getpid
 #undef getpid
 #endif
@@ -293,6 +299,26 @@ set_error_handler( error_handler callback, void *user_data ) {
 }
 
 
+bool
+set_echo_reply_handler( echo_reply_handler callback, void *user_data ) {
+  if ( callback == NULL ) {
+    die( "Callback function ( echo_reply_handler ) must not be NULL." );
+  }
+  assert( callback != NULL );
+
+  maybe_init_openflow_application_interface();
+  assert( openflow_application_interface_initialized );
+
+  debug( "Setting a echo reply handler ( callback = %p, user_data = %p ).",
+         callback, user_data );
+
+  event_handlers.echo_reply_callback = callback;
+  event_handlers.echo_reply_user_data = user_data;
+
+  return true;
+}
+
+
 bool
 set_vendor_handler( vendor_handler callback, void *user_data ) {
   if ( callback == NULL ) {
@@ -536,6 +562,57 @@ handle_error( const uint64_t datapath_id, buffer *data ) {
 }
 
 
+static void
+handle_echo_reply( const uint64_t datapath_id, buffer *data ) {
+  uint16_t body_length;
+  uint32_t transaction_id;
+  buffer *body;
+  struct ofp_header *header;
+
+  if ( ( data == NULL ) || ( ( data != NULL ) && ( data->length == 0 ) ) ) {
+    critical( "An OpenFlow message must be filled before calling handle_echo_reply()." );
+    assert( 0 );
+  }
+
+  header = ( struct ofp_header * ) data->data;
+
+  transaction_id = ntohl( header->xid );
+
+  body_length = ( uint16_t ) ( ntohs( header->length )
+                               - sizeof( struct ofp_header ) );
+
+  debug( "A echo reply message is received from %#" PRIx64
+         " ( transaction_id = %#x, body length = %u ).",
+         datapath_id, transaction_id, body_length );
+
+  if ( event_handlers.echo_reply_callback == NULL ) {
+    debug( "Callback function for echo reply events is not set." );
+    return;
+  }
+
+  if ( body_length > 0 ) {
+    body = duplicate_buffer( data );
+    remove_front_buffer( body, sizeof( struct ofp_header ) );
+  }
+  else {
+    body = NULL;
+  }
+
+  debug( "Calling echo reply handler ( callback = %p, user_data = %p ).",
+         event_handlers.echo_reply_callback, event_handlers.echo_reply_user_data );
+
+  event_handlers.echo_reply_callback( datapath_id,
+                                      transaction_id,
+                                      body,
+                                      event_handlers.echo_reply_user_data );
+
+  if ( body != NULL ) {
+    free_buffer( body );
+  }
+}
+
+
+
 static void
 handle_vendor( const uint64_t datapath_id, buffer *data ) {
   uint16_t body_length;
@@ -631,7 +708,7 @@ handle_features_reply( const uint64_t datapath_id, buffer *data ) {
       ntoh_phy_port( p, phy_port );
       append_to_tail( &phy_ports_head, ( void * ) p );
       phy_port_to_string( p, description, sizeof( description ) );
-      debug( "[%u] %s", phy_port, description );
+      debug( "[%p] %s", phy_port, description );
       phy_port++;
     }
   }
@@ -1114,7 +1191,7 @@ static void
 handle_barrier_reply( const uint64_t datapath_id, buffer *data ) {
   uint32_t transaction_id;
   struct ofp_header *header;
-  
+
   if ( ( data == NULL ) || ( ( data != NULL ) && ( data->length == 0 ) ) ) {
     critical( "An OpenFlow message must be filled before calling handle_barrier_reply()." );
     assert( 0 );
@@ -1252,6 +1329,9 @@ update_switch_event_stats( uint16_t type, int send_receive, bool result ) {
   case MESSENGER_OPENFLOW_DISCONNECTED:
     snprintf( key, STAT_KEY_LENGTH, "%s%s%s%s", prefix, "switch_disconnected", direction, suffix );
     break;
+  case MESSENGER_OPENFLOW_FAILD_TO_CONNECT:
+    snprintf( key, STAT_KEY_LENGTH, "%s%s%s%s", prefix, "switch_failed_to_connect", direction, suffix );
+    break;
   default:
     snprintf( key, STAT_KEY_LENGTH, "%s%s%s%s", prefix, "undefined_switch_event", direction, suffix );
     break;
@@ -1286,39 +1366,43 @@ handle_switch_ready( uint64_t datapath_id ) {
 
 
 static void
-handle_switch_events( uint16_t type, void *data, size_t length ) {
-  uint64_t datapath_id;
-  openflow_service_header_t *message;
+handle_messenger_openflow_disconnected( uint64_t datapath_id ) {
+  if ( event_handlers.switch_disconnected_callback != NULL ) {
+    debug( "Calling switch disconnected handler (callback = %p, user_data = %p).",
+           event_handlers.switch_disconnected_callback, event_handlers.switch_disconnected_user_data );
+    event_handlers.switch_disconnected_callback( datapath_id, event_handlers.switch_disconnected_user_data );
+  }
+  else {
+    debug( "Callback function for switch disconnected events is not set." );
+  }
+  delete_openflow_messages( datapath_id );
+}
+
 
+static void
+handle_switch_events( uint16_t type, void *data, size_t length ) {
   assert( data != NULL );
   assert( length == sizeof( openflow_service_header_t ) );
 
-  debug( "A switch event is received from remote ( type = %u ).", type );
+  debug( "Received a switch event (type = %u) from remote.", type );
 
-  message = ( openflow_service_header_t * ) data;
-
-  datapath_id = ntohll( message->datapath_id );
+  openflow_service_header_t *message = data;
+  uint64_t datapath_id = ntohll( message->datapath_id );
 
   switch ( type ) {
-  case MESSENGER_OPENFLOW_CONNECTED:
-    break;
-  case MESSENGER_OPENFLOW_READY:
-    handle_switch_ready( datapath_id );
-    break;
-  case MESSENGER_OPENFLOW_DISCONNECTED:
-    if ( event_handlers.switch_disconnected_callback != NULL ) {
-      debug( "Calling switch disconnected handler ( callback = %p, user_data = %p ).",
-             event_handlers.switch_disconnected_callback, event_handlers.switch_disconnected_user_data );
-      event_handlers.switch_disconnected_callback( datapath_id,
-                                                   event_handlers.switch_disconnected_user_data );
-    }
-    else {
-      debug( "Callback function for switch disconnected events is not set." );
-    }
-    break;
-  default:
-    error( "Unhandled switch event ( type = %u ).", type );
-    break;
+    case MESSENGER_OPENFLOW_CONNECTED:
+    case MESSENGER_OPENFLOW_FAILD_TO_CONNECT:
+      // Do nothing.
+      break;
+    case MESSENGER_OPENFLOW_READY:
+      handle_switch_ready( datapath_id );
+      break;
+    case MESSENGER_OPENFLOW_DISCONNECTED:
+      handle_messenger_openflow_disconnected( datapath_id );
+      break;
+    default:
+      error( "Unhandled switch event (type = %u).", type );
+      break;
   }
 
   update_switch_event_stats( type, OPENFLOW_MESSAGE_RECEIVE, true );
@@ -1471,6 +1555,9 @@ handle_openflow_message( void *data, size_t length ) {
   case OFPT_ERROR:
     handle_error( datapath_id, buffer );
     break;
+  case OFPT_ECHO_REPLY:
+    handle_echo_reply( datapath_id, buffer );
+    break;
   case OFPT_VENDOR:
     handle_vendor( datapath_id, buffer );
     break;
@@ -1520,6 +1607,7 @@ handle_message( uint16_t type, void *data, size_t length ) {
   case MESSENGER_OPENFLOW_MESSAGE:
     return handle_openflow_message( data, length );
   case MESSENGER_OPENFLOW_CONNECTED:
+  case MESSENGER_OPENFLOW_FAILD_TO_CONNECT:
   case MESSENGER_OPENFLOW_READY:
   case MESSENGER_OPENFLOW_DISCONNECTED:
     return handle_switch_events( type, data, length );
@@ -1665,6 +1753,18 @@ send_list_switches_request( void *user_data ) {
 }
 
 
+bool
+delete_openflow_messages( uint64_t datapath_id ) {
+  debug( "Deleting OpenFlow messages in a send queue ( datapath_id = %#" PRIx64 " ).", datapath_id );
+
+  char remote_service_name[ MESSENGER_SERVICE_NAME_LENGTH ];
+  memset( remote_service_name, '\0', sizeof( remote_service_name ) );
+  snprintf( remote_service_name, sizeof( remote_service_name ),
+            "switch.%#" PRIx64, datapath_id );
+  return clear_send_queue( remote_service_name );
+}
+
+
 /*
  * Local variables:
  * c-basic-offset: 2

data/src/lib/openflow_application_interface.h

@@ -24,6 +24,7 @@
 #define OPENFLOW_APPLICATION_INTERFACE_H
 
 
+#include <arpa/inet.h>
 #include "buffer.h"
 #include "linked_list.h"
 #include "openflow.h"
@@ -72,6 +73,14 @@ typedef void ( *error_handler )(
 );
 
 
+typedef void ( *echo_reply_handler )(
+  uint64_t datapath_id,
+  uint32_t transaction_id,
+  const buffer *data,
+  void *user_data
+);
+
+
 typedef void ( *vendor_handler )(
   uint64_t datapath_id,
   uint32_t transaction_id,
@@ -210,6 +219,9 @@ typedef struct openflow_event_handlers {
   error_handler error_callback;
   void *error_user_data;
 
+  echo_reply_handler echo_reply_callback;
+  void *echo_reply_user_data;
+
   vendor_handler vendor_callback;
   void *vendor_user_data;
 
@@ -252,10 +264,10 @@ bool set_openflow_event_handlers( const openflow_event_handlers_t handlers );
 #define set_switch_ready_handler( callback, user_data )                                      \
   {                                                                                          \
     if ( __builtin_types_compatible_p( typeof( callback ), simple_switch_ready_handler ) ) { \
-      _set_switch_ready_handler( true, callback, user_data );                                \
+      _set_switch_ready_handler( true, ( void * ) callback, user_data );                     \
     }                                                                                        \
     else if ( __builtin_types_compatible_p( typeof( callback ), switch_ready_handler ) ) {   \
-      _set_switch_ready_handler( false, callback, user_data );                               \
+      _set_switch_ready_handler( false, ( void * ) callback, user_data );                    \
     }                                                                                        \
     else {                                                                                   \
       _set_switch_ready_handler( false, NULL, NULL );                                        \
@@ -266,6 +278,7 @@ bool _set_switch_ready_handler( bool simple_callback, void *callback, void *user
 
 bool set_switch_disconnected_handler( switch_disconnected_handler callback, void *user_data );
 bool set_error_handler( error_handler callback, void *user_data );
+bool set_echo_reply_handler( echo_reply_handler callback, void *user_data );
 bool set_vendor_handler( vendor_handler callback, void *user_data );
 bool set_features_reply_handler( features_reply_handler callback, void *user_data );
 bool set_get_config_reply_handler( get_config_reply_handler callback, void *user_data );
@@ -274,10 +287,10 @@ bool set_get_config_reply_handler( get_config_reply_handler callback, void *user
 #define set_packet_in_handler( callback, user_data )                                      \
   {                                                                                       \
     if ( __builtin_types_compatible_p( typeof( callback ), simple_packet_in_handler ) ) { \
-      _set_packet_in_handler( true, callback, user_data );                                \
+      _set_packet_in_handler( true, ( void * ) callback, user_data );                     \
     }                                                                                     \
     else if ( __builtin_types_compatible_p( typeof( callback ), packet_in_handler ) ) {   \
-      _set_packet_in_handler( false, callback, user_data );                               \
+      _set_packet_in_handler( false, ( void * ) callback, user_data );                    \
     }                                                                                     \
     else {                                                                                \
       _set_packet_in_handler( false, NULL, NULL );                                        \
@@ -289,10 +302,10 @@ bool _set_packet_in_handler( bool simple_callback, void *callback, void *user_da
 #define set_flow_removed_handler( callback, user_data )                                      \
   {                                                                                          \
     if ( __builtin_types_compatible_p( typeof( callback ), simple_flow_removed_handler ) ) { \
-      _set_flow_removed_handler( true, callback, user_data );                                \
+      _set_flow_removed_handler( true, ( void * ) callback, user_data );                     \
     }                                                                                        \
     else if ( __builtin_types_compatible_p( typeof( callback ), flow_removed_handler ) ) {   \
-      _set_flow_removed_handler( false, callback, user_data );                               \
+      _set_flow_removed_handler( false, ( void * ) callback, user_data );                    \
     }                                                                                        \
     else {                                                                                   \
       _set_flow_removed_handler( false, NULL, NULL );                                        \
@@ -315,9 +328,21 @@ bool set_list_switches_reply_handler( list_switches_reply_handler callback );
 
 bool send_openflow_message( const uint64_t datapath_id, buffer *message );
 
+
+/********************************************************************************
+ * Function for retrieving the list of switches from Switch Manager.
+ ********************************************************************************/
+
 bool send_list_switches_request( void *user_data );
 
 
+/********************************************************************************
+ * Function for deleting OpenFlow messages in a send queue
+ ********************************************************************************/
+
+bool delete_openflow_messages( uint64_t datapath_id );
+
+
 #endif // OPENFLOW_APPLICATION_INTERFACE_H
 
 

data/src/lib/openflow_message.c

@@ -25,6 +25,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <syslog.h>
 #include <unistd.h>
 #include "openflow_message.h"
 #include "packet_info.h"
@@ -139,7 +140,7 @@ create_error( const uint32_t transaction_id, const uint16_t type,
   debug( "Creating an error ( xid = %#x, type = %#x, code = %#x, data length = %u ).",
          transaction_id, type, code, data_len );
 
-  length =  ( uint16_t ) ( sizeof( struct ofp_error_msg ) + data_len );
+  length = ( uint16_t ) ( sizeof( struct ofp_error_msg ) + data_len );
   buffer = create_header( transaction_id, OFPT_ERROR, length );
   assert( buffer != NULL );
 

data/src/lib/openflow_service_interface.h

@@ -33,6 +33,7 @@
 #define MESSENGER_OPENFLOW_READY 3
 #define MESSENGER_OPENFLOW_DISCONNECTED 4
 #define MESSENGER_OPENFLOW_DISCONNECT_REQUEST 5
+#define MESSENGER_OPENFLOW_FAILD_TO_CONNECT 6
 
 
 /**