trema 0.2.5 → 0.2.6

data/src/examples/packet_in/packet-in.rb

@@ -1,8 +1,4 @@
 #
-# Dumps packet-in message.
-#
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -20,16 +16,16 @@
 #
 
 
-class PacketinDumper < Controller
-  def packet_in datapath_id, event
-    puts "received a packet_in"
+class PacketInDumper < Controller
+  def packet_in datapath_id, message
+    info "received a packet_in"
     info "datapath_id: #{ datapath_id.to_hex }"
-    info "transaction_id: #{ event.transaction_id.to_hex }"
-    info "buffer_id: #{ event.buffer_id.to_hex }"
-    info "total_len: #{ event.total_len }"
-    info "in_port: #{ event.in_port }"
-    info "reason: #{ event.reason.to_hex }"
-    info "data: #{ event.data.unpack "H*" }"
+    info "transaction_id: #{ message.transaction_id.to_hex }"
+    info "buffer_id: #{ message.buffer_id.to_hex }"
+    info "total_len: #{ message.total_len }"
+    info "in_port: #{ message.in_port }"
+    info "reason: #{ message.reason.to_hex }"
+    info "data: #{ message.data.unpack "H*" }"
   end
 end
 

data/src/examples/packetin_filter_config/packetin_filter_config.c

@@ -62,7 +62,7 @@ dump_and_delete_filters( int status, int n_entries, packetin_filter_entry *entri
   dump_filters( status, n_entries, entries, user_data );
 
   struct ofp_match *match = user_data;
-  char *service_name = xstrdup( get_trema_name() );  
+  char *service_name = xstrdup( get_trema_name() );
   bool ret = delete_packetin_filter( *match, UINT16_MAX, service_name, true, delete_filter_completed, user_data );
   xfree( service_name );
   if ( ret == false ) {
@@ -83,7 +83,7 @@ add_filter_completed( int status, void *user_data ) {
   info( "A packetin filter was added successfully." );
 
   struct ofp_match *match = user_data;
-  char *service_name = xstrdup( get_trema_name() );  
+  char *service_name = xstrdup( get_trema_name() );
   bool ret = dump_packetin_filter( *match, UINT16_MAX, service_name, true, dump_filters, user_data );
   xfree( service_name );
   if ( ret == false ) {

data/src/examples/patch_panel/network.conf

@@ -0,0 +1,14 @@
+vswitch("patch") {
+  datapath_id "0xabc"
+}
+
+vhost ("host1") {
+  ip "192.168.0.1"
+}
+
+vhost ("host2") {
+  ip "192.168.0.2"
+}
+
+link "patch", "host1"
+link "patch", "host2"

data/src/examples/patch_panel/patch-panel.conf

@@ -0,0 +1 @@
+1 2

data/{features/step_definitions/show_stats_steps.rb → src/examples/patch_panel/patch-panel.rb}

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,21 +16,39 @@
 #
 
 
-Then /^the stats of "([^"]*)" should be:$/ do | host, string |
-  step %{I try to run "./trema show_stats #{ host }" (log = "show_stats.log")}
-  step %{the content of "show_stats.log" should be:}, string
-end
+class PatchPanel < Controller
+  def start
+    @patch = []
+    File.open( "./patch-panel.conf" ).each_line do | each |
+      if /^(\d+)\s+(\d+)$/=~ each
+        @patch << [ $1.to_i, $2.to_i ]
+      end
+    end
+  end
 
 
-Then /^the tx stats of "([^"]*)" should be:$/ do | host, string |
-  step %{I try to run "./trema show_stats #{ host } --tx" (log = "show_stats.log")}
-  step %{the content of "show_stats.log" should be:}, string
-end
+  def switch_ready datapath_id
+    @patch.each do | port_a, port_b |
+      make_patch datapath_id, port_a, port_b
+    end
+  end
+
+
+  private
 
 
-Then /^the rx stats of "([^"]*)" should be:$/ do | host, string |
-  step %{I try to run "./trema show_stats #{ host } --rx" (log = "show_stats.log")}
-  step %{the content of "show_stats.log" should be:}, string
+  def make_patch datapath_id, port_a, port_b
+    send_flow_mod_add(
+      datapath_id,
+      :match => Match.new( :in_port => port_a ),
+      :actions => SendOutPort.new( port_b )
+    )
+    send_flow_mod_add(
+      datapath_id,
+      :match => Match.new( :in_port => port_b ),
+      :actions => SendOutPort.new( port_a )
+    )
+  end
 end
 
 

