trema 0.2.2.1 → 0.2.3

data/ruby/trema/set-ip-tos.rb

@@ -0,0 +1,63 @@
+#
+# 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.
+#
+
+
+require "trema/action"
+require "trema/monkey-patch/integer"
+
+
+module Trema
+  #
+  # An action to modify the IP ToS/DSCP field of a packet.
+  #
+  class SetIpTos < Action
+    attr_reader :type_of_service
+
+
+    #
+    # Creates an action to modify the IP ToS/DSCP field of a packet.
+    #
+    # @example
+    #   SetIpTos.new(32)
+    #
+    # @param [Integer] :type_of_service
+    #   the ToS/DSCP field to set to.
+    #
+    # @raise [ArgumentError] if type_of_service argument is not an unsigned 8-bit Integer.
+    # @raise [TypeError] if type_of_service argument is not an Integer.
+    #
+    def initialize type_of_service
+      if not type_of_service.is_a?( Integer )
+        raise TypeError, "ToS must be an unsigned 8-bit integer"
+      end
+      if not type_of_service.unsigned_8bit?
+        raise ArgumentError, "ToS must be an unsigned 8-bit integer"
+      end
+      @type_of_service = type_of_service
+    end
+  end
+
+
+  ActionSetNwTos = SetIpTos
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/set-transport-dst-port.rb

@@ -0,0 +1,53 @@
+#
+# 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.
+#
+
+
+require "trema/set-transport-port"
+
+
+module Trema
+  #
+  # An action to modify the destination TCP/UDP port of a packet.
+  #
+  class SetTransportDstPort < SetTransportPort
+    #
+    # Creates an action to modify the destination TCP/UDP port of a packet.
+    #
+    # @example
+    #   SetTransportDstPort.new( 5555 )
+    #
+    # @param [Integer] port_number
+    #   the destination TCP/UDP port number. Any numeric 16-bit value.
+    #
+    # @raise [ArgumentError] if port_number is not an unsigned 16-bit Integer.
+    # @raise [TypeError] if port_number is not an Integer.
+    #
+    def initialize port_number
+      super port_number
+    end
+  end
+
+
+  ActionSetTpDst = SetTransportDstPort
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/set-transport-port.rb

@@ -0,0 +1,52 @@
+#
+# 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.
+#
+
+
+require "trema/action"
+require "trema/monkey-patch/integer"
+
+
+module Trema
+  #
+  # A super-class of {SetTransportSrcPort} and {SetTransportDstPort} action.
+  #
+  class SetTransportPort < Action
+    attr_reader :port_number
+
+
+    #
+    # @private
+    #
+    def initialize port_number
+      error_message = "TCP/UDP port must be an unsigned 16-bit integer"
+      if not port_number.is_a?( Integer )
+        raise TypeError, error_message
+      end
+      if not port_number.unsigned_16bit?
+        raise ArgumentError, error_message
+      end
+      @port_number = port_number
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/set-transport-src-port.rb

@@ -0,0 +1,54 @@
+#
+# 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.
+#
+
+
+require "trema/monkey-patch/integer"
+require "trema/set-transport-port"
+
+
+module Trema
+  #
+  # An action to modify the source TCP/UDP port of a packet.
+  #
+  class SetTransportSrcPort < SetTransportPort
+    #
+    # Creates an action to modify the source TCP/UDP port of a packet.
+    #
+    # @example
+    #   SetTransportSrcPort.new( 5555 )
+    #
+    # @param [Integer] port_number
+    #   the source TCP or UDP port number. Any numeric 16-bit value.
+    #
+    # @raise [ArgumentError] if port_number is not an unsigned 16-bit Integer.
+    # @raise [TypeError] if port_number is not an Integer.
+    #
+    def initialize port_number
+      super port_number
+    end
+  end
+
+
+  ActionSetTpSrc = SetTransportSrcPort
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/set-vlan-priority.rb

