trema 0.2.5 → 0.2.6

data/src/lib/openflow_message.h

@@ -69,7 +69,7 @@ buffer *create_flow_removed( const uint32_t transaction_id, const struct ofp_mat
                             const uint32_t duration_nsec, const uint16_t idle_timeout,
                             const uint64_t packet_count, const uint64_t byte_count );
 buffer *create_port_status( const uint32_t transaction_id, const uint8_t reason,
-                            const struct ofp_phy_port desc);
+                            const struct ofp_phy_port desc );
 buffer *create_packet_out( const uint32_t transaction_id, const uint32_t buffer_id,
                            const uint16_t in_port, const openflow_actions *actions,
                            const buffer *data );
@@ -275,6 +275,7 @@ bool get_error_type_and_code( const uint8_t type, const int error_no,
                               uint16_t *error_type, uint16_t *error_code );
 void set_match_from_packet( struct ofp_match *match, const uint16_t in_port,
                             const uint32_t wildcards, const buffer *packet );
+void normalize_match( struct ofp_match *match );
 
 
 #endif // OPENFLOW_MESSAGE_H

data/src/lib/openflow_switch_interface.c

@@ -18,9 +18,9 @@
  */
 
 
+#include <arpa/inet.h>
 #include <assert.h>
 #include <inttypes.h>
-#include <arpa/inet.h>
 #include <syslog.h>
 #include "chibach_private.h"
 #include "hash_table.h"
