trema 0.2.8 → 0.3.0

data/ruby/trema/send-out-port.rb

@@ -74,9 +74,14 @@ module Trema
     end
 
 
-    ##############################################################################
+    def to_s
+      "SendOutPort: port=#{ @port_number }, max_len=#{ @max_len }"
+    end
+
+
+    ############################################################################
     private
-    ##############################################################################
+    ############################################################################
 
 
     def check_port_number

data/ruby/trema/set-eth-dst-addr.rb

@@ -41,6 +41,11 @@ module Trema
     def initialize mac_address
       super mac_address
     end
+
+
+    def to_s
+      "SetEthDstAddr: mac_address=#{ @mac_address }"
+    end
   end
 
 

data/ruby/trema/set-eth-src-addr.rb

@@ -41,6 +41,11 @@ module Trema
     def initialize mac_address
       super mac_address
     end
+
+
+    def to_s
+      "SetEthSrcAddr: mac_address=#{ @mac_address }"
+    end
   end
 
 

data/ruby/trema/stats-reply.c

@@ -168,69 +168,65 @@ Init_stats_reply() {
 static VALUE
 get_action( const struct ofp_action_header *ah ) {
   VALUE action = Qnil;
-  VALUE options = rb_hash_new();
 
   switch ( ah->type ) {
     case OFPAT_OUTPUT:
     {
       const struct ofp_action_output *ao = ( const struct ofp_action_output * ) ah;
 
-      rb_hash_aset( options, ID2SYM( rb_intern( "port" ) ), UINT2NUM( ao->port ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionOutput" ), rb_intern( "new" ), 1, options );
+      VALUE options = rb_hash_new();
+      rb_hash_aset( options, ID2SYM( rb_intern( "port_number" ) ), UINT2NUM( ao->port ) );
+      rb_hash_aset( options, ID2SYM( rb_intern( "max_len" ) ), UINT2NUM( ao->max_len ) );
+      action = rb_funcall( rb_eval_string( "Trema::SendOutPort" ), rb_intern( "new" ), 1, options );
     }
       break;
     case OFPAT_SET_VLAN_VID:
     {
       const struct ofp_action_vlan_vid *action_vlan_vid = ( const struct ofp_action_vlan_vid * ) ah;
 
-      rb_hash_aset( options, ID2SYM( rb_intern( "vlan_vid" ) ), UINT2NUM( action_vlan_vid->vlan_vid ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionSetVlanVid" ), rb_intern( "new" ), 1, options );
+      VALUE vlan_id = UINT2NUM( action_vlan_vid->vlan_vid );
+      action = rb_funcall( rb_eval_string( "Trema::SetVlanVid" ), rb_intern( "new" ), 1, vlan_id );
     }
       break;
     case OFPAT_SET_VLAN_PCP:
     {
       const struct ofp_action_vlan_pcp *action_vlan_pcp = ( const struct ofp_action_vlan_pcp * ) ah;
 
-      rb_hash_aset( options, ID2SYM( rb_intern( "vlan_pcp" ) ), UINT2NUM( action_vlan_pcp->vlan_pcp ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionSetVlanPcp" ), rb_intern( "new" ), 1, options );
+      VALUE vlan_priority =  UINT2NUM( action_vlan_pcp->vlan_pcp );
+      action = rb_funcall( rb_eval_string( "Trema::SetVlanPriority" ), rb_intern( "new" ), 1, vlan_priority );
     }
       break;
     case OFPAT_STRIP_VLAN:
     {
-      action = rb_funcall( rb_eval_string( "Trema::ActionStripVlan" ), rb_intern( "new" ), 0 );
+      action = rb_funcall( rb_eval_string( "Trema::StripVlanHeader" ), rb_intern( "new" ), 0 );
     }
       break;
     case OFPAT_SET_DL_SRC:
     case OFPAT_SET_DL_DST:
     {
-      VALUE dl_addr;
+      VALUE mac_address;
       const struct ofp_action_dl_addr *action_dl_addr = ( const struct ofp_action_dl_addr * ) ah;
 
-      dl_addr = rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( action_dl_addr->dl_addr ) ) );
+      mac_address = rb_funcall( rb_eval_string( "Trema::Mac" ), rb_intern( "new" ), 1, ULL2NUM( mac_to_uint64( action_dl_addr->dl_addr ) ) );
       if ( ah->type == OFPAT_SET_DL_SRC ) {
-        rb_hash_aset( options, ID2SYM( rb_intern( "dl_src" ) ),  dl_addr );
-        action = rb_funcall( rb_eval_string( "Trema::ActionSetDlSrc" ), rb_intern( "new" ), 1, options );
+        action = rb_funcall( rb_eval_string( "Trema::SetEthSrcAddr" ), rb_intern( "new" ), 1, mac_address );
       }
       else {
-        rb_hash_aset( options, ID2SYM( rb_intern( "dl_dst" ) ),  dl_addr );
-        action = rb_funcall( rb_eval_string( "Trema::ActionSetDlDst" ), rb_intern( "new" ), 1, options );
+        action = rb_funcall( rb_eval_string( "Trema::SetEthDstAddr" ), rb_intern( "new" ), 1, mac_address );
       }
     }
       break;
     case OFPAT_SET_NW_SRC:
     case OFPAT_SET_NW_DST:
     {
-      VALUE nw_addr;
       const struct ofp_action_nw_addr *action_nw_addr = ( const struct ofp_action_nw_addr * ) ah;
 
-      nw_addr = rb_funcall( rb_eval_string( "Trema::IP " ), rb_intern( "new" ), 1, UINT2NUM( action_nw_addr->nw_addr ) );
+      VALUE ip_address = rb_funcall( rb_eval_string( "Trema::IP " ), rb_intern( "new" ), 1, UINT2NUM( action_nw_addr->nw_addr ) );
       if ( ah->type == OFPAT_SET_NW_SRC ) {
-        rb_hash_aset( options, ID2SYM( rb_intern( "nw_src" ) ), nw_addr );
-        action = rb_funcall( rb_eval_string( "Trema::ActionSetNwSrc" ), rb_intern( "new" ), 1, options );
+        action = rb_funcall( rb_eval_string( "Trema::SetIpSrcAddr" ), rb_intern( "new" ), 1, rb_funcall( ip_address, rb_intern( "to_s" ), 0 ) );
       }
       else {
-        rb_hash_aset( options, ID2SYM( rb_intern( "nw_dst" ) ), nw_addr );
-        action = rb_funcall( rb_eval_string( "Trema::ActionSetNwDst" ), rb_intern( "new" ), 1, options );
+        action = rb_funcall( rb_eval_string( "Trema::SetIpDstAddr" ), rb_intern( "new" ), 1, rb_funcall( ip_address, rb_intern( "to_s" ), 0 ) );
       }
     }
       break;
@@ -238,40 +234,53 @@ get_action( const struct ofp_action_header *ah ) {
     {
       const struct ofp_action_nw_tos *action_nw_tos = ( const struct ofp_action_nw_tos * ) ah;
 
-      rb_hash_aset( options, ID2SYM( rb_intern( "nw_tos" ) ), ULL2NUM( action_nw_tos->nw_tos ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionSetNwTos" ), rb_intern( "new" ), 1, options );
+      VALUE type_of_service = ULL2NUM( action_nw_tos->nw_tos );
+      action = rb_funcall( rb_eval_string( "Trema::SetIpTos" ), rb_intern( "new" ), 1, type_of_service );
     }
       break;
     case OFPAT_SET_TP_SRC:
     {
       const struct ofp_action_tp_port *action_tp_port = ( const struct ofp_action_tp_port * ) ah;
 
-      rb_hash_aset( options, ID2SYM( rb_intern( "tp_src" ) ), ULL2NUM( action_tp_port->tp_port ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionSetTpSrc" ), rb_intern( "new" ), 1, options );
+      VALUE port_number = ULL2NUM( action_tp_port->tp_port );
+      action = rb_funcall( rb_eval_string( "Trema::SetTransportSrcPort" ), rb_intern( "new" ), 1, port_number );
     }
       break;
     case OFPAT_SET_TP_DST:
     {
       const struct ofp_action_tp_port *action_tp_port = ( const struct ofp_action_tp_port * ) ah;
 
-      rb_hash_aset( options, ID2SYM( rb_intern( "tp_dst" ) ), ULL2NUM( action_tp_port->tp_port ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionSetTpDst" ), rb_intern( "new" ), 1, options );
+      VALUE port_number = ULL2NUM( action_tp_port->tp_port );
+      action = rb_funcall( rb_eval_string( "Trema::SetTransportDstPort" ), rb_intern( "new" ), 1, port_number );
     }
       break;
     case OFPAT_ENQUEUE:
     {
       const struct ofp_action_enqueue *action_enqueue = ( const struct ofp_action_enqueue * ) ah;
-      rb_hash_aset( options, ID2SYM( rb_intern( "port" ) ), ULL2NUM( action_enqueue->port ) );
+      VALUE options = rb_hash_new();
+      rb_hash_aset( options, ID2SYM( rb_intern( "port_number" ) ), UINT2NUM( action_enqueue->port ) );
       rb_hash_aset( options, ID2SYM( rb_intern( "queue_id" ) ), ULL2NUM( action_enqueue->queue_id ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionEnqueue" ), rb_intern( "new" ), 1, options );
+      action = rb_funcall( rb_eval_string( "Trema::Enqueue" ), rb_intern( "new" ), 1, options );
     }
       break;
     case OFPAT_VENDOR:
     {
-      const struct ofp_action_vendor_header *action_vendor = ( const struct ofp_action_vendor_header * ) ah;
-
-      rb_hash_aset( options, ID2SYM( rb_intern( "vendor" ) ), ULL2NUM( action_vendor->vendor ) );
-      action = rb_funcall( rb_eval_string( "Trema::ActionVendor" ), rb_intern( "new" ), 1, options );
+      const struct ofp_action_vendor_header *vendor_header = ( const struct ofp_action_vendor_header * ) ah;
+
+      VALUE vendor_id = ULL2NUM( vendor_header->vendor );
+      if ( vendor_header->len > ( uint16_t ) sizeof( *vendor_header ) ) {
+        long length = ( long ) ( vendor_header->len - sizeof( *vendor_header ) );
+        VALUE data_array = rb_ary_new2( length );
+        const uint8_t *data = ( const uint8_t * ) ( ( const char * ) vendor_header + sizeof( *vendor_header ) );
+        long i;
+        for ( i = 0; i < length; i++ ) {
+          rb_ary_push( data_array, UINT2NUM( data[ i ] ) );
+        }
+        action = rb_funcall( rb_eval_string( "Trema::VendorAction" ), rb_intern( "new" ), 2, vendor_id, data_array );
+      }
+      else {
+        action = rb_funcall( rb_eval_string( "Trema::VendorAction" ), rb_intern( "new" ), 1, vendor_id );
+      }
     }
       break;
   }

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end
 
 

data/spec/trema/send-out-port_spec.rb

@@ -24,6 +24,7 @@ describe SendOutPort, ".new( 1 )" do
   subject { SendOutPort.new( 1 ) }
   its( :port_number ) { should == 1 }
   its( :max_len ) { should == 2 ** 16 - 1 }
+  its( :to_s ) { should == "SendOutPort: port=1, max_len=65535" }
 end
 
 
@@ -34,6 +35,7 @@ describe SendOutPort, ".new( :port_number => number )" do
   context "when :port_number == 1" do
     let( :port_number ) { 1 }
     its( :port_number ) { should == 1 }
+    its( :to_s ) { should == "SendOutPort: port=1, max_len=65535" }
   end
 end
 
@@ -45,6 +47,7 @@ describe SendOutPort, ".new( :port_number => 1, :max_len => number )" do
   context "when :max_len == 256" do
     let( :max_len ) { 256 }
     its( :max_len ) { should == 256 }
+    its( :to_s ) { should == "SendOutPort: port=1, max_len=256" }
   end
 end
 

data/spec/trema/set-eth-dst-addr_spec.rb

@@ -23,12 +23,14 @@ require "trema"
 describe SetEthDstAddr, %{.new( "52:54:00:a8:ad:8c" )} do
   subject { SetEthDstAddr.new( "52:54:00:a8:ad:8c" ) }
   its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
+  its( :to_s ) { should == "SetEthDstAddr: mac_address=52:54:00:a8:ad:8c" }
 end
 
 
 describe SetEthDstAddr, %{.new( Mac.new( "52:54:00:a8:ad:8c" ) )} do
   subject { SetEthDstAddr.new( Mac.new( "52:54:00:a8:ad:8c" ) )}
   its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
+  its( :to_s ) { should == "SetEthDstAddr: mac_address=52:54:00:a8:ad:8c" }
 end
 
 

data/spec/trema/set-eth-src-addr_spec.rb

@@ -23,12 +23,14 @@ require "trema"
 describe SetEthSrcAddr, %{.new( "52:54:00:a8:ad:8c" )} do
   subject { SetEthSrcAddr.new( "52:54:00:a8:ad:8c" ) }
   its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
+  its( :to_s ) { should == "SetEthSrcAddr: mac_address=52:54:00:a8:ad:8c" }
 end
 
 
 describe SetEthSrcAddr, %{.new( Mac.new( "52:54:00:a8:ad:8c" ) )} do
   subject { SetEthSrcAddr.new( Mac.new( "52:54:00:a8:ad:8c" ) )}
   its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
+  its( :to_s ) { should == "SetEthSrcAddr: mac_address=52:54:00:a8:ad:8c" }
 end
 
 

data/src/examples/simple_router/README

@@ -0,0 +1,18 @@
+This directory includes an OpenFlow controller that controls a single
+OpenFlow switch and emulates a router.
+
+# How to run 
+
+Run this
+
+ % sudo trema run ./src/examples/simple_router/simple-router.rb -c ./src/examples/simple_router/simple_router_netns.conf -d 
+
+and send packets like as follows.
+
+ % sudo ip netns exec host1 ping 192.168.2.2
+
+Then check flow entries in OpenFlow switch.
+
+ % sudo trema dump_flows 0x1
+
+This will display flow entries created by the controller.

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

@@ -37,7 +37,7 @@ class RoutingTable
     dest = IPAddr.new( options[ :destination ] )
     masklen = options[ :masklen ]
     prefix = dest.mask( masklen )
-    @db[ masklen ][ prefix.to_i ] = IPAddr.new( options[ :gateway ] )
+    @db[ masklen ][ prefix.to_i ] = IPAddr.new( options[ :nexthop ] )
   end
 
 

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

@@ -130,11 +130,11 @@ class SimpleRouter < Controller
 
 
   def resolve_next_hop( daddr )
-    next_hop = @routing_table.lookup( daddr.value )
-    if next_hop
-      next_hop
-    else
+    interface = @interfaces.find_by_prefix( daddr.value )
+    if interface
       daddr.value
+    else
+      @routing_table.lookup( daddr.value )
     end
   end
 
@@ -165,8 +165,8 @@ class SimpleRouter < Controller
 
   def create_action_from( macsa, macda, port )
     [
-      SetEthSrcAddr.new( macsa.to_s ),
-      SetEthDstAddr.new( macda.to_s ),
+      SetEthSrcAddr.new( macsa ),
+      SetEthDstAddr.new( macda ),
       SendOutPort.new( port )
     ]
   end

data/src/examples/simple_router/simple_router.conf

@@ -15,4 +15,10 @@ $interface = [
   }
 ]
 
-$route = []
+$route = [
+  {
+    :destination => "0.0.0.0",
+    :masklen => 0,
+    :nexthop => "192.168.1.2"
+  }
+]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-01-01 00:00:00 Z
+date: 2013-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -466,6 +466,7 @@ files:
 - src/examples/repeater_hub/repeater-hub_spec.rb
 - src/examples/repeater_hub/repeater_hub.c
 - src/examples/repeater_hub/repeater_hub.conf
+- src/examples/simple_router/README
 - src/examples/simple_router/arp-table.rb
 - src/examples/simple_router/interface.rb
 - src/examples/simple_router/router-utils.rb