trema 0.2.5 → 0.2.6

data/src/examples/match_compare/match-compare.rb

@@ -82,8 +82,8 @@ class MatchCompare < Controller
         next
       end
       if each.match.compare( match )
-	action = each.action
-	log = each.log
+        action = each.action
+        log = each.log
         break
       end
     end

data/src/examples/multi_learning_switch/multi-learning-switch.rb

@@ -20,7 +20,7 @@
 #
 
 
-$LOAD_PATH << "./src/examples/learning_switch/"
+$LOAD_PATH << File.join( File.dirname( __FILE__ ), "../learning_switch/" )
 
 
 require "fdb"

data/src/examples/multi_learning_switch/multi_learning_switch.c

@@ -20,9 +20,9 @@
  */
 
 
+#include <assert.h>
 #include <inttypes.h>
 #include <time.h>
-#include <assert.h>
 #include "trema.h"
 
 
@@ -253,10 +253,10 @@ handle_packet_in( uint64_t datapath_id, packet_in message ) {
     warn( "Unknown switch (datapath ID = %#" PRIx64 ")", datapath_id );
     return;
   }
-  
+
   packet_info packet_info = get_packet_info( message.data );
   learn( sw->forwarding_db, message.in_port, packet_info.eth_macsa );
-  forwarding_entry *destination = lookup_hash_entry( sw->forwarding_db, 
+  forwarding_entry *destination = lookup_hash_entry( sw->forwarding_db,
                                                      packet_info.eth_macda );
 
   if ( destination == NULL ) {

data/src/examples/openflow_message/README

@@ -5,7 +5,7 @@ itself, but maybe useful for the reference of Trema API.
 
 # How to run
 
-See features/example.message.*.feature 
+See features/example.message.*.feature
 
 
 Enjoy!

data/src/examples/openflow_message/echo-request.rb

@@ -39,7 +39,7 @@ class EchoRequestController < Controller
       exit false
     end
   end
-  
+
 
   def switch_ready msg_datapath_id
     may_raise_error msg_datapath_id

data/src/examples/openflow_message/features_request.c

@@ -39,8 +39,8 @@ 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:" );
   if ( capabilities & OFPC_FLOW_STATS ) {
@@ -68,43 +68,43 @@ handle_features_reply(
     info( "  OFPC_ARP_MATCH_IP" );
   }
   info( "actions:" );
-  if( actions & ( 1 << OFPAT_OUTPUT ) ) {
+  if ( actions & ( 1 << OFPAT_OUTPUT ) ) {
     info( "  OFPAT_OUTPUT" );
   }
-  if( actions & ( 1 << OFPAT_SET_VLAN_VID ) ) {
+  if ( actions & ( 1 << OFPAT_SET_VLAN_VID ) ) {
     info( "  OFPAT_SET_VLAN_VID" );
   }
-  if( actions & ( 1 << OFPAT_SET_VLAN_PCP ) ) {
+  if ( actions & ( 1 << OFPAT_SET_VLAN_PCP ) ) {
     info( "  OFPAT_SET_VLAN_PCP" );
   }
-  if( actions & ( 1 << OFPAT_STRIP_VLAN ) ) {
+  if ( actions & ( 1 << OFPAT_STRIP_VLAN ) ) {
     info( "  OFPAT_STRIP_VLAN" );
   }
-  if( actions & ( 1 << OFPAT_SET_DL_SRC ) ) {
+  if ( actions & ( 1 << OFPAT_SET_DL_SRC ) ) {
     info( "  OFPAT_SET_DL_SRC" );
   }
-  if( actions & ( 1 << OFPAT_SET_DL_DST ) ) {
+  if ( actions & ( 1 << OFPAT_SET_DL_DST ) ) {
     info( "  OFPAT_SET_DL_DST" );
   }
-  if( actions & ( 1 << OFPAT_SET_NW_SRC ) ) {
+  if ( actions & ( 1 << OFPAT_SET_NW_SRC ) ) {
     info( "  OFPAT_SET_NW_SRC" );
   }
-  if( actions & ( 1 << OFPAT_SET_NW_DST ) ) {
+  if ( actions & ( 1 << OFPAT_SET_NW_DST ) ) {
     info( "  OFPAT_SET_NW_DST" );
   }
-  if( actions & ( 1 << OFPAT_SET_NW_TOS ) ) {
+  if ( actions & ( 1 << OFPAT_SET_NW_TOS ) ) {
     info( "  OFPAT_SET_NW_TOS" );
   }
-  if( actions & ( 1 << OFPAT_SET_TP_SRC ) ) {
+  if ( actions & ( 1 << OFPAT_SET_TP_SRC ) ) {
     info( "  OFPAT_SET_TP_SRC" );
   }
-  if( actions & ( 1 << OFPAT_SET_TP_DST ) ) {
+  if ( actions & ( 1 << OFPAT_SET_TP_DST ) ) {
     info( "  OFPAT_SET_TP_DST" );
   }
-  if( actions & ( 1 << OFPAT_ENQUEUE ) ) {
+  if ( actions & ( 1 << OFPAT_ENQUEUE ) ) {
     info( "  OFPAT_ENQUEUE" );
   }
-  if( actions & OFPAT_VENDOR ) {
+  if ( actions & OFPAT_VENDOR ) {
     info( "  OFPAT_VENDOR" );
   }
 
@@ -123,12 +123,12 @@ handle_features_reply(
       phy_port->hw_addr[ 5 ]
     );
     info( "  name = %s", phy_port->name );
-    info( "  config = %#lx", phy_port->config );
-    info( "  state = %#lx", phy_port->state );
-    info( "  curr = %#lx", phy_port->curr );
-    info( "  advertised = %#lx", phy_port->advertised );
-    info( "  supported = %#lx", phy_port->supported );
-    info( "  peer = %#lx", phy_port->peer );
+    info( "  config = %#" PRIx32 "", phy_port->config );
+    info( "  state = %#" PRIx32 "", phy_port->state );
+    info( "  curr = %#" PRIx32 "", phy_port->curr );
+    info( "  advertised = %#" PRIx32 "", phy_port->advertised );
+    info( "  supported = %#" PRIx32 "", phy_port->supported );
+    info( "  peer = %#" PRIx32 "", phy_port->peer );
   }
 }
 

data/src/examples/openflow_message/hello.c

@@ -1,7 +1,5 @@
 /*
- * Sends hello message(s).
- *
- * Author: Shin-ya Zenke, Yasuhito Takamiya <yasuhito@gmail.com>
+ * A test example program to send a OFPT_HELLO message.
  *
  * Copyright (C) 2008-2012 NEC Corporation
  *

data/src/examples/openflow_message/hello.rb

@@ -1,8 +1,6 @@
 #
 # A test example program to send a OFPT_HELLO message.
 #
-# Author: Nick Karanatsios <nickkaranatsios@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -20,37 +18,24 @@
 #
 
 
-require "example"
-
-
 class HelloController < Controller
-  include Example
-
-
-  class << self
-    def run args
-      usage unless Example.options_parse args
-    end
-
-
-    def usage
-      puts Example.cmd_usage
-      puts "Send count number of hello messages to datapath_id."
-      exit false
+  def start
+    if ARGV.size < 2
+      STDERR.puts "Usage: #{ File.basename ARGV[ 0 ] } COUNT"
+      shutdown!
     end
+    @count = ARGV[ 1 ].to_i
   end
 
 
-  def switch_ready msg_datapath_id
-    may_raise_error msg_datapath_id
-    send_nr_msgs Hello
+  def switch_ready datapath_id
+    @count.times do
+      send_message datapath_id, Hello.new
+    end
   end
 end
 
 
-HelloController.run ARGV
-
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix

data/src/examples/{hello_trema/hello_trema.rb → openflow_message/vendor-action.rb}

@@ -1,9 +1,9 @@
 #
-# Hello trema world!
+# "Vendor Action" sample application
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
+# Author: SUGYO Kazushi
 #
-# Copyright (C) 2008-2012 NEC Corporation
+# Copyright (C) 2012 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
@@ -20,16 +20,26 @@
 #
 
 
-class HelloController < Controller
+class VendorActionSampleController < Controller
+  NX_VENDOR_ID = 0x00002320
+  NXAST_NOTE = 8
+
   def switch_ready datapath_id
-    info "Hello %#x from #{ ARGV[ 0 ] }!" % datapath_id
-    shutdown!
+    body = [ NXAST_NOTE, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ].pack( "nC6" )
+    actions = VendorAction.new( NX_VENDOR_ID, body.unpack( "C*" ) )
+    send_flow_mod_modify(
+      datapath_id,
+      :hard_timeout => 60,
+      :match => Match.new,
+      :actions => actions,
+      :strict => true
+    )
   end
 end
 
 
 ### Local variables:
 ### mode: Ruby
-### coding: utf-8
+### coding: utf-8-unix
 ### indent-tabs-mode: nil
 ### End:

data/src/examples/openflow_message/vendor_action.c

@@ -0,0 +1,105 @@
+/*
+ * "Vendor Action" sample application
+ *
+ * Author: SUGYO Kazushi
+ *
+ * Copyright (C) 2008-2012 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 <inttypes.h>
+#include <stdio.h>
+#include "trema.h"
+
+#define NX_VENDOR_ID 0x00002320
+#define NXAST_NOTE 8
+
+struct nx_action_note {
+    uint16_t type;
+    uint16_t len;
+    uint32_t vendor;
+    uint16_t subtype;
+    uint8_t note[6];
+};
+
+void
+usage() {
+  printf( "Usage: %s COUNT\n", get_executable_name() );
+}
+
+
+static void
+send_flow_mod( uint64_t datapath_id, void *user_data ) {
+  UNUSED( user_data );
+  uint8_t note[] = { 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 };
+
+  buffer *body = alloc_buffer();
+  struct nx_action_note *action = append_back_buffer( body, sizeof( struct nx_action_note ) );
+  action->subtype = htons( NXAST_NOTE );
+  memcpy( action->note, note, sizeof( action->note ) );
+  remove_front_buffer( body, sizeof( struct ofp_action_vendor_header ) );
+
+  openflow_actions *actions = create_actions();
+  append_action_vendor( actions, NX_VENDOR_ID, body );
+
+  struct ofp_match match;
+  memset( &match, 0, sizeof( match ) );
+  buffer *flow_mod = create_flow_mod(
+    get_transaction_id(),
+    match,
+    get_cookie(),
+    OFPFC_MODIFY_STRICT,
+    0,
+    60,
+    UINT16_MAX,
+    UINT32_MAX,
+    OFPP_NONE,
+    OFPFF_SEND_FLOW_REM,
+    actions
+  );
+
+  bool ret = send_openflow_message( datapath_id, flow_mod );
+  if ( !ret ) {
+    error( "Failed to send an flow_mod message to the switch with datapath ID = %#" PRIx64 ".", datapath_id );
+    stop_trema();
+  }
+
+  free_buffer( flow_mod );
+
+  delete_actions( actions );
+
+  free_buffer( body );
+}
+
+
+int
+main( int argc, char *argv[] ) {
+  init_trema( &argc, &argv );
+
+  set_switch_ready_handler( send_flow_mod, NULL );
+
+  start_trema();
+
+  return 0;
+}
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 2
+ * indent-tabs-mode: nil
+ * End:
+ */

data/src/examples/openflow_switch/hello_switch.c

@@ -0,0 +1,81 @@
+/*
+ * A simple switch that has minimum function to test hello message.
+ *
+ * Copyright (C) 2012 Hiroyasu OHYAMA
+ *
+ * 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 "chibach.h"
+
+
+static void handle_features_request( uint32_t, void * );
+static void handle_hello( uint32_t, uint8_t, void * );
+
+
+static void
+handle_features_request( uint32_t tid, void *user_data ) {
+  UNUSED( user_data );
+
+  uint32_t supported = ( ( 1 << OFPAT_OUTPUT ) | 
+                         ( 1 << OFPAT_SET_VLAN_VID ) | 
+                         ( 1 << OFPAT_SET_VLAN_PCP ) | 
+                         ( 1 << OFPAT_STRIP_VLAN ) | 
+                         ( 1 << OFPAT_SET_DL_SRC ) | 
+                         ( 1 << OFPAT_SET_DL_DST ) | 
+                         ( 1 << OFPAT_SET_NW_SRC ) | 
+                         ( 1 << OFPAT_SET_NW_DST ) | 
+                         ( 1 << OFPAT_SET_NW_TOS ) | 
+                         ( 1 << OFPAT_SET_TP_SRC ) | 
+                         ( 1 << OFPAT_SET_TP_DST ) );
+
+	buffer *msg = create_features_reply( tid, get_datapath_id(), 0, 1, 0, supported, NULL );
+
+  switch_send_openflow_message( msg );
+}
+
+
+static void
+handle_hello( uint32_t tid, uint8_t version, void *user_data ) {
+  UNUSED( version );
+  UNUSED( user_data );
+
+  info( "received: OFPT_HELLO" );
+
+  switch_send_openflow_message( create_hello( tid ) );
+}
+
+
+int
+main( int argc, char **argv ) {
+  init_chibach( &argc, &argv );
+
+  set_hello_handler( handle_hello, NULL );
+  set_features_request_handler( handle_features_request, NULL );
+
+  start_chibach();
+
+  stop_chibach();
+
+  return 0;
+}
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 2
+ * indent-tabs-mode: nil
+ * End:
+ */