trema 0.3.19 → 0.3.20

data/features/switch_event/set_forward_entries.feature

@@ -28,7 +28,7 @@ Feature: Ruby methods for setting switch event forwarding entry
 
   @slow_process
   Scenario Outline: set_forward_entries_to_switch dpid, event_type, trema_names
-    Given a file named "nw_dsl.conf" with:
+    Given a file named "network.conf" with:
       """
       vswitch { datapath_id 0x1 }
       """
@@ -37,15 +37,20 @@ Feature: Ruby methods for setting switch event forwarding entry
       class SetEntriesToSwitchDaemonTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         def switch_ready datapath_id
-          set_forward_entries_to_switch datapath_id, <event_type>, ["SetEntriesToSwitchDaemonTest","Another"] do | success, services |
+          set_forward_entries_to_switch datapath_id, @event_type, ["SetEntriesToSwitchDaemonTest","Another"] do | success, services |
             raise "Failed to set forwarding entry to switch" if not success
-            info "Successfully set a forwarding entries of <event_type> to switch #{datapath_id.to_hex} : #{services.inspect}"
+            info "Successfully set a forwarding entries of #{@event_type_string} to switch #{datapath_id.to_hex} : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./SetEntriesToSwitchDaemonTest.rb -c nw_dsl.conf -d`
+    When I successfully run `trema run "./SetEntriesToSwitchDaemonTest.rb <event_type>" -c network.conf -d`
     And wait until "SetEntriesToSwitchDaemonTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/SetEntriesToSwitchDaemonTest.log" should contain:
@@ -67,16 +72,21 @@ Feature: Ruby methods for setting switch event forwarding entry
       class SetEntriesToSwitchManagerTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         oneshot_timer_event :test_start, 0
         def test_start
-          set_forward_entries_to_switch_manager <event_type>, ["SetEntriesToSwitchManagerTest","Another"] do | success, services |
+          set_forward_entries_to_switch_manager @event_type, ["SetEntriesToSwitchManagerTest","Another"] do | success, services |
             raise "Failed to set forwarding entry to switch manager" if not success
-            info "Successfully set a forwarding entries of <event_type> to switch manager : #{services.inspect}"
+            info "Successfully set a forwarding entries of #{@event_type_string} to switch manager : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./SetEntriesToSwitchManagerTest.rb -d`
+    When I successfully run `trema run "./SetEntriesToSwitchManagerTest.rb <event_type>" -d`
     And wait until "SetEntriesToSwitchManagerTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/SetEntriesToSwitchManagerTest.log" should contain:

data/features/trema_commands/dump_flows.feature

@@ -22,6 +22,7 @@ Feature: dump_flows command
   @slow_process
   Scenario: dump a flow entry
     Given I run `trema send_packets --source host1 --dest host2`
+    And *** sleep 1 ***
     When I run `trema dump_flows repeater_hub`
     Then the output should contain "actions=FLOOD"
 

data/features/trema_commands/reset_stats.feature

@@ -17,6 +17,7 @@ Feature: reset_stats command
       """
     And I run `trema run ../../src/examples/learning_switch/learning-switch.rb -c learning_switch.conf -d`
     And I run `trema send_packets --source host1 --dest host2`
+    And *** sleep 1 ***
 
   @slow_process
   Scenario: reset_stats host1

data/features/trema_commands/show_stats.feature

@@ -42,6 +42,7 @@ Feature: show_stats command
   @slow_process
   Scenario: show_stats hostname --rx
     When I run `trema send_packets --source host1 --dest host2`
+     And *** sleep 1 ***
      And I run `trema show_stats host2 --rx`
     Then the output should contain:
       """

data/ruby/trema/features-reply.c

@@ -47,7 +47,7 @@ features_reply_alloc( VALUE klass ) {
  *       :n_tables => 1,
  *       :capabilities => 135,
  *       :actions => 2048,
- *       :port => [ port1, port2, ... ]
+ *       :ports => [ port1, port2, ... ]
  *     )
  *   @param [Hash] options
  *     the options to create a message with.
