trema 0.2.2.1 → 0.2.3

data/src/switch_manager/ofpmsg_recv.c

@@ -130,36 +130,38 @@ ofpmsg_recv_error( struct switch_info *sw_info, buffer *buf ) {
         free_buffer( buf );
         return 0;
       }
-      cookie_entry_t *entry = lookup_cookie_entry_by_cookie( &cookie );
-      if ( entry != NULL ) {
-        flow_mod->cookie = htonll( entry->application.cookie );
-        if ( length >= offsetof( struct ofp_flow_mod, actions ) ) {
-          flow_mod->flags = htons( entry->application.flags );
-        }
-      }
-
-      if ( length >= offsetof( struct ofp_flow_mod, idle_timeout ) ) {
-        uint16_t command = ntohs( flow_mod->command );
-        switch ( command ) {
-        case OFPFC_ADD:
-        {
-          if ( entry != NULL ) {
-            delete_cookie_entry( entry );
-          }
-          else {
-            error( "No cookie entry found ( cookie = %#" PRIx64 " ).", cookie );
+      if ( sw_info->cookie_translation ) {
+        cookie_entry_t *entry = lookup_cookie_entry_by_cookie( &cookie );
+        if ( entry != NULL ) {
+          flow_mod->cookie = htonll( entry->application.cookie );
+          if ( length >= offsetof( struct ofp_flow_mod, actions ) ) {
+            flow_mod->flags = htons( entry->application.flags );
           }
         }
-        break;
 
-        case OFPFC_MODIFY:
-        case OFPFC_MODIFY_STRICT:
-        case OFPFC_DELETE:
-        case OFPFC_DELETE_STRICT:
+        if ( length >= offsetof( struct ofp_flow_mod, idle_timeout ) ) {
+          uint16_t command = ntohs( flow_mod->command );
+          switch ( command ) {
+          case OFPFC_ADD:
+          {
+            if ( entry != NULL ) {
+              delete_cookie_entry( entry );
+            }
+            else {
+              error( "No cookie entry found ( cookie = %#" PRIx64 " ).", cookie );
+            }
+          }
           break;
 
-        default:
-          error( "Undefined flow_mod command ( command = %#x ).", command );
+          case OFPFC_MODIFY:
+          case OFPFC_MODIFY_STRICT:
+          case OFPFC_DELETE:
+          case OFPFC_DELETE_STRICT:
+            break;
+
+          default:
+            error( "Undefined flow_mod command ( command = %#x ).", command );
+          }
         }
       }
     }
@@ -190,9 +192,13 @@ int
 ofpmsg_recv_echoreply( struct switch_info *sw_info,  buffer *buf ) {
   ofpmsg_debug( "Receive 'echo reply' from a switch." );
 
-  // TODO: implement keepalive mechanism
+  int ret = switch_event_recv_echoreply( sw_info, buf );
+  if ( ret < 0 ) {
+    free_buffer( buf );
+    return ret;
+  }
 
-  free_buffer( buf );
+  send_transaction_reply( sw_info, buf );
 
   return 0;
 }
@@ -274,14 +280,22 @@ ofpmsg_recv_flowremoved( struct switch_info *sw_info, buffer *buf ) {
     return 0;
   }
 
+  if ( !sw_info->cookie_translation ) {
+    service_send_to_application( sw_info->state_service_name_list, MESSENGER_OPENFLOW_MESSAGE,
+                                 &sw_info->datapath_id, buf );
+    free_buffer( buf );
+    return 0;
+  }
+
   entry = lookup_cookie_entry_by_cookie( &cookie );
   if ( entry == NULL ) {
     error( "No cookie entry found ( cookie = %#" PRIx64 " ).", cookie );
     free_buffer( buf );
     return 0;
   }
-  debug( "Cookie found ( cookie = %#" PRIx64 ", application = [ cookie = %#" PRIx64 ", service name = %s, flags = %#x ], "
-         "reference_count = %d, expire_at = %u ).",
+
+  debug( "Cookie found ( cookie = %#" PRIx64 ", application = [ cookie = %#" PRIx64
+         ", service name = %s, flags = %#x ], reference_count = %d, expire_at = %u ).",
          cookie, entry->application.cookie, entry->application.service_name, entry->application.flags,
          entry->reference_count, entry->expire_at );
 
@@ -319,7 +333,7 @@ ofpmsg_recv_statsreply( struct switch_info *sw_info, buffer *buf ) {
 
   ofpmsg_debug( "Receive 'statistics reply' from a switch." );
 
-  if ( type == OFPST_FLOW ) {
+  if ( type == OFPST_FLOW && sw_info->cookie_translation ) {
     size_t body_offset = offsetof( struct ofp_stats_reply, body );
     int body_length = ntohs( stats_reply->header.length ) - ( int ) body_offset;
     struct ofp_flow_stats *flow_stats = ( void * ) ( ( char * ) stats_reply + body_offset );

data/src/switch_manager/ofpmsg_send.c

@@ -46,6 +46,23 @@ ofpmsg_send_hello( struct switch_info *sw_info ) {
 }
 
 
+int
+ofpmsg_send_echorequest( struct switch_info *sw_info, uint32_t xid, buffer *body ) {
+  int ret;
+  buffer *buf;
+
+  buf = create_echo_request( xid, body );
+  free_buffer( body );
+
+  ret = send_to_secure_channel( sw_info, buf );
+  if ( ret == 0 ) {
+    debug( "Send 'echo request' to a switch %#" PRIx64 ".", sw_info->datapath_id );
+  }
+
+  return ret;
+}
+
+
 int
 ofpmsg_send_echoreply( struct switch_info *sw_info, uint32_t xid, buffer *body ) {
   int ret;
@@ -187,7 +204,7 @@ ofpmsg_send( struct switch_info *sw_info, buffer *buf, char *service_name ) {
   new_xid = insert_xid_entry( ntohl( ofp_header->xid ), service_name );
   ofp_header->xid = htonl( new_xid );
 
-  if ( ofp_header->type == OFPT_FLOW_MOD ) {
+  if ( ofp_header->type == OFPT_FLOW_MOD && sw_info->cookie_translation ) {
     ret = update_flowmod_cookie( buf, service_name );
     if ( ret < 0 ) {
       error( "Failed to update cookie value ( ret = %d ).", ret );
@@ -227,6 +244,28 @@ ofpmsg_send_delete_all_flows( struct switch_info *sw_info ) {
 }
 
 
+int
+ofpmsg_send_deny_all( struct switch_info *sw_info ) {
+  int ret;
+  struct ofp_match match;
+  buffer *buf;
+
+  memset( &match, 0, sizeof( match ) );
+  match.wildcards = OFPFW_ALL;
+  const uint16_t timeout = 10;
+
+  buf = create_flow_mod( generate_xid(), match, RESERVED_COOKIE,
+                         OFPFC_ADD, 0, timeout, UINT16_MAX, UINT32_MAX, OFPP_NONE, 0, NULL );
+
+  ret = send_to_secure_channel( sw_info, buf );
+  if ( ret == 0 ) {
+    debug( "Send 'flow mod (deny all)' to a switch %#" PRIx64 ".", sw_info->datapath_id );
+  }
+
+  return ret;
+}
+
+
 /*
  * Local variables:
  * c-basic-offset: 2

data/src/switch_manager/ofpmsg_send.h

@@ -30,12 +30,14 @@
 
 
 int ofpmsg_send_hello( struct switch_info *sw_info );
+int ofpmsg_send_echorequest( struct switch_info *sw_info, uint32_t xid, buffer *body );
 int ofpmsg_send_echoreply( struct switch_info *sw_info, uint32_t xid, buffer *body );
 int ofpmsg_send_featuresrequest( struct switch_info *sw_info );
 int ofpmsg_send_setconfig( struct switch_info *sw_info );
 int ofpmsg_send_error_msg( struct switch_info *sw_info, uint16_t type, uint16_t code, buffer *data );
 int ofpmsg_send( struct switch_info *sw_info, buffer *buf, char *service_name );
 int ofpmsg_send_delete_all_flows( struct switch_info *sw_info );
+int ofpmsg_send_deny_all( struct switch_info *sw_info );
 
 
 #endif // OFPMSG_SEND_H

data/src/switch_manager/switch.c

@@ -42,13 +42,29 @@
 #include "xid_table.h"
 
 
+#define SUB_TIMESPEC( _a, _b, _return )                       \
+  do {                                                        \
+    ( _return )->tv_sec = ( _a )->tv_sec - ( _b )->tv_sec;    \
+    ( _return )->tv_nsec = ( _a )->tv_nsec - ( _b )->tv_nsec; \
+    if ( ( _return )->tv_nsec < 0 ) {                         \
+      ( _return )->tv_sec--;                                  \
+      ( _return )->tv_nsec += 1000000000;                     \
+    }                                                         \
+  }                                                           \
+  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  },
 };
 
@@ -58,9 +74,16 @@ 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 bool age_cookie_table_enabled = false;
 
+typedef struct {
+  uint64_t datapath_id;
+  uint32_t sec;
+  uint32_t nsec;
+} echo_body;
 
 void
 usage() {
@@ -71,7 +94,9 @@ usage() {
     "  -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 start\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"
@@ -109,6 +134,8 @@ option_parser( int argc, char *argv[] ) {
 
   switch_info.secure_channel_fd = 0; // stdin
   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 ) {
     switch ( c ) {
       case 's':
@@ -119,6 +146,14 @@ option_parser( int argc, char *argv[] ) {
         switch_info.flow_cleanup = false;
         break;
 
+      case NO_COOKIE_TRANSLATION_LONG_OPTION_VALUE:
+        switch_info.cookie_translation = false;
+        break;
+
+      case NO_PACKET_IN_LONG_OPTION_VALUE:
+        switch_info.deny_packet_in_on_startup = true;
+        break;
+
       default:
         usage();
         exit( EXIT_SUCCESS );
@@ -259,6 +294,13 @@ switch_event_recv_hello( struct switch_info *sw_info ) {
     // cancel to hello_wait-timeout timer
     switch_unset_timeout( switch_event_timeout_hello, NULL );
 
+    if ( sw_info->deny_packet_in_on_startup ) {
+      ret = ofpmsg_send_deny_all( sw_info );
+      if ( ret < 0 ) {
+        return ret;
+      }
+    }
+
     ret = ofpmsg_send_featuresrequest( sw_info );
     if ( ret < 0 ) {
       return ret;
@@ -273,6 +315,66 @@ switch_event_recv_hello( struct switch_info *sw_info ) {
 }
 
 
+static void
+echo_reply_timeout( void *user_data ) {
+  UNUSED( user_data );
+
+  error( "Echo request timeout ( datapath id %#" PRIx64 ").", switch_info.datapath_id );
+  switch_event_disconnected( &switch_info );
+}
+
+
+int
+switch_event_recv_echoreply( struct switch_info *sw_info, buffer *buf ) {
+  if ( buf->length != sizeof( struct ofp_header ) + sizeof( echo_body ) ) {
+    return 0;
+  }
+  struct ofp_header *header = buf->data;
+  if ( ntohl( header->xid ) != sw_info->echo_request_xid ) {
+    return 0;
+  }
+
+  echo_body *body = ( echo_body * ) ( header + 1 );
+  if ( ntohll( body->datapath_id ) != sw_info->datapath_id ) {
+    return 0;
+  }
+  switch_unset_timeout( echo_reply_timeout, NULL );
+  struct timespec now, tim;
+  clock_gettime( CLOCK_MONOTONIC, &now );
+  tim.tv_sec = ( time_t ) ntohl( body->sec );
+  tim.tv_nsec = ( long ) ntohl( body->nsec );
+
+  SUB_TIMESPEC( &now, &tim, &tim );
+
+  info( "echo round-trip time %u.%09u.", ( uint32_t ) tim.tv_sec, ( uint32_t ) tim.tv_nsec );
+
+  return 0;
+}
+
+
+static void
+echo_request_interval( void *user_data ) {
+  struct switch_info *sw_info = user_data;
+
+  buffer *buf = alloc_buffer();
+  echo_body *body = append_back_buffer( buf, sizeof( echo_body ) );
+  body->datapath_id = htonll( switch_info.datapath_id );
+  struct timespec now;
+  clock_gettime( CLOCK_MONOTONIC, &now );
+  body->sec = htonl( ( uint32_t ) now.tv_sec );
+  body->nsec = htonl( ( uint32_t ) now.tv_nsec );
+  sw_info->echo_request_xid = generate_xid();
+
+  int err = ofpmsg_send_echorequest( sw_info, sw_info->echo_request_xid, buf );
+  if ( err < 0 ) {
+    switch_event_disconnected( &switch_info );
+    return;
+  }
+
+  switch_set_timeout( ECHO_REPLY_TIMEOUT, echo_reply_timeout, NULL );
+}
+
+
 int
 switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
   int ret;
@@ -323,6 +425,7 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
         return ret;
       }
     }
+    add_periodic_event_callback( ECHO_REQUEST_INTERVAL, echo_request_interval, sw_info );
     break;
 
   case SWITCH_STATE_COMPLETED:
@@ -342,8 +445,14 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
 
 int
 switch_event_disconnected( struct switch_info *sw_info ) {
+  int old_state = sw_info->state;
+
   sw_info->state = SWITCH_STATE_DISCONNECTED;
 
+  if ( old_state == SWITCH_STATE_COMPLETED ) {
+    delete_timer_event( echo_request_interval, sw_info );
+  }
+
   if ( sw_info->fragment_buf != NULL ) {
     free_buffer( sw_info->fragment_buf );
     sw_info->fragment_buf = NULL;
@@ -368,13 +477,16 @@ switch_event_disconnected( struct switch_info *sw_info ) {
     sw_info->secure_channel_fd = -1;
   }
 
-  // send secure channle disconnect state to application
-  service_send_state( sw_info, &sw_info->datapath_id, MESSENGER_OPENFLOW_DISCONNECTED );
+  if ( old_state != SWITCH_STATE_COMPLETED ) {
+    service_send_state( sw_info, &sw_info->datapath_id, MESSENGER_OPENFLOW_FAILD_TO_CONNECT );
+  }
+  else {
+    // send secure channle disconnect state to application
+    service_send_state( sw_info, &sw_info->datapath_id, MESSENGER_OPENFLOW_DISCONNECTED );
+  }
   flush_messenger();
-  debug( "send disconnected state" );
 
-  stop_event_handler();
-  stop_messenger();
+  stop_trema();
 
   return 0;
 }
@@ -426,10 +538,16 @@ management_recv( uint16_t tag, void *data, size_t data_len ) {
     break;
 
   case DUMP_COOKIE_TABLE:
+    if ( !switch_info.cookie_translation ) {
+      break;
+    }
     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;
@@ -446,6 +564,22 @@ management_recv( uint16_t tag, void *data, size_t data_len ) {
 }
 
 
+static void
+stop_switch_daemon( void ) {
+  switch_event_disconnected( &switch_info );
+}
+
+
+static void
+handle_sigterm( int signum ) {
+  UNUSED( signum );
+
+  if ( !set_external_callback( stop_switch_daemon ) ) {
+    stop_trema();
+  }
+}
+
+
 int
 main( int argc, char *argv[] ) {
   int ret;
@@ -485,6 +619,12 @@ main( int argc, char *argv[] ) {
     }
   }
 
+  struct sigaction signal_exit;
+  memset( &signal_exit, 0, sizeof( struct sigaction ) );
+  signal_exit.sa_handler = handle_sigterm;
+  sigaction( SIGINT, &signal_exit, NULL );
+  sigaction( SIGTERM, &signal_exit, NULL );
+
   fcntl( switch_info.secure_channel_fd, F_SETFL, O_NONBLOCK );
 
   set_fd_handler( switch_info.secure_channel_fd, secure_channel_read, NULL, secure_channel_write, NULL );
@@ -499,9 +639,12 @@ main( int argc, char *argv[] ) {
   switch_info.send_queue = create_message_queue();
   switch_info.recv_queue = create_message_queue();
   switch_info.running_timer = false;
+  switch_info.echo_request_xid = 0;
 
   init_xid_table();
-  init_cookie_table();
+  if ( switch_info.cookie_translation ) {
+    init_cookie_table();
+  }
 
   add_message_received_callback( get_trema_name(), service_recv );
 
@@ -520,7 +663,9 @@ main( int argc, char *argv[] ) {
   start_trema();
 
   finalize_xid_table();
-  finalize_cookie_table();
+  if ( switch_info.cookie_translation ) {
+    finalize_cookie_table();
+  }
 
   if ( switch_info.secure_channel_fd >= 0 ) {
     delete_fd_handler( switch_info.secure_channel_fd );