@@ -0,0 +1,65 @@
+#
+# 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.
+#
+
+
+require "trema/action"
+
+
+module Trema
+  #
+  # An action to modify the VLAN priority of a packet.
+  #
+  class SetVlanPriority < Action
+    attr_reader :vlan_priority
+
+
+    #
+    # Creates an action to modify the VLAN priority of a
+    # packet. Priority bits can be used to prioritize different
+    # classes of traffic. Valid values are between 0 (lowest) and 7
+    # (highest).
+    #
+    # @example
+    #   SetVlanPriority.new( 7 )
+    #
+    # @param [Integer] vlan_priority
+    #   the VLAN priority to set to.
+    #
+    # @raise [ArgumentError] if vlan_priority is not within 0 and 7 inclusive.
+    # @raise [TypeError] if vlan_priority is not an Integer.
+    #
+    def initialize vlan_priority
+      if not vlan_priority.is_a?( Integer )
+        raise TypeError, "VLAN priority must be an unsigned 8-bit Integer"
+      end
+      if not ( vlan_priority >= 0 and vlan_priority <= 7 )
+        raise ArgumentError, "Valid VLAN priority values are 0 to 7 inclusive"
+      end
+      @vlan_priority = vlan_priority
+    end
+  end
+
+
+  ActionSetVlanPcp = SetVlanPriority
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/set-vlan-vid.rb

@@ -0,0 +1,64 @@
+#
+# 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.
+#
+
+
+require "trema/action"
+
+
+module Trema
+  #
+  # An action to modify the VLAN ID of a packet.
+  #
+  class SetVlanVid < Action
+    attr_reader :vlan_id
+
+
+    #
+    # Creates an action to modify the VLAN ID of a packet. The VLAN ID
+    # is 16-bits long but the actual VID (VLAN Identifier) of the IEEE
+    # 802.1Q frame is 12-bits.
+    #
+    # @example
+    #   ActionSetVlanVid.new( vlan_id )
+    #
+    # @param [Integer] vlan_id
+    #   the VLAN ID to set to. Only the lower 12-bits are used.
+    #
+    # @raise [ArgumentError] if vlan_id not within 1 and 4096 inclusive.
+    # @raise [TypeError] if vlan_id is not an Integer.
+    #
+    def initialize vlan_id
+      if not vlan_id.is_a?( Integer )
+        raise TypeError, "VLAN ID argument must be an Integer"
+      end
+      if not ( vlan_id >= 1 and vlan_id <= 4096 )
+        raise ArgumentError, "Valid VLAN ID values between 1 to 4096 inclusive"
+      end
+      @vlan_id = vlan_id
+    end
+  end
+
+
+  ActionSetVlanVid = SetVlanVid
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/shell/down.rb

@@ -26,7 +26,7 @@ require "trema/dsl"
 module Trema
   module Shell
     def down name
-      Switch[ name ].shutdown!
+      OpenflowSwitch[ name ].shutdown!
     end
   end
 end

data/ruby/trema/shell/link.rb

@@ -30,11 +30,11 @@ module Trema
       link = Link.new( stanza )
       link.enable!
 
-      if Switch[ peer0 ]
-        Switch[ peer0 ] << link.name
+      if OpenflowSwitch[ peer0 ]
+        OpenflowSwitch[ peer0 ] << link.name
       end
-      if Switch[ peer1 ]
-        Switch[ peer1 ] << link.name_peer
+      if OpenflowSwitch[ peer1 ]
+        OpenflowSwitch[ peer1 ] << link.name_peer
       end
 
       if Host[ peer0 ]

data/ruby/trema/shell/run.rb

@@ -29,15 +29,17 @@ module Trema
       sanity_check
 
       if controller
-        if /ELF/=~ `file #{ controller }`
-          stanza = DSL::Run.new
-          stanza.path controller
-          App.new stanza
-        else
+        if /\.rb\Z/=~ controller.split.first
           require "trema"
+          include Trema
           ARGV.replace controller.split
           $LOAD_PATH << File.dirname( controller )
-          Trema.module_eval IO.read( controller )
+          load controller
+        else
+          # Assume that the controller is written in C
+          stanza = Trema::DSL::Run.new
+          stanza.path controller
+          Trema::App.new( stanza )
         end
       end
 

data/ruby/trema/shell/up.rb

@@ -26,10 +26,10 @@ require "trema/dsl"
 module Trema
   module Shell
     def up name