@@ -67,7 +67,7 @@ features_reply_alloc( VALUE klass ) {
  *     IP address lookup in APR packets.
  *   @option options [Number] :actions
  *     supported actions expressed as a 32-bit bitmap.
- *   @option options [Port] :port
+ *   @option options [Port] :ports
  *     an array of {Port} objects detailing port description and function.
  *   @return [FeaturesReply]
  */
@@ -305,14 +305,17 @@ handle_features_reply(
   rb_hash_aset( attributes, ID2SYM( rb_intern( "actions" ) ), UINT2NUM( actions ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "ports" ) ), ports_from( ports ) );
 
-  list_element *tmp_ports = xmalloc( sizeof( list_element ) );
-  memcpy( tmp_ports, ports, sizeof( list_element ) );
   list_element *physical_ports = xmalloc( sizeof( list_element ) );
   create_list( &physical_ports );
-  iterate_list( tmp_ports, append_physical_port, &physical_ports );
+  if ( ports != NULL ) {
+    // use memcpy() to walk over the const qualifier
+    list_element *tmp_ports = xmalloc( sizeof( list_element ) );
+    memcpy( tmp_ports, ports, sizeof( list_element ) );
+    iterate_list( tmp_ports, append_physical_port, &physical_ports );
+    xfree( tmp_ports );
+  }
   rb_hash_aset( attributes, ID2SYM( rb_intern( "physical_ports" ) ), ports_from( physical_ports ) );
   xfree( physical_ports );
-  xfree( tmp_ports );
 
   VALUE features_reply = rb_funcall( cFeaturesReply, rb_intern( "new" ), 1, attributes );
   rb_funcall( ( VALUE ) controller, rb_intern( "features_reply" ), 2, ULL2NUM( datapath_id ), features_reply );

data/ruby/trema/monkey-patch/integer/validators.rb

@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2008-2013 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.
+#
+
+
+module MonkeyPatch
+  module Integer
+    module Validators
+      # nw_tos (IP ToS) value consists of 8 bits, of which only the 6 high-order
+      # bits belong to DSCP, the 2 low-order bits must be zero.
+      def valid_nw_tos?
+        unsigned_8bit? and self % 4 == 0
+      end
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/monkey-patch/integer.rb

@@ -18,11 +18,13 @@
 
 require "trema/monkey-patch/integer/base-conversions"
 require "trema/monkey-patch/integer/ranges"
+require "trema/monkey-patch/integer/validators"
 
 
 class Integer
   include MonkeyPatch::Integer::BaseConversions
   include MonkeyPatch::Integer::Ranges
+  include MonkeyPatch::Integer::Validators
 end
 
 

data/ruby/trema/packet-in.c

@@ -442,6 +442,137 @@ packet_in_arp_tpa( VALUE self ) {
 }
 
 
+/*
+ * Is it an RARP packet?
+ *
+ * @return [Boolean] whether the packet is an RARP packet or not.
+ */
+static VALUE
+packet_in_is_rarp( VALUE self ) {
+  if ( ( get_packet_in_info( self )->format & NW_RARP ) ) {
+    return Qtrue;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
+
+/*
+ * Is it an RARP request packet?
+ *
+ * @return [Boolean] whether the packet is an RARP request packet or not.
+ */
+static VALUE
+packet_in_is_rarp_request( VALUE self ) {
+  if ( packet_type_rarp_request( get_packet_in( self )->data ) ) {
+    return Qtrue;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
+
+/*
+ * Is it an RARP reply packet?
+ *
+ * @return [Boolean] whether the packet is an RARP reply packet or not.
+ */
+static VALUE
+packet_in_is_rarp_reply( VALUE self ) {
+  if ( packet_type_rarp_reply( get_packet_in( self )->data ) ) {
+    return Qtrue;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
+
+/*
+ * The RARP operation code.
+ *
+ * @return [Integer] the value of the RARP opcode field.
+ */
+static VALUE
+packet_in_rarp_oper( VALUE self ) {
+  PACKET_IN_RETURN_NUM( NW_RARP, UINT2NUM, arp_ar_op );
+}
+
+
+/*
+ * The RARP source hardware address of a packet.
+ *
+ * @return [Trema::Mac, nil]
+ *   the value of the RARP source hardware address as a Trema::Mac object or nil
+ *   if packet not an RARP.
+ */
+static VALUE
+packet_in_rarp_sha( VALUE self ) {
+  if ( ( get_packet_in_info( self )->format & NW_RARP ) ) {
+    PACKET_IN_RETURN_MAC( arp_sha );
+  }
+  else {
+    return Qnil;
+  }
+}
+
+
+/*
+ * The RARP source protocol address of a packet.
+ *
+ * @return [Trema::IP, nil]
+ *   the value of RARP source protocol address as a Trema::IP object or nil if
+ *   packet is not an RARP.
+ */
+static VALUE
+packet_in_rarp_spa( VALUE self ) {
+  if ( ( get_packet_in_info( self )->format & NW_RARP ) ) {
+    PACKET_IN_RETURN_IP( arp_spa );
+  }
+  else {
+    return Qnil;
+  }
+}
+
+
+/*
+ * The RARP target hardware address of a packet.
+ *
+ * @return [Trema::Mac]
+ *   the value of RARP target hardware address as a Trema::Mac object or nil if
+ *   packet is not an RARP.
+ */
+static VALUE
+packet_in_rarp_tha( VALUE self ) {
+  if ( ( get_packet_in_info( self )->format & NW_RARP ) ) {
+    PACKET_IN_RETURN_MAC( arp_tha );
+  }
+  else {
+    return Qnil;
+  }
+}
+
+
+/*
+ * The ARP target protocol address of a packet.
+ *
+ * @return [Trema::IP]
+ *   the value of RARP target protocol address as a Trema::IP object or nil if
+ *   packet is not an RARP.
+ */
+static VALUE
+packet_in_rarp_tpa( VALUE self ) {
+  if ( ( get_packet_in_info( self )->format & NW_RARP ) ) {
+    PACKET_IN_RETURN_IP( arp_tpa );
+  }
+  else {
+    return Qnil;
+  }
+}
+
+
 /*
  * Is it an IPv4 packet?
  *
@@ -1121,6 +1252,7 @@ Init_packet_in() {
 
   rb_define_method( cPacketIn, "vtag?", packet_in_is_vtag, 0 );
   rb_define_method( cPacketIn, "arp?", packet_in_is_arp, 0 );
+  rb_define_method( cPacketIn, "rarp?", packet_in_is_rarp, 0 );
   rb_define_method( cPacketIn, "ipv4?", packet_in_is_ipv4, 0 );
   rb_define_method( cPacketIn, "lldp?", packet_in_is_lldp, 0 );
   rb_define_method( cPacketIn, "icmpv4?", packet_in_is_icmpv4, 0 );
@@ -1142,6 +1274,14 @@ Init_packet_in() {
   rb_define_method( cPacketIn, "arp_request?", packet_in_is_arp_request, 0 );
   rb_define_method( cPacketIn, "arp_reply?", packet_in_is_arp_reply, 0 );
 
+  rb_define_method( cPacketIn, "rarp_oper", packet_in_rarp_oper, 0 );
+  rb_define_method( cPacketIn, "rarp_sha", packet_in_rarp_sha, 0 );
+  rb_define_method( cPacketIn, "rarp_spa", packet_in_rarp_spa, 0 );
+  rb_define_method( cPacketIn, "rarp_tha", packet_in_rarp_tha, 0 );
+  rb_define_method( cPacketIn, "rarp_tpa", packet_in_rarp_tpa, 0 );
+  rb_define_method( cPacketIn, "rarp_request?", packet_in_is_rarp_request, 0 );
+  rb_define_method( cPacketIn, "rarp_reply?", packet_in_is_rarp_reply, 0 );
+
   rb_define_method( cPacketIn, "ipv4_version", packet_in_ipv4_version, 0 );
   rb_define_method( cPacketIn, "ipv4_ihl", packet_in_ipv4_ihl, 0 );
   rb_define_method( cPacketIn, "ipv4_tos", packet_in_ipv4_tos, 0 );

data/ruby/trema/packet-queue.rb

@@ -15,157 +15,161 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-
-class Queue
-  class << self
-    #
-    # The {PacketQueue} to append to the list.
-    #
-    attr_accessor :queues
-  end
+module Trema
+  class Queue
+    class << self
+      #
+      # The {PacketQueue} to append to the list.
+      #
+      attr_accessor :queues
+    end
 
 
-  # Add queue to list.
-  # @param [PacketQueue] queue a {PacketQueue} instance.
-  def self.append queue
-    @queues ||= []
-    @queues << queue unless @queues.include?(queue)
-  end
+    # Add queue to list.
+    # @param [PacketQueue] queue a {PacketQueue} instance.
+    def self.append queue
+      @queues ||= []
+      @queues << queue unless @queues.include?(queue)
+    end
 
 
-  # @return [Array]
-  #   an array of {PacketQueue} objects.
-  def self.queues
-    @queues
-  end
+    # @return [Array]
+    #   an array of {PacketQueue} objects.
+    def self.queues
+      @queues
+    end
 
 
-  # Iterate over each {PacketQueue} item.
-  # @return [Array] a list of {PacketQueue} items.
-  def self.each &block
-    @queues.each do | each |
-      block.call each
+    # Iterate over each {PacketQueue} item.
+    # @return [Array] a list of {PacketQueue} items.
+    def self.each &block
+      @queues.each do | each |
+        block.call each
+      end
     end
   end
-end
 
 
-class PacketQueue
-  # No property for queue.
-  OFPQT_NONE = 0
-  # Minimum datarate guaranteed.
-  OFPQT_MIN_RATE = 1
-
-
-  # Id for the specific queue.
-  # @return [Number] queue_id
-  #   the value of attribute queue_id.
-  attr_accessor :queue_id
-  # Queue description's length in bytes.
-  # @return [Number] len
-  #   the value of attribute len.
-  attr_accessor :len
-  # List of queue properties.
-  # @return [Array] properties
-  #   the value of attribute properties.
-  attr_accessor :properties
-
-
-  # @overload initialize(options={})
-  # @param [Hash] options ths options hash.
-  # @option options [Symbol] :queue_id
-  #   id for the specific queue.
-  # @option options [Symbol] :len
-  #   queue description's length in bytes.
-  #
-  def initialize options
-    @queue_id = options[ :queue_id ]
-    @len = options[ :len ]
-    @properties = []
-  end
+  class PacketQueue
+    # No property for queue.
+    OFPQT_NONE = 0
 
+    # Minimum datarate guaranteed.
+    OFPQT_MIN_RATE = 1
 
-  # @param [MinRateQueue] queue
-  #   a property queue {MinRateQueue} object to append to the properties list.
-  def append queue
-    @properties << queue
-  end
+    # Id for the specific queue.
+    # @return [Number] queue_id
+    #   the value of attribute queue_id.
+    attr_accessor :queue_id
 
+    # Queue description's length in bytes.
+    # @return [Number] len
+    #   the value of attribute len.
+    attr_accessor :len
 
-  # @return [String]
-  #   text representation of {PacketQueue}'s attributes and all its properties
-  #   queue object's attributes.
-  def to_s
-    str = "queue_id: #{@queue_id} len: #{@len} "
-    @properties.each do | each |
-      str += each.to_s
+    # List of queue properties.
+    # @return [Array] properties
+    #   the value of attribute properties.
+    attr_accessor :properties
+
+
+    # @overload initialize(options={})
+    # @param [Hash] options ths options hash.
+    # @option options [Symbol] :queue_id
+    #   id for the specific queue.
+    # @option options [Symbol] :len
+    #   queue description's length in bytes.
+    #
+    def initialize options
+      @queue_id = options[ :queue_id ]
+      @len = options[ :len ]
+      @properties = []
     end
-     str
-  end
-end
 
 
-class QueueProperty
-  # Property queue id.
-  # For minimum-rate type queue the property value is set to 1, otherwise defaults
-  # to zero.
-  # @return [Number]
-  #   the value of attribute property.
-  attr_accessor :property
-  # length of property. If >= 8 minimum-rate type queue is defined.
-  # @return [Number]
-  #   the value of attribute len.
-  attr_accessor :len
-
-
-  # Each queue is described by a set of properties, each of a specific type and
-  # configuration.
-  # @param [Number] property
-  #   property queue id.
-  # @param [Number] len
-  #   length in bytes of the property queue.
-  def initialize property, len
-    @property = property
-    @len = len
-  end
+    # @param [MinRateQueue] queue
+    #   a property queue {MinRateQueue} object to append to the properties list.
+    def append queue
+      @properties << queue
+    end
 
 
-  # @return [String]
-  #  text representation of its attributes (property,len).
-  def to_s
-    "property: #{@property} len: #{@len} "
+    # @return [String]
+    #   text representation of {PacketQueue}'s attributes and all its properties
+    #   queue object's attributes.
+    def to_s
+      str = "queue_id: #{@queue_id} len: #{@len} "
+      @properties.each do | each |
+        str += each.to_s
+      end
+      str
+    end
   end
-end
 
 
-class MinRateQueue < QueueProperty
-  # the rate value of the minimum rate queue.
-  # @return [Number]
-  #   the value of attribute rate.
-  attr_accessor :rate
-
-
-  # An object that encapsulates the minimum rate queue property description.
-  # @param [Number] property
-  #   property queue id.
-  # @param [Number] len
-  #   length in bytes of the property queue.
-  # @param [Number] rate
-  #   the rate value of the mimimum rate queue.
-  # @param [PacketQueue] packet_queue
-  #   A {PacketQueue} instance to use to save the minimum rate queue.
-  def initialize property, len, rate, packet_queue
-    super property, len
-    @rate = rate
-    packet_queue.append self
-    Queue.append packet_queue
+  class QueueProperty
+    # Property queue id.
+    # For minimum-rate type queue the property value is set to 1, otherwise defaults
+    # to zero.
+    # @return [Number]
+    #   the value of attribute property.
+    attr_accessor :property
+
+    # length of property. If >= 8 minimum-rate type queue is defined.
+    # @return [Number]
+    #   the value of attribute len.
+    attr_accessor :len
+
+
+    # Each queue is described by a set of properties, each of a specific type and
+    # configuration.
+    # @param [Number] property
+    #   property queue id.
+    # @param [Number] len
+    #   length in bytes of the property queue.
+    def initialize property, len
+      @property = property
+      @len = len
+    end
+
+
+    # @return [String]
+    #  text representation of its attributes (property,len).
+    def to_s
+      "property: #{@property} len: #{@len} "
+    end
   end
 
 
-  # @return [String]
-  #  text representation of rate prefixed by property and length attributes.
-  def to_s
-    super.to_s + " rate: #{rate} "
+  class MinRateQueue < QueueProperty
+    # the rate value of the minimum rate queue.
+    # @return [Number]
+    #   the value of attribute rate.
+    attr_accessor :rate
+
+
+    # An object that encapsulates the minimum rate queue property description.
+    # @param [Number] property
+    #   property queue id.
+    # @param [Number] len
+    #   length in bytes of the property queue.
+    # @param [Number] rate
+    #   the rate value of the mimimum rate queue.
+    # @param [PacketQueue] packet_queue
+    #   A {PacketQueue} instance to use to save the minimum rate queue.
+    def initialize property, len, rate, packet_queue
+      super property, len
+      @rate = rate
+      packet_queue.append self
+      Trema::Queue.append packet_queue
+    end
+
+
+    # @return [String]
+    #  text representation of rate prefixed by property and length attributes.
+    def to_s
+      super.to_s + " rate: #{rate} "
+    end
   end
 end
 

data/ruby/trema/port.c

@@ -305,7 +305,18 @@ Init_port() {
   cPort = rb_define_class_under( mTrema, "Port", rb_cObject );
 
   rb_define_const( cPort, "OFPPC_PORT_DOWN", INT2NUM( OFPPC_PORT_DOWN ) );
+  rb_define_const( cPort, "OFPPC_NO_STP", INT2NUM( OFPPC_NO_STP ) );
+  rb_define_const( cPort, "OFPPC_NO_RECV", INT2NUM( OFPPC_NO_RECV ) );
+  rb_define_const( cPort, "OFPPC_NO_RECV_STP", INT2NUM( OFPPC_NO_RECV_STP ) );
+  rb_define_const( cPort, "OFPPC_NO_FLOOD", INT2NUM( OFPPC_NO_FLOOD ) );
+  rb_define_const( cPort, "OFPPC_NO_FWD", INT2NUM( OFPPC_NO_FWD ) );
+  rb_define_const( cPort, "OFPPC_NO_PACKET_IN", INT2NUM( OFPPC_NO_PACKET_IN ) );
   rb_define_const( cPort, "OFPPS_LINK_DOWN", INT2NUM( OFPPS_LINK_DOWN ) );
+  rb_define_const( cPort, "OFPPS_STP_LISTEN", INT2NUM( OFPPS_STP_LISTEN ) );
+  rb_define_const( cPort, "OFPPS_STP_LEARN", INT2NUM( OFPPS_STP_LEARN ) );
+  rb_define_const( cPort, "OFPPS_STP_FORWARD", INT2NUM( OFPPS_STP_FORWARD ) );
+  rb_define_const( cPort, "OFPPS_STP_BLOCK", INT2NUM( OFPPS_STP_BLOCK ) );
+  rb_define_const( cPort, "OFPPS_STP_MASK", INT2NUM( OFPPS_STP_MASK ) );
   rb_define_const( cPort, "OFPPF_10MB_HD", INT2NUM( OFPPF_10MB_HD ) );
   rb_define_const( cPort, "OFPPF_10MB_FD", INT2NUM( OFPPF_10MB_FD ) );
   rb_define_const( cPort, "OFPPF_100MB_HD", INT2NUM( OFPPF_100MB_HD ) );