trema 0.3.16 → 0.3.17

data/src/lib/event_forward_interface.h

@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2013 NEC Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef EVENT_FORWARD_INTERFACE_H_
+#define EVENT_FORWARD_INTERFACE_H_
+
+
+#include "buffer.h"
+#include "linked_list.h"
+
+// management interface application_ids
+enum switch_management_command {
+  // switch only
+  DUMP_XID_TABLE = 0,
+  DUMP_COOKIE_TABLE,
+  TOGGLE_COOKIE_AGING,
+
+  // switch manager/daemon
+  EVENT_FORWARD_ENTRY_ADD,
+  EVENT_FORWARD_ENTRY_DELETE,
+  EVENT_FORWARD_ENTRY_DUMP,
+  EVENT_FORWARD_ENTRY_SET,
+
+  // switch manager only
+  EFI_GET_SWLIST,
+};
+
+enum efi_event_type {
+  EVENT_FORWARD_TYPE_VENDOR = 0,
+  EVENT_FORWARD_TYPE_PACKET_IN,
+  EVENT_FORWARD_TYPE_PORT_STATUS,
+  EVENT_FORWARD_TYPE_STATE_NOTIFY
+};
+
+enum efi_result {
+  EFI_OPERATION_SUCCEEDED = 0,
+  EFI_OPERATION_FAILED,
+};
+
+// messenger message data structure
+typedef struct {
+  // enum efi_event_type
+  uint8_t type;
+  uint8_t pad[3];
+  // Number of element in service_list. 0 for dump, 1 for add/delete, N for set operation.
+  uint32_t n_services;
+  // e.g. "service1\0service2\0"
+  char service_list[0];
+} __attribute__( ( packed ) ) event_forward_operation_request;
+
+typedef struct {
+  // enum efi_event_type
+  uint8_t type;
+  // enum efi_result
+  uint8_t result;
+  uint8_t pad[2];
+  uint32_t n_services;
+  // service list after operation
+  char service_list[0];
+} __attribute__( ( packed ) ) event_forward_operation_reply;
+
+
+// struct for user API
+typedef struct {
+  enum efi_result result;
+  uint32_t n_services;
+  // service list after operation.
+  const char **services;
+} event_forward_operation_result;
+
+
+// High level API callback function signature
+typedef void ( *event_forward_entry_to_all_callback )(
+    enum efi_result result,
+    void *user_data
+);
+
+
+// Low level API callback function signature
+typedef void ( *event_forward_entry_operation_callback )(
+    event_forward_operation_result result,
+    void *user_data
+);
+
+
+typedef void ( *switch_list_request_callback )(
+    // NULL if failed
+    uint64_t* dpids,
+    size_t n_dpids,
+    void *user_data
+);
+
+
+// setup/teardown messenger channel
+bool init_event_forward_interface( void );
+bool finalize_event_forward_interface( void );
+
+
+// High level API (calls Low level API for switch manager and existing switch daemons)
+bool add_event_forward_entry_to_all_switches( enum efi_event_type type, const char* service_name, event_forward_entry_to_all_callback callback, void* user_data );
+bool delete_event_forward_entry_to_all_switches( enum efi_event_type type, const char* service_name, event_forward_entry_to_all_callback callback, void* user_data );
+
+
+// Low level API for switch manager
+bool set_switch_manager_event_forward_entries( enum efi_event_type type, list_element* service_list, event_forward_entry_operation_callback callback, void* user_data );
+bool add_switch_manager_event_forward_entry( enum efi_event_type type, const char* service_name, event_forward_entry_operation_callback callback, void* user_data );
+bool delete_switch_manager_event_forward_entry( enum efi_event_type type, const char* service_name, event_forward_entry_operation_callback callback, void* user_data );
+bool dump_switch_manager_event_forward_entries( enum efi_event_type type, event_forward_entry_operation_callback callback, void* user_data );
+
+
+// Low level API for switch daemon
+bool set_switch_event_forward_entries( uint64_t dpid, enum efi_event_type type, list_element* service_list, event_forward_entry_operation_callback callback, void* user_data );
+bool add_switch_event_forward_entry( uint64_t dpid, enum efi_event_type type, const char* service_name, event_forward_entry_operation_callback callback, void* user_data );
+bool delete_switch_event_forward_entry( uint64_t dpid, enum efi_event_type type, const char* service_name, event_forward_entry_operation_callback callback, void* user_data );
+bool dump_switch_event_forward_entries( uint64_t dpid, enum efi_event_type type, event_forward_entry_operation_callback callback, void* user_data );
+
+
+// internal utilities
+buffer* create_event_forward_operation_request( buffer* buf, enum efi_event_type, list_element* service_list );
+buffer* create_event_forward_operation_reply( enum efi_event_type, enum efi_result, list_element* service_list );
+
+bool send_efi_switch_list_request( switch_list_request_callback callback, void* user_data );
+
+#endif /* EVENT_FORWARD_INTERFACE_H_ */