@@ -458,7 +458,7 @@ handle_error( buffer *data ) {
   buffer *body = duplicate_buffer( data );
   remove_front_buffer( body, offsetof( struct ofp_error_msg, data ) );
 
-  debug( "An error message is received ( transaction_id = %#x, type = %u, code = %u, data length = %u ).",
+  debug( "An error message is received ( transaction_id = %#x, type = %#x, code = %#x, data length = %zu ).",
          transaction_id, type, code, body->length );
 
   if ( event_handlers.error_callback == NULL ) {
@@ -506,7 +506,7 @@ handle_echo_request( buffer *data ) {
          body,
          event_handlers.echo_request_user_data );
 
-  event_handlers.echo_request_callback( transaction_id, body, event_handlers.set_config_user_data );
+  event_handlers.echo_request_callback( transaction_id, body, event_handlers.echo_request_user_data );
 
   if ( body != NULL ) {
     free_buffer( body );
@@ -540,7 +540,7 @@ handle_echo_reply( buffer *data ) {
          body,
          event_handlers.echo_reply_user_data );
 
-  event_handlers.echo_reply_callback( transaction_id, body, event_handlers.set_config_user_data );
+  event_handlers.echo_reply_callback( transaction_id, body, event_handlers.echo_reply_user_data );
 
   if ( body != NULL ) {
     free_buffer( body );
@@ -701,7 +701,7 @@ handle_packet_out( buffer *data ) {
   }
 
   debug( "A packet-out is received ( transaction_id = %#x, buffer_id = %#x, in_port = %u, "
-         "actions_len = %u, frame_length = %u ).",
+         "actions_len = %zu, frame_length = %zu ).",
          transaction_id, buffer_id, in_port, actions_len, frame_length );
 
   if ( event_handlers.packet_out_callback == NULL ) {
@@ -820,7 +820,7 @@ handle_port_mod( buffer *data ) {
          event_handlers.port_mod_user_data );
 
   event_handlers.port_mod_callback( transaction_id, port_no, hw_addr, config, mask, advertise,
-                                    event_handlers.barrier_request_user_data );
+                                    event_handlers.port_mod_user_data );
 
 }
 
@@ -855,7 +855,7 @@ handle_stats_request( buffer *data ) {
     {
       struct ofp_aggregate_stats_request *aggregate = p;
       ntoh_match( &aggregate->match, &aggregate->match );
-      aggregate->out_port = ntohs( aggregate->out_port );      
+      aggregate->out_port = ntohs( aggregate->out_port );
     }
     break;
 
@@ -980,7 +980,7 @@ handle_openflow_message( buffer *message ) {
 
   int ret = validate_openflow_message( message );
   if ( ret < 0 ) {
-    error( "Failed to validate an OpenFlow message ( code = %d, length = %u ).", ret, message->length );
+    error( "Failed to validate an OpenFlow message ( code = %d, length = %zu ).", ret, message->length );
     return false;
   }
 
@@ -1031,7 +1031,7 @@ handle_openflow_message( buffer *message ) {
     handle_queue_get_config_request( message );
     break;
   default:
-    error( "Unhandled OpenFlow message ( type = %u ).", header->type );
+    error( "Unhandled OpenFlow message ( type = %#x ).", header->type );
     ret = false;
     break;
   }
@@ -1080,7 +1080,7 @@ switch_send_openflow_message( buffer *message ) {
 
 bool
 handle_secure_channel_message( buffer *message ) {
-  debug( "An OpenFlow message is received from remove." );
+  debug( "An OpenFlow message is received from remote." );
 
   assert( message != NULL );
   assert( message->length >= sizeof( struct ofp_header ) );
@@ -1098,7 +1098,7 @@ handle_local_message( uint16_t tag, void *data, size_t length ) {
   assert( data != NULL );
   assert( length >= sizeof( openflow_service_header_t ) );
 
-  debug( "A message is received from remote ( tag = %u, data = %p, length = %u ).", tag, data, length );
+  debug( "A message is received from remote ( tag = %#x, data = %p, length = %zu ).", tag, data, length );
 
   switch ( tag ) {
   case MESSENGER_OPENFLOW_MESSAGE:
@@ -1261,7 +1261,7 @@ send_error_message( uint32_t transaction_id, uint16_t type, uint16_t code ) {
     case OFPBAC_BAD_ARGUMENT:
     case OFPBAC_EPERM:
     case OFPBAC_TOO_MANY:
-    case OFPBAC_BAD_QUEUE:   
+    case OFPBAC_BAD_QUEUE:
     {
       const buffer *original_message = get_openflow_message( transaction_id );
       if ( original_message != NULL ) {

data/src/lib/packet_parser.c

@@ -16,11 +16,11 @@
  */
 
 
-#include <assert.h>
-#include <stdint.h>
 #include <arpa/inet.h>
+#include <assert.h>
 #include <net/ethernet.h>
 #include <netinet/ip.h>
+#include <stdint.h>
 #include "packet_info.h"
 #include "log.h"
 #include "wrapper.h"
@@ -63,7 +63,7 @@ parse_ether( buffer *buf ) {
 
     packet_info->vlan_tci = ntohs( vlantag_header->tci );
     packet_info->vlan_tpid = packet_info->eth_type;
-    packet_info->vlan_prio =TCI_GET_PRIO( packet_info->vlan_tci );
+    packet_info->vlan_prio = TCI_GET_PRIO( packet_info->vlan_tci );
     packet_info->vlan_cfi = TCI_GET_CFI( packet_info->vlan_tci );
     packet_info->vlan_vid = TCI_GET_VID( packet_info->vlan_tci );
 
@@ -76,7 +76,7 @@ parse_ether( buffer *buf ) {
   }
 
   // Skip nested vlan headers.
-  while (  packet_info->eth_type == ETH_ETHTYPE_TPID ) {
+  while ( packet_info->eth_type == ETH_ETHTYPE_TPID ) {
     // Check the length of remained buffer
     length = REMAINED_BUFFER_LENGTH( buf, ptr );
     if ( length < sizeof( vlantag_header_t ) ) {
@@ -115,8 +115,6 @@ parse_ether( buffer *buf ) {
     packet_info->l2_payload = ptr;
     packet_info->l2_payload_length = payload_length;
   }
-
-  return;
 }
 
 
@@ -147,9 +145,7 @@ parse_arp( buffer *buf ) {
   packet_info->arp_tpa = ntohl( arp_header->tip );
 
   packet_info->format |= NW_ARP;
-
-  return;
-};
+}
 
 
 static void
@@ -196,8 +192,6 @@ parse_ipv4( buffer *buf ) {
   }
 
   packet_info->format |= NW_IPV4;
-
-  return;
 }
 
 
@@ -218,8 +212,8 @@ parse_ipv6( buffer *buf ) {
   // Parses IPv6 header
   ipv6_header_t *ipv6_header = ptr;
   uint32_t hdrctl = ntohl( ipv6_header->hdrctl );
-  packet_info->ipv6_version = ( uint8_t )( hdrctl >> 28 );
-  packet_info->ipv6_tc = ( uint8_t )( hdrctl >> 20 & 0xFF );
+  packet_info->ipv6_version = ( uint8_t ) ( hdrctl >> 28 );
+  packet_info->ipv6_tc = ( uint8_t ) ( hdrctl >> 20 & 0xFF );
   packet_info->ipv6_flowlabel = hdrctl & 0xFFFFF;
   packet_info->ipv6_plen = ntohs( ipv6_header->plen );
   packet_info->ipv6_nexthdr = ipv6_header->nexthdr;
@@ -228,8 +222,6 @@ parse_ipv6( buffer *buf ) {
   memcpy( packet_info->ipv6_daddr, ipv6_header->daddr, IPV6_ADDRLEN );
 
   packet_info->format |= NW_IPV6;
-
-  return;
 }
 
 
@@ -248,8 +240,6 @@ parse_lldp( buffer *buf ) {
   }
 
   packet_info->format |= NW_LLDP;
-
-  return;
 }
 
 
@@ -296,9 +286,7 @@ parse_icmp( buffer *buf ) {
   }
 
   packet_info->format |= NW_ICMPV4;
-
-  return;
-};
+}
 
 
 static void
@@ -330,9 +318,7 @@ parse_udp( buffer *buf ) {
   }
 
   packet_info->format |= TP_UDP;
-
-  return;
-};
+}
 
 
 static void
@@ -377,10 +363,7 @@ parse_tcp( buffer *buf ) {
   }
 
   packet_info->format |= TP_TCP;
-
-  return;
-};
-
+}
 
 
 static void
@@ -404,8 +387,6 @@ parse_igmp( buffer *buf ) {
   packet_info->igmp_group = ntohl( igmp->group );
 
   packet_info->format |= NW_IGMP;
-
-  return;
 }
 
 
@@ -433,12 +414,10 @@ parse_etherip( buffer *buf ) {
   if ( payload_length > 0 ) {
     packet_info->l4_payload = ptr;
     packet_info->l4_payload_length = payload_length;
-    packet_info->etherip_offset = ( uint16_t ) ( ( char * ) ptr - ( char *) buf->data );
+    packet_info->etherip_offset = ( uint16_t ) ( ( char * ) ptr - ( char * ) buf->data );
   }
 
   packet_info->format |= TP_ETHERIP;
-
-  return;
 }
 
 

data/src/lib/packetin_filter_interface.c

@@ -204,7 +204,7 @@ handle_reply( uint16_t tag, void *data, size_t length, void *user_data ) {
     case MESSENGER_ADD_PACKETIN_FILTER_REPLY:
     {
       if ( length != sizeof( add_packetin_filter_reply ) ) {
-        error( "Invalid add packetin filter reply ( length = %u ).", length );
+        error( "Invalid add packetin filter reply ( length = %zu ).", length );
         return;
       }
       add_packetin_filter_reply *reply = data;
@@ -214,7 +214,7 @@ handle_reply( uint16_t tag, void *data, size_t length, void *user_data ) {
     case MESSENGER_DELETE_PACKETIN_FILTER_REPLY:
     {
       if ( length != sizeof( delete_packetin_filter_reply ) ) {
-        error( "Invalid delete packetin filter reply ( length = %u ).", length );
+        error( "Invalid delete packetin filter reply ( length = %zu ).", length );
         return;
       }
       delete_packetin_filter_reply *reply = data;
@@ -224,13 +224,13 @@ handle_reply( uint16_t tag, void *data, size_t length, void *user_data ) {
     case MESSENGER_DUMP_PACKETIN_FILTER_REPLY:
     {
       if ( length < offsetof( dump_packetin_filter_reply, entries ) ) {
-        error( "Invalid dump packetin filter reply ( length = %u ).", length );
+        error( "Invalid dump packetin filter reply ( length = %zu ).", length );
         return;
       }
       dump_packetin_filter_reply *reply = data;
       size_t expected_length = offsetof( dump_packetin_filter_reply, entries ) + sizeof( packetin_filter_entry ) * ntohl( reply->n_entries );
       if ( length != expected_length ) {
-        error( "Invalid dump packetin filter reply ( length = %u ).", length );
+        error( "Invalid dump packetin filter reply ( length = %zu ).", length );
         return;
       }
       packetin_filter_entry *entries = NULL;
@@ -249,7 +249,7 @@ handle_reply( uint16_t tag, void *data, size_t length, void *user_data ) {
     break;
     default:
     {
-      warn( "Undefined reply tag ( tag = %#x, length = %u ).", tag, length );
+      warn( "Undefined reply tag ( tag = %#x, length = %zu ).", tag, length );
     }
     return;
   }

data/src/lib/persistent_storage.c

@@ -131,14 +131,14 @@ save_value( void *value, int n_columns, char **columns, char **column_names ) {
 }
 
 
-static char*
+static char *
 get_value_from_backend( const char *key ) {
   assert( db_handle != NULL );
   assert( key != NULL );
 
   char *value = NULL;
   char *err = NULL;
-  char *statement= sqlite3_mprintf( "SELECT value FROM trema WHERE key = '%q'", key );
+  char *statement = sqlite3_mprintf( "SELECT value FROM trema WHERE key = '%q'", key );
   int ret = trema_sqlite3_exec( db_handle, statement, save_value, &value, &err );
   if ( ret != SQLITE_OK ) {
     error( "Failed to execute a SQL statement ( statement = %s, error = %s ).", statement, err );
@@ -336,7 +336,7 @@ valid_key( const char *key ) {
 
   size_t length = strlen( key );
   if ( length > MAX_KEY_LENGTH ) {
-    error( "Too long key ( length = %u ) specified. Maximum length is %u.", length, MAX_KEY_LENGTH );
+    error( "Too long key ( length = %zu ) specified. Maximum length is %zu.", length, MAX_KEY_LENGTH );
     return false;
   }
 
@@ -358,7 +358,7 @@ valid_value( const char *value ) {
 
   size_t length = strlen( value );
   if ( length > MAX_KEY_LENGTH ) {
-    error( "Too long value ( length = %u ) specified. Maximum length is %u.", length, MAX_VALUE_LENGTH );
+    error( "Too long value ( length = %zu ) specified. Maximum length is %zu.", length, MAX_VALUE_LENGTH );
     return false;
   }
 
@@ -412,7 +412,7 @@ get_value( const char *key, char *value, const size_t length ) {
 
   size_t required_length = strlen( retrieved ) + 1;
   if ( required_length > length ) {
-    error( "Insufficient buffer space ( %u [bytes] > %u [bytes] ).",
+    error( "Insufficient buffer space ( %zu [bytes] > %zu [bytes] ).",
            required_length, length );
     return false;
   }
@@ -442,13 +442,13 @@ delete_key_value( const char *key ) {
 }
 
 
-const char*
+const char *
 _get_db_file( void ) {
   return db_file;
 }
 
 
-const sqlite3*
+const sqlite3 *
 _get_db_handle( void ) {
   return db_handle;
 }

data/src/lib/secure_channel.c

@@ -239,7 +239,7 @@ flush_send_queue( int fd, void *user_data ) {
   assert( send_queue != NULL );
   assert( connection.fd >= 0 );
 
-  debug( "Flushing send queue ( length = %d ).", send_queue->length );
+  debug( "Flushing send queue ( length = %u ).", send_queue->length );
 
   set_writable( connection.fd, false );
 
@@ -309,7 +309,7 @@ static void
 check_connected( void *user_data ) {
   UNUSED( user_data );
 
-  debug( "Checking a connection ( fd = %d ip = %#x, port = %u ).", connection.fd, connection.ip, connection.port );
+  debug( "Checking a connection ( fd = %d, ip = %#x, port = %u ).", connection.fd, connection.ip, connection.port );
 
   assert( secure_channel_initialized );
   assert( connection.fd >= 0 );
@@ -326,7 +326,7 @@ check_connected( void *user_data ) {
     return;
   }
 
-  switch( err ) {
+  switch ( err ) {
     case 0:
       connected();
       break;
@@ -341,7 +341,7 @@ check_connected( void *user_data ) {
       return;
 
     case EINPROGRESS:
-      set_fd_handler( connection.fd, NULL ,NULL, ( event_fd_callback ) check_connected, NULL );
+      set_fd_handler( connection.fd, NULL, NULL, ( event_fd_callback ) check_connected, NULL );
       set_writable( connection.fd, true );
       break;
 
@@ -393,7 +393,7 @@ try_connect() {
 
   ret = connect( connection.fd, ( struct sockaddr * ) &addr, sizeof( struct sockaddr_in ) );
   if ( ret < 0 ) {
-    switch( errno ) {
+    switch ( errno ) {
       case EINTR:
       case EAGAIN:
       case ECONNREFUSED:
@@ -476,7 +476,7 @@ send_message_to_secure_channel( buffer *message ) {
   assert( connection.state == CONNECTED );
   assert( connection.fd >= 0 );
 
-  debug( "Enqueuing a message to send queue ( queue length = %d, message length = %d ).",
+  debug( "Enqueuing a message to send queue ( queue length = %u, message length = %zu ).",
         send_queue->length, message->length );
 
   if ( send_queue->length == 0 ) {

data/src/lib/secure_channel.h

@@ -25,7 +25,7 @@
 
 
 typedef void ( *connected_handler )( void );
-typedef void ( *disconnected_handler ) ( void );
+typedef void ( *disconnected_handler )( void );
 
 
 bool init_secure_channel( uint32_t ip, uint16_t port,

data/src/lib/stat.c

@@ -64,12 +64,6 @@ static hash_table *stats = NULL;
 static pthread_mutex_t stats_table_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
 
 
-typedef struct {
-  char key[ STAT_KEY_LENGTH ];
-  uint64_t value;
-} stat_entry;
-
-
 static void
 create_stats_table() {
   assert( stats == NULL );
@@ -88,7 +82,9 @@ delete_stats_table() {
   init_hash_iterator( stats, &iter );
   while ( ( e = iterate_hash_next( &iter ) ) != NULL ) {
     void *value = delete_hash_entry( stats, e->key );
-    xfree( value );
+    if ( value != NULL ) {
+      xfree( value );
+    }
   }
   delete_hash( stats );
   stats = NULL;
@@ -178,29 +174,71 @@ increment_stat( const char *key ) {
 
 
 void
-dump_stats() {
+reset_stats() {
   assert( stats != NULL );
 
-  int n_stats = 0;
+  pthread_mutex_lock( &stats_table_mutex );
+
+  hash_entry *e = NULL;
   hash_iterator iter;
-  hash_entry *e;
+  init_hash_iterator( stats, &iter );
+  while ( ( e = iterate_hash_next( &iter ) ) != NULL ) {
+    stat_entry *st = e->value;
+    if ( st != NULL ) {
+      void *deleted = delete_hash_entry( stats, st->key );
+      if ( deleted != NULL ) {
+        xfree( deleted );
+      }
+    }
+  }
 
-  pthread_mutex_lock( &stats_table_mutex );
+  pthread_mutex_unlock( &stats_table_mutex );
+}
 
-  info( "Statistics:" );
 
+void
+foreach_stat( void function( const char *key, const uint64_t value, void *user_data ), void *user_data ) {
+  assert( stats != NULL );
+  assert( function != NULL );
+
+  pthread_mutex_lock( &stats_table_mutex );
+
+  hash_entry *e = NULL;
+  hash_iterator iter;
   init_hash_iterator( stats, &iter );
   while ( ( e = iterate_hash_next( &iter ) ) != NULL ) {
     stat_entry *st = e->value;
-    info( "%s: %" PRIu64, st->key, st->value );
-    n_stats++;
+    if ( st != NULL ) {
+      function( st->key, st->value, user_data );
+    }
   }
 
+  pthread_mutex_unlock( &stats_table_mutex );
+}
+
+
+static void
+print_stat( const char *key, const uint64_t value, void *user_data ) {
+  assert( key != NULL );
+  assert( user_data != NULL );
+
+  info( "%s: %" PRIu64, key, value );
+  ( *( int * ) user_data )++;
+}
+
+
+void
+dump_stats() {
+  assert( stats != NULL );
+
+  info( "Statistics:" );
+
+  int n_stats = 0;
+  foreach_stat( print_stat, &n_stats );
+
   if ( n_stats == 0 ) {
     info( "No statistics found." );
   }
-
-  pthread_mutex_unlock( &stats_table_mutex );
 }
 
 
@@ -210,4 +248,3 @@ dump_stats() {
  * indent-tabs-mode: nil
  * End:
  */
-