trema 0.4.5 → 0.4.6

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end
 
 

data/spec/trema/dsl/runner_spec.rb

@@ -38,7 +38,7 @@ module Trema
 
           context = mock(
             "context",
-            :port => 6633,
+            :port => 6653,
             :tremashark => nil,
             :switch_manager => nil,
             :packetin_filter => nil,

data/spec/trema/dsl/syntax_spec.rb

@@ -23,7 +23,7 @@ require "trema/packetin-filter"
 
 describe Trema::DSL::Syntax do
   before( :each ) do
-    @context = mock( "context", :port => 6633, :dump_to => nil )
+    @context = mock( "context", :port => 6653, :dump_to => nil )
     @syntax = Trema::DSL::Syntax.new( @context )
   end
 

data/spec/trema/shell/vswitch_spec.rb

@@ -41,7 +41,7 @@ describe Trema::Shell, ".vswitch" do
 
   context "executed within a shell" do
     before {
-      $config = mock( "config", :port => 6633 )
+      $config = mock( "config", :port => 6653 )
       $context = mock( "context", :dump => true )
     }
     after { Trema::OpenflowSwitch[ "0xabc" ].shutdown! if Trema::OpenflowSwitch[ "0xabc" ] }

data/spec/trema/stats-reply_spec.rb

@@ -142,7 +142,7 @@ describe StatsReply, ".new( VALID OPTIONS )" do
     its( :tx_packets ) { should == 10 }
     its( :rx_bytes ) { should == 1454 }
     its( :tx_bytes ) { should == 2314 }
-    its ( :rx_dropped ) { should == 1 }
+    its( :rx_dropped ) { should == 1 }
     its( :tx_dropped ) { should == 1 }
     its( :rx_errors ) { should == 1 }
     its( :tx_errors ) { should == 1 }
@@ -178,6 +178,7 @@ describe StatsReply, ".new( VALID OPTIONS )" do
 
     it { should respond_to( :to_s ) }
     its( :vendor_id ) { should == 123 }
+    its( :data ) { should be_nil }
   end
 
 

data/spec/trema/stats-request_spec.rb

@@ -137,6 +137,7 @@ describe StatsRequest do
     subject { VendorStatsRequest.new }
     it_should_behave_like "any stats-request"
     its( :vendor_id ) { should == 0x00004cff }
+    its( :data ) { should be_nil }
   end
 
 
@@ -144,6 +145,16 @@ describe StatsRequest do
     subject { VendorStatsRequest.new :vendor_id => 123 }
     it_should_behave_like "any stats-request"
     its( :vendor_id ) { should == 123 }
+    its( :data ) { should be_nil }
+  end
+
+
+  context "when .VendorStatsRequest.new(:data => value)" do
+    subject { VendorStatsRequest.new :data => data }
+    it_should_behave_like "any stats-request"
+    let( :data ) { "VENDOR DATA".unpack( "C*" ) }
+    its( :data ) { should == [86, 69, 78, 68, 79, 82, 32, 68, 65, 84, 65] }
+    its( :vendor_id ) { should == 0x00004cff }
   end
 end
 

data/src/examples/cbench_switch/cbench-switch.rb

@@ -22,6 +22,7 @@ class CbenchSwitch < Controller
   def packet_in datapath_id, message
     send_flow_mod_add(
       datapath_id,
+      :cookie => 0,
       :match => ExactMatch.from( message ),
       :buffer_id => message.buffer_id,
       :actions => ActionOutput.new( :port => message.in_port + 1 )

data/src/examples/cbench_switch/cbench_switch.c

@@ -32,7 +32,7 @@ handle_packet_in( uint64_t datapath_id, packet_in message ) {
   buffer *flow_mod = create_flow_mod(
     get_transaction_id(),
     match,
-    get_cookie(),
+    0,
     OFPFC_ADD,
     0,
     0,

data/src/examples/openflow_message/vendor-action.rb

@@ -19,12 +19,12 @@
 
 
 class VendorActionSampleController < Controller
-  NX_VENDOR_ID = 0x00002320
-  NXAST_NOTE = 8
+  OVS_VENDOR_ID = 0x00002320
+  OVSAST_NOTE = 8
 
   def switch_ready datapath_id
-    body = [ NXAST_NOTE, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ].pack( "nC6" )
-    actions = VendorAction.new( NX_VENDOR_ID, body.unpack( "C*" ) )
+    body = [ OVSAST_NOTE, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ].pack( "nC6" )
+    actions = VendorAction.new( OVS_VENDOR_ID, body.unpack( "C*" ) )
     send_flow_mod_modify(
       datapath_id,
       :hard_timeout => 60,

data/src/examples/openflow_message/vendor-stats-request.rb

@@ -0,0 +1,66 @@
+#
+# "Vendor Stats Request" sample application
+#
+# Copyright (C) 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.
+#
+
+
+class VendorStatsRequestSample < Controller
+  OVS_VENDOR_ID = 0x00002320
+  OVSST_FLOW = 0
+
+  def switch_ready datapath_id
+    send_vendor_stats_request datapath_id
+  end
+
+
+  def stats_reply datapath_id, message
+    if message.type == StatsReply::OFPST_VENDOR
+      vendor_stats_reply datapath_id, message
+    end
+  end
+
+
+  private
+
+
+  def vendor_stats_reply datapath_id, message
+    info "[vendor_stats_reply]"
+    info "vendor_id: 0x%08x" % message.stats.first.vendor_id
+    info "data: [#{ message.stats.first.data.map { | n |  "0x%02x" % n }.join ", " }]"
+  end
+
+
+  def send_vendor_stats_request datapath_id
+    data = [
+      OVSST_FLOW,
+      0x0, 0x0, 0x0, 0x0,
+      OFPP_NONE,
+      0x0,
+      0xff,
+      0x0, 0x0, 0x0
+    ].pack( "NC4 nnCC3" )
+    vendor_request = VendorStatsRequest.new( :vendor_id => OVS_VENDOR_ID, :data => data.unpack( "C*" ) )
+    send_message( datapath_id, vendor_request )
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/src/examples/simple_router/arp-table.rb

@@ -17,16 +17,13 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-
 class ARPEntry
   include Trema::DefaultLogger
 
-
   attr_reader :port
   attr_reader :hwaddr
   attr_writer :age_max
 
-
   def initialize port, hwaddr, age_max
     @port = port
     @hwaddr = hwaddr
@@ -35,7 +32,6 @@ class ARPEntry
     info "New entry: MAC addr = #{ @hwaddr.to_s }, port = #{ @port }"
   end
 
-
   def update port, hwaddr
     @port = port
     @hwaddr = hwaddr
@@ -43,7 +39,6 @@ class ARPEntry
     info "Update entry: MAC addr = #{ @hwaddr.to_s }, port = #{ @port }"
   end
 
-
   def aged_out?
     aged_out = Time.now - @last_updated > @age_max
     info "Age out: An ARP entry (MAC address = #{ @hwaddr.to_s }, port number = #{ @port }) has been aged-out" if aged_out
@@ -51,40 +46,34 @@ class ARPEntry
   end
 end
 
-
 class ARPTable
   DEFAULT_AGE_MAX = 300
 
-
   def initialize
     @db = {}
   end
 
-
   def update port, ipaddr, hwaddr
-    entry = @db[ ipaddr.to_i ]
+    entry = @db[ipaddr.to_i]
     if entry
-      entry.update( port, hwaddr )
+      entry.update(port, hwaddr)
     else
-      new_entry = ARPEntry.new( port, hwaddr, DEFAULT_AGE_MAX )
-      @db[ ipaddr.to_i ] = new_entry
+      new_entry = ARPEntry.new(port, hwaddr, DEFAULT_AGE_MAX)
+      @db[ipaddr.to_i] = new_entry
     end
   end
 
-
   def lookup ipaddr
-    @db[ ipaddr.to_i ]
+    @db[ipaddr.to_i]
   end
 
-
   def age
-    @db.delete_if do | ipaddr, entry |
+    @db.delete_if do |ipaddr, entry|
       entry.aged_out?
     end
   end
 end
 
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix

data/src/examples/simple_router/interface.rb

@@ -17,10 +17,10 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+require 'arp-table'
+require 'routing-table'
 
-require "arp-table"
-require "routing-table"
-
+require 'pio'
 
 class Interface
   attr_reader :hwaddr
@@ -28,70 +28,61 @@ class Interface
   attr_reader :masklen
   attr_reader :port
 
-
   def initialize options
-    @port = options[ :port ]
-    @hwaddr = Mac.new( options[ :hwaddr ] )
-    @ipaddr = IPAddr.new( options[ :ipaddr ] )
-    @masklen = options[ :masklen ]
+    @port = options[:port]
+    @hwaddr = Pio::Mac.new(options[:hwaddr])
+    @ipaddr = Pio::IPv4Address.new(options[:ipaddr])
+    @masklen = options[:masklen]
   end
 
-
   def has? mac
     mac == hwaddr
   end
 end
 
-
 class Interfaces
   def initialize interfaces = []
     @list = []
-    interfaces.each do | each |
-      @list << Interface.new( each )
+    interfaces.each do |each|
+      @list << Interface.new(each)
     end
   end
 
-
   def find_by_port port
-    @list.find do | each |
+    @list.find do |each|
       each.port == port
     end
   end
 
-
   def find_by_ipaddr ipaddr
-    @list.find do | each |
-      each.ipaddr == ipaddr
+    @list.find do |each|
+      each.ipaddr.to_i == ipaddr.to_i
     end
   end
 
-
   def find_by_prefix ipaddr
-    @list.find do | each |
+    @list.find do |each|
       masklen = each.masklen
-      each.ipaddr.mask( masklen ) == ipaddr.mask( masklen )
+      each.ipaddr.mask(masklen).to_s == ipaddr.mask(masklen).to_s
     end
   end
 
-
   def find_by_port_and_ipaddr port, ipaddr
-    @list.find do | each |
-      each.port == port and each.ipaddr == ipaddr
+    @list.find do |each|
+      each.port == port and each.ipaddr.to_i == ipaddr.to_i
     end
   end
 
-
   def ours? port, macda
-    return true if macda.broadcast?
+    true if macda.broadcast?
 
-    interface = find_by_port( port )
-    if not interface.nil? and interface.has?( macda )
-      return true
+    interface = find_by_port(port)
+    if not interface.nil? and interface.has?(macda)
+      true
     end
   end
 end
 
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8

data/src/examples/simple_router/routing-table.rb

@@ -17,49 +17,42 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-
-require "ipaddr"
-
+require 'pio'
 
 class RoutingTable
   ADDR_LEN = 32
 
-
   def initialize route = []
-    @db = Array.new( ADDR_LEN + 1 ) { Hash.new }
-    route.each do | each |
-      add( each )
+    @db = Array.new(ADDR_LEN + 1) { Hash.new }
+    route.each do |each|
+      add(each)
     end
   end
 
-
   def add options
-    dest = IPAddr.new( options[ :destination ] )
-    masklen = options[ :masklen ]
-    prefix = dest.mask( masklen )
-    @db[ masklen ][ prefix.to_i ] = IPAddr.new( options[ :nexthop ] )
+    dest = Pio::IPv4Address.new(options[:destination])
+    masklen = options[:masklen]
+    prefix = dest.mask(masklen)
+    @db[masklen][prefix.to_i] = Pio::IPv4Address.new(options[:nexthop])
   end
 
-
   def delete options
-    dest = IPAddr.new( options[ :destination ] )
-    masklen = options[ :masklen ]
-    prefix = dest.mask( masklen )
-    @db[ masklen ].delete( prefix.to_i )
+    dest = Pio::IPv4Address.new(options[:destination])
+    masklen = options[:masklen]
+    prefix = dest.mask(masklen)
+    @db[masklen].delete(prefix.to_i)
   end
 
-
   def lookup dest
-    ( 0..ADDR_LEN ).reverse_each do | masklen |
-      prefix = dest.mask( masklen )
-      entry = @db[ masklen ][ prefix.to_i ]
+    (0..ADDR_LEN).reverse_each do |masklen|
+      prefix = dest.mask(masklen)
+      entry = @db[masklen][prefix.to_i]
       return entry if entry
     end
     nil
   end
 end
 
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix

data/src/examples/simple_router/simple-router.rb

@@ -17,26 +17,21 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-require "arp-table"
-require "interface"
-require "router-utils"
-require "routing-table"
-
+require 'arp-table'
+require 'interface'
+require 'routing-table'
 
 class SimpleRouter < Controller
-  include RouterUtils
-
 
   def start
-    load "simple_router.conf"
-    @interfaces = Interfaces.new( $interface )
+    load 'simple_router.conf'
+    @interfaces = Interfaces.new($interface)
     @arp_table = ARPTable.new
-    @routing_table = RoutingTable.new( $route )
+    @routing_table = RoutingTable.new($route)
   end
 
-
-  def packet_in( dpid, message )
-    return if not to_me?( message )
+  def packet_in(dpid, message)
+    return if not to_me?(message)
 
     if message.arp_request?
       handle_arp_request dpid, message
@@ -49,38 +44,33 @@ class SimpleRouter < Controller
     end
   end
 
-
   private
 
-
-  def to_me?( message )
+  def to_me?(message)
     return true if message.macda.broadcast?
 
-    interface = @interfaces.find_by_port( message.in_port )
-    if interface and interface.has?( message.macda )
+    interface = @interfaces.find_by_port(message.in_port)
+    if interface and interface.has?(message.macda)
       return true
     end
   end
 
-
-  def handle_arp_request( dpid, message )
+  def handle_arp_request(dpid, message)
     port = message.in_port
     daddr = message.arp_tpa
-    interface = @interfaces.find_by_port_and_ipaddr( port, daddr )
+    interface = @interfaces.find_by_port_and_ipaddr(port, daddr)
     if interface
-      arp_reply = create_arp_reply_from( message, interface.hwaddr )
-      packet_out dpid, arp_reply, SendOutPort.new( interface.port )
+      arp_reply = create_arp_reply_from(message, interface.hwaddr)
+      packet_out dpid, arp_reply, SendOutPort.new(interface.port)
     end
   end
 
-
-    def handle_arp_reply( message )
+  def handle_arp_reply(message)
     @arp_table.update message.in_port, message.arp_spa, message.arp_sha
   end
 
-
-  def handle_ipv4( dpid, message )
-    if should_forward?( message )
+  def handle_ipv4(dpid, message)
+    if should_forward?(message)
       forward dpid, message
     elsif message.icmpv4_echo_request?
       handle_icmpv4_echo_request dpid, message
@@ -89,38 +79,35 @@ class SimpleRouter < Controller
     end
   end
 
-
-  def should_forward?( message )
-    not @interfaces.find_by_ipaddr( message.ipv4_daddr )
+  def should_forward?(message)
+    not @interfaces.find_by_ipaddr(message.ipv4_daddr)
   end
 
-
-  def handle_icmpv4_echo_request( dpid, message )
-    interface = @interfaces.find_by_port( message.in_port )
-    saddr = message.ipv4_saddr.value
-    arp_entry = @arp_table.lookup( saddr )
+  def handle_icmpv4_echo_request(dpid, message)
+    interface = @interfaces.find_by_port(message.in_port)
+    saddr = message.ipv4_saddr
+    arp_entry = @arp_table.lookup(saddr)
     if arp_entry
-      icmpv4_reply = create_icmpv4_reply( arp_entry, interface, message )
-      packet_out dpid, icmpv4_reply, SendOutPort.new( interface.port )
+      icmpv4_reply = create_icmpv4_reply(arp_entry, interface, message)
+      packet_out dpid, icmpv4_reply, SendOutPort.new(interface.port)
     else
       handle_unresolved_packet dpid, message, interface, saddr
     end
   end
 
+  def forward(dpid, message)
+    next_hop = resolve_next_hop(message.ipv4_daddr)
 
-  def forward( dpid, message )
-    next_hop = resolve_next_hop( message.ipv4_daddr )
-
-    interface = @interfaces.find_by_prefix( next_hop )
+    interface = @interfaces.find_by_prefix(next_hop)
     if not interface or interface.port == message.in_port
       return
     end
 
-    arp_entry = @arp_table.lookup( next_hop )
+    arp_entry = @arp_table.lookup(next_hop)
     if arp_entry
       macsa = interface.hwaddr
       macda = arp_entry.hwaddr
-      action = create_action_from( macsa, macda, interface.port )
+      action = create_action_from(macsa, macda, interface.port)
       flow_mod dpid, message, action
       packet_out dpid, message.data, action
     else
@@ -128,27 +115,24 @@ class SimpleRouter < Controller
     end
   end
 
-
-  def resolve_next_hop( daddr )
-    interface = @interfaces.find_by_prefix( daddr.value )
+  def resolve_next_hop(daddr)
+    interface = @interfaces.find_by_prefix(daddr.value)
     if interface
-      daddr.value
+      daddr
     else
-      @routing_table.lookup( daddr.value )
+      @routing_table.lookup(daddr.value)
     end
   end
 
-
-  def flow_mod( dpid, message, action )
+  def flow_mod(dpid, message, action)
     send_flow_mod_add(
       dpid,
-      :match => ExactMatch.from( message ),
+      :match => ExactMatch.from(message),
       :actions => action
     )
   end
 
-
-  def packet_out( dpid, packet, action )
+  def packet_out(dpid, packet, action)
     send_packet_out(
       dpid,
       :data => packet,
@@ -156,22 +140,49 @@ class SimpleRouter < Controller
     )
   end
 
-
-  def handle_unresolved_packet( dpid, message, interface, ipaddr )
-    arp_request = create_arp_request_from( interface, ipaddr )
-    packet_out dpid, arp_request, SendOutPort.new( interface.port )
+  def handle_unresolved_packet(dpid, message, interface, ipaddr)
+    arp_request = create_arp_request_from(interface, ipaddr)
+    packet_out dpid, arp_request, SendOutPort.new(interface.port)
   end
 
-
-  def create_action_from( macsa, macda, port )
+  def create_action_from(macsa, macda, port)
     [
-      SetEthSrcAddr.new( macsa ),
-      SetEthDstAddr.new( macda ),
-      SendOutPort.new( port )
+      SetEthSrcAddr.new(macsa),
+      SetEthDstAddr.new(macda),
+      SendOutPort.new(port)
     ]
   end
-end
 
+  def create_arp_request_from(interface, addr)
+    Pio::Arp::Request.new(
+      :source_mac => interface.hwaddr,
+      :sender_protocol_address => interface.ipaddr,
+      :target_protocol_address => addr
+    ).to_binary
+  end
+
+  def create_arp_reply_from(message, replyaddr)
+    Pio::Arp::Reply.new(
+      :source_mac => replyaddr,
+      :destination_mac => message.macsa,
+      :sender_protocol_address => message.arp_tpa,
+      :target_protocol_address => message.arp_spa
+    ).to_binary
+  end
+
+  def create_icmpv4_reply(entry, interface, message)
+    request = Pio::Icmp.read(message.data)
+    Pio::Icmp::Reply.new(
+      :destination_mac => entry.hwaddr,
+      :source_mac => interface.hwaddr,
+      :ip_source_address => message.ipv4_daddr,
+      :ip_destination_address => message.ipv4_saddr,
+      :icmp_identifier => request.icmp_identifier,
+      :icmp_sequence_number => request.icmp_sequence_number,
+      :echo_data => request.echo_data
+    ).to_binary
+  end
+end
 
 ### Local variables:
 ### mode: Ruby