data/src/lib/trema.h

@@ -28,6 +28,7 @@
 #include "checks.h"
 #include "doubly_linked_list.h"
 #include "etherip.h"
+#include "event_forward_interface.h"
 #include "event_handler.h"
 #include "hash_table.h"
 #include "linked_list.h"

data/src/lib/utility.c

@@ -31,7 +31,7 @@
 #include "log.h"
 #include "trema_wrapper.h"
 #include "utility.h"
-
+#include "wrapper.h"
 
 static void
 _die( const char *format, ... ) {
@@ -594,6 +594,18 @@ get_checksum( uint16_t *pos, uint32_t size ) {
 }
 
 
+void
+xfree_data( void *data, void *user_data ) {
+  UNUSED( user_data );
+  xfree( data );
+}
+
+
+bool
+string_equal( void *data, void *user_data ) {
+  return strcmp( data, user_data ) == 0;
+}
+
 /*
  * Local variables:
  * c-basic-offset: 2

data/src/lib/utility.h

@@ -54,6 +54,9 @@ bool actions_to_string( const struct ofp_action_header *actions, uint16_t action
 
 uint16_t get_checksum( uint16_t *pos, uint32_t size );
 
+void xfree_data( void *data, void *user_data );
+
+bool string_equal( void *data, void *user_data );
 
 #endif // UTILITY_H
 

data/src/switch_manager/event_forward_entry_manipulation.c

@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2013 NEC Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <assert.h>
+#include "trema.h"
+#include "event_forward_entry_manipulation.h"
+
+
+void
+management_event_forward_entry_add( list_element **service_list,
+                             const event_forward_operation_request *request, size_t request_len ) {
+  if ( request->n_services == 0 ) return;
+  if ( request->n_services > 1 ) {
+    warn( "Only 1 service name expected for EVENT_FWD_ENTRY_ADD. Ignoring others." );
+  }
+  const size_t service_name_len = request_len - offsetof( event_forward_operation_request, service_list );
+  if ( service_name_len == 0 ) return;
+
+  char *service_name = xcalloc( service_name_len + 1, sizeof( char ) );
+  strncpy( service_name, request->service_list, service_name_len );
+
+  const char *match = find_list_custom( *service_list, string_equal, service_name );
+  if ( match == NULL ) {
+    info( "Adding '%s' to event filter.", service_name );
+    insert_in_front( service_list, service_name );
+  }
+  else {
+    // already there
+    xfree( service_name );
+  }
+}
+
+
+void
+management_event_forward_entry_delete( list_element **service_list,
+                                const event_forward_operation_request *request, size_t request_len ) {
+  if ( request->n_services == 0 ) return;
+  if ( request->n_services > 1 ) {
+    warn( "Only 1 service name expected for EVENT_FWD_ENTRY_DELETE. Ignoring others." );
+  }
+  const size_t service_name_len = request_len - offsetof( event_forward_operation_request, service_list );
+  if ( service_name_len == 0 ) return;
+
+  char *service_name = xcalloc( service_name_len + 1, sizeof( char ) );
+  strncpy( service_name, request->service_list, service_name_len );
+
+  const char *match = find_list_custom( *service_list, string_equal, service_name );
+  if ( match == NULL ) {
+    // didn't exist
+    xfree( service_name );
+  }
+  else {
+    info( "Deleting '%s' from event filter.", service_name );
+    bool success = delete_element( service_list, match );
+    assert( success );
+  }
+}
+
+
+void
+management_event_forward_entries_set( list_element **service_list,
+                                const event_forward_operation_request *request, size_t request_len ) {
+  const size_t service_name_list_len = request_len - offsetof( event_forward_operation_request, service_list );
+
+  const char **service_name_list = xcalloc( request->n_services, sizeof( char * ) );
+
+  // split null terminated string list.
+  unsigned int n_services = 0;
+  const char *name_begin = request->service_list;
+  for ( size_t i = 0 ; i < service_name_list_len ; ++i ) {
+    if ( request->service_list[ i ] == '\0' ) {
+      service_name_list[ n_services++ ] = name_begin;
+      if ( n_services == request->n_services ) {
+        if ( i + 1 != service_name_list_len ) {
+          warn( "Expecting %d name(s) for EVENT_FWD_ENTRY_SET, but more exist. Ignoring.", request->n_services );
+        }
+        break;
+      }
+      name_begin = &request->service_list[ i + 1 ];
+    }
+  }
+  if ( n_services != request->n_services ) {
+    warn( "Expected %d name(s) for EVENT_FWD_ENTRY_SET, but found %d.", request->n_services, n_services );
+  }
+
+  info( "Resetting event filter(s)." );
+  // clear current list
+  iterate_list( *service_list, xfree_data, NULL );
+  delete_list( *service_list );
+  create_list( service_list );
+
+  // set new list
+  for ( unsigned int i = 0 ; i < n_services ; ++i ) {
+    const size_t service_name_len = strlen( service_name_list[ i ] );
+    if ( service_name_len == 0 ) {
+      warn( "Ignoring 0 length service name in EVENT_FWD_ENTRY_SET" );
+      continue;
+    }
+    info( " Adding '%s' to event filter.", service_name_list[ i ] );
+    append_to_tail( service_list, xstrdup( service_name_list[ i ] ) );
+  }
+
+  xfree( service_name_list );
+}
+
+

data/src/switch_manager/event_forward_entry_manipulation.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2013 NEC Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef EVENT_FORWARD_ENTRY_MANIPULATION_H_
+#define EVENT_FORWARD_ENTRY_MANIPULATION_H_
+
+#include "event_forward_interface.h"
+
+void management_event_forward_entry_add( list_element** service_list,
+                             const event_forward_operation_request* request, size_t request_len );
+void management_event_forward_entry_delete( list_element** service_list,
+                             const event_forward_operation_request* request, size_t request_len );
+void management_event_forward_entries_set( list_element** service_list,
+                             const event_forward_operation_request* request, size_t request_len );
+
+
+#endif /* EVENT_FORWARD_ENTRY_MANIPULATION_H_ */

data/src/switch_manager/secure_channel_listener.c

@@ -30,6 +30,7 @@
 #include "trema.h"
 #include "secure_channel_listener.h"
 #include "switch_manager.h"
+#include "switch_option.h"
 
 
 const int LISTEN_SOCK_MAX = 128;
@@ -165,7 +166,13 @@ secure_channel_listen_start( struct listener_info *listener_info ) {
 
 static char **
 make_switch_daemon_args( struct listener_info *listener_info, struct sockaddr_in *addr, int accept_fd ) {
-  int argc = SWITCH_MANAGER_DEFAULT_ARGC + listener_info->switch_daemon_argc + 1;
+  const int argc = SWITCH_MANAGER_DEFAULT_ARGC
+      + listener_info->switch_daemon_argc
+      + ( int ) list_length_of( listener_info->vendor_service_name_list )
+      + ( int ) list_length_of( listener_info->packetin_service_name_list )
+      + ( int ) list_length_of( listener_info->portstatus_service_name_list )
+      + ( int ) list_length_of( listener_info->state_service_name_list )
+      + 1;
   char **argv = xcalloc( ( size_t ) argc, sizeof( char * ) );
   char *command_name = xasprintf( "%s%s:%u", SWITCH_MANAGER_COMMAND_PREFIX,
                                   inet_ntoa( addr->sin_addr ),
@@ -191,6 +198,19 @@ make_switch_daemon_args( struct listener_info *listener_info, struct sockaddr_in
     argv[ i ] = xstrdup( listener_info->switch_daemon_argv[ j ] );
   }
 
+  for ( list_element *e = listener_info->vendor_service_name_list; e != NULL; e = e->next, ++i ) {
+    argv[ i ] = xasprintf( VENDOR_PREFIX "%s",  e->data );
+  }
+  for ( list_element *e = listener_info->packetin_service_name_list; e != NULL; e = e->next, ++i ) {
+    argv[ i ] = xasprintf( PACKET_IN_PREFIX "%s",  e->data );
+  }
+  for ( list_element *e = listener_info->portstatus_service_name_list; e != NULL; e = e->next, ++i ) {
+    argv[ i ] = xasprintf( PORTSTATUS_PREFIX "%s",  e->data );
+  }
+  for ( list_element *e = listener_info->state_service_name_list; e != NULL; e = e->next, ++i ) {
+    argv[ i ] = xasprintf( STATE_PREFIX "%s",  e->data );
+  }
+
   return argv;
 }
 
@@ -199,9 +219,9 @@ static void
 free_switch_daemon_args( char **argv ) {
   int i;
   for ( i = 0; argv[ i ] != NULL; i++ ) {
-    free( argv[ i ] );
+    xfree( argv[ i ] );
   }
-  free( argv );
+  xfree( argv );
 }
 
 

data/src/switch_manager/switch.c

@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <assert.h>
 #include "trema.h"
 #include "cookie_table.h"
-#include "management_interface.h"
 #include "message_queue.h"
 #include "messenger.h"
 #include "ofpmsg_send.h"
@@ -38,7 +38,8 @@
 #include "service_interface.h"
 #include "switch.h"
 #include "xid_table.h"
-
+#include "switch_option.h"
+#include "event_forward_entry_manipulation.h"
 
 #define SUB_TIMESPEC( _a, _b, _return )                       \
   do {                                                        \
@@ -52,23 +53,6 @@
   while ( 0 )
 
 
-enum long_options_val {
-  NO_FLOW_CLEANUP_LONG_OPTION_VALUE = 1,
-  NO_COOKIE_TRANSLATION_LONG_OPTION_VALUE = 2,
-  NO_PACKET_IN_LONG_OPTION_VALUE = 3,
-};
-
-static struct option long_options[] = {
-  { "socket", 1, NULL, 's' },
-  { "no-flow-cleanup", 0, NULL, NO_FLOW_CLEANUP_LONG_OPTION_VALUE },
-  { "no-cookie-translation", 0, NULL, NO_COOKIE_TRANSLATION_LONG_OPTION_VALUE },
-  { "no-packet_in", 0, NULL, NO_PACKET_IN_LONG_OPTION_VALUE },
-  { NULL, 0, NULL, 0  },
-};
-
-static char short_options[] = "s:";
-
-
 struct switch_info switch_info;
 
 static const time_t COOKIE_TABLE_AGING_INTERVAL = 3600; // sec.
@@ -138,7 +122,7 @@ option_parser( int argc, char *argv[] ) {
   switch_info.flow_cleanup = true;
   switch_info.cookie_translation = true;
   switch_info.deny_packet_in_on_startup = false;
-  while ( ( c = getopt_long( argc, argv, short_options, long_options, NULL ) ) != -1 ) {
+  while ( ( c = getopt_long( argc, argv, switch_short_options, switch_long_options, NULL ) ) != -1 ) {
     switch ( c ) {
       case 's':
         switch_info.secure_channel_fd = strtofd( optarg );
@@ -498,6 +482,20 @@ switch_event_disconnected( struct switch_info *sw_info ) {
   }
   flush_messenger();
 
+  // free service name list
+  iterate_list( sw_info->vendor_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->vendor_service_name_list );
+  sw_info->vendor_service_name_list = NULL;
+  iterate_list( sw_info->packetin_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->packetin_service_name_list );
+  sw_info->packetin_service_name_list = NULL;
+  iterate_list( sw_info->portstatus_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->portstatus_service_name_list );
+  sw_info->portstatus_service_name_list = NULL;
+  iterate_list( sw_info->state_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->state_service_name_list );
+  sw_info->state_service_name_list = NULL;
+
   stop_trema();
 
   return 0;
@@ -539,10 +537,75 @@ switch_event_recv_error( struct switch_info *sw_info ) {
 }
 
 
+static void
+management_event_forward_entry_operation( const messenger_context_handle *handle, uint32_t command, event_forward_operation_request *req, size_t data_len ) {
+
+  debug( "management efi command:%#x, type:%#x, n_services:%d", command, req->type, req->n_services );
+
+  list_element **subject = NULL;
+  switch ( req->type ) {
+    case EVENT_FORWARD_TYPE_VENDOR:
+      info( "Managing vendor event." );
+      subject = &switch_info.vendor_service_name_list;
+      break;
+
+    case EVENT_FORWARD_TYPE_PACKET_IN:
+      info( "Managing packet_in event." );
+      subject = &switch_info.packetin_service_name_list;
+      break;
+
+    case EVENT_FORWARD_TYPE_PORT_STATUS:
+      info( "Managing port_status event." );
+      subject = &switch_info.portstatus_service_name_list;
+      break;
+
+    case EVENT_FORWARD_TYPE_STATE_NOTIFY:
+      info( "Managing state_notify event." );
+      subject = &switch_info.state_service_name_list;
+      break;
+
+    default:
+      error( "Invalid EVENT_FWD_TYPE ( %#x )", req->type );
+      event_forward_operation_reply res;
+      memset( &res, 0, sizeof( event_forward_operation_reply ) );
+      res.type = req->type;
+      res.result = EFI_OPERATION_FAILED;
+      management_application_reply *reply = create_management_application_reply( MANAGEMENT_REQUEST_FAILED, command, &res, sizeof( event_forward_operation_reply ) );
+      send_management_application_reply( handle, reply );
+      xfree( reply );
+      return;
+  }
+  assert( subject != NULL );
+
+  switch ( command ) {
+    case EVENT_FORWARD_ENTRY_ADD:
+      management_event_forward_entry_add( subject, req, data_len );
+      break;
+
+    case EVENT_FORWARD_ENTRY_DELETE:
+      management_event_forward_entry_delete( subject, req, data_len );
+      break;
+
+    case EVENT_FORWARD_ENTRY_DUMP:
+      info( "Dumping current event filter." );
+      // do nothing
+      break;
+
+    case EVENT_FORWARD_ENTRY_SET:
+      management_event_forward_entries_set( subject, req, data_len );
+      break;
+  }
+
+  buffer *buf = create_event_forward_operation_reply( req->type, EFI_OPERATION_SUCCEEDED, *subject );
+  management_application_reply *reply = create_management_application_reply( MANAGEMENT_REQUEST_SUCCEEDED, command, buf->data, buf->length );
+  free_buffer( buf );
+  send_management_application_reply( handle, reply );
+  xfree( reply );
+}
+
+
 static void
 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 ( command ) {
@@ -577,6 +640,18 @@ management_recv( const messenger_context_handle *handle, uint32_t command, void
     }
     break;
 
+    case EVENT_FORWARD_ENTRY_ADD:
+    case EVENT_FORWARD_ENTRY_DELETE:
+    case EVENT_FORWARD_ENTRY_DUMP:
+    case EVENT_FORWARD_ENTRY_SET:
+    {
+      event_forward_operation_request *req = data;
+      req->n_services = ntohl( req->n_services );
+      management_event_forward_entry_operation( handle, command, req, data_len );
+      return;
+    }
+    break;
+
     default:
     {
       error( "Undefined management command ( %#x )", command );
@@ -623,14 +698,9 @@ main( int argc, char *argv[] ) {
   create_list( &switch_info.portstatus_service_name_list );
   create_list( &switch_info.state_service_name_list );
 
-  // FIXME
-#define VENDER_PREFIX "vendor::"
-#define PACKET_IN_PREFIX "packet_in::"
-#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 ], VENDOR_PREFIX, strlen( VENDOR_PREFIX ) ) == 0 ) {
+      service_name = xstrdup( argv[ i ] + strlen( VENDOR_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 ) {