data/src/examples/switch_info/{switch_info.rb → switch-info.rb}

@@ -20,7 +20,7 @@
 #
 
 
-class SwitchInfoController < Controller
+class SwitchInfo < Controller
   def switch_ready datapath_id
     send_message datapath_id, FeaturesRequest.new
   end
@@ -33,7 +33,7 @@ class SwitchInfoController < Controller
     info "n_tables: %u" % message.n_tables
     info "capabilities: %u" % message.capabilities
     info "actions: %u" % message.actions
-    info "ports: %s" % message.ports.collect { | each | each.number }.sort.join( ", " )
+    info "#ports: %d" % message.ports.size
     shutdown!
   end
 end

data/src/examples/switch_info/switch_info.c

@@ -48,11 +48,11 @@ handle_features_reply (
   UNUSED( user_data );
 
   info( "datapath_id: %#" PRIx64, datapath_id );
-  info( "transaction_id: %#lx", transaction_id );
-  info( "n_buffers: %lu", n_buffers );
+  info( "transaction_id: %#" PRIx32 "", transaction_id );
+  info( "n_buffers: %" PRIu32 "", n_buffers );
   info( "n_tables: %u", n_tables );
-  info( "capabilities: %lu", capabilities );
-  info( "actions: %lu", actions );
+  info( "capabilities: %" PRIu32 "", capabilities );
+  info( "actions: %" PRIu32 "", actions );
   info( "#ports: %d", list_length_of( phy_ports ) );
 
   stop_trema();

data/src/examples/switch_monitor/switch_monitor.c

@@ -30,7 +30,7 @@ join( char *result, const list_element *switches ) {
   const list_element *element;
   for ( element = switches; element != NULL; element = element->next ) {
     char tmp[ 19 ]; // "0x" + 64bits in hex + '\0'
-    snprintf( tmp, sizeof( tmp ), "%#" PRIx64, * ( uint64_t *) element->data );
+    snprintf( tmp, sizeof( tmp ), "%#" PRIx64, *( uint64_t * ) element->data );
     strcat( result, tmp );
     strcat( result, comma );
   }
@@ -56,7 +56,7 @@ delete_switches( list_element *switches ) {
 }
 
 
-static void 
+static void
 insert_datapath_id( list_element **switches, uint64_t datapath_id ) {
   list_element *element = NULL;
   for ( element = *switches; element != NULL; element = element->next ) {
@@ -121,7 +121,7 @@ show_switches( void *user_data ) {
   char *list = xmalloc( 20 * num_switch + 1 ); // 20 = dpid string (18 chars) + ", "
   list[ 0 ] = '\0';
   join( list, *switches );
-  info( "All switches  = %s", list );
+  info( "All switches = %s", list );
   xfree( list );
 }
 

data/src/examples/traffic_monitor/counter.c

@@ -32,16 +32,16 @@ create_counter() {
 
 void
 add_counter( hash_table *db, uint8_t *mac, uint64_t packet_count, uint64_t byte_count ) {
-  counter *counter = lookup_hash_entry( db, mac );
-  if ( counter == NULL ) {
-    counter = xmalloc( sizeof( counter ) );
-    memcpy( counter->mac, mac, ETH_ADDRLEN );
-    counter->packet_count = 0;
-    counter->byte_count = 0;
-    insert_hash_entry( db, counter->mac, counter );
+  counter *entry = lookup_hash_entry( db, mac );
+  if ( entry == NULL ) {
+    entry = xmalloc( sizeof( counter ) );
+    memcpy( entry->mac, mac, ETH_ADDRLEN );
+    entry->packet_count = 0;
+    entry->byte_count = 0;
+    insert_hash_entry( db, entry->mac, entry );
   }
-  counter->packet_count += packet_count;
-  counter->byte_count += byte_count;
+  entry->packet_count += packet_count;
+  entry->byte_count += byte_count;
 }
 
 

data/src/examples/traffic_monitor/fdb.c

@@ -32,23 +32,23 @@ create_fdb() {
 
 uint16_t
 lookup_fdb( hash_table *db, uint8_t *mac ) {
-  fdb *fdb = lookup_hash_entry( db, mac );
-  return ( uint16_t ) ( fdb == NULL ? ENTRY_NOT_FOUND_IN_FDB : fdb->port_number );
+  fdb *entry = lookup_hash_entry( db, mac );
+  return ( uint16_t ) ( entry == NULL ? ENTRY_NOT_FOUND_IN_FDB : entry->port_number );
 
 }
 
 
 void
 learn_fdb( hash_table *db, uint8_t *mac, uint16_t port_number ) {
-  fdb *fdb = lookup_hash_entry( db, mac );
-  if ( fdb == NULL ) {
-    fdb = xmalloc( sizeof( fdb ) );
-    memcpy( fdb->mac, mac, ETH_ADDRLEN );
-    fdb->port_number = port_number;
-    insert_hash_entry( db, fdb->mac, fdb );
+  fdb *entry = lookup_hash_entry( db, mac );
+  if ( entry == NULL ) {
+    entry = xmalloc( sizeof( fdb ) );
+    memcpy( entry->mac, mac, ETH_ADDRLEN );
+    entry->port_number = port_number;
+    insert_hash_entry( db, entry->mac, entry );
   }
   else {
-    fdb->port_number = port_number;
+    entry->port_number = port_number;
   }
 }
 

data/src/lib/arp.h

@@ -46,7 +46,7 @@ typedef struct arp_header {
   uint32_t sip;
   uint8_t tha[ ETH_ADDRLEN ];
   uint32_t tip;
-} __attribute__((packed)) arp_header_t;
+} __attribute__( ( packed ) ) arp_header_t;
 
 
 #define ARP_OP_REQUEST 1

data/src/lib/buffer.c

@@ -191,7 +191,8 @@ append_front_buffer( buffer *buf, size_t length ) {
   if ( already_allocated( pbuf, length ) ) {
     memmove( ( char * ) b->data + length, b->data, b->length );
     memset( b->data, 0, length );
-  } else {
+  }
+  else {
     append_front( pbuf, length );
   }
   b->length += length;
@@ -235,7 +236,7 @@ append_back_buffer( buffer *buf, size_t length ) {
     pthread_mutex_unlock( pbuf->mutex );
     return ( char * ) pbuf->public.data;
   }
- 
+
   if ( !already_allocated( pbuf, length ) ) {
     append_back( pbuf, length );
   }
@@ -284,7 +285,7 @@ dump_buffer( const buffer *buf, void dump_function( const char *format, ... ) )
   pthread_mutex_lock( ( ( const private_buffer * ) buf )->mutex );
 
   char *hex = xmalloc( sizeof( char ) * ( buf->length * 2 + 1 ) );
-  char *datap = buf->data;
+  uint8_t *datap = buf->data;
   char *hexp = hex;
   for ( unsigned int i = 0; i < buf->length; i++, datap++, hexp += 2 ) {
     snprintf( hexp, 3, "%02x", *datap );

data/src/lib/byteorder.c

@@ -178,6 +178,19 @@ ntoh_action_enqueue( struct ofp_action_enqueue *dst, const struct ofp_action_enq
 }
 
 
+static void
+copy_action_vendor_body( struct ofp_action_vendor_header *dst, const struct ofp_action_vendor_header *src, size_t body_length ) {
+  assert( src != NULL );
+  assert( dst != NULL );
+
+  if ( body_length > 0 ) {
+    const void *body_src = ( const char * ) src + sizeof( struct ofp_action_vendor_header );
+    void *body_dst = ( char * ) dst + sizeof( struct ofp_action_vendor_header );
+    bcopy( body_src, body_dst, body_length );
+  }
+}
+
+
 void
 ntoh_action_vendor( struct ofp_action_vendor_header *dst, const struct ofp_action_vendor_header *src ) {
   assert( src != NULL );
@@ -186,6 +199,19 @@ ntoh_action_vendor( struct ofp_action_vendor_header *dst, const struct ofp_actio
   dst->type = ntohs( src->type );
   dst->len = ntohs( src->len );
   dst->vendor = ntohl( src->vendor );
+  copy_action_vendor_body( dst, src, dst->len - sizeof( struct ofp_action_vendor_header ) );
+}
+
+
+void
+hton_action_vendor( struct ofp_action_vendor_header *dst, const struct ofp_action_vendor_header *src ) {
+  assert( src != NULL );
+  assert( dst != NULL );
+
+  dst->type = htons( src->type );
+  dst->len = htons( src->len );
+  dst->vendor = htonl( src->vendor );
+  copy_action_vendor_body( dst, src, src->len - sizeof( struct ofp_action_vendor_header ) );
 }
 
 
@@ -302,12 +328,12 @@ ntoh_flow_stats( struct ofp_flow_stats *dst, const struct ofp_flow_stats *src )
   dst->cookie = ntohll( fs->cookie );
   dst->packet_count = ntohll( fs->packet_count );
   dst->byte_count = ntohll( fs->byte_count );
-  
+
   uint16_t actions_length = ( uint16_t ) ( ntohs( fs->length ) - offsetof( struct ofp_flow_stats, actions ) );
 
   struct ofp_action_header *ah_src = fs->actions;
   struct ofp_action_header *ah_dst = dst->actions;
-  
+
   while ( actions_length >= sizeof( struct ofp_action_header ) ) {
     ntoh_action( ah_dst, ah_src );
     actions_length = ( uint16_t ) ( actions_length - ah_dst->len );
@@ -345,7 +371,7 @@ hton_flow_stats( struct ofp_flow_stats *dst, const struct ofp_flow_stats *src )
 
   struct ofp_action_header *ah_src = fs->actions;
   struct ofp_action_header *ah_dst = dst->actions;
-  
+
   while ( actions_length >= sizeof( struct ofp_action_header ) ) {
     hton_action( ah_dst, ah_src );
     actions_length = ( uint16_t ) ( actions_length - ah_src->len );
@@ -433,7 +459,7 @@ ntoh_queue_property( struct ofp_queue_prop_header *dst, const struct ofp_queue_p
 
   dst->property = ntohs( ph->property );
   dst->len = ntohs( ph->len );
-  
+
   if ( dst->property == OFPQT_MIN_RATE ) {
     struct ofp_queue_prop_min_rate *mr_src = ( struct ofp_queue_prop_min_rate * ) ph;
     struct ofp_queue_prop_min_rate *mr_dst = ( struct ofp_queue_prop_min_rate * ) dst;
@@ -457,7 +483,7 @@ hton_queue_property( struct ofp_queue_prop_header *dst, const struct ofp_queue_p
 
   dst->property = htons( ph->property );
   dst->len = htons( ph->len );
-  
+
   if ( src->property == OFPQT_MIN_RATE ) {
     struct ofp_queue_prop_min_rate *mr_src = ( struct ofp_queue_prop_min_rate * ) ph;
     struct ofp_queue_prop_min_rate *mr_dst = ( struct ofp_queue_prop_min_rate * ) dst;

data/src/lib/byteorder.h

@@ -24,8 +24,8 @@
 #define BYTEORDER_H
 
 
-#include <endian.h>
 #include <byteswap.h>
+#include <endian.h>
 #include <openflow.h>
 
 
@@ -72,7 +72,7 @@ void ntoh_action_enqueue( struct ofp_action_enqueue *dst, const struct ofp_actio
 #define hton_action_enqueue ntoh_action_enqueue
 
 void ntoh_action_vendor( struct ofp_action_vendor_header *dst, const struct ofp_action_vendor_header *src );
-#define hton_action_vendor ntoh_action_vendor
+void hton_action_vendor( struct ofp_action_vendor_header *dst, const struct ofp_action_vendor_header *src );
 
 void ntoh_action( struct ofp_action_header *dst, const struct ofp_action_header *src );
 void hton_action( struct ofp_action_header *dst, const struct ofp_action_header *src );

data/src/lib/chibach.c

@@ -78,12 +78,14 @@ usage() {
   printf(
     "Usage: %s [OPTION]...\n"
     "\n"
-    "  -i, --datapath_id=DATAPATH_ID set datapath id\n"
-    "  -c, --controller=IP_ADDR      set controller host\n"
-    "  -p, --port=TCP_PORT           set controller TCP port\n"
-    "  -d, --daemonize               run in the background\n"
-    "  -l, --logging_level=LEVEL     set logging level\n"
-    "  -h, --help                    display this help and exit\n",
+    "  -i, --datapath_id=DATAPATH_ID   set datapath id\n"
+    "  -c, --controller=IP_ADDR        set controller host\n"
+    "  -p, --port=TCP_PORT             set controller TCP port\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_chibach_name()
   );
 }

data/src/lib/daemon.c

@@ -1,6 +1,4 @@
 /*
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -125,6 +123,18 @@ extern ssize_t mock_read( int fd, void *buf, size_t count );
 #define kill mock_kill
 extern int mock_kill( pid_t pid, int sig );
 
+#ifdef readlink
+#undef readlink
+#endif // readlink
+#define readlink mock_readlink
+extern ssize_t mock_readlink( const char *path, char *buf, size_t bufsiz );
+
+#ifdef basename
+#undef basename
+#endif // basename
+#define basename mock_basename
+extern char *mock_basename( char *path );
+
 #ifdef rename
 #undef rename
 #endif // rename
@@ -193,7 +203,7 @@ write_pid( const char *directory, const char *name ) {
   }
 
   char str[ PID_STRING_LENGTH ];
-  snprintf( str, sizeof( str ),"%d\n", getpid() );
+  snprintf( str, sizeof( str ), "%d\n", getpid() );
   str[ sizeof( str ) - 1 ] = '\0';
   ssize_t ret = write( fd, str, strlen( str ) );
   if ( ret == -1 ) {
@@ -269,6 +279,22 @@ read_pid( const char *directory, const char *name ) {
     return -1;
   }
 
+  char proc_path[ 32 ];
+  char exe_path[ PATH_MAX ];
+  sprintf( proc_path, "/proc/%d/exe", pid );
+  ssize_t readsiz = readlink( proc_path, exe_path, sizeof( exe_path ) - 1 );
+  if ( readsiz == -1 ) {
+    warn( "Failed to check process id %d ( %s [%d] ).", pid, strerror( errno ), errno );
+    return -1;
+  }
+  exe_path[ readsiz ] = '\0';
+
+  char *exe_name = basename( exe_path );
+  if ( strcmp( name, exe_name ) != 0 ) {
+    warn( "Failed to check process name %s ( %s [%d] ).", name, strerror( errno ), errno );
+    return -1;
+  }
+
   return pid;
 }