-      if Switch[ name ].running?
-        Switch[ name ].restart!
+      if OpenflowSwitch[ name ].running?
+        OpenflowSwitch[ name ].restart!
       else
-        Switch[ name ].run!
+        OpenflowSwitch[ name ].run!
       end
     end
   end

data/ruby/trema/stats-reply.c

@@ -18,6 +18,7 @@
  */
 
 
+#include <arpa/inet.h>
 #include "trema.h"
 #include "ruby.h"
 #include "action-common.h"
@@ -140,6 +141,7 @@ stats_reply_stats( VALUE self ) {
 
 void
 Init_stats_reply() {
+  rb_require( "trema/desc-stats-reply" );
   rb_require( "trema/flow-stats-reply" );
   rb_require( "trema/aggregate-stats-reply" );
   rb_require( "trema/table-stats-reply" );
@@ -296,6 +298,28 @@ handle_stats_reply(
 
   uint16_t body_length = ( uint16_t ) body->length;
   switch ( type ) {
+    case OFPST_DESC:
+    {
+      struct ofp_desc_stats *desc_stats = ( struct ofp_desc_stats * ) body->data;
+      VALUE options = rb_hash_new();
+      VALUE desc_stats_arr = rb_ary_new();
+      VALUE desc_stats_reply;
+
+      rb_hash_aset( options, ID2SYM( rb_intern( "mfr_desc" ) ), 
+        rb_str_new( desc_stats->mfr_desc, ( long ) strnlen( desc_stats->mfr_desc, DESC_STR_LEN - 1 ) ) );
+      rb_hash_aset( options, ID2SYM( rb_intern( "hw_desc" ) ), 
+        rb_str_new( desc_stats->hw_desc, ( long ) strnlen( desc_stats->hw_desc, DESC_STR_LEN  - 1 ) ) );
+      rb_hash_aset( options, ID2SYM( rb_intern( "sw_desc" ) ), 
+        rb_str_new( desc_stats->sw_desc, ( long ) strnlen( desc_stats->sw_desc, DESC_STR_LEN  - 1 ) ) );
+      rb_hash_aset( options, ID2SYM( rb_intern( "serial_num" ) ), 
+        rb_str_new( desc_stats->serial_num, ( long ) strnlen( desc_stats->serial_num, SERIAL_NUM_LEN  - 1 ) ) );
+      rb_hash_aset( options, ID2SYM( rb_intern( "dp_desc" ) ), 
+        rb_str_new( desc_stats->dp_desc, ( long ) strnlen( desc_stats->dp_desc, DESC_STR_LEN  - 1 ) ) );
+      desc_stats_reply = rb_funcall( rb_eval_string( " Trema::DescStatsReply" ), rb_intern( "new" ), 1, options );
+      rb_ary_push( desc_stats_arr, desc_stats_reply );
+      rb_hash_aset( attributes, ID2SYM( rb_intern( "stats" ) ), desc_stats_arr );
+    }
+      break;
     case OFPST_FLOW:
     {
       struct ofp_flow_stats *flow_stats;
@@ -304,11 +328,12 @@ handle_stats_reply(
       VALUE flow_stats_reply;
       VALUE match_obj;
       VALUE options = rb_hash_new();
-      VALUE actions_arr = rb_ary_new();
+      VALUE actions_arr;
 
       flow_stats = ( struct ofp_flow_stats * ) body->data;
 
       while ( body_length > 0 ) {
+        actions_arr = rb_ary_new();
 
         match_obj = rb_funcall( rb_eval_string( "Match.new" ), rb_intern( "replace" ), 1, Data_Wrap_Struct( cStatsReply, NULL, NULL, &flow_stats->match ) );
         rb_hash_aset( options, ID2SYM( rb_intern( "length" ) ), UINT2NUM( flow_stats->length ) );
@@ -471,7 +496,7 @@ handle_stats_reply(
   }
 
   VALUE r_stats_reply = rb_funcall( cStatsReply, rb_intern( "new" ), 1, attributes );
-  rb_funcall( controller, rb_intern( "stats_reply" ), 1, r_stats_reply );
+  rb_funcall( controller, rb_intern( "stats_reply" ), 2, ULL2NUM( datapath_id ), r_stats_reply );
 }